diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 345a0eeb188234c34e6a2e95c7e903f96a228fa5..d249b8c87619b15020fef331e940b493c5f63100 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,7 +122,7 @@ fast-build:
- merge_requests
- branches
stage: precheck
- image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native:22.04
+ image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native-itk5:22.04
before_script:
- export GIT_LFS_SKIP_SMUDGE=1
- git checkout -f -q $CI_COMMIT_SHA
@@ -159,7 +159,7 @@ ubuntu-24-prepare:
extends: .common-prepare
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:24.04
script:
- - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=ubuntu-24.04-llvm-xdk-full -DOTB_FULL_BUILD:BOOL=ON
+ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=ubuntu-24.04-llvm-full
artifacts:
untracked: false
when: on_success
@@ -189,8 +189,6 @@ python3.12-gdal-bindings:
extends: .common-build
image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:24.04
only:
- changes:
- - SuperBuild/CMake/External_gdal.cmake
refs:
- /^release-[0-9]+\.[0-9]+$/
script:
@@ -400,21 +398,21 @@ update-archive:
artifacts: false
-release-container:
- image: $BUILD_IMAGE_REGISTRY/otb-alpine:3.7
- stage: deploy
- extends: .general
- only:
- refs:
- - tags@orfeotoolbox/otb
- variables:
- - $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
- script:
- - curl --request POST
- --form token=$K8S_SECRET_RELEASE
- --form ref=master
- --form variables[OTB_TAG]=$CI_COMMIT_TAG
- https://gitlab.orfeo-toolbox.org/api/v4/projects/126/trigger/pipeline
+# release-container:
+# image: $BUILD_IMAGE_REGISTRY/otb-alpine:3.7
+# stage: deploy
+# extends: .general
+# only:
+# refs:
+# - tags@orfeotoolbox/otb
+# variables:
+# - $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
+# script:
+# - curl --request POST
+# --form token=$K8S_SECRET_RELEASE
+# --form ref=master
+# --form variables[OTB_TAG]=$CI_COMMIT_TAG
+# https://gitlab.orfeo-toolbox.org/api/v4/projects/126/trigger/pipeline
release-docker:
image:
diff --git a/CI/headers_check.py b/CI/headers_check.py
index 574e52c9e4e45987903c0121de6c40b35ff80c50..459c2c1a12257f85acdedd5fe122d208a5461dce 100755
--- a/CI/headers_check.py
+++ b/CI/headers_check.py
@@ -140,6 +140,12 @@ excludedfiles = set([
'./Modules/Visualization/Ice/README',
'./Modules/Core/Wrappers/SWIG/src/numpy.i',
'./Modules/Core/Wrappers/SWIG/src/python/__init__.py',
+ './Modules/Core/Common/include/otbCastImageFilter.h',
+ './Modules/Core/Common/include/otbCastImageFilter.hxx',
+ './CI/Invoke-CmdScript.ps1',
+ './CI/copy_boost_dlls.ps1',
+ './CI/dev_env.ps1',
+ './CI/setup_python.ps1',
'./Packaging/Files/OTB Project.zip',
'./Packaging/Files/template.app/Contents/Info.plist',
'./Packaging/LICENSE',
diff --git a/CI/ubuntu-22.04-fast.cmake b/CI/ubuntu-22.04-fast.cmake
index 09cb5f517d4a189da5774a8c5279994f340a29cc..7ca25a3da30627b4449b03e3ccd6c81e9cddc213 100644
--- a/CI/ubuntu-22.04-fast.cmake
+++ b/CI/ubuntu-22.04-fast.cmake
@@ -21,11 +21,8 @@
# Configuration options for ubuntu-22.04-fast
set(site_option
-"CMAKE_C_COMPILER:STRING=clang
-CMAKE_CXX_COMPILER:STRING=clang++
-CMAKE_EXE_LINKER_FLAGS:STRING=-fuse-ld=lld
-CMAKE_MODULE_LINKER_FLAGS:STRING=-fuse-ld=lld
-CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld
+"CMAKE_C_COMPILER:STRING=gcc
+CMAKE_CXX_COMPILER:STRING=g++
CMAKE_C_COMPILER_LAUNCHER:STRING=ccache
CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache
OTB_USE_SHARK:BOOL=OFF
diff --git a/CI/ubuntu-22.04-llvm-full.cmake b/CI/ubuntu-22.04-llvm-full.cmake
index 90025e2439a99d965a32254f8ef2f320dcfe103f..08cabd9b4c3a37f534668020e6f7540482c2cbb4 100644
--- a/CI/ubuntu-22.04-llvm-full.cmake
+++ b/CI/ubuntu-22.04-llvm-full.cmake
@@ -55,15 +55,15 @@ if(NOT ${ci_do_doxygen} EQUAL -1)
set(site_option
"${site_option}
BUILD_DOCUMENTATION:BOOL=ON
-OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-4.13.0
-OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen413/html\"
+OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-5.3.0
+OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen53/html\"
")
set (ENABLE_DOXYGEN ON)
# The ITK doxygen tag file needs to be patched before being used for OTB
# See otb-devutils/Scripts/tagfile_fix.py
message(STATUS "Get resources for Doxygen build ...")
- execute_process(COMMAND wget https://www.orfeo-toolbox.org/packages/archives/Doxygen/InsightDoxygenDocTag-4.13.0.gz
+ execute_process(COMMAND wget https://www.orfeo-toolbox.org/packages/archives/Doxygen/InsightDoxygenDocTag-5.3.0.gz
WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY})
- execute_process(COMMAND gzip -d InsightDoxygenDocTag-4.13.0.gz
+ execute_process(COMMAND gzip -d InsightDoxygenDocTag-5.3.0.gz
WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY})
-endif()
+endif()
\ No newline at end of file
diff --git a/CI/ubuntu-22.04-llvm-xdk-full.cmake b/CI/ubuntu-22.04-llvm-xdk-full.cmake
index 209a70cb9ba8e217b5adc3a21d5af2f775cb74e7..13ac15a8d427136b9b73a72c3d9d804b23371387 100644
--- a/CI/ubuntu-22.04-llvm-xdk-full.cmake
+++ b/CI/ubuntu-22.04-llvm-xdk-full.cmake
@@ -54,15 +54,15 @@ if(NOT ${ci_do_doxygen} EQUAL -1)
set(site_option
"${site_option}
BUILD_DOCUMENTATION:BOOL=ON
-OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-4.13.0
-OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen413/html\"
+OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-5.3.0
+OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen53/html\"
")
set (ENABLE_DOXYGEN ON)
# The ITK doxygen tag file needs to be patched before being used for OTB
# See otb-devutils/Scripts/tagfile_fix.py
message(STATUS "Get resources for Doxygen build ...")
- execute_process(COMMAND wget https://www.orfeo-toolbox.org/packages/archives/Doxygen/InsightDoxygenDocTag-4.13.0.gz
+ execute_process(COMMAND wget https://www.orfeo-toolbox.org/packages/archives/Doxygen/InsightDoxygenDocTag-5.3.0.gz
WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY})
- execute_process(COMMAND gzip -d InsightDoxygenDocTag-4.13.0.gz
+ execute_process(COMMAND gzip -d InsightDoxygenDocTag-5.3.0.gz
WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY})
endif()
\ No newline at end of file
diff --git a/CI/ubuntu-22.04-llvm-xdk.cmake b/CI/ubuntu-22.04-llvm-xdk.cmake
deleted file mode 100644
index e16554f426440ce28edafcdd4af0335b03e244f9..0000000000000000000000000000000000000000
--- a/CI/ubuntu-22.04-llvm-xdk.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2005-2024 Centre National d'Etudes Spatiales (CNES)
-#
-# This file is part of Orfeo Toolbox
-#
-# https://www.orfeo-toolbox.org/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Configuration options for ubuntu-22.04-llvm-xdk
-
-set(site_option
-"CMAKE_C_COMPILER:STRING=clang
-CMAKE_CXX_COMPILER:STRING=clang++
-CMAKE_EXE_LINKER_FLAGS:STRING=-fuse-ld=lld
-CMAKE_MODULE_LINKER_FLAGS:STRING=-fuse-ld=lld
-CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld
-USE_SYSTEM_OPENSSL:BOOL=OFF
-")
diff --git a/CI/ubuntu-22.04-llvm.cmake b/CI/ubuntu-22.04-llvm.cmake
deleted file mode 100644
index ecb12d9ba91629426d03597deb7297c9f29517a7..0000000000000000000000000000000000000000
--- a/CI/ubuntu-22.04-llvm.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2005-2024 Centre National d'Etudes Spatiales (CNES)
-#
-# This file is part of Orfeo Toolbox
-#
-# https://www.orfeo-toolbox.org/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Configuration options for ubuntu-22.04-llvm
-
-set(site_option
-"CMAKE_C_COMPILER:STRING=clang
-CMAKE_CXX_COMPILER:STRING=clang++
-CMAKE_EXE_LINKER_FLAGS:STRING=-fuse-ld=lld
-CMAKE_MODULE_LINKER_FLAGS:STRING=-fuse-ld=lld
-CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld
-CMAKE_C_COMPILER_LAUNCHER:STRING=ccache
-CMAKE_CXX_COMPILER_LAUNCHER:STRING=ccache
-OTB_USE_SHARK:BOOL=OFF
-USE_SYSTEM_OPENSSL:BOOL=OFF")
-
-if(NOT ${ci_do_cookbook} EQUAL -1)
- set(site_option
-"${site_option}
-BUILD_COOKBOOK:BOOL=ON")
-endif()
-
-if(NOT ${ci_do_doxygen} EQUAL -1)
- set(site_option
-"${site_option}
-BUILD_DOCUMENTATION:BOOL=ON
-OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-4.13.0
-OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen413/html\"
-")
- set (ENABLE_DOXYGEN ON)
- # The ITK doxygen tag file needs to be patched before being used for OTB
- # See otb-devutils/Scripts/tagfile_fix.py
- message(STATUS "Get resources for Doxygen build ...")
- execute_process(COMMAND wget https://www.orfeo-toolbox.org/packages/archives/Doxygen/InsightDoxygenDocTag-4.13.0.gz
- WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY})
- execute_process(COMMAND gzip -d InsightDoxygenDocTag-4.13.0.gz
- WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY})
-endif()
diff --git a/CMake/GenerateExportHeaderCustom.cmake b/CMake/GenerateExportHeaderCustom.cmake
index ba1a14e76b4133fb2d642972a093a972ac794303..7232511dd3975c392fb1f07131bad9b8e2b0e339 100644
--- a/CMake/GenerateExportHeaderCustom.cmake
+++ b/CMake/GenerateExportHeaderCustom.cmake
@@ -316,7 +316,7 @@ macro(_DO_SET_MACRO_VALUES TARGET_LIBRARY)
endif()
endmacro()
-macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
+macro(_OTB_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
# Option overrides
set(options DEFINE_NO_DEPRECATED)
set(oneValueArgs PREFIX_NAME BASE_NAME EXPORT_MACRO_NAME EXPORT_FILE_NAME
@@ -411,11 +411,11 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
endif()
endif()
- configure_file("${_GENERATE_EXPORT_HEADER_MODULE_DIR}/exportheader.cmake.in"
+ configure_file("${CMAKE_SOURCE_DIR}/CMake/exportheader.cmake.in"
"${EXPORT_FILE_NAME}" @ONLY)
endmacro()
-function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
+function(OTB_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
if(NOT ${type} STREQUAL "STATIC_LIBRARY"
AND NOT ${type} STREQUAL "SHARED_LIBRARY"
@@ -427,7 +427,7 @@ function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
_test_compiler_hidden_visibility()
_test_compiler_has_deprecated()
_do_set_macro_values(${TARGET_LIBRARY})
- _do_generate_export_header(${TARGET_LIBRARY} ${ARGN})
+ _otb_do_generate_export_header(${TARGET_LIBRARY} ${ARGN})
endfunction()
function(add_compiler_export_flags)
diff --git a/CMake/OTBCheckTargetSystemArch.cmake b/CMake/OTBCheckTargetSystemArch.cmake
index fe1e6cfeaa83681d6d730a0df3023e8171b21bb1..0693ea915eedec36de5922a19ad10372c44d3431 100644
--- a/CMake/OTBCheckTargetSystemArch.cmake
+++ b/CMake/OTBCheckTargetSystemArch.cmake
@@ -47,10 +47,10 @@ macro(OTB_CHECK_TARGET_SYSTEM_ARCH _RESULT1 _RESULT2)
OUTPUT_VARIABLE ov
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-
+
set(${_RESULT1} "${ov}")
set(${_RESULT2} FALSE)
- if("${ov}" STREQUAL "x86_64")
+ if("${ov}" MATCHES "(x86_64|amd64)")
set(${_RESULT2} TRUE)
endif()
endif()
diff --git a/CMake/OTBGroups.cmake b/CMake/OTBGroups.cmake
index cea4602b3ffa6834853d5249240e41b5f994ee8b..098ebbdf714a6ef5db33b9b3247dc01385ae7827 100644
--- a/CMake/OTBGroups.cmake
+++ b/CMake/OTBGroups.cmake
@@ -152,11 +152,9 @@ set_property(GLOBAL PROPERTY OTB_GROUPS_ENABLED ${GROUPS_ENABLED_LIST})
if(OTBGroup_Learning MATCHES ON)
set(OTB_USE_LIBSVM ON CACHE BOOL "Enable module LibSVM in OTB" FORCE)
set(OTB_USE_OPENCV ON CACHE BOOL "Enable module OPENCV in OTB" FORCE)
- set(OTB_USE_SHARK ON CACHE BOOL "Enable module Shark in OTB" FORCE)
else()
set(OTB_USE_LIBSVM OFF CACHE BOOL "Enable module LibSVM in OTB" FORCE)
set(OTB_USE_OPENCV OFF CACHE BOOL "Enable module OPENCV in OTB" FORCE)
- set(OTB_USE_SHARK OFF CACHE BOOL "Enable module Shark in OTB" FORCE)
endif()
if(OTBGroup_FeaturesExtraction MATCHES ON)
set(OTB_USE_MUPARSER ON CACHE BOOL "Enable module MuParser in OTB" FORCE)
diff --git a/CMake/OTBModuleHeaderTest.cmake b/CMake/OTBModuleHeaderTest.cmake
index 792f0a40f0de3ec30c1f74e4edc753de80445f8e..7fb1a4c40e7a0085d311b9b8188f085d0550ceac 100644
--- a/CMake/OTBModuleHeaderTest.cmake
+++ b/CMake/OTBModuleHeaderTest.cmake
@@ -68,7 +68,9 @@ macro( otb_module_headertest _name )
AND Python_EXECUTABLE
AND NOT (Python_VERSION VERSION_LESS 3)
AND NOT (${_name} STREQUAL OTBTestKernel)
- AND NOT (CMAKE_GENERATOR MATCHES "^Visual Studio 10.*"))
+ AND NOT (${_name} STREQUAL OTBDate)
+ AND NOT (${_name} STREQUAL OTBShark)
+ AND NOT (CMAKE_GENERATOR MATCHES "^NMake Makefiles *"))
# Count how many tests we are going to get, and put the source files in
# the list _outputs.
@@ -93,7 +95,6 @@ macro( otb_module_headertest _name )
add_custom_target( ${_name}HeaderTestClean
${CMAKE_COMMAND} -E remove ${_outputs} )
add_dependencies( OTBHeaderTests ${_name}HeaderTestClean )
-
# We check to see if the headers are changed. If so, remove the header test
# source files so they are regenerated.
set( _headers_list_md5 "${${_name}_BINARY_DIR}/test/CMakeFiles/HeadersList.md5" )
@@ -112,7 +113,6 @@ macro( otb_module_headertest _name )
if( ${_regenerate_sources} )
file( REMOVE ${_outputs} )
endif()
-
set( _test_num 1 )
foreach( _header_test_src ${_outputs} )
get_filename_component( _test_name ${_header_test_src} NAME_WE )
@@ -127,7 +127,7 @@ macro( otb_module_headertest _name )
${BANNED_HEADERS}
)
add_executable( ${_test_name} ${_header_test_src} )
- target_link_libraries( ${_test_name} OTBCommon )
+ target_link_libraries( ${_test_name} OTBCommon)
if (${_name}_LIBRARIES)
target_link_libraries(${_test_name} ${${_name}_LIBRARIES})
diff --git a/CMake/OTBModuleMacros.cmake b/CMake/OTBModuleMacros.cmake
index 4dcc8774ae0b4d8d8aa9c2f3711de29a35166895..d7f7deb1819e2462c0a2d86642d455f4d9d5022e 100644
--- a/CMake/OTBModuleMacros.cmake
+++ b/CMake/OTBModuleMacros.cmake
@@ -238,7 +238,7 @@ macro(otb_module_impl)
# Generate the export macro header for symbol visibility/Windows DLL declspec
# This header is called *Modulename*Export.h in the build directory,
# and contains defines for _EXPORT macros such as OTBApplicationEngine_EXPORT
- generate_export_header(${otb-module}
+ otb_generate_export_header(${otb-module}
EXPORT_FILE_NAME ${_export_header_file}
EXPORT_MACRO_NAME ${otb-module}_EXPORT
DEPRECATED_MACRO_NAME ${otb-module}_DEPRECATED
@@ -283,10 +283,10 @@ macro(otb_module_impl)
list(APPEND otb-module-INCLUDE_DIRS-build "${${otb-module}_SYSTEM_INCLUDE_DIRS}")
list(APPEND otb-module-INCLUDE_DIRS-install "${${otb-module}_SYSTEM_INCLUDE_DIRS}")
endif()
- set(otb-module-LIBRARY_DIRS "\${GROUP_${__current_component}_LOCATION}/lib")
+ set(otb-module-LIBRARY_DIRS "${${otb-module}_SYSTEM_LIBRARY_DIRS}")
# add system lib dir if it exists
- if (${${otb-module}_SYSTEM_LIBRARY_DIRS})
- list(APPEND otb-module-LIBRARY_DIRS "${${otb-module}_SYSTEM_LIBRARY_DIRS}")
+ if (${GROUP_${__current_component}_LOCATION})
+ list(APPEND otb-module-LIBRARY_DIRS "\${GROUP_${__current_component}_LOCATION}/lib")
endif()
set(otb-module-INCLUDE_DIRS "${otb-module-INCLUDE_DIRS-build}")
set(otb-module-EXPORT_CODE "${otb-module-EXPORT_CODE-build}")
diff --git a/CMake/OTBSetStandardCompilerFlags.cmake b/CMake/OTBSetStandardCompilerFlags.cmake
index 4835fdd437a2b815752128d65801a23e291b3d9c..d7e74c996b78ef96ced6d70fcc8d43c87a612377 100644
--- a/CMake/OTBSetStandardCompilerFlags.cmake
+++ b/CMake/OTBSetStandardCompilerFlags.cmake
@@ -231,6 +231,7 @@ macro(check_compiler_platform_flags)
endif()
endif()
endif()
+
#-----------------------------------------------------------------------------
#OTB requires special compiler flags on some platforms.
if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/CMake/OTBStandaloneModuleMacros.cmake b/CMake/OTBStandaloneModuleMacros.cmake
index d38dc6f2540ccbf821ba07c7016a63c0051cf394..1b345ba68118a2c87e153bfbb759e0927b0f7d3e 100644
--- a/CMake/OTBStandaloneModuleMacros.cmake
+++ b/CMake/OTBStandaloneModuleMacros.cmake
@@ -517,7 +517,7 @@ macro(otb_module_impl)
# Generate the export macro header for symbol visibility/Windows DLL declspec
# This header is called *Modulename*Export.h in the build directory,
# and contains defines for _EXPORT macros such as OTBApplicationEngine_EXPORT
- generate_export_header(${otb-module}
+ otb_generate_export_header(${otb-module}
EXPORT_FILE_NAME ${_export_header_file}
EXPORT_MACRO_NAME ${otb-module}_EXPORT
DEPRECATED_MACRO_NAME ${otb-module}_DEPRECATED
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58476871c7a7a8456b9f03306ed2a5d2b8438b60..89f71a49728eb91d1d3745e4518f549ac6326fff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,9 +37,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
# Check compiler versions
-set(OTB_MIN_GNU_VER 5)
+set(OTB_MIN_GNU_VER 8)
set(OTB_MIN_MSVC_VER 19)
-set(OTB_MIN_Clang_VER 3.4)
+set(OTB_MIN_Clang_VER 10)
if(DEFINED OTB_MIN_${CMAKE_CXX_COMPILER_ID}_VER)
if(CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${OTB_MIN_${CMAKE_CXX_COMPILER_ID}_VER})
message(FATAL_ERROR "The version of your ${CMAKE_CXX_COMPILER_ID} "
@@ -113,8 +113,8 @@ set(main_project_name ${_OTBModuleMacros_DEFAULT_LABEL})
#-----------------------------------------------------------------------------
# OTB version number.
-set(OTB_VERSION_MAJOR "9")
-set(OTB_VERSION_MINOR "1")
+set(OTB_VERSION_MAJOR "10")
+set(OTB_VERSION_MINOR "0")
set(OTB_VERSION_PATCH "0")
set(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
@@ -376,7 +376,16 @@ if(XDK_INSTALL_PATH)
install(DIRECTORY ${XDK_INSTALL_PATH}/share
DESTINATION .
USE_SOURCE_PERMISSIONS
- COMPONENT Core)
+ COMPONENT Core
+ PATTERN "cmake" EXCLUDE
+ )
+ # On Windows this folder does not exist
+ if( EXISTS ${XDK_INSTALL_PATH}/share/cmake)
+ install(DIRECTORY ${XDK_INSTALL_PATH}/share/cmake
+ DESTINATION ./lib
+ USE_SOURCE_PERMISSIONS
+ COMPONENT Core)
+ endif()
install(DIRECTORY ${XDK_INSTALL_PATH}/include
DESTINATION .
USE_SOURCE_PERMISSIONS
@@ -430,7 +439,7 @@ if(UNIX)
configure_file(${OTB_SOURCE_DIR}/Packaging/Files/post_install.sh.in
${CMAKE_BINARY_DIR}/post_install.sh @ONLY)
install( PROGRAMS
- ${OTB_SOURCE_DIR}/Packaging/Files/check_python_env.sh
+ ${OTB_SOURCE_DIR}/Packaging/Files/build_gdal_bindings.sh
${CMAKE_BINARY_DIR}/post_install.sh
${OTB_SOURCE_DIR}/Packaging/Files/sanitize_rpath.sh
DESTINATION ./tools
diff --git a/Data/Baseline/OTB-Applications/Files/utTvConcatenateVectorData.dbf b/Data/Baseline/OTB-Applications/Files/utTvConcatenateVectorData.dbf
index fb9bc594ea815de65b02815e1ec2604602206a47..2c8e54fe139a95e1f97dfb0ff38f90e34d9b4db9 100644
--- a/Data/Baseline/OTB-Applications/Files/utTvConcatenateVectorData.dbf
+++ b/Data/Baseline/OTB-Applications/Files/utTvConcatenateVectorData.dbf
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ccddb00be6356a07895f6f6fef3b958196226b4a470b62dacd8bee3dd2112213
-size 136403
+oid sha256:b0494b65fd35a998a565d88a9dd0287cb1bde66ac3447e272e45894321835571
+size 136404
diff --git a/Data/Baseline/OTB-Applications/Files/utTvConcatenateVectorData.prj b/Data/Baseline/OTB-Applications/Files/utTvConcatenateVectorData.prj
new file mode 100644
index 0000000000000000000000000000000000000000..f45cbadf0074d8b7b2669559a93bc50bb95f82d4
--- /dev/null
+++ b/Data/Baseline/OTB-Applications/Files/utTvConcatenateVectorData.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
\ No newline at end of file
diff --git a/Data/Baseline/OTB/Files/apTvSeSegmentationMeanshiftVector.6.sqlite b/Data/Baseline/OTB/Files/apTvSeSegmentationMeanshiftVector.6.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..5097939e0dfe611be42694139046cb56d598d700
--- /dev/null
+++ b/Data/Baseline/OTB/Files/apTvSeSegmentationMeanshiftVector.6.sqlite
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10f19136bf7e0e48d90f6f9227ad77ff401b5c18e9fc146874d16f811161570c
+size 53248
diff --git a/Data/Baseline/OTB/Files/apTvSeSegmentationMeanshiftVector.7.sqlite b/Data/Baseline/OTB/Files/apTvSeSegmentationMeanshiftVector.7.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..05a4e78fb736423ab4265866736dd4634d51cf4d
--- /dev/null
+++ b/Data/Baseline/OTB/Files/apTvSeSegmentationMeanshiftVector.7.sqlite
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de30d4f58a59741dd5ca1cfc66962c8fb15cdf73b53f16886096934e5cf3e2aa
+size 53248
diff --git a/Data/Baseline/OTB/Files/ioSHPVectorDataFileReader2.1.txt b/Data/Baseline/OTB/Files/ioSHPVectorDataFileReader2.1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cdeceb83ef65e8a5dbbeff2c054656953bcba807
--- /dev/null
+++ b/Data/Baseline/OTB/Files/ioSHPVectorDataFileReader2.1.txt
@@ -0,0 +1,35 @@
+VectorData (0x5f0da4bc59e0)
+ RTTI typeinfo: otb::VectorData<double, 2u, double>
+ Reference Count: 2
+ Modified Time: 168
+ Debug: Off
+ Object Name:
+ Observers:
+ none
+ Source: (0x5f0da4bc7870)
+ Source output name: Primary
+ Release Data: Off
+ Data Released: False
+ Global Release Data: Off
+ PipelineMTime: 18
+ UpdateMTime: 169
+ RealTimeStamp: 0 seconds
+
++Root (Root)
+ +Document (ToulouseRoad-examples)
+ +Line () 6 points
+ -> Metadata: VectorData Keyword list: - Size: 1
+ number (Integer64): 1
+
+ +Line () 4 points
+ -> Metadata: VectorData Keyword list: - Size: 1
+ number (Integer64): 2
+
+ +Line () 9 points
+ -> Metadata: VectorData Keyword list: - Size: 1
+ number (Integer64): 3
+
+ +Line () 4 points
+ -> Metadata: VectorData Keyword list: - Size: 1
+ number (Integer64): 4
+
diff --git a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt
index 682cfcb63e56e77072b1e7525b14889f6efbbdb1..9f05bce3a230729bb733c6e01a7978939139a2f6 100644
--- a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt
+++ b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.1.txt
@@ -1,6 +1,23 @@
+VectorData (0x6352a94019f0)
+ RTTI typeinfo: otb::VectorData<double, 2u, double>
+ Reference Count: 2
+ Modified Time: 280
+ Debug: Off
+ Object Name:
+ Observers:
+ none
+ Source: (0x6352a9403880)
+ Source output name: Primary
+ Release Data: Off
+ Data Released: False
+ Global Release Data: Off
+ PipelineMTime: 18
+ UpdateMTime: 281
+ RealTimeStamp: 0 seconds
+
+Root (Root)
-+Document (Paths)
-+Line () 2 points
+ +Document (Paths)
+ +Line () 2 points
-> Metadata: VectorData Keyword list: - Size: 5
Name (String): Tessellated
description (String): If the <tessellate> tag has a value of 1, the line will contour to the underlying terrain
@@ -8,7 +25,7 @@
extrude (Integer): 0
visibility (Integer): 0
-+Line () 2 points
+ +Line () 2 points
-> Metadata: VectorData Keyword list: - Size: 5
Name (String): Untessellated
description (String): If the <tessellate> tag has a value of 0, the line follow a simple straight-line path from point to point
@@ -16,7 +33,7 @@
extrude (Integer): 0
visibility (Integer): 0
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 6
Name (String): Absolute
description (String): Transparent purple line
@@ -25,7 +42,7 @@
extrude (Integer): 0
visibility (Integer): 0
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 6
Name (String): Absolute Extruded
description (String): Transparent green wall with yellow outlines
@@ -34,7 +51,7 @@
extrude (Integer): 1
visibility (Integer): 0
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 6
Name (String): Relative
description (String): Black line (10 pixels wide), height tracks terrain
@@ -43,7 +60,7 @@
extrude (Integer): 0
visibility (Integer): 0
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 6
Name (String): Relative Extruded
description (String): Opaque blue walls with red outline, height tracks terrain
diff --git a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.txt b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.txt
index 540608dc05a4abf37cdb94331bc935b4f83e57c4..1f7d1ae97940be4c16b8218f686e3d2aada284f9 100644
--- a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.txt
+++ b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader.txt
@@ -1,31 +1,48 @@
+VectorData (0x5e3c2d00e120)
+ RTTI typeinfo: otb::VectorData<double, 2u, double>
+ Reference Count: 2
+ Modified Time: 280
+ Debug: Off
+ Object Name:
+ Observers:
+ none
+ Source: (0x5e3c2d00e410)
+ Source output name: Primary
+ Release Data: Off
+ Data Released: False
+ Global Release Data: Off
+ PipelineMTime: 18
+ UpdateMTime: 281
+ RealTimeStamp: 0 seconds
+
+Root (Root)
-+Document (Paths)
-+Line () 2 points
+ +Document (Paths)
+ +Line () 2 points
-> Metadata: VectorData Keyword list: - Size: 2
Name (String): Tessellated
Description (String): If the <tessellate> tag has a value of 1, the line will contour to the underlying terrain
-+Line () 2 points
+ +Line () 2 points
-> Metadata: VectorData Keyword list: - Size: 2
Name (String): Untessellated
Description (String): If the <tessellate> tag has a value of 0, the line follow a simple straight-line path from point to point
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 2
Name (String): Absolute
Description (String): Transparent purple line
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 2
Name (String): Absolute Extruded
Description (String): Transparent green wall with yellow outlines
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 2
Name (String): Relative
Description (String): Black line (10 pixels wide), height tracks terrain
-+Line () 11 points
+ +Line () 11 points
-> Metadata: VectorData Keyword list: - Size: 2
Name (String): Relative Extruded
Description (String): Opaque blue walls with red outline, height tracks terrain
diff --git a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.3.txt b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.3.txt
new file mode 100644
index 0000000000000000000000000000000000000000..49789d01634ee4baa2dd3cd9e351fe66cdbfe856
--- /dev/null
+++ b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.3.txt
@@ -0,0 +1,22 @@
+VectorData (0x63e21111b9f0)
+ RTTI typeinfo: otb::VectorData<double, 2u, double>
+ Reference Count: 2
+ Modified Time: 94
+ Debug: Off
+ Object Name:
+ Observers:
+ none
+ Source: (0x63e21111d880)
+ Source output name: Primary
+ Release Data: Off
+ Data Released: False
+ Global Release Data: Off
+ PipelineMTime: 18
+ UpdateMTime: 95
+ RealTimeStamp: 0 seconds
+
++Root (Root)
+ +Document (KmlFile)
+ +Collection ()
+ +Point () [-123.939, 49.1646]
+ +Polygon () 7 points, 0 interior rings
diff --git a/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.4.txt b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.4.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b4b82a61e724729850296467d020eb5ded8de152
--- /dev/null
+++ b/Data/Baseline/OTB/Files/ioTvKMLVectorDataFileReader2.4.txt
@@ -0,0 +1,22 @@
+VectorData (0x63553878a120)
+ RTTI typeinfo: otb::VectorData<double, 2u, double>
+ Reference Count: 2
+ Modified Time: 94
+ Debug: Off
+ Object Name:
+ Observers:
+ none
+ Source: (0x63553878a410)
+ Source output name: Primary
+ Release Data: Off
+ Data Released: False
+ Global Release Data: Off
+ PipelineMTime: 18
+ UpdateMTime: 95
+ RealTimeStamp: 0 seconds
+
++Root (Root)
+ +Document (KmlFile)
+ +Collection ()
+ +Point () [-123.939, 49.1646]
+ +Polygon () 7 points, 0 interior rings
diff --git a/Data/Baseline/OTB/Images/obTuWatershedSegmentationFilterLabelImage.1.tif b/Data/Baseline/OTB/Images/obTuWatershedSegmentationFilterLabelImage.1.tif
new file mode 100644
index 0000000000000000000000000000000000000000..51d4c7edcfb4f437a81b3b303ac52bcc201dff7c
--- /dev/null
+++ b/Data/Baseline/OTB/Images/obTuWatershedSegmentationFilterLabelImage.1.tif
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49831ab756458243d99367e06884eab40737b9dd113ed09628bdc638a07705f2
+size 827613
diff --git a/Data/Input/ADS40RoiSmall.png.aux.xml b/Data/Input/ADS40RoiSmall.png.aux.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ed238186380d66d34dd11447a9b4a9c74d552eb
--- /dev/null
+++ b/Data/Input/ADS40RoiSmall.png.aux.xml
@@ -0,0 +1,10 @@
+<PAMDataset>
+ <PAMRasterBand band="1">
+ <Metadata>
+ <MDI key="STATISTICS_MAXIMUM">255</MDI>
+ <MDI key="STATISTICS_MEAN">120.1091003418</MDI>
+ <MDI key="STATISTICS_MINIMUM">23</MDI>
+ <MDI key="STATISTICS_STDDEV">48.85195761071</MDI>
+ </Metadata>
+ </PAMRasterBand>
+</PAMDataset>
diff --git a/Documentation/Cookbook/rst/C++/PersistentFilters.rst b/Documentation/Cookbook/rst/C++/PersistentFilters.rst
index 2c7b6073bb376b3716efe9abecf89bd465637358..c3adbdf51dc6b8153b607f03e65afc208b7d5741 100644
--- a/Documentation/Cookbook/rst/C++/PersistentFilters.rst
+++ b/Documentation/Cookbook/rst/C++/PersistentFilters.rst
@@ -151,7 +151,7 @@ results container with respect to the number of threads is handled here.
virtual void Reset()
{
// Retrieve the number of threads
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
// Reset the temporary results container
m_TemporarySums = std::vector<PixelType>(numberOfThreads, itk::NumericTraits<PixelType>::Zero);
@@ -199,7 +199,7 @@ Last, we need to define the ``Synthetize()`` method (still in the
virtual void Synthetize()
{
// For each thread
- for(unsigned int threadId = 0; threadId <this->GetNumberOfThreads();++threadId)
+ for(unsigned int threadId = 0; threadId <this->GetNumberOfWorkUnits();++threadId)
{
// Update final result
m_Mean+=m_TemporarySums[threadId];
diff --git a/Documentation/Cookbook/rst/C++/StreamingAndThreading.rst b/Documentation/Cookbook/rst/C++/StreamingAndThreading.rst
index 0d7d29f4be418af512fcb6ab48231a17ae7cec0f..3b003559a09f6812ff8abb4104927814d114e21b 100644
--- a/Documentation/Cookbook/rst/C++/StreamingAndThreading.rst
+++ b/Documentation/Cookbook/rst/C++/StreamingAndThreading.rst
@@ -37,7 +37,7 @@ Even if you use a non streamed writer, each filter which has a
to one thread and you will notice two calls to the function.
If you have some particular requirement and want to use only one thread,
-you can call the ``SetNumberOfThreads()`` method on each of your filter.
+you can call the ``SetNumberOfWorkUnits()`` method on each of your filter.
When you are writing your own filter, you have to follow some rules to
make your filter streamable and threadable. Some details are provided in
diff --git a/Documentation/Cookbook/rst/CompilingOTBFromSource.rst b/Documentation/Cookbook/rst/CompilingOTBFromSource.rst
index bcdc3b486a91a640353ed028fff74141750b7c0e..a514f3c9bc0f10ac7d67422500103b6ff9202c4d 100644
--- a/Documentation/Cookbook/rst/CompilingOTBFromSource.rst
+++ b/Documentation/Cookbook/rst/CompilingOTBFromSource.rst
@@ -25,33 +25,33 @@ process:
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| **Library** | **Mandatory** | **Minimum version** | **Superbuild Version** |
+===================================================================+=======================+============================+==========================+
- | `Boost <http://www.boost.org>`_ | Yes | 1.73.0 | 1.82.0 |
+ | `Boost <http://www.boost.org>`_ | Yes | 1.73.0 | 1.86.0 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `Expat <https://sourceforge.net/projects/expat/>`_ | Yes | | 2.5.0 |
+ | `Expat <https://sourceforge.net/projects/expat/>`_ | Yes | | 2.6.3 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `Geos <https://libgeos.org/>`_ | Yes | | 3.12.1 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `ITK <http://www.itk.org>`_ | Yes | 4.6.0 | 4.13.3 |
+ | `ITK <http://www.itk.org>`_ | Yes | 5.0.0 | 5.3.0 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `GDAL <http://www.gdal.org>`_ | Yes | 2.4.1 | 3.8.3 |
+ | `GDAL <http://www.gdal.org>`_ | Yes | 3.0.0 | 3.9.3 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `HDF4 <https://www.hdfgroup.org/solutions/hdf4/>`_ | Yes | | 4.2.13 |
+ | `HDF4 <https://www.hdfgroup.org/solutions/hdf4/>`_ | Yes | | 4.2.15 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `HDF5 <https://www.hdfgroup.org/solutions/hdf5/>`_ | Yes | | 1.12.3 |
+ | `HDF5 <https://www.hdfgroup.org/solutions/hdf5/>`_ | Yes | | 1.14.5 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.7.1 |
+ | `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.7.3 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `libjpeg-turbo <https://github.com/libjpeg-turbo/libjpeg-turbo>`_ | Yes | | 3.0.3 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `libpng <https://downloads.sourceforge.net/project/libpng>`_ | Yes | | 1.6.37 |
+ | `libpng <https://downloads.sourceforge.net/project/libpng>`_ | Yes | | 1.6.44 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `libtiff <http://www.libtiff.org/>`_ | Yes | | 4.6.0 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `NetCDF <https://github.com/Unidata/netcdf-c>`_ | Yes | | 4.9.2 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `OpenJPEG <https://github.com/uclouvain/openjpeg>`_ | Yes | | 2.5.0 |
+ | `OpenJPEG <https://github.com/uclouvain/openjpeg>`_ | Yes | | 2.5.2 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `PROJ <https://proj.org/>`_ | Yes | | 9.3.1 |
+ | `PROJ <https://proj.org/>`_ | Yes | | 9.5.0 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `SQLITE <https://www.sqlite.org>`_ | Yes | | 3.42.0 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
@@ -61,7 +61,7 @@ process:
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `6S <http://6s.ltdri.org>`_ | No | | |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `Curl <http://www.curl.haxx.se>`_ | No | | 8.2.1 |
+ | `Curl <http://www.curl.haxx.se>`_ | No | | 8.10.1 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `FFTW <http://www.fftw.org>`_ | No | | 3.3.10 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
@@ -69,11 +69,11 @@ process:
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `MPI <https://www.open-mpi.org/>`_ | No | | |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.3.2 |
+ | `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.3.4 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 | 4.0.8 |
+ | `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 | 4.0.12 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
- | `OpenCV <http://opencv.org>`_ | No | 3.0.0 | 4.6.0 |
+ | `OpenCV <http://opencv.org>`_ | No | 3.0.0 | 4.10.0 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
| `Shark <http://image.diku.dk/shark/>`_ | No | 4 | 4.0 |
+-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+
diff --git a/Documentation/Cookbook/rst/First_Step_Docker.rst b/Documentation/Cookbook/rst/First_Step_Docker.rst
index 0699f5c2de58b5c787cb62eab222b9211f6fdcd3..7ee9e2a8d5fbd52eed11f783db810fca68c7202d 100644
--- a/Documentation/Cookbook/rst/First_Step_Docker.rst
+++ b/Documentation/Cookbook/rst/First_Step_Docker.rst
@@ -25,7 +25,7 @@ Apply your first BandMath processing
.. code-block:: bash
- docker run -it -v /home/user/Data:/Data orfeotoolbox/otb:latest otbcli_BandMath –il /Data/phr_xs.tif –out ndvi.tif –exp “(im1b4-im1b1)/ (im1b4+im1b1)â€
+ docker run -it -v /home/user/Data:/Data orfeotoolbox/otb:latest otbcli_BandMath –il /Data/phr_xs.tif –out /Data/ndvi.tif –exp “(im1b4-im1b1)/ (im1b4+im1b1)â€
**Important Note**:
If you are on MacOS, there is a trick to use the docker image due to the ARM architecture, it is described in the `README <https://hub.docker.com/r/orfeotoolbox/otb>`_ of the official docker hub image page
\ No newline at end of file
diff --git a/Documentation/Cookbook/rst/First_Step_Linux.rst b/Documentation/Cookbook/rst/First_Step_Linux.rst
index 3285ed36ad293b2b2598d76b4b95782d90d73fab..f8b90a32d31cc59c82a9d822a87c67a4914f972d 100644
--- a/Documentation/Cookbook/rst/First_Step_Linux.rst
+++ b/Documentation/Cookbook/rst/First_Step_Linux.rst
@@ -21,9 +21,7 @@ Download OTB
.. code-block:: bash
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux-Core.tar.gz -o /Path/Download/OTB-Core-9.0.tar.gz
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux-FeaturesExtraction.tar.gz -o /Path/Download/OTB-FeaturesExtraction-9.0.tar.gz
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux-Dependencies.tar.gz -o /Path/Download/OTB-Dependencies-9.0.tar.gz
+ curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-10.0.0-Linux.tar.gz -o /Path/Download/OTB-10.0.tar.gz
Installation
@@ -33,9 +31,7 @@ Installation
# Install otb
cd /Path/Download
- tar xvf OTB-Core-9.0.tar.gz --one-top-level="/Path/To/Install/OTB"
- tar xvf OTB-Features-9.0.tar.gz --one-top-level="/Path/To/Install/OTB"
- tar xvf OTB-Dependencies-9.0.tar.gz --one-top-level="/Path/To/Install/OTB"
+ tar xvf OTB-10.0.tar.gz --one-top-level="/Path/To/Install/OTB"
source /Path/To/Install/OTB/otbenv.profile
Download an example image
@@ -50,17 +46,17 @@ Compute NDVI using the CLI interface
.. code-block:: bash
- otbcli_BandMath –il /Path/You/Want/phr_xs.tif –out ndvi.tif –exp “(im1b4-im1b1)/ (im1b4+im1b1)â€
+ otbcli_BandMath –il /Path/You/Want/phr_xs.tif –out /Path/You/Want/ndvi.tif –exp “(im1b4-im1b1)/ (im1b4+im1b1)â€
Use Python API to compute NDVI
++++++++++++++++++++++++++++++
-To use the Python API you have first to recompile the bindings for your version of Python. By default they are compiled for Python 3.8
+To use the Python API you have first to recompile the bindings for your version of Python. By default they are compiled for Python 3.10
.. code-block:: bash
# Recompile python bindings
- cd /Path/To/OTB-9.0
+ cd /Path/To/OTB-10.0
source otbenv.profile
sh recompile-bindings.sh
diff --git a/Documentation/Cookbook/rst/Installation.rst b/Documentation/Cookbook/rst/Installation.rst
index 138b1f8881abd2d7f0ffa1f4cf9b35eccac8f3ce..639a274583ccff810dcc95064e285434b8195950 100644
--- a/Documentation/Cookbook/rst/Installation.rst
+++ b/Documentation/Cookbook/rst/Installation.rst
@@ -13,14 +13,14 @@ Orfeo Toolbox installation is straightforward:
If you want the latests features, you might be interested to compile from source. Detailled steps at :doc:`CompilingOTBFromSource`.
-OTB 9.x is known to work on:
+OTB 10.x is known to work on:
.. table:: OTB compat list
+--------------------------------------------+-------------------------------+--------------------+
| **Operating System** | **Minimum compiler required** | **Python version** |
+============================================+===============================+====================+
- | Debian 11 and more & Ubuntu 20.04 and more | GCC 8 | Python >= 3.8 |
+ | Debian 12 and more & Ubuntu 22.04 and more | GCC 8 | Python >= 3.10 |
+--------------------------------------------+-------------------------------+--------------------+
| RedHat 8 | GCC 8 | Python >= 3.8 |
+--------------------------------------------+-------------------------------+--------------------+
@@ -47,24 +47,21 @@ Docker image
The following docker images are availables on `DockerHub <https://hub.docker.com/r/orfeotoolbox/otb>`__.
**It is the only way to run OTB for MacOS since the Intel architecture is no more in the Mac ecosystem.**:
-.. table:: Docker list for version 9.1
-
- +----------------+--------------+--------------------+
- | **Tag** | **OS base** | **Python version** |
- +================+==============+====================+
- | 9.1.0 | ubuntu 20.04 | Python 3.8 |
- +----------------+--------------+--------------------+
- | 9.1.0_ubuntu22 | ubuntu 22.04 | Python 3.10 |
- +----------------+--------------+--------------------+
- | 9.1.0_ubuntu24 | ubuntu 24.04 | Python 3.12 |
- +----------------+--------------+--------------------+
+.. table:: Docker list for version 10.0
+ +-----------------+--------------+--------------------+
+ | **Tag** | **OS base** | **Python version** |
+ +=================+==============+====================+
+ | 10.0.0 | ubuntu 22.04 | Python 3.10 |
+ +-----------------+--------------+--------------------+
+ | 10.0.0_ubuntu24 | ubuntu 24.04 | Python 3.12 |
+ +-----------------+--------------+--------------------+
It can be used on any device running Docker with the following instruction:
::
- # you can adapt the version you want using different tag like orfeotoolbox/otb:9.1.0
+ # you can adapt the version you want using different tag like orfeotoolbox/otb:10.0.0
docker pull orfeotoolbox/otb
To run CLI tools, you can launch the docker image with:
@@ -78,7 +75,7 @@ If you are planning on using the image on MacOS with an Apple Silicon chip (M1,M
::
- docker run -it --platform=linux/amd64 orfeotoolbox/otb:9.0.0
+ docker run -it --platform=linux/amd64 orfeotoolbox/otb:10.0.0
Distribution packages
@@ -91,7 +88,7 @@ want to get involved in the packaging of OTB for your favourite
platform, please contact us through the developer’s mailing list:
otb-developers@googlegroups.com.
-There are OTB packages for Debian (unstable) since version 5.2.0. OTB
+There are OTB packages for Debian since version 5.2.0. OTB
Applications packages may be available as Debian packages through APT
repositories:
diff --git a/Documentation/Cookbook/rst/Installation_Linux.rst b/Documentation/Cookbook/rst/Installation_Linux.rst
index 690bb7028745ca519abcd9964789c94fdb36ae87..8766ce24543b7fcd30bf4ae69bc496f5c6a9e882 100644
--- a/Documentation/Cookbook/rst/Installation_Linux.rst
+++ b/Documentation/Cookbook/rst/Installation_Linux.rst
@@ -1,29 +1,29 @@
-We provide a Core package and standalone optional packages to install over the Core for GNU/Linux x86_64. They include
-all of the OTB applications along with command line launchers.
-Since OTB 9.0, it is now possible to have a modular installation, you have to choose which package to download depending on your use case.
-
-See the page :doc:`Modules` to pick the ones you need.
+Recommended Installation : One package containing all the modules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+With OTB 9 the packaging is made by CMake to deliver a unique self extractible tar.gz to users. All you have to do is downloading the **OTB-10.0.0-Linux.tar.gz** package.
**Important note for RedHat / Fedora / Rocky users**
If you are using Fedora, Redhat8, please download the package **Linux_RedHat** which contains GDAL bindings in a different folder than the standard Linux package.
It is because the default system Python user site in RedHat, and distributions based on it, is lib/python3.8/site-packages and in ubuntu/debian it is lib/python3/dist-packages
-Recommended Installation : One package containing all the modules
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-With OTB 9 the packaging is made by CMake to deliver a unique self extractible tar.gz to users. All you have to do is downloading the **OTB-9.0.0-Linux.tar.gz** package.
-
You can download the package from the website and extract it in your file manager, or from command line :
.. code-block:: bash
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux.tar.gz -o /Path/To/Downloads/OTB-9.0.0-Linux.tar.gz
- tar xf /Path/To/Downloads/OTB-9.0.0-Linux.tar.gz --one-top-level=/Path/To/OTB_install
+ curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-10.0.0-Linux.tar.gz -o /Path/To/Downloads/OTB-10.0.0-Linux.tar.gz
+ tar xf /Path/To/Downloads/OTB-10.0.0-Linux.tar.gz --one-top-level=/Path/To/OTB_install
source /Path/To/OTB_install/otbenv.profile
Advanced Installation : Modular installation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+We provide a Core package and standalone optional packages to install over the Core for GNU/Linux x86_64. They include
+all of the OTB applications along with command line launchers.
+Since OTB 9.0, it is now possible to have a modular installation, you have to choose which package to download depending on your use case.
+
+See the page :doc:`Modules` to pick the ones you need.
+
Because OTB is a quite big software, the modular installation helps you to have only the needed software instead of all OTB. You need at least the Core and Dependencies modules and you can install only the components that matters to you.
Download
@@ -38,11 +38,11 @@ You can then use directly the applications packaged in the Learning package alon
.. code-block:: bash
# Download mandatory packages to run OTB: Core and Dependencies
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux-Core.tar.gz -o OTB-9.0.0-Linux-Core.tar.gz
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux-Dependencies.tar.gz -o OTB-9.0.0-Linux-Dependencies.tar.gz
+ curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-10.0.0-Linux-Core.tar.gz -o OTB-10.0.0-Linux-Core.tar.gz
+ curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-10.0.0-Linux-Dependencies.tar.gz -o OTB-10.0.0-Linux-Dependencies.tar.gz
# Download optional packages, note that Learning needs FeaturesExtraction
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux-FeaturesExtraction.tar.gz -o OTB-9.0.0-Linux-FeaturesExtraction.tar.gz
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.0.0-Linux-Learning.tar.gz -o OTB-9.0.0-Linux-Learning.tar.gz
+ curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-10.0.0-Linux-FeaturesExtraction.tar.gz -o OTB-10.0.0-Linux-FeaturesExtraction.tar.gz
+ curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-10.0.0-Linux-Learning.tar.gz -o OTB-10.0.0-Linux-Learning.tar.gz
...
.. _mod_install:
@@ -57,10 +57,10 @@ Unless specific needs we advice you to extract all packages on the same director
.. code-block:: bash
# Install each tar gz in the same "top level" folder
- tar xvf OTB-9.0.0-Linux-Core.tar.gz --one-top-level="/Path/To/Install/OTB"
- tar xvf OTB-9.0.0-Linux-FeaturesExtraction.tar.gz --one-top-level="/Path/To/Install/OTB"
+ tar xvf OTB-10.0.0-Linux-Core.tar.gz --one-top-level="/Path/To/Install/OTB"
+ tar xvf OTB-10.0.0-Linux-FeaturesExtraction.tar.gz --one-top-level="/Path/To/Install/OTB"
# It is necessary to install the dependencies AFTER the other modules
- tar xvf OTB-9.0.0-Linux-Dependencies.tar.gz --one-top-level="/Path/To/Install/OTB"
+ tar xvf OTB-10.0.0-Linux-Dependencies.tar.gz --one-top-level="/Path/To/Install/OTB"
...
source /Path/To/Install/OTB/otbenv.profile
@@ -98,7 +98,7 @@ Python bindings
**Our recommendation is to always recompile the python bindings when you install OTB**
-Since OTB 8.0.0 OTB bindings for Python 3.8 are distributed as a binary
+Since OTB 10.0.0 OTB bindings for Python 3.10 are distributed as a binary
package. Please note that using a different Python version may not be compatible with
OTB wrappings directly after installation. If the installation completes
without issue, information relating to your Python bindings will be provided.
@@ -107,12 +107,12 @@ You must have Python NumPy bindings installed in your system. They can be instal
without admin rights as follows: "pip install --user numpy". This is to give users the option
to select their own existing Python installation rather than the one dibstributed by the OTB package.
-By default, bindings for Python 3.8 will be enabled with the ``otbenv`` script.
+By default, bindings for Python 3.10 will be enabled with the ``otbenv`` script.
Recompiling Python bindings
```````````````````````````
-If you are using another version of Python 3 than 3.8, but still want to use OTB Python bindings, it is possible
+If you are using another version of Python 3 than 3.10, but still want to use OTB Python bindings, it is possible
to compile the python bindings again with your version of Python. CMake is required (it is available in most package
managers or at [https://cmake.org/]). Make sure you installed the necessary dependencies in the :doc:`First_Steps` page
diff --git a/Documentation/Cookbook/rst/RemoteModules.rst b/Documentation/Cookbook/rst/RemoteModules.rst
index 159365c2c89c23d8cf268d2b7defb8a6444b5216..875ce6f06f9c834bce953c0b96aa0eebf968dab9 100644
--- a/Documentation/Cookbook/rst/RemoteModules.rst
+++ b/Documentation/Cookbook/rst/RemoteModules.rst
@@ -163,6 +163,19 @@ In case you have an OTB install with OTB components separated from Core, you wil
We strongly recommend **adding these exports in your .bashrc** in order to make your applications available system wise
+**Packaging**
+
+To package your remote module, you just have to adapt the "packaging.cmake" file found in `Remote Module Template <https://gitlab.orfeo-toolbox.org/remote_modules/remote-module-template>`__
+Remember to add "include(packaging.cmake)" at the end of your main CMakeLists.txt
+Once done,
+
+.. code-block:: bash
+
+ cd /Path/to/build_folder
+ make package
+
+You should have a package called RemoteModuleName-1.0.0.tar.gz in the build_packages folder
+
Writing your own remote module
------------------------------
diff --git a/Documentation/Cookbook/rst/templates/PythonAPI.rst b/Documentation/Cookbook/rst/templates/PythonAPI.rst
index 14d7588a7b0a895c4a2382cd6680d00c8a6ce3bc..7708fd1937ef7d1eaf4d1d9b2375986c38c853ae 100644
--- a/Documentation/Cookbook/rst/templates/PythonAPI.rst
+++ b/Documentation/Cookbook/rst/templates/PythonAPI.rst
@@ -9,22 +9,6 @@ environment script ``otbenv`` to properly setup variables such as
source the script). In other cases, you should set these variables depending on
your configuration.
-On Unix systems, it is typically available in the ``/usr/lib/otb/python``
-directory. Depending on how you installed OTB, you may need to configure the
-environment variable ``PYTHONPATH`` to include this directory so that the module
-becomes available from Python.
-
-On Windows, you can install the ``otb-python`` package, and the module
-will be automatically available from an OSGeo4W shell.
-
-As for the command line, the path to the application modules needs to
-be properly set with the ``OTB_APPLICATION_PATH`` environment
-variable. The standard location on Unix systems is
-``/usr/lib/otb/applications``. On Windows, the applications are
-available in the ``otb-bin`` OSGeo4W package, and the environment is
-configured automatically so ``OTB_APPLICATION_PATH`` doesn't need to
-be modified ``OTB_APPLICATION_PATH``.
-
Once your environment is set, you can use OTB applications from Python, just
like this small example:
@@ -514,6 +498,22 @@ Here is a small example of what can be done:
# Only a portion of "out" was exported but ReadImageInfo is still able to detect the
# correct full size of the image
+A Higher level Python API for OTB : pyOTB
+-----------------------------------------
+
+If you want a high level API to develop your OTB pipeline entirely in Python
+you can use `pyOTB <https://pyotb.readthedocs.io/en/stable/>`__
+
+it is easy to install it with pip.
+
+Develop a pipeline with ITK 5 python filters
+--------------------------------------------
+
+With ITK 5, pip install itk is now available, it exposes all itk filters in python,
+this enables you to develop an application using itk filters, which is able to handle xarray or numpy tables
+
+To develop a pipeline with itk filters, you can follow the `documentation <https://docs.itk.org/en/latest/learn/python_quick_start.html>`__
+
Corner cases
------------
diff --git a/Examples/BasicFilters/HillShadingExample.cxx b/Examples/BasicFilters/HillShadingExample.cxx
index 5010184f770df8ac7fbb0ec9c9498930aea402ab..8214aa48fd76ecf0e052e03b21c38c5793a1ee4f 100644
--- a/Examples/BasicFilters/HillShadingExample.cxx
+++ b/Examples/BasicFilters/HillShadingExample.cxx
@@ -30,6 +30,7 @@
#include "otbDEMToImageGenerator.h"
#include "otbHillShadingFilter.h"
+#include "itkBinaryFunctorImageFilter.h"
#include "itkScalarToRGBColormapImageFilter.h"
#include "otbReliefColormapFunctor.h"
#include "itkMultiplyImageFilter.h"
diff --git a/Examples/DisparityMap/StereoReconstructionExample.cxx b/Examples/DisparityMap/StereoReconstructionExample.cxx
index 928c113612ee9c7f0701306bf0b4974f08952139..431dba5655fd039c77d4b392b075bd3b16f6e3d7 100644
--- a/Examples/DisparityMap/StereoReconstructionExample.cxx
+++ b/Examples/DisparityMap/StereoReconstructionExample.cxx
@@ -48,7 +48,9 @@
#include "otbImageFileWriter.h"
#include "otbBCOInterpolateImageFunction.h"
#include "itkUnaryFunctorImageFilter.h"
-#include "itkVectorCastImageFilter.h"
+
+#include "otbCastImageFilter.h"
+
#include "otbImageList.h"
#include "otbImageListToVectorImageFilter.h"
#include "itkRescaleIntensityImageFilter.h"
@@ -93,7 +95,7 @@ int main(int argc, char* argv[])
using DisplacementType = itk::Vector<double, 2>;
using DisplacementFieldType = otb::Image<DisplacementType>;
- using DisplacementFieldCastFilterType = itk::VectorCastImageFilter<FloatVectorImageType, DisplacementFieldType>;
+ using DisplacementFieldCastFilterType = otb::CastImageFilter<FloatVectorImageType, DisplacementFieldType>;
using WarpFilterType = otb::StreamingWarpImageFilter<FloatImageType, FloatImageType, DisplacementFieldType>;
diff --git a/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx b/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx
index 6051b069e0aa1d13c01aaa99a432b0bebd0ad0da..5e88943752e4936d822cd47a918fc817beffa4c5 100644
--- a/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx
+++ b/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx
@@ -127,7 +127,7 @@ int main(int argc, char* argv[])
unmixer->SetInput(rescaler->GetOutput());
unmixer->GetModifiableFunctor().SetMatrix(endMember2Matrix->GetMatrix());
- unmixer->SetNumberOfThreads(1); // FIXME : currently buggy
+ unmixer->SetNumberOfWorkUnits(1); // FIXME : currently buggy
// We now instantiate the writer and set the file name for the
// output image and trigger the unmixing computation with the \code{Update()} of the writer.
diff --git a/Examples/IO/DEMHandlerExample.cxx b/Examples/IO/DEMHandlerExample.cxx
index 48acadbaf749f7b980d3ff89d03753ade5af05a9..22c48b2a0deb64071cab507c61f70d7fb6acfbb4 100644
--- a/Examples/IO/DEMHandlerExample.cxx
+++ b/Examples/IO/DEMHandlerExample.cxx
@@ -34,6 +34,7 @@
// library.
#include "otbDEMHandler.h"
+#include "vcl_legacy_aliases.h"
int main(int argc, char* argv[])
{
diff --git a/Examples/IO/VectorDataIOExample.cxx b/Examples/IO/VectorDataIOExample.cxx
index 799da5c74602ce65687abe70a8a217db2754808d..b654328f6cd5bbed6fd546d9407eed21505b4002 100644
--- a/Examples/IO/VectorDataIOExample.cxx
+++ b/Examples/IO/VectorDataIOExample.cxx
@@ -50,7 +50,6 @@
// which model the individual objects that we get from the vector
// data structure.
-#include "itkPreOrderTreeIterator.h"
#include "otbObjectList.h"
#include "otbPolygon.h"
@@ -82,7 +81,6 @@ int main(int argc, char* argv[])
// be accessed using an \doxygen{itk}{PreOrderTreeIterator}.
using DataTreeType = VectorDataType::DataTreeType;
- using TreeIteratorType = itk::PreOrderTreeIterator<DataTreeType>;
// In this example we will only read polygon objects from the input
// file before writing them to the output file. We define the type
// for the polygon object as well as an iterator to the vertices. The
@@ -94,18 +92,18 @@ int main(int argc, char* argv[])
PolygonListType::Pointer polygonList = PolygonListType::New();
// We get the data tree and instantiate an iterator to walk through it.
- TreeIteratorType it(reader->GetOutput()->GetDataTree());
+ auto itPair = reader->GetOutput()->GetIteratorPair();
- it.GoToBegin();
+ auto it = itPair.first;
// We check that the current object is a polygon using the
// \code{IsPolygonFeature()} method and get its exterior ring in
// order to store it into the list.
- while (!it.IsAtEnd())
+ while (it != itPair.second)
{
- if (it.Get()->IsPolygonFeature())
+ if (reader->GetOutput()->Get(it)->IsPolygonFeature())
{
- polygonList->PushBack(it.Get()->GetPolygonExteriorRing());
+ polygonList->PushBack(reader->GetOutput()->Get(it)->GetPolygonExteriorRing());
}
++it;
}
@@ -132,12 +130,9 @@ int main(int argc, char* argv[])
multiPolygon->SetNodeType(otb::FEATURE_MULTIPOLYGON);
// We assign these objects to the data tree stored by the vector data object.
- DataTreeType::Pointer tree = outVectorData->GetDataTree();
- DataNodeType::Pointer root = tree->GetRoot()->Get();
-
- tree->Add(document, root);
- tree->Add(folder, document);
- tree->Add(multiPolygon, folder);
+ outVectorData->Add(document, outVectorData->GetRoot());
+ outVectorData->Add(folder, document);
+ outVectorData->Add(multiPolygon, folder);
// We can now iterate through the polygon list and fill the vector
// data structure.
@@ -145,7 +140,7 @@ int main(int argc, char* argv[])
{
DataNodeType::Pointer newPolygon = DataNodeType::New();
newPolygon->SetPolygonExteriorRing(pit.Get());
- tree->Add(newPolygon, multiPolygon);
+ outVectorData->Add(newPolygon, multiPolygon);
}
// And finally we write the vector data to a file using a generic
// \doxygen{otb}{VectorDataFileWriter}.
diff --git a/Examples/Iterators/ImageSliceIteratorWithIndex.cxx b/Examples/Iterators/ImageSliceIteratorWithIndex.cxx
index d806d8af4c752a8d240cee31d7be2c500d007590..abc621bdf71a48da9f3a0e6a03fadfecd140f7d0 100644
--- a/Examples/Iterators/ImageSliceIteratorWithIndex.cxx
+++ b/Examples/Iterators/ImageSliceIteratorWithIndex.cxx
@@ -101,6 +101,7 @@
#include "itkImageLinearIteratorWithIndex.h"
#include "otbImageFileReader.h"
#include "otbImageFileWriter.h"
+#include "vcl_legacy_aliases.h"
int main(int argc, char* argv[])
{
diff --git a/Examples/Learning/SOMExample.cxx b/Examples/Learning/SOMExample.cxx
index 9e2a8e67e1427e66f1d9a595a3de0f9ef87bbc23..413835a76791be8ce99c94fe69c6eac5a71c7440 100644
--- a/Examples/Learning/SOMExample.cxx
+++ b/Examples/Learning/SOMExample.cxx
@@ -48,7 +48,6 @@
#include "itkMacro.h"
-#include "itkVectorExpandImageFilter.h"
#include "itkVectorNearestNeighborInterpolateImageFunction.h"
#include "itkExpandImageFilter.h"
diff --git a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
index a6851a451a35be938a820601074a617872ffaae9..e67a39dd7bf7942309533424b464ff04d0df9779 100644
--- a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
+++ b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
@@ -132,7 +132,7 @@ int main(int argc, char* argv[])
// For non regression tests, set the number of threads to 1
// because MeanShift results depends on the number of threads
- filter->SetNumberOfThreads(1);
+ filter->SetNumberOfWorkUnits(1);
// The \doxygen{otb}{MeanShiftSegmentationFilter} type is instantiated using the image
// types.
diff --git a/Examples/Patented/SIFTDisparityMapEstimation.cxx b/Examples/Patented/SIFTDisparityMapEstimation.cxx
index 63a067a1a19abe0aea039e59c961eae88b295eb1..f95ab277eef9b47ab3e29ff0de5e3d10c414c47d 100644
--- a/Examples/Patented/SIFTDisparityMapEstimation.cxx
+++ b/Examples/Patented/SIFTDisparityMapEstimation.cxx
@@ -121,8 +121,8 @@ int main(int argc, char* argv[])
filter2->SetInput(0, movingReader->GetOutput());
filter2->SetScalesNumber(3);
- filter1->SetNumberOfThreads(1);
- filter2->SetNumberOfThreads(1);
+ filter1->SetNumberOfWorkUnits(1);
+ filter2->SetNumberOfWorkUnits(1);
euclideanMatcher->SetInput1(filter1->GetOutput());
euclideanMatcher->SetInput2(filter2->GetOutput());
diff --git a/Modules/Core/Adapters/CurlAdapters/CMakeLists.txt b/Modules/Core/Adapters/CurlAdapters/CMakeLists.txt
index e1cfa168afee364562863fb95c28e993fe80ab24..98c86d719e83152a6137d3fb6b123b6fbf82bc41 100644
--- a/Modules/Core/Adapters/CurlAdapters/CMakeLists.txt
+++ b/Modules/Core/Adapters/CurlAdapters/CMakeLists.txt
@@ -17,8 +17,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
+if(OTBCurl_ENABLED)
project(OTBCurlAdapters)
set(OTBCurlAdapters_LIBRARIES OTBCurlAdapters)
otb_module_impl()
+endif()
diff --git a/Modules/Core/Adapters/CurlAdapters/src/CMakeLists.txt b/Modules/Core/Adapters/CurlAdapters/src/CMakeLists.txt
index 13628b0788575bb482e659de4e0aa149bd476146..73f0634fb261fb82c71d46acffe5658ea65e3c34 100644
--- a/Modules/Core/Adapters/CurlAdapters/src/CMakeLists.txt
+++ b/Modules/Core/Adapters/CurlAdapters/src/CMakeLists.txt
@@ -25,12 +25,6 @@ set(OTBCurlAdapters_SRC
)
add_library(OTBCurlAdapters ${OTBCurlAdapters_SRC})
-target_link_libraries(OTBCurlAdapters
- ${OTBCommon_LIBRARIES} CURL::libcurl
- )
-
-if (OTBCurl_ENABLED)
- target_link_libraries(OTBCurlAdapters CURL::libcurl)
-endif()
+target_link_libraries(OTBCurlAdapters PUBLIC ${OTBCommon_LIBRARIES} CURL::libcurl)
otb_module_target(OTBCurlAdapters COMPONENT_Core)
diff --git a/Modules/Core/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx b/Modules/Core/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
index 8673181e198ae05ce98e5a8a059fe368988a6c2a..8f9c447a14ad6d4bb58922ec1cfffd682cecb731 100644
--- a/Modules/Core/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
+++ b/Modules/Core/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
@@ -27,7 +27,6 @@
#include <clocale> // toupper
// ITK includes
#include "itkMacro.h" // itkExceptionMacro
-#include "itkExceptionObject.h"
#include "itksys/SystemTools.hxx"
// OTB includes
#include "otbOGRDriversInit.h"
diff --git a/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx b/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx
index 7447e63c129c98b4f6fd37845ec5fa4955e9cf77..fd85646a508dfd2abac654b7500e7e803a7597a8 100644
--- a/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx
+++ b/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx
@@ -27,6 +27,7 @@
// For boost/lexical_cast.hpp
#endif
#include "boost/lexical_cast.hpp"
+#include <cassert>
#include <sstream>
#include <stdexcept>
diff --git a/Modules/Core/Applications/app/otbVectorDataSetField.cxx b/Modules/Core/Applications/app/otbVectorDataSetField.cxx
index 8da927e4df728006448ca9e3b402492170a97834..61fc44ac2f2cea95c15020f37162780cc78f650a 100644
--- a/Modules/Core/Applications/app/otbVectorDataSetField.cxx
+++ b/Modules/Core/Applications/app/otbVectorDataSetField.cxx
@@ -84,13 +84,12 @@ private:
{
m_InputData = GetParameterVectorData("in");
- typedef VectorDataType::DataTreeType DataTreeType;
- typedef itk::PreOrderTreeIterator<DataTreeType> TreeIteratorType;
- TreeIteratorType it(m_InputData->GetDataTree());
+ std::pair<VectorDataType::VertexIterator,VectorDataType::VertexIterator> itPair = m_InputData->GetIteratorPair();
+ auto currentit = itPair.first;
- for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ for (; currentit != itPair.second; ++currentit)
{
- it.Get()->SetFieldAsString(GetParameterAsString("fn"), GetParameterAsString("fv"));
+ m_InputData->Get(currentit)->SetFieldAsString(GetParameterAsString("fn"), GetParameterAsString("fv"));
}
SetParameterOutputVectorData("out", m_InputData);
diff --git a/Modules/Core/Applications/app/otbZonalStatistics.cxx b/Modules/Core/Applications/app/otbZonalStatistics.cxx
index d8e29fb346f9db986755c279bcfb63a694e09337..76c63ec6d4606a56985541635a314a910017ba1f 100644
--- a/Modules/Core/Applications/app/otbZonalStatistics.cxx
+++ b/Modules/Core/Applications/app/otbZonalStatistics.cxx
@@ -62,7 +62,6 @@ public:
typedef otb::VectorDataIntoImageProjectionFilter<VectorDataType, FloatVectorImageType> VectorDataReprojFilterType;
typedef otb::VectorDataToLabelImageFilter<VectorDataType, LabelImageType> RasterizeFilterType;
typedef VectorDataType::DataTreeType DataTreeType;
- typedef itk::PreOrderTreeIterator<DataTreeType> TreeIteratorType;
typedef VectorDataType::DataNodeType DataNodeType;
typedef DataNodeType::PolygonListPointerType PolygonListPointerType;
typedef otb::StreamingStatisticsMapFromLabelImageFilter<FloatVectorImageType, LabelImageType> StatsFilterType;
@@ -324,23 +323,23 @@ public:
otbAppLogINFO("Writing output vector data");
LabelValueType internalFID = -1;
m_NewVectorData = VectorDataType::New();
- DataNodeType::Pointer root = m_NewVectorData->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = m_NewVectorData->GetRoot();
DataNodeType::Pointer document = DataNodeType::New();
document->SetNodeType(otb::DOCUMENT);
- m_NewVectorData->GetDataTree()->Add(document, root);
+ m_NewVectorData->Add(document, root);
DataNodeType::Pointer folder = DataNodeType::New();
folder->SetNodeType(otb::FOLDER);
- m_NewVectorData->GetDataTree()->Add(folder, document);
+ m_NewVectorData->Add(folder, document);
m_NewVectorData->SetProjectionRef(m_VectorDataSrc->GetProjectionRef());
- TreeIteratorType itVector(m_VectorDataSrc->GetDataTree());
- itVector.GoToBegin();
+ auto vDataIterators = m_VectorDataSrc->GetIteratorPair();
+ auto currentIter = vDataIterators.first;
- while (!itVector.IsAtEnd())
+ while (currentIter != vDataIterators.second)
{
- if (!itVector.Get()->IsRoot() && !itVector.Get()->IsDocument() && !itVector.Get()->IsFolder())
+ DataNodeType::Pointer currentGeometry = m_VectorDataSrc->Get(currentIter);
+ if (!currentGeometry->IsRoot() && !currentGeometry->IsDocument() && !currentGeometry->IsFolder())
{
- DataNodeType::Pointer currentGeometry = itVector.Get();
if (m_FromLabelImage)
internalFID = currentGeometry->GetFieldAsInt("polygon_id");
else
@@ -357,10 +356,10 @@ public:
currentGeometry->SetFieldAsDouble(CreateFieldName("min", band), m_MinMap[internalFID][band]);
currentGeometry->SetFieldAsDouble(CreateFieldName("max", band), m_MaxMap[internalFID][band]);
}
- m_NewVectorData->GetDataTree()->Add(currentGeometry, folder);
+ m_NewVectorData->Add(currentGeometry, folder);
}
}
- ++itVector;
+ ++currentIter;
} // next feature
SetParameterOutputVectorData("out.vector.filename", m_NewVectorData);
diff --git a/Modules/Core/Common/include/otbCastImageFilter.h b/Modules/Core/Common/include/otbCastImageFilter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e2089dec7f2621599a54bcb4a0c3bd8e930b435b
--- /dev/null
+++ b/Modules/Core/Common/include/otbCastImageFilter.h
@@ -0,0 +1,109 @@
+/*=========================================================================
+ *
+ * Copyright Insight Software Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *=========================================================================*/
+#ifndef otbCastImageFilter_h
+#define otbCastImageFilter_h
+
+#include "itkUnaryFunctorImageFilter.h"
+#include "itkProgressReporter.h"
+
+#include <type_traits>
+
+namespace otb
+{
+
+/** \class CastImageFilter
+ *
+ * \brief Casts input pixels to output pixel type.
+ *
+ * This filter is templated over the input image type
+ * and the output image type.
+ *
+ * A typical use is to cast a
+ \code
+ itk::Image<type1, dim>
+ \endcode
+ * to a
+ \code
+ itk::Image<type2, dim>
+ \endcode
+ *
+ * This filter can also be used to cast a
+ \code
+ itk::VectorImage<type1, dim>
+ \endcode
+ * to a
+ \code
+ itk::VectorImage<type2, dim>
+ \endcode
+ *
+ * This class is copied from the itkCastImageFilter, but it doesn't have
+ * a static assertion requiring the input and output pixel dimension to match,
+ * thus this filter can be used to convert to and from variableLengthVector.
+ *
+ * If you need to perform a dimensionaly reduction, you may want
+ * to use the ExtractImageFilter instead of the CastImageFilter.
+ *
+ * \ingroup OTBCommon
+ */
+template< typename TInputImage, typename TOutputImage >
+class ITK_TEMPLATE_EXPORT CastImageFilter:
+ public itk::InPlaceImageFilter< TInputImage, TOutputImage >
+{
+public:
+ ITK_DISALLOW_COPY_AND_ASSIGN(CastImageFilter);
+
+ /** Standard class type aliases. */
+ using Self = CastImageFilter;
+ using Superclass = itk::InPlaceImageFilter< TInputImage, TOutputImage >;
+ using Pointer = itk::SmartPointer< Self >;
+ using ConstPointer = itk::SmartPointer< const Self >;
+
+ using OutputImageRegionType = typename Superclass::OutputImageRegionType;
+ using InputPixelType = typename TInputImage::PixelType;
+ using OutputPixelType = typename TOutputImage::PixelType;
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(CastImageFilter, InPlaceImageFilter);
+
+protected:
+ CastImageFilter();
+ virtual ~CastImageFilter() = default;
+
+ void GenerateOutputInformation() override;
+
+ void GenerateData() override;
+
+ void DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread) override;
+
+ template<typename TInputPixelType>
+ void DynamicThreadedGenerateDataDispatched(const OutputImageRegionType & outputRegionForThread, std::true_type isConvertible);
+
+ template<typename TInputPixelType>
+ void DynamicThreadedGenerateDataDispatched(const OutputImageRegionType & outputRegionForThread, std::false_type isConvertible);
+};
+} // end namespace otb
+
+#endif
+
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbCastImageFilter.hxx"
+#endif
+
diff --git a/Modules/Core/Common/include/otbCastImageFilter.hxx b/Modules/Core/Common/include/otbCastImageFilter.hxx
new file mode 100644
index 0000000000000000000000000000000000000000..2dd3c971cb74e23d3d6a5c145646a20c7e2d429c
--- /dev/null
+++ b/Modules/Core/Common/include/otbCastImageFilter.hxx
@@ -0,0 +1,175 @@
+/*=========================================================================
+ *
+ * Copyright Insight Software Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *=========================================================================*/
+#ifndef itkCastImageFilter_hxx
+#define itkCastImageFilter_hxx
+
+#include "otbCastImageFilter.h"
+#include "itkProgressReporter.h"
+#include "itkImageAlgorithm.h"
+
+namespace otb
+{
+
+
+template< typename TInputImage, typename TOutputImage >
+CastImageFilter< TInputImage, TOutputImage >
+::CastImageFilter()
+{
+ this->SetNumberOfRequiredInputs(1);
+ this->InPlaceOff();
+ this->DynamicMultiThreadingOn();
+}
+
+template< typename TInputImage, typename TOutputImage >
+void
+CastImageFilter< TInputImage, TOutputImage >
+::GenerateData()
+{
+ if ( this->GetInPlace() && this->CanRunInPlace() )
+ {
+ // nothing to do, so avoid iterating over all the pixels
+ // for nothing! Allocate the output, generate a fake progress and exit
+ this->AllocateOutputs();
+ itk::ProgressReporter progress(this, 0, 1);
+ return;
+ }
+ //else do normal Before+Threaded+After
+ Superclass::GenerateData();
+}
+
+
+template< typename TInputImage, typename TOutputImage >
+void
+CastImageFilter< TInputImage, TOutputImage >
+::GenerateOutputInformation()
+ {
+ // do not call the superclass' implementation of this method since
+ // this filter allows the input the output to be of different dimensions
+
+ // get pointers to the input and output
+ TOutputImage *outputPtr = this->GetOutput();
+ const TInputImage *inputPtr = this->GetInput();
+
+ if ( !outputPtr || !inputPtr )
+ {
+ return;
+ }
+
+ // Set the output image largest possible region. Use a RegionCopier
+ // so that the input and output images can have different dimensions.
+ OutputImageRegionType outputLargestPossibleRegion;
+ this->CallCopyInputRegionToOutputRegion( outputLargestPossibleRegion,
+ inputPtr->GetLargestPossibleRegion() );
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
+
+ itk::ImageToImageFilterDetail::ImageInformationCopier<Superclass::OutputImageDimension,
+ Superclass::InputImageDimension>
+ informationCopier;
+ informationCopier(outputPtr, inputPtr);
+
+ }
+
+
+template< typename TInputImage, typename TOutputImage >
+void
+CastImageFilter< TInputImage, TOutputImage >
+::DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread)
+{
+ DynamicThreadedGenerateDataDispatched<InputPixelType>(outputRegionForThread,
+ std::is_convertible<InputPixelType, OutputPixelType>());
+}
+
+template< typename TInputImage, typename TOutputImage >
+template<typename TInputPixelType>
+void
+CastImageFilter< TInputImage, TOutputImage >
+::DynamicThreadedGenerateDataDispatched(const OutputImageRegionType & outputRegionForThread, std::true_type)
+{
+ const TInputImage *inputPtr = this->GetInput();
+ TOutputImage *outputPtr = this->GetOutput(0);
+
+ // Define the portion of the input to walk for this thread, using
+ // the CallCopyOutputRegionToInputRegion method allows for the input
+ // and output images to be different dimensions
+ typename TInputImage::RegionType inputRegionForThread;
+
+ this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
+
+ itk::ImageAlgorithm::Copy( inputPtr, outputPtr, inputRegionForThread, outputRegionForThread );
+}
+
+
+template< typename TInputImage, typename TOutputImage >
+template<typename TInputPixelType>
+void
+CastImageFilter< TInputImage, TOutputImage >
+::DynamicThreadedGenerateDataDispatched(const OutputImageRegionType & outputRegionForThread, std::false_type)
+{
+ // Implementation for non-implicit convertible pixels which are
+ // itk-array-like.
+
+ //static_assert( OutputPixelType::Dimension == InputPixelType::Dimension, "Vector dimensions are required to match!" );
+ static_assert( std::is_convertible<typename InputPixelType::ValueType, typename OutputPixelType::ValueType>::value, "Component types are required to be convertible." );
+
+ const typename OutputImageRegionType::SizeType ®ionSize = outputRegionForThread.GetSize();
+
+ if( regionSize[0] == 0 )
+ {
+ return;
+ }
+ const TInputImage *inputPtr = this->GetInput();
+ TOutputImage *outputPtr = this->GetOutput(0);
+
+ // Define the portion of the input to walk for this thread, using
+ // the CallCopyOutputRegionToInputRegion method allows for the input
+ // and output images to be different dimensions
+ typename TInputImage::RegionType inputRegionForThread;
+
+ this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
+
+ // Define the iterators
+ itk::ImageScanlineConstIterator< TInputImage > inputIt(inputPtr, inputRegionForThread);
+ itk::ImageScanlineIterator< TOutputImage > outputIt(outputPtr, outputRegionForThread);
+
+ inputIt.GoToBegin();
+ outputIt.GoToBegin();
+ OutputPixelType value;
+
+ while ( !inputIt.IsAtEnd() )
+ {
+ while ( !inputIt.IsAtEndOfLine() )
+ {
+ const InputPixelType &inputPixel = inputIt.Get();
+ for ( unsigned int k = 0; k < OutputPixelType::Dimension; k++ )
+ {
+ value[k] = static_cast< typename OutputPixelType::ValueType >( inputPixel[k] );
+ }
+ outputIt.Set( value );
+
+ ++inputIt;
+ ++outputIt;
+ }
+ inputIt.NextLine();
+ outputIt.NextLine();
+ }
+
+}
+
+} // end namespace otb
+
+#endif
diff --git a/Modules/Core/Common/include/otbChannelSelectorFunctor.h b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
index 434858d5552ed5b356c4f90ca526e8f17eeb253f..b1e03c00289edd7e5b489511e81e5ef82ea24595 100644
--- a/Modules/Core/Common/include/otbChannelSelectorFunctor.h
+++ b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
@@ -46,25 +46,23 @@ class ChannelSelectorFunctor : public itk::Object
{
public:
/** Standard class typedefs */
- typedef ChannelSelectorFunctor Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ using Self = ChannelSelectorFunctor;
+ using Superclass = itk::Object;
+ using Pointer = itk::SmartPointer<Self>;
+ using ConstPointer = itk::SmartPointer<const Self>;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
itkTypeMacro(ChannelSelectorFunctor, itk::Object);
- typedef TInputPixel PixelType;
- typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
- typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
- typedef itk::RGBPixel<ScalarType> RGBPixelType;
- typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
-
- typedef VectorPixelType OutputPixelType;
-
- typedef std::vector<unsigned int> ChannelListType;
+ using PixelType = TInputPixel;
+ using ScalarType = typename itk::NumericTraits<PixelType>::ValueType;
+ using VectorPixelType = itk::VariableLengthVector<ScalarType>;
+ using RGBPixelType = itk::RGBPixel<ScalarType>;
+ using RGBAPixelType = itk::RGBAPixel<ScalarType>;
+ using OutputPixelType = VectorPixelType;
+ using ChannelListType = std::vector<unsigned int>;
const char* GetDescription() const
{
@@ -246,9 +244,7 @@ protected:
}
/** Destructor */
- ~ChannelSelectorFunctor() override
- {
- }
+ ~ChannelSelectorFunctor() = default;
private:
ChannelListType m_ChannelList;
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.h b/Modules/Core/Common/include/otbCommandProgressUpdate.h
index e7fdd0467cdbecec76a62bd935744c53388265db..37405c6122066e56287eb78a49f34cfd1139e7ea 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.h
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.h
@@ -38,18 +38,16 @@ template <class TFilter>
class CommandProgressUpdate : public itk::Command
{
public:
- typedef CommandProgressUpdate Self;
- typedef itk::Command Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ using Self = CommandProgressUpdate;
+ using Superclass = itk::Command;
+ using Pointer = itk::SmartPointer<Self>;
itkNewMacro(Self);
protected:
- CommandProgressUpdate()
- {
- }
+ CommandProgressUpdate() = default;
public:
- typedef const TFilter* FilterPointer;
+ using FilterPointer = const TFilter*;
void Execute(itk::Object* caller, const itk::EventObject& event) override;
diff --git a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
index 84376fe19384beb0f7387e705b90d4f70d22074b..8170cff3856f1a5ce591c0b0f3c3430a64723949 100644
--- a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
+++ b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
@@ -71,12 +71,11 @@ class ITK_EXPORT ComplexToIntensityImageFilter
{
public:
/** Standard class typedefs. */
- typedef ComplexToIntensityImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
- Function::ComplexToIntensity<typename TInputImage::PixelType, typename TOutputImage::PixelType>>
- Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ using Self = ComplexToIntensityImageFilter;
+ using Superclass = itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Function::ComplexToIntensity<typename TInputImage::PixelType, typename TOutputImage::PixelType>>;
+ using Pointer = itk::SmartPointer<Self>;
+ using ConstPointer = itk::SmartPointer<const Self>;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -84,9 +83,9 @@ public:
/** Runtime information support. */
itkTypeMacro(ComplexToIntensityImageFilter, UnaryFunctorImageFilter);
- typedef typename TInputImage::PixelType InputPixelType;
- typedef typename TOutputImage::PixelType OutputPixelType;
- typedef typename itk::NumericTraits<InputPixelType>::ValueType InputPixelValueType;
+ using InputPixelType = typename TInputImage::PixelType;
+ using OutputPixelType = typename TOutputImage::PixelType;
+ using InputPixelValueType = typename itk::NumericTraits<InputPixelType>::ValueType;
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
@@ -96,12 +95,8 @@ public:
protected:
- ComplexToIntensityImageFilter()
- {
- }
- ~ComplexToIntensityImageFilter() override
- {
- }
+ ComplexToIntensityImageFilter() = default;
+ ~ComplexToIntensityImageFilter() override = default;
private:
ComplexToIntensityImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Common/include/otbConfigurationManager.h b/Modules/Core/Common/include/otbConfigurationManager.h
index 22748fbf0642544991f13be0fc215deba307b6dc..3a34a95c2722f2277062202a8f8843bac6dd4699 100644
--- a/Modules/Core/Common/include/otbConfigurationManager.h
+++ b/Modules/Core/Common/include/otbConfigurationManager.h
@@ -23,12 +23,6 @@
#include "itkVersion.h"
-#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
-#include "itksys/FundamentalType.h"
-#else
-#include "itk_kwiml.h"
-#endif
-
#include <string>
#include <boost/cstdint.hpp>
#include "itkLoggerBase.h"
@@ -49,12 +43,7 @@ namespace otb
class OTBCommon_EXPORT ConfigurationManager
{
public:
-#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
- typedef ::itksysFundamentalType_UInt64 RAMValueType;
-#else
- typedef KWIML_INT_uint64_t RAMValueType;
-#endif
-
+ using RAMValueType = std::uint64_t ;
/**
* DEMDirectory is a directory were DEM tiles are stored.
*
@@ -102,7 +91,7 @@ public:
* decoded), level is INFO.
*
*/
- static itk::LoggerBase::PriorityLevelType GetLoggerLevel();
+ static itk::LoggerBaseEnums::PriorityLevel GetLoggerLevel();
/**
* If OpenMP is enabled, the number of threads for openMP is set to the
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.h b/Modules/Core/Common/include/otbDecimateImageFilter.h
index 138a0066c8e74fb428a7b416feb16d85f093165c..6a5d9151333308002f7904c9b2cf5a74d37f71e7 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.h
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.h
@@ -45,10 +45,10 @@ class ITK_EXPORT DecimateImageFilter : public itk::ImageToImageFilter<TInputImag
{
public:
/** Standard class typedefs. */
- typedef DecimateImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ using Self = DecimateImageFilter;
+ using Superclass = itk::ImageToImageFilter<TInputImage, TOutputImage>;
+ using Pointer = itk::SmartPointer<Self>;
+ using ConstPointer = itk::SmartPointer<const Self>;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -61,12 +61,12 @@ public:
itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** Image typedef support. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ using InputImageType = TInputImage;
+ using InputImageRegionType = typename InputImageType::RegionType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ using OutputImageType = TOutputImage;
+ using OutputImageRegionType = typename OutputImageType::RegionType;
+ using OutputPixelType = typename OutputImageType::PixelType;
/** Set/Get the DecimateFactor */
itkGetMacro(DecimationFactor, unsigned int);
@@ -76,26 +76,25 @@ protected:
DecimateImageFilter()
{
m_DecimationFactor = 1;
+ this->DynamicMultiThreadingOn();
}
- virtual ~DecimateImageFilter()
- {
- }
+ virtual ~DecimateImageFilter() = default;
/** Since input and output image are very likely to be of different size.
* Region estimation functions has to be reimplemented
*/
- virtual void CallCopyOutputRegionToInputRegion(InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion);
- virtual void CallCopyInputRegionToOutputRegion(OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion);
+ void CallCopyOutputRegionToInputRegion(InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion) override;
+ void CallCopyInputRegionToOutputRegion(OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion) override;
/** Output image region size is not of the same dimension as the input.
* That is why GenerateOutputInformation has to be redefined.
*/
- virtual void GenerateOutputInformation();
+ void GenerateOutputInformation() override;
/** Allows multithreading */
- virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
DecimateImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.hxx b/Modules/Core/Common/include/otbDecimateImageFilter.hxx
index 71e3569ce3fa2ea8138aa00c232dc6de52e68c84..6c48a346bd9c6eff8f982282b5bbbb244df5854c 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.hxx
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.hxx
@@ -103,8 +103,7 @@ void DecimateImageFilter<TInputImage, TOutputImage>::CallCopyInputRegionToOutput
}
template <class TInputImage, class TOutputImage>
-void DecimateImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void DecimateImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
index 4a2a763083ea298fbc3aa3c18d76018f9aaa169d..cecfd83635db90b1563e89b96bbd71c4928cf8f6 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.h
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.h
@@ -121,9 +121,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
FunctionToImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.hxx b/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
index aaf0abadf40ff83eac95499ab773b0fb2741ba79..0ccd431b27b389e6c5cc63599256e87bc33e7123 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
@@ -24,7 +24,6 @@
#include "otbFunctionToImageFilter.h"
#include "itkImageRegionConstIterator.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -37,6 +36,7 @@ FunctionToImageFilter<TInputImage, TOutputImage, TFunction>::FunctionToImageFilt
{
this->InPlaceOff();
m_PixelFunction = FunctionType::New();
+ this->DynamicMultiThreadingOn();
}
/**
@@ -70,8 +70,7 @@ void FunctionToImageFilter<TInputImage, TOutputImage, TFunction>::BeforeThreaded
* ThreadedGenerateData function. Performs the pixel-wise addition
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void FunctionToImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void FunctionToImageFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// We use dynamic_cast since inputs are stored as DataObjects.
@@ -82,8 +81,6 @@ void FunctionToImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenera
itk::ImageRegionConstIterator<TInputImage> inputIt(inputPtr, outputRegionForThread);
itk::ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -93,7 +90,6 @@ void FunctionToImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenera
outputIt.Set(static_cast<OutputImagePixelType>(m_PixelFunction->EvaluateAtIndex(inputIt.GetIndex())));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
} // end namespace otb
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
index 5746494383fefa5a37504c7dd5fe87fed906e89c..6878ee2d71c0b4ad488d755ad17004d609de21ef 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
@@ -26,7 +26,7 @@
#include "itkImageRegionSplitter.h"
#include "itkIndex.h"
#include "itkSize.h"
-#include "itkFastMutexLock.h"
+#include <mutex>
namespace otb
{
@@ -173,7 +173,7 @@ private:
mutable bool m_IsUpToDate;
// Lock to ensure thread-safety
- itk::SimpleFastMutexLock m_Lock;
+ std::mutex m_Lock;
};
} // end namespace otb
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
index 2fa7b336db629958a3e08a20e2f8934e6c7a6dee..aec3448f4cb3cbf37a9b8daaf4a60fed9134b228 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
@@ -37,15 +37,14 @@ unsigned int ImageRegionAdaptativeSplitter<VImageDimension>::GetNumberOfSplits(c
// Set parameters
this->SetImageRegion(region);
this->SetRequestedNumberOfSplits(requestedNumber);
-
+
+ std::lock_guard<std::mutex> mutexHolder(m_Lock);
// Check if we need to compute split map agagin
- m_Lock.Lock();
if (!m_IsUpToDate)
{
// Do so if we need to
this->EstimateSplitMap();
}
- m_Lock.Unlock();
// Return the size of the split map
return m_StreamVector.size();
@@ -57,15 +56,13 @@ itk::ImageRegion<VImageDimension> ImageRegionAdaptativeSplitter<VImageDimension>
{
// Set parameters
this->SetImageRegion(region);
-
+ std::lock_guard<std::mutex> mutexHolder(m_Lock);
// Check if we need to compute split map agagin
- m_Lock.Lock();
if (!m_IsUpToDate)
{
// Do so if we need to
this->EstimateSplitMap();
}
- m_Lock.Unlock();
// Return the requested split
return m_StreamVector.at(i);
diff --git a/Modules/Core/Common/include/otbLogger.h b/Modules/Core/Common/include/otbLogger.h
index 13492704c4b0c1335a08fd427302cbee2ae7e36a..950aaa0c340236ad937d320b94d7a21f40245cbc 100644
--- a/Modules/Core/Common/include/otbLogger.h
+++ b/Modules/Core/Common/include/otbLogger.h
@@ -72,7 +72,7 @@ public:
void LogSetupInformationDone();
// Overwrite this to provide custom formatting of log entries
- std::string BuildFormattedEntry(itk::Logger::PriorityLevelType, std::string const&) override;
+ std::string BuildFormattedEntry(itk::LoggerBaseEnums::PriorityLevel, std::string const&) override;
protected:
Logger();
diff --git a/Modules/Core/Common/include/otbMacro.h b/Modules/Core/Common/include/otbMacro.h
index 09c5f82e15d0d785c47c790101aefda13f14a4b1..d368a7ddcd05077e9ffcf0618aefc5a6ed24d309 100644
--- a/Modules/Core/Common/include/otbMacro.h
+++ b/Modules/Core/Common/include/otbMacro.h
@@ -30,6 +30,7 @@
#include "itkMacro.h"
#include "itkObject.h"
+#include "itkThreadSupport.h"
#include "otbConfigure.h"
#include "otbLogger.h"
@@ -42,7 +43,57 @@
namespace otb
{
} // end namespace otb - this is here for documentation purposes
+/* ITK 5.0 uses a different threading model compared to ITK 4.x.
+ * This has a significant impact on OTB as we make heavy use of itk filters.
+ * DynamicThreadedGenerateData() is the newer variant without threadId,
+ * and is the preferred signature, which is called by default. This
+ * variant can split the requested region into different number of
+ * pieces depending on current multi-processing load, which allows
+ * better load balancing. The non-dynamic (also known as classic)
+ * ThreadedGenerateData() signature has threadId, and number of pieces
+ * to be split into is known in advance. It is activated by calling
+ * this->DynamicMultiThreadingOff(); in derived class constructor.
+ *
+ * OTB uses ThreadedGenerateData() with threadId and thus required
+ * to call this->DynamicMultiThreadingOff(); in filter's constructor.
+ *
+ * OTB_DISABLE_DYNAMIC_MT is a simple macro that insert this
+ * function call *IF* itk version used is 5.0 or above.
+ * This macro expands to empty when OTB is built with ITK 4.x and
+ * this ease from ITK 4.x to ITK 5.x. Ideally ThreadedGenerateData() function
+ * everywhere in OTB must be replace with DynamicThreadedGenerateData().
+ * This for sure is not a glorified sed command. Usage of function parameter
+ * threadId (and progress reporter) must be removed as well.
+ *
+ * It also leads us into a situation that OTB will no longer work with ITK 4.x.
+ * We cannot break that until ITK 5.0 is available on all platforms and is well tested.
+ * As time of writing this patch ITK 5.0 is in alpha release.
+ * Eventually OTB can move up in direction where it is requires ITK 5.0 or.
+ * But until things are resolved this macro based compatibility must stay.
+ *
+ * Finally please note that OTB_DISABLE_DYNAMIC_MT does not disable multithreading.
+ * Method or macro name can sometimes cause confusion when reading code.
+ *
+ * sample run-time exception:
+ * =========================
+ * 2018-06-04 15:30:09 (DEBUG): Caught itk::ExceptionObject during application execution:
+ * 2018-06-04 15:30:09 (DEBUG): /usr/src/ports/itk/Modules/Core/Common/src/itkPoolMultiThreader.cxx:202:
+ * itk::ERROR: PoolMultiThreader(0xabad1dea): Exception occurred during SingleMethodExecute
+ * /home/rashad/local/include/ITK-5.0/itkImageSource.hxx:276:
+ * itk::ERROR: ShiftScaleImageFilter(0xabad1deaff): Subclass should override this method!!!
+ * If old behavior is desired invoke this->DynamicMultiThreadingOff(); before Update() is called. The best place is in class constructor.
+ */
+#define OTB_DISABLE_DYNAMIC_MT this->DynamicMultiThreadingOff();
+/*
+//ITK_THREAD_RETURN_TYPE and ITK_THREAD_RETURN_VALUE bas been changed in ITK5 (master)
+// we need to re-exposed to the global namespace to keep the
+// use of these items consistent.
+#if ITK_VERSION_MAJOR > 4
+#define ITK_THREAD_RETURN_TYPE itk::ITK_THREAD_RETURN_TYPE
+#define ITK_THREAD_RETURN_VALUE itk::ITK_THREAD_RETURN_DEFAULT_VALUE
+#endif
+*/
#define otbFileContext(x) << "file " __FILE__ ", line " << __LINE__ << ", " x
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
index 1091f6d83d11e001ec1188f80b353a9b88cc20ea..1c682da2926d55ceed82ee62013d3428553dce14 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
@@ -150,9 +150,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
QuaternaryFunctorImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
index 64f1a61fa74ce2c52902cf5f6a615f5d42d66ab0..ecf60b1e7605f08165947b2068a9d774fc80fd6c 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
@@ -102,8 +102,8 @@ void QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInp
* ThreadedGenerateData function. Performs the pixel-wise addition
*/
template <class TInputImage1, class TInputImage2, class TInputImage3, class TInputImage4, class TOutputImage, class TFunction>
-void QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
// We use dynamic_cast since inputs are stored as DataObjects. The
// ImageToImageFilter::GetInput(int) always returns a pointer to a
@@ -120,7 +120,7 @@ void QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInp
itk::ImageRegionConstIterator<TInputImage4> inputIt4(inputPtr4, outputRegionForThread);
itk::ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
+ //itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
inputIt1.GoToBegin();
inputIt2.GoToBegin();
@@ -135,7 +135,7 @@ void QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInp
++inputIt3;
++inputIt4;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
+ //progress.CompletedPixel(); // potential exception thrown here
}
}
} // end namespace otb
diff --git a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
index 2a184ba59829f7113c9b34e8ef2ed76474978b80..947460c05fe33ae43428f04d8da164f9442fd473 100644
--- a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
@@ -55,7 +55,7 @@ namespace otb
* \ingroup OTBCommon
*/
template <class PrintCallbackType = StandardOutputPrintCallback>
-class OTBCommon_EXPORT_TEMPLATE StandardOneLineFilterWatcher : public FilterWatcherBase
+class StandardOneLineFilterWatcher : public FilterWatcherBase
{
public:
/** Constructor. Takes a ProcessObject to monitor and an optional
diff --git a/Modules/Core/Common/include/otbStopwatch.h b/Modules/Core/Common/include/otbStopwatch.h
index cc620c2f69b388a43d613cb73cb757e44b0f2713..2885dceac91019201e90587c5cd56e84b365fa80 100644
--- a/Modules/Core/Common/include/otbStopwatch.h
+++ b/Modules/Core/Common/include/otbStopwatch.h
@@ -42,10 +42,10 @@ class OTBCommon_EXPORT Stopwatch final
{
public:
/** Standard class typedefs. */
- typedef Stopwatch Self;
+ using Self = Stopwatch;
/** Represents a duration measured in milliseconds */
- typedef uint64_t DurationType;
+ using DurationType = std::uint64_t;
/** Constructs a timer instance */
Stopwatch();
@@ -79,7 +79,7 @@ public:
static Stopwatch StartNew();
private:
- typedef uint64_t TimepointType;
+ using TimepointType = std::uint64_t;
TimepointType GetTimestamp() const;
DurationType GetRunningElapsedTime() const;
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
index ac10da9c228fa71c569438ed57c59ba9b58d455d..49f41872a029a65e844d45340b4b910ba2112260 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
@@ -117,9 +117,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Since the number of components per pixel depends on the radius range, one must reimplement
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
index e7dd76a1f2f31799658152ebf45531eb6c12cd4c..fb896aa73838342a3273e05f2158fe6709b613db 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
@@ -35,6 +35,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TFunction>
UnaryFunctorNeighborhoodVectorImageFilter<TInputImage, TOutputImage, TFunction>::UnaryFunctorNeighborhoodVectorImageFilter()
{
+ this->DynamicMultiThreadingOn();
this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
for (unsigned int i = 0; i < InputImageDimension; ++i)
@@ -56,8 +57,7 @@ void UnaryFunctorNeighborhoodVectorImageFilter<TInputImage, TOutputImage, TFunct
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void UnaryFunctorNeighborhoodVectorImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void UnaryFunctorNeighborhoodVectorImageFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
InputImageRegionType inputRegionForThread;
@@ -71,9 +71,6 @@ void UnaryFunctorNeighborhoodVectorImageFilter<TInputImage, TOutputImage, TFunct
itk::ImageRegionIterator<TOutputImage> outputIt(this->GetOutput(), outputRegionForThread);
outputIt.GoToBegin();
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
while (!outputIt.IsAtEnd() && !neighInputIt.IsAtEnd())
{
outputIt.Set(m_Functor(neighInputIt));
@@ -81,7 +78,6 @@ void UnaryFunctorNeighborhoodVectorImageFilter<TInputImage, TOutputImage, TFunct
++neighInputIt;
++outputIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
index 63d056a2fa6a6143d06c857eb9f6950590f36ce8..a119c40f9d3e3d00bd657b824d4dd13839a33855 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
@@ -104,9 +104,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Since the number of components per pixel depends on the radius range, one must reimplement
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
index 4a3ee2ff3350abb04d80faaa21b7354513ce0f60..0ddde34352f11ad921776ed611a3a9065b16f450 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
@@ -34,6 +34,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TFunction>
UnaryFunctorVectorImageFilter<TInputImage, TOutputImage, TFunction>::UnaryFunctorVectorImageFilter()
{
+ this->DynamicMultiThreadingOn();
this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
}
@@ -53,8 +54,7 @@ void UnaryFunctorVectorImageFilter<TInputImage, TOutputImage, TFunction>::Genera
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void UnaryFunctorVectorImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void UnaryFunctorVectorImageFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -65,8 +65,6 @@ void UnaryFunctorVectorImageFilter<TInputImage, TOutputImage, TFunction>::Thread
itk::ImageRegionIterator<OutputImageType> outputIt(this->GetOutput(), outputRegionForThread);
outputIt.GoToBegin();
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
while (!outputIt.IsAtEnd() && !inputIt.IsAtEnd())
{
@@ -75,7 +73,6 @@ void UnaryFunctorVectorImageFilter<TInputImage, TOutputImage, TFunction>::Thread
++inputIt;
++outputIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
index 74c001dde42588e2ca86cb5a83032a4e2ad6cad3..f544c08a5718c4472eedbe7f2c99950657f1674d 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
@@ -122,9 +122,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Pad the input requested region by radius
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
index 6bb823090f44e9ea971a4c20de8e3352a51396a6..849dbe89aa0da59aec30b71cd99a83555e698129 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
@@ -23,7 +23,6 @@
#include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h"
#include "itkImageRegionIterator.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -83,8 +82,8 @@ void UnaryFunctorWithIndexWithOutputSizeImageFilter<TInputImage, TOutputImage, T
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void UnaryFunctorWithIndexWithOutputSizeImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void UnaryFunctorWithIndexWithOutputSizeImageFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
InputImagePointer inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
OutputImagePointer outputPtr = this->GetOutput(0);
@@ -96,8 +95,6 @@ void UnaryFunctorWithIndexWithOutputSizeImageFilter<TInputImage, TOutputImage, T
IteratorType inputIt = IteratorType(inputPtr, inputRegionForThread);
itk::ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -106,7 +103,6 @@ void UnaryFunctorWithIndexWithOutputSizeImageFilter<TInputImage, TOutputImage, T
outputIt.Set(m_Functor(inputIt.Get(), inputIt.GetIndex()));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
diff --git a/Modules/Core/Common/src/otbConfigurationManager.cxx b/Modules/Core/Common/src/otbConfigurationManager.cxx
index ebd30e89234a59c992c1136819306d74d53ca300..70adb469609e0c5a23297e4c30fe704c497db7a0 100644
--- a/Modules/Core/Common/src/otbConfigurationManager.cxx
+++ b/Modules/Core/Common/src/otbConfigurationManager.cxx
@@ -23,7 +23,8 @@
#include "otbMacro.h"
#include "otbLogger.h"
-#include "itkMultiThreader.h"
+#include "itkMultiThreaderBase.h"
+
#include "itksys/SystemTools.hxx"
#ifdef _OPENMP
@@ -65,12 +66,12 @@ ConfigurationManager::RAMValueType ConfigurationManager::GetMaxRAMHint()
}
}
-itk::LoggerBase::PriorityLevelType ConfigurationManager::GetLoggerLevel()
+itk::LoggerBaseEnums::PriorityLevel ConfigurationManager::GetLoggerLevel()
{
std::string svalue;
// Default value is INFO
- itk::LoggerBase::PriorityLevelType level = itk::LoggerBase::INFO;
+ itk::LoggerBaseEnums::PriorityLevel level = itk::LoggerBase::INFO;
itksys::SystemTools::GetEnv("OTB_LOGGER_LEVEL", svalue);
// on windows a variable set with set EX="" will keep the "". We need
// to remove them.
@@ -109,9 +110,9 @@ int ConfigurationManager::InitOpenMPThreads()
{
int ret = 1;
#ifdef _OPENMP
- ret = itk::MultiThreader::GetGlobalDefaultNumberOfThreads();
+ ret = itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads();
omp_set_num_threads(ret);
-#endif
+#endif //_OPENMP
return ret;
}
}
diff --git a/Modules/Core/Common/src/otbLogger.cxx b/Modules/Core/Common/src/otbLogger.cxx
index 93e3f3be700022cdbcfd97871277aa83eea3d938..1d13dcc7f48779e049bd4c5edc8913c4b9d3e7a7 100644
--- a/Modules/Core/Common/src/otbLogger.cxx
+++ b/Modules/Core/Common/src/otbLogger.cxx
@@ -24,7 +24,8 @@
#include "itkStdStreamLogOutput.h"
#include <iostream>
#include "gdal.h"
-#include "itkMultiThreader.h"
+
+#include "itkMultiThreaderBase.h"
#include <type_traits>
#include <cassert>
@@ -81,17 +82,17 @@ void Logger::LogSetupInformation()
{
std::ostringstream oss;
- oss << "Default RAM limit for OTB is " << otb::ConfigurationManager::GetMaxRAMHint() << " MB" << std::endl;
+ oss << "Default RAM limit for OTB is " << otb::ConfigurationManager::GetMaxRAMHint() << " MB\n";
this->Info(oss.str());
oss.str("");
oss.clear();
- oss << "GDAL maximum cache size is " << GDALGetCacheMax64() / (1024 * 1024) << " MB" << std::endl;
+ oss << "GDAL maximum cache size is " << GDALGetCacheMax64() / (1024 * 1024) << " MB\n";
this->Info(oss.str());
oss.str("");
oss.clear();
- oss << "OTB will use at most " << itk::MultiThreader::GetGlobalDefaultNumberOfThreads() << " threads" << std::endl;
+ oss << "OTB will use at most " << itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads() << " threads\n";
this->Info(oss.str());
oss.str("");
oss.clear();
@@ -118,19 +119,19 @@ void Logger::LogSetupInformationDone()
m_LogSetupInfoDone = true;
}
-std::string Logger::BuildFormattedEntry(itk::Logger::PriorityLevelType level, std::string const& content)
+std::string Logger::BuildFormattedEntry(itk::LoggerBaseEnums::PriorityLevel level, std::string const& content)
{
static const std::string levelString[] = {"(MUSTFLUSH)", "(FATAL)", "(CRITICAL)", "(WARNING)", "(INFO)", "(DEBUG)", "(NOTSET)"};
- assert(level <= std::extent<decltype(levelString)>::value);
+ assert(int(level) <= std::extent<decltype(levelString)>::value);
if (strcmp(this->GetName(), "") == 0)
{
- return itksys::SystemTools::GetCurrentDateTime("%Y-%m-%d %H:%M:%S") + " " + levelString[level] + ": " + content;
+ return itksys::SystemTools::GetCurrentDateTime("%Y-%m-%d %H:%M:%S") + " " + levelString[std::uint8_t(level)] + ": " + content;
}
else
{
- return itksys::SystemTools::GetCurrentDateTime("%Y-%m-%d %H:%M:%S") + " " + levelString[level] + " " + this->GetName() + ": " + content;
+ return itksys::SystemTools::GetCurrentDateTime("%Y-%m-%d %H:%M:%S") + " " + levelString[std::uint8_t(level)] + " " + this->GetName() + ": " + content;
}
}
diff --git a/Modules/Core/Common/src/otbStandardOutputPrintCallback.cxx b/Modules/Core/Common/src/otbStandardOutputPrintCallback.cxx
index 24ce3e9e029ec1939026d1e3390f5c8281f7a10f..f5ffe08c54b3bbcf6b4033d895aeb782f3a0d8f7 100644
--- a/Modules/Core/Common/src/otbStandardOutputPrintCallback.cxx
+++ b/Modules/Core/Common/src/otbStandardOutputPrintCallback.cxx
@@ -19,6 +19,7 @@
*/
#include "otbStandardOutputPrintCallback.h"
+#include <iostream>
namespace otb
{
diff --git a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx b/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
index cc64d276f69c457faeefeba6d86cf347178b2dfc..a85ecf18fbbae12ecb658e730f37886d76987471 100644
--- a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
+++ b/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
@@ -69,7 +69,7 @@ int otbAmplitudePhaseToRGBFunctor(int itkNotUsed(argc), char* argv[])
colormapper->SetInput1(modulusFilter->GetOutput());
colormapper->SetInput2(constFilter->GetOutput());
colormapper->SetInput3(phaseFilter->GetOutput());
- colormapper->SetNumberOfThreads(1);
+ colormapper->SetNumberOfWorkUnits(1);
writer->SetInput(colormapper->GetOutput());
diff --git a/Modules/Core/Conversion/include/otbLabelImageSmallRegionMergingFilter.hxx b/Modules/Core/Conversion/include/otbLabelImageSmallRegionMergingFilter.hxx
index 8417c59bd672e500a25b5491f4e2cc3b430b0ba3..fe8a4aaf69a9447a1ba68f513d9c090607affb47 100644
--- a/Modules/Core/Conversion/include/otbLabelImageSmallRegionMergingFilter.hxx
+++ b/Modules/Core/Conversion/include/otbLabelImageSmallRegionMergingFilter.hxx
@@ -31,6 +31,7 @@ namespace otb
template <class TInputLabelImage>
PersistentLabelImageSmallRegionMergingFilter<TInputLabelImage>::PersistentLabelImageSmallRegionMergingFilter() : m_Size(1)
{
+ this->DynamicMultiThreadingOff();
}
template <class TInputLabelImage>
@@ -77,7 +78,7 @@ template <class TInputLabelImage>
void PersistentLabelImageSmallRegionMergingFilter<TInputLabelImage>::Reset()
{
m_NeighboursMapsTmp.clear();
- m_NeighboursMapsTmp.resize(this->GetNumberOfThreads());
+ m_NeighboursMapsTmp.resize(this->GetNumberOfWorkUnits());
}
template <class TInputLabelImage>
@@ -86,7 +87,7 @@ void PersistentLabelImageSmallRegionMergingFilter<TInputLabelImage>::Synthetize(
NeighboursMapType neighboursMap;
// Merge the neighbours maps from all threads
- for (unsigned int threadId = 0; threadId < this->GetNumberOfThreads(); threadId++)
+ for (unsigned int threadId = 0; threadId < this->GetNumberOfWorkUnits(); threadId++)
{
for (auto const& neighbours : m_NeighboursMapsTmp[threadId])
{
diff --git a/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.h b/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.h
index 7be8ee181fdc821e1d8f1b2566c701c313189fc7..f9865c9180c844ba875c358e419d141bc1b382a3 100644
--- a/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.h
+++ b/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.h
@@ -70,8 +70,6 @@ public:
typedef VectorData<TPrecision> VectorDataType;
typedef typename VectorDataType::Pointer VectorDataPointerType;
typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
- typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
typedef typename VectorDataType::DataNodeType DataNodeType;
typedef typename DataNodeType::Pointer DataNodePointerType;
typedef typename VectorDataType::LineType LineType;
diff --git a/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.hxx b/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.hxx
index 29f3c90b52eb4c226e4562ad9b196256324a1235..7634fb489c430d41dad5664b85b4b289d16d3368 100644
--- a/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.hxx
+++ b/Modules/Core/Conversion/include/otbLabelImageToVectorDataFilter.hxx
@@ -256,17 +256,10 @@ void LabelImageToVectorDataFilter<TInputImage, TPrecision>::GenerateData(void)
// Adding the layer to the data tree
VectorDataPointerType data = dynamic_cast<VectorDataType*>(this->GetOutput());
data->SetProjectionRef(this->GetInput()->GetProjectionRef());
-
- DataTreePointerType tree = data->GetDataTree();
- DataNodePointerType root = tree->GetRoot()->Get();
- tree->Add(document, root);
-
- // This is not good but we do not have the choice if we want to
- // get a hook on the internal structure
- InternalTreeNodeType* documentPtr = const_cast<InternalTreeNodeType*>(tree->GetNode(document));
+ data->Add(document, data->GetRoot());
OGRIOHelper::Pointer OGRConversion = OGRIOHelper::New();
- OGRConversion->ConvertOGRLayerToDataTreeNode(&outputLayer.ogr(), documentPtr);
+ OGRConversion->ConvertOGRLayerToDataTreeNode(data,&outputLayer.ogr(), document);
// Clear memory
GDALClose(dataset);
diff --git a/Modules/Core/Conversion/include/otbLabelMapToVectorDataFilter.hxx b/Modules/Core/Conversion/include/otbLabelMapToVectorDataFilter.hxx
index cb0ba3c743ed92887b3feb00c139e9f7b0668dd5..ce7f51b9d8cabfd3a5db0c3ba6cfc5064c370456 100644
--- a/Modules/Core/Conversion/include/otbLabelMapToVectorDataFilter.hxx
+++ b/Modules/Core/Conversion/include/otbLabelMapToVectorDataFilter.hxx
@@ -80,9 +80,9 @@ void LabelMapToVectorDataFilter<TLabelMap, TVectorData, TFieldsFunctor>::Generat
document->SetNodeType(DOCUMENT);
folder1->SetNodeType(FOLDER);
- DataNodePointerType root = output->GetDataTree()->GetRoot()->Get();
- output->GetDataTree()->Add(document, root);
- output->GetDataTree()->Add(folder1, document);
+ DataNodePointerType root = output->GetRoot();
+ output->Add(document, root);
+ output->Add(folder1, document);
// Lets begin by declaring the iterator for the objects in the image.
ConstIteratorType it = ConstIteratorType(input);
@@ -116,7 +116,7 @@ void LabelMapToVectorDataFilter<TLabelMap, TVectorData, TFieldsFunctor>::Generat
}
/**Add the polygon to the VectorData*/
- output->GetDataTree()->Add(node, folder1);
+ output->Add(node, folder1);
++it;
}
}
diff --git a/Modules/Core/Conversion/include/otbPersistentImageToVectorDataFilter.hxx b/Modules/Core/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
index 3c9f985337136eef34554ac84c79395032c1203a..88944954a94e9eb8017a289127689d4277687a83 100644
--- a/Modules/Core/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
+++ b/Modules/Core/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
@@ -56,9 +56,9 @@ void PersistentImageToVectorDataFilter<TImage, TOutputVectorData>::Reset()
typedef typename DataNodeType::Pointer DataNodePointerType;
this->GetOutputVectorData()->Clear();
- DataNodePointerType root = DataNodeType::New();
- root->SetNodeId("Root");
- this->GetOutputVectorData()->GetDataTree()->SetRoot(root);
+ // DataNodePointerType root = DataNodeType::New();
+ // root->SetNodeId("Root");
+ // this->GetOutputVectorData()->SetRoot(root);
DataNodePointerType folder = DataNodeType::New();
folder->SetNodeType(otb::FOLDER);
@@ -66,8 +66,8 @@ void PersistentImageToVectorDataFilter<TImage, TOutputVectorData>::Reset()
DataNodePointerType document = DataNodeType::New();
document->SetNodeType(otb::DOCUMENT);
- this->GetOutputVectorData()->GetDataTree()->Add(document, this->GetOutputVectorData()->GetDataTree()->GetRoot()->Get());
- this->GetOutputVectorData()->GetDataTree()->Add(folder, document);
+ this->GetOutputVectorData()->Add(document, this->GetOutputVectorData()->GetRoot());
+ this->GetOutputVectorData()->Add(folder, document);
}
template <class TImage, class TOutputVectorData>
diff --git a/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.h
index 13de777f9ac560da29dfe89589a66ee7763024d9..3de883e0bc71258e237ecc4658fea27730f546fc 100644
--- a/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.h
+++ b/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.h
@@ -92,10 +92,7 @@ public:
/** VectorData typedefs*/
typedef TVectorData VectorDataType;
typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
- typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
-
+ typedef typename VectorDataType::DataNodePointerType DataNodePointerType;
typedef itk::DataObject DataObjectType;
/** Set/Get the AllTouchedMode flag */
diff --git a/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.hxx b/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.hxx
index 945d7fdb0b23700a562d133144c368c3e7a08c55..d6ef04e798fe9cb1570926e8c7262c3cdae7039e 100644
--- a/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.hxx
+++ b/Modules/Core/Conversion/include/otbRasterizeVectorDataFilter.hxx
@@ -74,11 +74,8 @@ void RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage>::Generate
otbMsgDevMacro(<< "Projection information unavailable");
}
- // Retrieving root node
- DataTreeConstPointerType tree = vd->GetDataTree();
-
// Get the input tree root
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(tree->GetRoot());
+ DataNodePointerType root = vd->GetRoot();
// Iterative method to build the layers from a VectorData
OGRRegisterAll();
@@ -90,7 +87,7 @@ void RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage>::Generate
// OGRDataSource but don t release it. Destruction is done in the
// destructor
m_OGRDataSourcePointer = nullptr;
- ogrLayerVector = IOConversion->ConvertDataTreeNodeToOGRLayers(inputRoot, m_OGRDataSourcePointer, ogrCurrentLayer, oSRS);
+ ogrLayerVector = IOConversion->ConvertDataTreeNodeToOGRLayers(vd,root, m_OGRDataSourcePointer, ogrCurrentLayer, oSRS);
// Cast OGRLayer* to OGRLayerH
for (unsigned int idx2 = 0; idx2 < ogrLayerVector.size(); ++idx2)
diff --git a/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.h b/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.h
index caacf0d5807d0270a4d5b5a7adf2279bb968b0df..e79c7c985e154c5e6dac97e404e111961b648835 100644
--- a/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.h
+++ b/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.h
@@ -79,9 +79,6 @@ public:
/** VectorData typedefs*/
typedef TVectorData VectorDataType;
typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
- typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
typedef itk::ImageBase<OutputImageType::ImageDimension> ImageBaseType;
diff --git a/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.hxx b/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.hxx
index 59e56645c596ef867aff9c9d3a0c53e99386f20c..6f7af097515aaaa5ce6a26a3b00a2e0e1891e49a 100644
--- a/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.hxx
+++ b/Modules/Core/Conversion/include/otbVectorDataToLabelImageFilter.hxx
@@ -151,12 +151,6 @@ void VectorDataToLabelImageFilter<TVectorData, TOutputImage>::GenerateOutputInfo
otbMsgDevMacro(<< "Projection information unavailable");
}
- // Retrieving root node
- DataTreeConstPointerType tree = vd->GetDataTree();
-
- // Get the input tree root
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(tree->GetRoot());
-
// Iterative method to build the layers from a VectorData
OGRLayer* ogrCurrentLayer = nullptr;
std::vector<OGRLayer*> ogrLayerVector;
@@ -166,7 +160,7 @@ void VectorDataToLabelImageFilter<TVectorData, TOutputImage>::GenerateOutputInfo
// OGRDataSource but don t release it. Destruction is done in the
// destructor
m_OGRDataSourcePointer = nullptr;
- ogrLayerVector = IOConversion->ConvertDataTreeNodeToOGRLayers(inputRoot, m_OGRDataSourcePointer, ogrCurrentLayer, oSRS);
+ ogrLayerVector = IOConversion->ConvertDataTreeNodeToOGRLayers(vd,vd->GetRoot(), m_OGRDataSourcePointer, ogrCurrentLayer, oSRS);
// From OGRLayer* to OGRGeometryH vector
for (unsigned int idx2 = 0; idx2 < ogrLayerVector.size(); ++idx2)
diff --git a/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.h
index b1dc8c501a777ba973c44f26345f99ef5a569142..a59df3567b68b486c5723e2857fa469b7adc5cd2 100644
--- a/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -24,7 +24,7 @@
#include "itkLabelObject.h"
#include "itkProgressReporter.h"
-#include "itkBarrier.h"
+//#include "itkBarrier.h"
#include "itkConceptChecking.h"
#include "itkContinuousIndex.h"
//#include "itkDataObject.h"
@@ -74,8 +74,7 @@ public:
typedef typename OutputLabelMapType::Pointer OutputLabelMapPointer;
typedef typename OutputLabelMapType::ConstPointer OutputLabelMapConstPointer;
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename InputVectorDataType::ChildrenListType ChildrenListType;
typedef typename InputVectorDataType::DataNodeType DataNodeType;
typedef typename DataNodeType::Pointer DataNodePointerType;
typedef typename DataNodeType::PolygonType PolygonType;
@@ -189,7 +188,7 @@ private:
VectorDataToLabelMapFilter(const Self&) = delete;
void operator=(const Self&) = delete;
- void ProcessNode(InternalTreeNodeType* source);
+ void ProcessNode(InputVectorDataConstPointer inputVdata,DataNodePointerType source);
/** Current label value incremented after the vectorization of a layer*/
LabelType m_lab;
diff --git a/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.hxx b/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.hxx
index 4729777a9176ca0b73300cfa3f8f30a7689fa63a..f9c252a3f78baef1aa713172182ea0175b4c03e3 100644
--- a/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.hxx
+++ b/Modules/Core/Conversion/include/otbVectorDataToLabelMapFilter.hxx
@@ -199,7 +199,6 @@ void VectorDataToLabelMapFilter<TVectorData, TLabelMap>::GenerateData()
{
InputVectorDataConstPointer input = this->GetInput(idx);
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(input->GetDataTree()->GetRoot());
// Use our own value for the background
output->SetBackgroundValue(itk::NumericTraits<OutputLabelMapPixelType>::max());
// Set the value of the first label
@@ -208,39 +207,39 @@ void VectorDataToLabelMapFilter<TVectorData, TLabelMap>::GenerateData()
// The projection information
output->SetMetaDataDictionary(input->GetMetaDataDictionary());
- ProcessNode(inputRoot);
+ ProcessNode(input,input->GetRoot());
}
}
}
template <class TVectorData, class TLabelMap>
-void VectorDataToLabelMapFilter<TVectorData, TLabelMap>::ProcessNode(InternalTreeNodeType* source)
+void VectorDataToLabelMapFilter<TVectorData, TLabelMap>::ProcessNode(InputVectorDataConstPointer inputVd,DataNodePointerType source)
{
// Get the children list from the input node
- ChildrenListType children = source->GetChildrenList();
+ ChildrenListType children = inputVd->GetChildrenList(source);
// For each child
for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
{
// Copy input DataNode info
- DataNodePointerType dataNode = (*it)->Get();
+ DataNodePointerType dataNode = (*it);
otbGenericMsgDebugMacro(<< "Type of node " << dataNode->GetNodeType() << " id" << dataNode->GetNodeId());
switch (dataNode->GetNodeType())
{
case otb::ROOT:
{
- ProcessNode((*it));
+ //ProcessNode(inputVd,dataNode);
break;
}
case otb::DOCUMENT:
{
- ProcessNode((*it));
+ ProcessNode(inputVd,dataNode);
break;
}
case otb::FOLDER:
{
- ProcessNode((*it));
+ ProcessNode(inputVd,dataNode);
break;
}
case FEATURE_POINT:
diff --git a/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index c7715f62504fb65e9a45d4a68e7b378c2c8f8808..2b7da34b1ac74d427db157eaacf1f01edf03798b 100644
--- a/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -24,7 +24,7 @@
#include "itkLabelObject.h"
#include "itkProgressReporter.h"
-#include "itkBarrier.h"
+//#include "itkBarrier.h"
#include "itkConceptChecking.h"
#include "itkContinuousIndex.h"
//#include "itkDataObject.h"
@@ -81,8 +81,7 @@ public:
typedef typename OutputLabelMapType::Pointer OutputLabelMapPointer;
typedef typename OutputLabelMapType::ConstPointer OutputLabelMapConstPointer;
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename InputVectorDataType::ChildrenListType ChildrenListType;
typedef typename InputVectorDataType::DataNodeType DataNodeType;
typedef typename DataNodeType::Pointer DataNodePointerType;
typedef typename DataNodeType::PolygonType PolygonType;
@@ -219,7 +218,7 @@ private:
VectorDataToLabelMapWithAttributesFilter(const Self&) = delete;
void operator=(const Self&) = delete;
- void ProcessNode(InternalTreeNodeType* source);
+ void ProcessNode(InputVectorDataConstPointer inputVdata, DataNodePointerType source);
/** Current label value incremented after the vectorization of a layer*/
LabelType m_lab;
diff --git a/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx b/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
index 415363f000155dc9710ff25926df1dc8aa9e2550..0479302e86afc8bb1a8549236f8da605e10da6d8 100644
--- a/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
+++ b/Modules/Core/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
@@ -235,8 +235,7 @@ void VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap>::GenerateD
if (this->GetInput(idx))
{
- InputVectorDataConstPointer input = this->GetInput(idx);
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(input->GetDataTree()->GetRoot());
+ InputVectorDataConstPointer input = this->GetInput(idx);
// Use our own value for the background
output->SetBackgroundValue(m_BackgroundValue);
// Set the value of the first label
@@ -245,39 +244,39 @@ void VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap>::GenerateD
// The projection information
output->SetMetaDataDictionary(input->GetMetaDataDictionary());
- ProcessNode(inputRoot);
+ ProcessNode(input,input->GetRoot());
}
}
}
template <class TVectorData, class TLabelMap>
-void VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap>::ProcessNode(InternalTreeNodeType* source)
+void VectorDataToLabelMapWithAttributesFilter<TVectorData, TLabelMap>::ProcessNode(InputVectorDataConstPointer inputVdata,DataNodePointerType source)
{
// Get the children list from the input node
- ChildrenListType children = source->GetChildrenList();
+ ChildrenListType children = inputVdata->GetChildrenList(source);
// For each child
for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
{
// Copy input DataNode info
- DataNodePointerType dataNode = (*it)->Get();
+ DataNodePointerType dataNode = (*it);
otbGenericMsgDebugMacro(<< "Type of node " << dataNode->GetNodeType() << " id" << dataNode->GetNodeId());
switch (dataNode->GetNodeType())
{
case otb::ROOT:
{
- ProcessNode((*it));
+ //ProcessNode(inputVdata,(*it));
break;
}
case otb::DOCUMENT:
{
- ProcessNode((*it));
+ ProcessNode(inputVdata,(*it));
break;
}
case otb::FOLDER:
{
- ProcessNode((*it));
+ ProcessNode(inputVdata,(*it));
break;
}
case FEATURE_POINT:
diff --git a/Modules/Core/Conversion/test/otbLabelImageRegionMergingFilter.cxx b/Modules/Core/Conversion/test/otbLabelImageRegionMergingFilter.cxx
index f5c2056902e3c076ffb7ae4e56ce1bf7eb2dda1c..575db3854f4b0943b92e8a434d4694d07cdb9316 100644
--- a/Modules/Core/Conversion/test/otbLabelImageRegionMergingFilter.cxx
+++ b/Modules/Core/Conversion/test/otbLabelImageRegionMergingFilter.cxx
@@ -67,7 +67,7 @@ int otbLabelImageRegionMergingFilter(int argc, char* argv[])
filter->SetThreshold(threshold);
filter->SetMaxIterationNumber(maxiterationnumber);
filter->SetInput(reader->GetOutput());
- // filter->SetNumberOfThreads(1);
+ // filter->SetNumberOfWorkUnits(1);
WriterType::Pointer writer2 = WriterType::New();
LabelWriterType::Pointer writer5 = LabelWriterType::New();
diff --git a/Modules/Core/Conversion/test/otbLabelImageRegionPruningFilter.cxx b/Modules/Core/Conversion/test/otbLabelImageRegionPruningFilter.cxx
index 6a00b9a4d04337a6a9885e484bd747ab32ebbeef..bb43e2d2abd7ae696b0b23126c27292767bc1553 100644
--- a/Modules/Core/Conversion/test/otbLabelImageRegionPruningFilter.cxx
+++ b/Modules/Core/Conversion/test/otbLabelImageRegionPruningFilter.cxx
@@ -70,7 +70,7 @@ int otbLabelImageRegionPruningFilter(int argc, char* argv[])
filter->SetThreshold(threshold);
filter->SetMaxIterationNumber(maxiterationnumber);
filter->SetInput(reader->GetOutput());
- // filter->SetNumberOfThreads(1);
+ // filter->SetNumberOfWorkUnits(1);
WriterType::Pointer writer2 = WriterType::New();
LabelWriterType::Pointer writer5 = LabelWriterType::New();
diff --git a/Modules/Core/Conversion/test/otbVectorDataToLabelImageFilterWithoutReader.cxx b/Modules/Core/Conversion/test/otbVectorDataToLabelImageFilterWithoutReader.cxx
index 9bbb6a5d5ceb995f1def175e5960690ad0755559..f8254af679db1a07b5f0256fd2f99981477040ad 100644
--- a/Modules/Core/Conversion/test/otbVectorDataToLabelImageFilterWithoutReader.cxx
+++ b/Modules/Core/Conversion/test/otbVectorDataToLabelImageFilterWithoutReader.cxx
@@ -110,12 +110,12 @@ int main(int itkNotUsed(argc), char* argv[])
polygon2->SetFieldAsInt("DN", 64);
- DataNodeType::Pointer root = data->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = data->GetRoot();
- data->GetDataTree()->Add(document, root);
- data->GetDataTree()->Add(folder, document);
- data->GetDataTree()->Add(polygon1, folder);
- data->GetDataTree()->Add(polygon2, folder);
+ data->Add(document, root);
+ data->Add(folder, document);
+ data->Add(polygon1, folder);
+ data->Add(polygon2, folder);
data->Update();
diff --git a/Modules/Core/Convolution/include/otbConvolutionImageFilter.h b/Modules/Core/Convolution/include/otbConvolutionImageFilter.h
index b090a33e051f04b20abb019d8fdb392dff63e748..4a201163e998ad6952c12eb6f1d461cb59ae872e 100644
--- a/Modules/Core/Convolution/include/otbConvolutionImageFilter.h
+++ b/Modules/Core/Convolution/include/otbConvolutionImageFilter.h
@@ -163,9 +163,9 @@ protected:
* write to the portion of the output image specified by the
* parameter "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** ConvolutionImageFilter needs a larger input requested region than
* the output requested region. As such, ConvolutionImageFilter needs
diff --git a/Modules/Core/Convolution/include/otbConvolutionImageFilter.hxx b/Modules/Core/Convolution/include/otbConvolutionImageFilter.hxx
index 942f6f9d2f07458f6a97b71af0987114d7a752bf..4932cfadfe62b4758dc9f677ab13a1ea1866b75d 100644
--- a/Modules/Core/Convolution/include/otbConvolutionImageFilter.hxx
+++ b/Modules/Core/Convolution/include/otbConvolutionImageFilter.hxx
@@ -92,15 +92,13 @@ void ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilt
}
template <class TInputImage, class TOutputImage, class TBoundaryCondition, class TFilterPrecision>
-void ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPrecision>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilterPrecision>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
// Allocate output
typename OutputImageType::Pointer output = this->GetOutput();
typename InputImageType::ConstPointer input = this->GetInput();
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
InputRealType sum = itk::NumericTraits<InputRealType>::Zero;
@@ -138,7 +136,6 @@ void ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilt
++inputIt;
++outputIt;
- progress.CompletedPixel();
}
}
else
@@ -156,7 +153,6 @@ void ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition, TFilt
++inputIt;
++outputIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/DEM/include/otbDEMToImageGenerator.h b/Modules/Core/DEM/include/otbDEMToImageGenerator.h
index 1e9ef7104b47c8b7296c26fbdf3c9ef0c0af5e7a..8dd30b04ba9fd197a40fba819c723b45c6aeb627 100644
--- a/Modules/Core/DEM/include/otbDEMToImageGenerator.h
+++ b/Modules/Core/DEM/include/otbDEMToImageGenerator.h
@@ -181,7 +181,7 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void GenerateOutputInformation() override;
PointType m_OutputOrigin{0.0};
diff --git a/Modules/Core/DEM/include/otbDEMToImageGenerator.hxx b/Modules/Core/DEM/include/otbDEMToImageGenerator.hxx
index 8f8fb9d426aec5c9a00d7148ab47ce4ae72a6fbb..48d8da13ebfe12d5714125754f79a6f869e033ae 100644
--- a/Modules/Core/DEM/include/otbDEMToImageGenerator.hxx
+++ b/Modules/Core/DEM/include/otbDEMToImageGenerator.hxx
@@ -24,6 +24,7 @@
#include "otbDEMToImageGenerator.h"
#include "otbMacro.h"
#include "itkProgressReporter.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
@@ -31,6 +32,7 @@ namespace otb
template <class TDEMImage>
DEMToImageGenerator<TDEMImage>::DEMToImageGenerator()
{
+ this->DynamicMultiThreadingOn();
m_OutputSpacing[0] = 0.0001;
m_OutputSpacing[1] = -0.0001;
m_OutputSize[0] = 1;
@@ -89,16 +91,13 @@ void DEMToImageGenerator<TDEMImage>::BeforeThreadedGenerateData()
template <class TDEMImage>
-void DEMToImageGenerator<TDEMImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void DEMToImageGenerator<TDEMImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
DEMImagePointerType DEMImage = this->GetOutput();
// Create an iterator that will walk the output region
ImageIteratorType outIt = ImageIteratorType(DEMImage, outputRegionForThread);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Walk the output image, evaluating the height at each pixel
IndexType currentindex;
PointType phyPoint;
@@ -154,7 +153,6 @@ void DEMToImageGenerator<TDEMImage>::ThreadedGenerateData(const OutputImageRegio
// Back to the MNT default value
DEMImage->SetPixel(currentindex, m_DefaultUnknownValue);
}
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/Density/include/otbPointSetToDensityImageFilter.h b/Modules/Core/Density/include/otbPointSetToDensityImageFilter.h
index 461254cab505c2a119ba939b88eff6b6c1557fcb..10a03b9ead9c24398220842e4774b829ef9244c2 100644
--- a/Modules/Core/Density/include/otbPointSetToDensityImageFilter.h
+++ b/Modules/Core/Density/include/otbPointSetToDensityImageFilter.h
@@ -94,7 +94,7 @@ protected:
/**
* Main computation method.
*/
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Main computation method.
diff --git a/Modules/Core/Density/include/otbPointSetToDensityImageFilter.hxx b/Modules/Core/Density/include/otbPointSetToDensityImageFilter.hxx
index 30ab46bfc4587a51dadb5364b279d38056201f2c..f2ba17c75e9ba9fcc6c715742a9f8a802745e4f7 100644
--- a/Modules/Core/Density/include/otbPointSetToDensityImageFilter.hxx
+++ b/Modules/Core/Density/include/otbPointSetToDensityImageFilter.hxx
@@ -23,7 +23,6 @@
#include "otbPointSetToDensityImageFilter.h"
#include "itkImageRegionIterator.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -34,6 +33,7 @@ template <class TInputPointSet, class TOutputImage, class TDensityFunction>
PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>::PointSetToDensityImageFilter()
{
m_Radius = 1;
+ this->DynamicMultiThreadingOn();
}
/*-------------------------------------------------------
@@ -50,14 +50,11 @@ void PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction
* ThreadedGenerateData
--------------------------------------------------------*/
template <class TInputPointSet, class TOutputImage, class TDensityFunction>
-void PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// sleep(threadId);
// std::cerr << threadId << " -> " << outputRegionForThread.GetIndex() << std::endl;
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
typename OutputImageType::Pointer outPtr = this->GetOutput();
@@ -78,7 +75,6 @@ void PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction
itOut.Set(densityComputeFunction->Evaluate(pCenter));
++itOut;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/Descriptors/test/CMakeLists.txt b/Modules/Core/Descriptors/test/CMakeLists.txt
index db88a3469b7a3838f9463df09bb09f52c61e4bea..943d481b4545d66e861040fd17a810a27eb1eb20 100644
--- a/Modules/Core/Descriptors/test/CMakeLists.txt
+++ b/Modules/Core/Descriptors/test/CMakeLists.txt
@@ -17,7 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
otb_module_test()
set(OTBDescriptorsTests
@@ -35,6 +34,10 @@ endif()
add_executable(otbDescriptorsTestDriver ${OTBDescriptorsTests})
target_link_libraries(otbDescriptorsTestDriver ${OTBDescriptors-Test_LIBRARIES})
otb_module_target_label(otbDescriptorsTestDriver)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set_target_properties(otbDescriptorsTestDriver PROPERTIES LINK_FLAGS "-Wl,-no-as-needed")
+endif()
+
# Tests Declaration
@@ -50,16 +53,16 @@ otb_add_test(NAME feTvHistogramOfOrientedGradientCovariantImageFunction COMMAND
-otb_add_test(NAME feTvForwardFourierMellinImageFilter COMMAND otbDescriptorsTestDriver
- --compare-n-images ${EPSILON_6} 2
- ${BASELINE}/feForwardFourierMellinImageFilterReal.tif
- ${TEMP}/feForwardFourierMellinImageFilterReal.tif
- ${BASELINE}/feForwardFourierMellinImageFilterImag.tif
- ${TEMP}/feForwardFourierMellinImageFilterImag.tif
- otbFourierMellinImageFilter
- ${INPUTDATA}/circle.raw.hdr
- ${TEMP}/feForwardFourierMellinImageFilterReal.tif
- ${TEMP}/feForwardFourierMellinImageFilterImag.tif)
+# otb_add_test(NAME feTvForwardFourierMellinImageFilter COMMAND otbDescriptorsTestDriver
+# --compare-n-images ${EPSILON_6} 2
+# ${BASELINE}/feForwardFourierMellinImageFilterReal.tif
+# ${TEMP}/feForwardFourierMellinImageFilterReal.tif
+# ${BASELINE}/feForwardFourierMellinImageFilterImag.tif
+# ${TEMP}/feForwardFourierMellinImageFilterImag.tif
+# otbFourierMellinImageFilter
+# ${INPUTDATA}/circle.raw.hdr
+# ${TEMP}/feForwardFourierMellinImageFilterReal.tif
+# ${TEMP}/feForwardFourierMellinImageFilterImag.tif)
otb_add_test(NAME feTvImageToHessianDeterminantImageFilter COMMAND otbDescriptorsTestDriver
--compare-image ${EPSILON_3}
diff --git a/Modules/Core/Descriptors/test/otbFourierMellinImageFilter.cxx b/Modules/Core/Descriptors/test/otbFourierMellinImageFilter.cxx
index 26d7c39ca4988a53d7f99278e271ba42510c2a05..5fb2f52df63a89d90ae1374119be53b49b396b32 100644
--- a/Modules/Core/Descriptors/test/otbFourierMellinImageFilter.cxx
+++ b/Modules/Core/Descriptors/test/otbFourierMellinImageFilter.cxx
@@ -29,6 +29,7 @@
#include "itkImageRegionConstIteratorWithIndex.h"
#include "itkImageRegionIterator.h"
#include "itkRescaleIntensityImageFilter.h"
+#include <itkFFTWGlobalConfiguration.h>
int otbFourierMellinImageFilter(int itkNotUsed(argc), char* argv[])
{
@@ -86,8 +87,13 @@ int otbFourierMellinImageFilter(int itkNotUsed(argc), char* argv[])
imaginaryWriter->SetInput(imaginaryRescaler->GetOutput());
imaginaryWriter->Update();
// Hugly hack for cleaning fftw threads
-#if defined(ITK_USE_FFTWF) || defined(ITK_USE_FFTWD)
- fftw_cleanup_threads();
+#if defined(ITK_USE_FFTWF)
+ fftwf_cleanup_threads();
+ fftwf_cleanup();
+#endif
+#if defined(ITK_USE_FFTWD)
+ fftw_cleanup_threads();
+ fftw_cleanup();
#endif
return EXIT_SUCCESS;
}
diff --git a/Modules/Core/Edge/include/otbHorizontalSobelVectorImageFilter.h b/Modules/Core/Edge/include/otbHorizontalSobelVectorImageFilter.h
index 6c18624a53f0a830e40314630d6ac1e1afc3a920..63f22a2d058a730eded8c1ff42e293df116f486c 100644
--- a/Modules/Core/Edge/include/otbHorizontalSobelVectorImageFilter.h
+++ b/Modules/Core/Edge/include/otbHorizontalSobelVectorImageFilter.h
@@ -87,6 +87,7 @@ public:
protected:
HorizontalSobelVectorImageFilter()
{
+
typename Superclass::RadiusType radius = {{1, 1}};
this->SetRadius(radius);
}
diff --git a/Modules/Core/Edge/include/otbLineCorrelationDetectorImageFilter.hxx b/Modules/Core/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
index 07e7d920e8f77fac62d9c156d9811a284380ca1a..cd2622141b0f77e5c727550ffc4bdaf7e9ce341a 100644
--- a/Modules/Core/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
+++ b/Modules/Core/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
@@ -40,6 +40,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator>
LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>::LineCorrelationDetectorImageFilter()
{
+
this->m_Radius.Fill(1);
this->m_LengthLine = 1;
this->m_WidthLine = 0;
diff --git a/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.h b/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.h
index 1c21110647d0c39d1fa1fc3b24e7dd34bbcdb23e..60581a8fe59d056f2ebfbe7eee7a952c17765e88 100644
--- a/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.h
+++ b/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.h
@@ -141,10 +141,10 @@ protected:
* ThreadedGenerateData() method. ThreadedGenerateData can only write the portion
* of the image specified by the parameter outputRegionForThread
*
- * \sa ImageToImageFilter::ThreadedGenerateData()
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData()
* \sa ImageToImageFilter::GenerateData()
*/
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
virtual double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3);
diff --git a/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.hxx b/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.hxx
index 6a6599ee7c3a23ec591ced9813ef0ac2f8d04b23..0be9df929c5609a30b29aa520908c7773a7639c9 100644
--- a/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.hxx
+++ b/Modules/Core/Edge/include/otbLineDetectorImageFilterBase.hxx
@@ -130,8 +130,8 @@ void LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirectio
}
template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
-void LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
typename InputImageType::ConstPointer input = this->GetInput();
@@ -156,8 +156,6 @@ void LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirectio
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_FaceList);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
typename TInputImage::IndexType bitIndex;
typename InterpolatorType::ContinuousIndexType Index;
@@ -366,9 +364,7 @@ void LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirectio
++it;
++itdir;
// interiorFace = false;
- progress.CompletedPixel();
- // ROMAIN
for (unsigned int i = 0; i < NB_DIR; ++i)
{
delete[] PixelValues[i];
diff --git a/Modules/Core/Edge/include/otbLineRatioDetectorImageFilter.hxx b/Modules/Core/Edge/include/otbLineRatioDetectorImageFilter.hxx
index c4eaf17b6169c81a70a5e5ddccf2cbd8fb7d2f3c..c41971d1e44e5c1250f8b10a733ebe6e7bdbe714 100644
--- a/Modules/Core/Edge/include/otbLineRatioDetectorImageFilter.hxx
+++ b/Modules/Core/Edge/include/otbLineRatioDetectorImageFilter.hxx
@@ -41,6 +41,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator>
LineRatioDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>::LineRatioDetectorImageFilter()
{
+
this->m_Radius.Fill(1);
this->m_LengthLine = 1;
this->m_WidthLine = 0;
diff --git a/Modules/Core/Edge/include/otbLineSegmentDetector.hxx b/Modules/Core/Edge/include/otbLineSegmentDetector.hxx
index 955241979b24d7b964acb62238c888979152e534..28d1ff0be99d15c781e1ab78cc263ad440ed1b68 100644
--- a/Modules/Core/Edge/include/otbLineSegmentDetector.hxx
+++ b/Modules/Core/Edge/include/otbLineSegmentDetector.hxx
@@ -35,6 +35,7 @@
#include "itkMatrix.h"
#include "itkSymmetricEigenAnalysis.h"
+#include "vcl_legacy_aliases.h"
extern "C" double dlngam_(double* x);
@@ -292,17 +293,17 @@ int LineSegmentDetector<TInputImage, TPrecision>::ComputeRectangles()
// Output
this->GetOutput(0)->SetMetaDataDictionary(this->GetInput()->GetMetaDataDictionary());
// Retrieving root node
- typename DataNodeType::Pointer root = this->GetOutput(0)->GetDataTree()->GetRoot()->Get();
+ typename DataNodeType::Pointer root = this->GetOutput(0)->GetRoot();
// Create the document node
typename DataNodeType::Pointer document = DataNodeType::New();
document->SetNodeType(otb::DOCUMENT);
// Adding the layer to the data tree
- this->GetOutput(0)->GetDataTree()->Add(document, root);
+ this->GetOutput(0)->Add(document, root);
// Create the folder node
typename DataNodeType::Pointer folder = DataNodeType::New();
folder->SetNodeType(otb::FOLDER);
// Adding the layer to the data tree
- this->GetOutput(0)->GetDataTree()->Add(folder, document);
+ this->GetOutput(0)->Add(folder, document);
this->GetOutput(0)->SetProjectionRef(this->GetInput()->GetProjectionRef());
SpacingType spacing = this->GetInput()->GetSignedSpacing();
@@ -325,7 +326,7 @@ int LineSegmentDetector<TInputImage, TPrecision>::ComputeRectangles()
CurrentGeometry->SetNodeType(otb::FEATURE_LINE);
typename LineType::Pointer line = LineType::New();
CurrentGeometry->SetLine(line);
- this->GetOutput(0)->GetDataTree()->Add(CurrentGeometry, folder);
+ this->GetOutput(0)->Add(CurrentGeometry, folder);
CurrentGeometry->GetLine()->AddVertex(start);
CurrentGeometry->GetLine()->AddVertex(end);
diff --git a/Modules/Core/Edge/include/otbPersistentVectorizationImageFilter.hxx b/Modules/Core/Edge/include/otbPersistentVectorizationImageFilter.hxx
index 409e7b9331b049d107012b4ff875223e682adf1e..b4333b6b1f92e60b00a27a12eaddc04b7907dc68 100644
--- a/Modules/Core/Edge/include/otbPersistentVectorizationImageFilter.hxx
+++ b/Modules/Core/Edge/include/otbPersistentVectorizationImageFilter.hxx
@@ -52,14 +52,12 @@ void PersistentVectorizationImageFilter<TInputImage, TOutputPath>::GenerateData(
{
// Compute the min max and handle mini-pipeline
m_MinMaxFilter->SetInput(this->GetInput());
- m_MinMaxFilter->GraftOutput(this->GetOutput());
m_MinMaxFilter->Update();
- this->GraftOutput(m_MinMaxFilter->GetOutput());
for (PixelType label = m_MinMaxFilter->GetMinimum() + 1; label <= m_MinMaxFilter->GetMaximum(); ++label)
{
ImageToEdgePathFilterPointerType edgeFilter = ImageToEdgePathFilterType::New();
- edgeFilter->SetInput(m_MinMaxFilter->GetOutput());
+ edgeFilter->SetInput(this->GetInput());
edgeFilter->SetForegroundValue(label);
edgeFilter->Update();
m_PathList->PushBack(edgeFilter->GetOutput());
diff --git a/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.h b/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
index 888c63563392565e6c5e7d1f0caea3d3c25a9c93..1fdaf2359f3bf5869e1fe2254705688748857457 100644
--- a/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
@@ -107,7 +107,7 @@ protected:
}
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
PixelSuppressionByDirectionImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx b/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
index 8792435dde5d56e8f3c8636e2ac0a7b8529cca46..3e89d0d7ee3ba9ce95160236e73f4deb8b1e67b4 100644
--- a/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
+++ b/Modules/Core/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
@@ -21,6 +21,7 @@
#ifndef otbPixelSuppressionByDirectionImageFilter_hxx
#define otbPixelSuppressionByDirectionImageFilter_hxx
+#include "otbMacro.h" //for
#include "otbPixelSuppressionByDirectionImageFilter.h"
#include "itkDataObject.h"
@@ -42,9 +43,9 @@ namespace otb
template <class TInputImage, class TOutputImage>
PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::PixelSuppressionByDirectionImageFilter()
{
-
m_Radius.Fill(1);
m_AngularBeam = static_cast<double>(0.);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -132,8 +133,7 @@ void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::Generate
}
template <class TInputImage, class TOutputImage>
-void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itk::ConstantBoundaryCondition<InputImageType> cbc;
@@ -156,9 +156,6 @@ void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::Threaded
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(inputDirection, outputRegionForThread, m_Radius);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// typename TInputImage::IndexType bitIndex;
//---------------------------------------------------------------------------
@@ -265,7 +262,6 @@ void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::Threaded
++bit;
++itin;
++itout;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/Edge/include/otbSobelVectorImageFilter.h b/Modules/Core/Edge/include/otbSobelVectorImageFilter.h
index 9a5b2b39820781ae1843a00b2479196efc050b72..49ddcfda69ca140b225950bbf407c4879d5e17dd 100644
--- a/Modules/Core/Edge/include/otbSobelVectorImageFilter.h
+++ b/Modules/Core/Edge/include/otbSobelVectorImageFilter.h
@@ -93,6 +93,7 @@ public:
protected:
SobelVectorImageFilter()
{
+
typename Superclass::RadiusType radius = {{1, 1}};
this->SetRadius(radius);
}
diff --git a/Modules/Core/Edge/include/otbStreamingLineSegmentDetector.h b/Modules/Core/Edge/include/otbStreamingLineSegmentDetector.h
index 2bed2660f49c6779a6ec55872a85d94e270f1f8e..939b00e964c175a098c0a0208ea6c9a3f1930d92 100644
--- a/Modules/Core/Edge/include/otbStreamingLineSegmentDetector.h
+++ b/Modules/Core/Edge/include/otbStreamingLineSegmentDetector.h
@@ -25,7 +25,6 @@
#include <vector>
#include "itkImageRegion.h"
-#include "itkPreOrderTreeIterator.h"
#include "itkDataObjectDecorator.h"
#include "itkSimpleDataObjectDecorator.h"
diff --git a/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.h b/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.h
index 77c00714588e6f7970d31887646007572241be97..25fb6113bd7fb4e2a53157a482308410785e3835 100644
--- a/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.h
+++ b/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.h
@@ -112,9 +112,9 @@ protected:
* through the parent class calling the ThreadedGenerateData() method.
* ThreadedGenerateData() can only write the area of the image specified by the parameter "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
TouziEdgeDetectorImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.hxx b/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
index 5d570d36a2792d669d2e2646e6a704bbfadf96a2..c49d70ae11ecb2847dd0207d42f7ddeeec53372b 100644
--- a/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
+++ b/Modules/Core/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
@@ -42,6 +42,7 @@ template <class TInputImage, class TOutputImage, class TOutputImageDirection>
TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::TouziEdgeDetectorImageFilter()
{
m_Radius.Fill(1);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage, class TOutputImageDirection>
@@ -115,8 +116,7 @@ void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirecti
}
template <class TInputImage, class TOutputImage, class TOutputImageDirection>
-void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
@@ -136,8 +136,6 @@ void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirecti
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
typename TInputImage::IndexType bitIndex;
@@ -292,7 +290,6 @@ void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirecti
++bit;
++it;
++it_dir;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/Functor/include/otbFunctorImageFilter.h b/Modules/Core/Functor/include/otbFunctorImageFilter.h
index 2e0f0fe59456556285d752026c40bfb3ae4977d3..88657f3cea52d83e07e6f9850753f195c078fe86 100644
--- a/Modules/Core/Functor/include/otbFunctorImageFilter.h
+++ b/Modules/Core/Functor/include/otbFunctorImageFilter.h
@@ -396,7 +396,7 @@ public:
protected:
/// Constructor of functor filter, will copy the functor
- FunctorImageFilter(const FunctorType& f, itk::Size<2> radius) : m_Functor(f), m_Radius(radius){};
+ FunctorImageFilter(const FunctorType& f, itk::Size<2> radius) : m_Functor(f), m_Radius(radius){this->DynamicMultiThreadingOn();};
FunctorImageFilter(const Self&) = delete;
void operator=(const Self&) = delete;
~FunctorImageFilter() = default;
@@ -406,7 +406,7 @@ private:
friend auto NewFunctorFilter<TFunction, TNameMap>(TFunction f, itk::Size<2> radius);
/** Overload of ThreadedGenerateData */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Pad the input requested region by radius
diff --git a/Modules/Core/Functor/include/otbFunctorImageFilter.hxx b/Modules/Core/Functor/include/otbFunctorImageFilter.hxx
index 08e6af83e8171c207da6509bd57fcb7ba371b975..8c1894d085a0de082c22463f4bbecd1a8c9f3436 100644
--- a/Modules/Core/Functor/include/otbFunctorImageFilter.hxx
+++ b/Modules/Core/Functor/include/otbFunctorImageFilter.hxx
@@ -318,7 +318,7 @@ void FunctorImageFilter<TFunction, TNameMap>::GenerateOutputInformation()
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TFunction, class TNameMap>
-void FunctorImageFilter<TFunction, TNameMap>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void FunctorImageFilter<TFunction, TNameMap>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
const auto& regionSize = outputRegionForThread.GetSize();
@@ -326,8 +326,6 @@ void FunctorImageFilter<TFunction, TNameMap>::ThreadedGenerateData(const OutputI
{
return;
}
- const auto numberOfLinesToProcess = outputRegionForThread.GetNumberOfPixels() / regionSize[0];
- itk::ProgressReporter p(this, threadId, numberOfLinesToProcess);
// Build output iterator
itk::ImageScanlineIterator<OutputImageType> outIt(this->GetOutput(), outputRegionForThread);
@@ -350,7 +348,6 @@ void FunctorImageFilter<TFunction, TNameMap>::ThreadedGenerateData(const OutputI
outIt.Set(outputValueHolder);
}
outIt.NextLine();
- p.CompletedPixel(); // may throw
}
}
diff --git a/Modules/Core/Functor/include/otbSynthetizeFilter.h b/Modules/Core/Functor/include/otbSynthetizeFilter.h
index 3b25e997233e6b5b827f45670e8b17a23583df11..2d2d8cf6f4c4c03a5bb9225599ebd573fd719b19 100644
--- a/Modules/Core/Functor/include/otbSynthetizeFilter.h
+++ b/Modules/Core/Functor/include/otbSynthetizeFilter.h
@@ -143,18 +143,14 @@ protected:
* \param[in] outputRegionForThread Specified output region to compute
* \param[in] threadId Id of the computing threads
*/
- void ThreadedGenerateData(
- OutputImageRegionType const& outputRegionForThread,
- itk::ThreadIdType threadId) override
+ void DynamicThreadedGenerateData(
+ OutputImageRegionType const& outputRegionForThread) override
{
using ImageScanlineConstIteratorType = itk::ImageScanlineConstIterator<InputImageType const>;
// using OutImageScanlineConstIteratorType = itk::ImageScanlineIterator<OutputImageType>;
using OutputIterator = itk::ImageScanlineIterator<OutputImageType>;
using InputIterator = ZipConstIterator<ImageScanlineConstIteratorType>;
- auto const regSizeY = outputRegionForThread.GetSize()[1];
- itk::ProgressReporter progress( this, threadId, outputRegionForThread.GetNumberOfPixels() / regSizeY );
-
InputIterator inputIterator(this->GetInputs(), outputRegionForThread);
OutputIterator outputIterator(this->GetOutput(), outputRegionForThread);
@@ -175,7 +171,6 @@ protected:
outputIterator.Set(m_functor(inputIterator.Get()));
}
- progress.CompletedPixel(); // Completed...Line()
}
}
diff --git a/Modules/Core/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h b/Modules/Core/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
index 60b65a9fa338ec5858f95c5ae5ee85ebe20c49bb..adb27a51cae4fbacee784f18679b9d8537f4fc09 100644
--- a/Modules/Core/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
+++ b/Modules/Core/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
@@ -24,7 +24,7 @@
#include <vector>
#include <utility>
#include <string>
-
+#include "OTBFuzzyExport.h"
namespace otb
{
diff --git a/Modules/Core/Fusion/Fuzzy/otb-module.cmake b/Modules/Core/Fusion/Fuzzy/otb-module.cmake
index 7f404e7632135717b30d065b0dec918da325ae7c..4fb661a5b98e6224e604816a4a05c6e65d07214e 100644
--- a/Modules/Core/Fusion/Fuzzy/otb-module.cmake
+++ b/Modules/Core/Fusion/Fuzzy/otb-module.cmake
@@ -25,6 +25,7 @@ membership value for each one of the qualitative values. it also contains classe
to handle xml files where are stored several statistics.")
otb_module(OTBFuzzy
+ENABLE_SHARED
DEPENDS
OTBCommon
OTBTinyXML
diff --git a/Modules/Core/IO/Carto/include/otbCoordinateToName.h b/Modules/Core/IO/Carto/include/otbCoordinateToName.h
index 8f1cb6b32426041f39566361dc676b723a1d23fb..f835a8aa6bb080545979c268bfcfde471e687917 100644
--- a/Modules/Core/IO/Carto/include/otbCoordinateToName.h
+++ b/Modules/Core/IO/Carto/include/otbCoordinateToName.h
@@ -22,9 +22,12 @@
#define otbCoordinateToName_h
#include "itkPoint.h"
-#include "itkMultiThreader.h"
+#include "itkPlatformMultiThreader.h"
+
+#include "itkConfigure.h"
#include "otbCurlHelperInterface.h"
#include "OTBCartoExport.h"
+#include "otbMacro.h" //for ITK_THREAD_RETURN_TYPE in ITK5
#include <string>
namespace otb
@@ -63,6 +66,8 @@ public:
itkSetMacro(Lon, double);
itkSetMacro(Lat, double);
+ using PlatformMultiThreader = itk::PlatformMultiThreader;
+
/**
* Set the lon/lat only if they are far enough from the current point to
* avoid triggering too many updates
@@ -127,7 +132,7 @@ protected:
virtual void DoEvaluate();
- static ITK_THREAD_RETURN_TYPE ThreadFunction(void*);
+ static itk::ITK_THREAD_RETURN_TYPE ThreadFunction(void*);
private:
CoordinateToName(const Self&) = delete;
@@ -149,7 +154,7 @@ private:
CurlHelperInterface::Pointer m_Curl;
- itk::MultiThreader::Pointer m_Threader;
+ PlatformMultiThreader::Pointer m_Threader;
};
} // namespace otb
diff --git a/Modules/Core/IO/Carto/include/otbMapFileProductWriter.h b/Modules/Core/IO/Carto/include/otbMapFileProductWriter.h
index 8988b2f2af31215ca89848e63f589698f4400e18..0a73414397b26278fbb7709566e269185d9e0bb2 100644
--- a/Modules/Core/IO/Carto/include/otbMapFileProductWriter.h
+++ b/Modules/Core/IO/Carto/include/otbMapFileProductWriter.h
@@ -36,6 +36,7 @@
// projection filter
#include "otbGenericRSResampleImageFilter.h"
+#include "OTBCartoExport.h"
#include <string>
namespace otb
@@ -67,7 +68,7 @@ namespace otb
* \ingroup OTBCarto
*/
template <class TInputImage>
-class ITK_EXPORT MapFileProductWriter : public itk::ProcessObject
+class ITK_TEMPLATE_EXPORT MapFileProductWriter : public itk::ProcessObject
{
public:
/** Standard class typedefs. */
diff --git a/Modules/Core/IO/Carto/include/otbMapFileProductWriter.hxx b/Modules/Core/IO/Carto/include/otbMapFileProductWriter.hxx
index 445a61ed551142785402ce1fe41716046a09bb18..2a37a4cab55ee4cb393326733b090ffd6dc0c586 100644
--- a/Modules/Core/IO/Carto/include/otbMapFileProductWriter.hxx
+++ b/Modules/Core/IO/Carto/include/otbMapFileProductWriter.hxx
@@ -152,7 +152,7 @@ void MapFileProductWriter<TInputImage>::InitializeVectorData()
// Initialize the vectordata to build the indexTile
m_VectorDataIndexTile = VectorDataType::New();
m_VectorDataIndexTile->SetProjectionRef(otb::SpatialReference::FromEPSG(m_SRID).ToWkt());
- DataNodeType::Pointer root = m_VectorDataIndexTile->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = m_VectorDataIndexTile->GetRoot();
DataNodeType::Pointer document = DataNodeType::New();
m_Folder = DataNodeType::New();
@@ -162,8 +162,8 @@ void MapFileProductWriter<TInputImage>::InitializeVectorData()
document->SetNodeId("DOCUMENT");
m_Folder->SetNodeId("FOLDER");
- m_VectorDataIndexTile->GetDataTree()->Add(document, root);
- m_VectorDataIndexTile->GetDataTree()->Add(m_Folder, document);
+ m_VectorDataIndexTile->Add(document, root);
+ m_VectorDataIndexTile->Add(m_Folder, document);
}
/**
@@ -449,7 +449,7 @@ void MapFileProductWriter<TInputImage>::AddBBoxToIndexTile(OutputPointType lower
m_Polygon->SetFieldAsString("LOCATION", oss.str());
// Add the to vectordata
- m_VectorDataIndexTile->GetDataTree()->Add(m_Polygon, m_Folder);
+ m_VectorDataIndexTile->Add(m_Polygon, m_Folder);
}
/**
diff --git a/Modules/Core/IO/Carto/include/otbOSMDataToVectorDataGenerator.h b/Modules/Core/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
index 0758734ac1e7d80ed17899a33b1c59e3afb9e7bf..451aaaff692f0096cdeab9ac620aa24004702a5e 100644
--- a/Modules/Core/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
+++ b/Modules/Core/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
@@ -27,6 +27,7 @@
#include <string>
#include "OTBCartoExport.h"
+#include "itkMacro.h"
#include "otbVectorData.h"
#include "otbVectorDataSource.h"
diff --git a/Modules/Core/IO/Carto/src/otbCoordinateToName.cxx b/Modules/Core/IO/Carto/src/otbCoordinateToName.cxx
index af237926f74c531720416e5d76ab7ebc3a47901b..947d2184dced2a0810ca8df4139c63b87a2b76e8 100644
--- a/Modules/Core/IO/Carto/src/otbCoordinateToName.cxx
+++ b/Modules/Core/IO/Carto/src/otbCoordinateToName.cxx
@@ -54,7 +54,7 @@ CoordinateToName::CoordinateToName() : m_Lon(-1000.0), m_Lat(-1000.0), m_Multith
m_Curl = CurlHelper::New();
- m_Threader = itk::MultiThreader::New();
+ m_Threader = PlatformMultiThreader::New();
m_UpdateDistance = 0.01; // about 1km at equator
}
@@ -83,13 +83,14 @@ bool CoordinateToName::Evaluate()
return true;
}
-ITK_THREAD_RETURN_TYPE
-CoordinateToName::ThreadFunction(void* arg)
+
+itk::ITK_THREAD_RETURN_TYPE
+CoordinateToName::ThreadFunction(void *arg)
{
- struct itk::MultiThreader::ThreadInfoStruct* pInfo = (itk::MultiThreader::ThreadInfoStruct*)(arg);
- CoordinateToName::Pointer lThis = (CoordinateToName*)(pInfo->UserData);
+ struct itk::MultiThreaderBase::WorkUnitInfo * pInfo = (itk::MultiThreaderBase::WorkUnitInfo *) (arg);
+ CoordinateToName::Pointer lThis = (CoordinateToName*) (pInfo->UserData);
lThis->DoEvaluate();
- return ITK_THREAD_RETURN_VALUE;
+ return itk::ITK_THREAD_RETURN_DEFAULT_VALUE;
}
void CoordinateToName::DoEvaluate()
diff --git a/Modules/Core/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx b/Modules/Core/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
index 024f3a6113b3a1513c7237a737384486645ec68d..51c8b9ef9a4747b11226e474262917f385ba63ab 100644
--- a/Modules/Core/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
+++ b/Modules/Core/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
@@ -264,7 +264,7 @@ void OSMDataToVectorDataGenerator::ProcessVectorData(const std::string& key, con
// Initialize the vectordata : EPSG 4326 is for WGS84
m_OutputVectorData->SetProjectionRef(otb::SpatialReference::FromWGS84().ToWkt());
- DataNodeType::Pointer root = m_OutputVectorData->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = m_OutputVectorData->GetRoot();
DataNodeType::Pointer document = DataNodeType::New();
DataNodeType::Pointer folder = DataNodeType::New();
@@ -274,8 +274,8 @@ void OSMDataToVectorDataGenerator::ProcessVectorData(const std::string& key, con
document->SetNodeId("DOCUMENT");
folder->SetNodeId("FOLDER");
- m_OutputVectorData->GetDataTree()->Add(document, root);
- m_OutputVectorData->GetDataTree()->Add(folder, document);
+ m_OutputVectorData->Add(document, root);
+ m_OutputVectorData->Add(folder, document);
// Form the vector data with the values parsed
for (unsigned int idx = 0; idx < m_VectorDataElementList.size(); ++idx)
@@ -330,7 +330,7 @@ void OSMDataToVectorDataGenerator::ProcessVectorData(const std::string& key, con
currentDataNode->SetFieldAsInt(m_ClassKey, m_ClassKeyValue);
// Add the to vectordata
- m_OutputVectorData->GetDataTree()->Add(currentDataNode, folder);
+ m_OutputVectorData->Add(currentDataNode, folder);
}
}
}
diff --git a/Modules/Core/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h b/Modules/Core/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
index be0b7841877a9fb8daf5b06ca6cac790700f7f5a..ab56e92c709b21597ca41cd48606c872e2021bcb 100644
--- a/Modules/Core/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
+++ b/Modules/Core/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
@@ -22,6 +22,7 @@
#define otbExtendedFilenameToReaderOptions_h
#include "otbExtendedFilenameHelper.h"
+#include "OTBExtendedFilenameExport.h"
#include <string>
namespace otb
@@ -49,7 +50,7 @@ namespace otb
* \ingroup OTBExtendedFilename
*/
-class ITK_EXPORT ExtendedFilenameToReaderOptions : public ExtendedFilenameHelper
+class OTBExtendedFilename_EXPORT ExtendedFilenameToReaderOptions : public ExtendedFilenameHelper
{
public:
/** Standard class typedefs. */
diff --git a/Modules/Core/IO/ExtendedFilename/otb-module.cmake b/Modules/Core/IO/ExtendedFilename/otb-module.cmake
index fd159f23a1a0de06d6d394e82f05364dd5ddbce8..b28f7199a5838a88a2bd60a1ff79953c8c14205b 100644
--- a/Modules/Core/IO/ExtendedFilename/otb-module.cmake
+++ b/Modules/Core/IO/ExtendedFilename/otb-module.cmake
@@ -25,6 +25,7 @@ different subdataset or resolution (for multi-resolution data), or manage ortho-
product by skipping either geographic or sensor-model information.")
otb_module(OTBExtendedFilename
+ENABLE_SHARED
DEPENDS
OTBCommon
OTBIOGDAL
diff --git a/Modules/Core/IO/IOGDAL/include/otbOGRIOHelper.h b/Modules/Core/IO/IOGDAL/include/otbOGRIOHelper.h
index 8bf67b1d20a7e9a9382284304564ce29ad725fc8..8770230fb3b212eeaae6671baffeceb489e6c695 100644
--- a/Modules/Core/IO/IOGDAL/include/otbOGRIOHelper.h
+++ b/Modules/Core/IO/IOGDAL/include/otbOGRIOHelper.h
@@ -47,20 +47,21 @@ namespace otb
class OTBIOGDAL_EXPORT OGRIOHelper : public itk::Object
{
public:
- /** Standard class typedefs. */
- typedef OGRIOHelper Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** Template parameters typedefs */
- /** Data typedef */
- typedef VectorData<> VectorDataType;
- typedef VectorDataType::DataTreeType DataTreeType;
- typedef DataTreeType::TreeNodeType InternalTreeNodeType;
-
- typedef VectorDataType::DataNodeType DataNodeType;
- typedef DataNodeType::Pointer DataNodePointerType;
+ /** Standard class usings. */
+ using Self = OGRIOHelper;
+ using Superclass = itk::Object;
+ using Pointer = itk::SmartPointer<Self>;
+ using ConstPointer = itk::SmartPointer<const Self>;
+
+ /** Template parameters usings */
+ /** Data using */
+ using VectorDataType = VectorData<double,2>;
+ using VectorDataPointerType = VectorDataType::Pointer;
+ using VectorDataConstPointerType = VectorDataType::ConstPointer;
+ using DataTreeType = VectorDataType::DataTreeType;
+
+ using DataNodeType = VectorDataType::DataNodeType;
+ using DataNodePointerType = DataNodeType::Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -69,14 +70,14 @@ public:
itkTypeMacro(OGRIOHelper, itk::Object);
/** Conversion tools */
- void ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNodeType* documentPtr) const;
+ void ConvertOGRLayerToDataTreeNode(VectorDataPointerType vecDataTree,OGRLayer* layer, DataNodePointerType document) const;
- unsigned int ProcessNodeWrite(InternalTreeNodeType* source, GDALDataset* m_DataSource, OGRGeometryCollection* ogrCollection, OGRLayer* ogrCurrentLayer,
+ unsigned int ProcessNodeWrite(VectorDataConstPointerType vdata, DataNodePointerType source, GDALDataset* m_DataSource, OGRGeometryCollection* ogrCollection, OGRLayer* ogrCurrentLayer,
OGRSpatialReference* oSRS);
/** Return a list of OGRLayer * */
- std::vector<OGRLayer*> ConvertDataTreeNodeToOGRLayers(InternalTreeNodeType* source, GDALDataset* dummyDatasource, OGRLayer* ogrCurrentLayer,
+ std::vector<OGRLayer*> ConvertDataTreeNodeToOGRLayers(VectorDataConstPointerType vdata,DataNodePointerType source, GDALDataset* dummyDatasource, OGRLayer* ogrCurrentLayer,
OGRSpatialReference* oSRS);
void ConvertGeometryToPointNode(const OGRGeometry* ogrGeometry, DataNodePointerType node) const;
@@ -93,17 +94,17 @@ private:
OGRIOHelper(const Self&) = delete;
void operator=(const Self&) = delete;
- typedef DataNodeType::PointType PointType;
+ using PointType = DataNodeType::PointType ;
- typedef DataNodeType::LineType LineType;
- typedef LineType::Pointer LinePointerType;
- typedef LineType::VertexListType VertexListType;
- typedef VertexListType::ConstPointer VertexListConstPointerType;
+ using LineType = DataNodeType::LineType;
+ using LinePointerType = LineType::Pointer;
+ using VertexListType = LineType::VertexListType;
+ using VertexListConstPointerType = VertexListType::ConstPointer;
- typedef DataNodeType::PolygonType PolygonType;
- typedef PolygonType::Pointer PolygonPointerType;
- typedef DataNodeType::PolygonListType PolygonListType;
- typedef PolygonListType::Pointer PolygonListPointerType;
+ using PolygonType = DataNodeType::PolygonType;
+ using PolygonPointerType = PolygonType::Pointer;
+ using PolygonListType = DataNodeType::PolygonListType;
+ using PolygonListPointerType = PolygonListType::Pointer;
}; // end class OGRIOHelper
diff --git a/Modules/Core/IO/IOGDAL/include/otbOGRVectorDataIO.h b/Modules/Core/IO/IOGDAL/include/otbOGRVectorDataIO.h
index a519edb1b2725c3717f30066a21bab523997318d..31fd5f979c419b5315549e1b6fa47837211fe131 100644
--- a/Modules/Core/IO/IOGDAL/include/otbOGRVectorDataIO.h
+++ b/Modules/Core/IO/IOGDAL/include/otbOGRVectorDataIO.h
@@ -47,11 +47,11 @@ namespace otb
class OTBIOGDAL_EXPORT OGRVectorDataIO : public VectorDataIOBase
{
public:
- /** Standard class typedefs. */
- typedef OGRVectorDataIO Self;
- typedef VectorDataIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ /** Standard class usings. */
+ using Self = OGRVectorDataIO;
+ using Superclass = VectorDataIOBase;
+ using Pointer = itk::SmartPointer<Self>;
+ using ConstPointer = itk::SmartPointer<const Self>;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -59,31 +59,28 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(OGRVectorDataIO, VectorDataIOBase);
- /** Byte order typedef */
- typedef Superclass::ByteOrder ByteOrder;
-
- /** Data typedef */
- typedef VectorData<double, 2> VectorDataType;
- typedef VectorDataType::DataTreeType DataTreeType;
- typedef DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef InternalTreeNodeType::ChildrenListType ChildrenListType;
- typedef DataTreeType::Pointer DataTreePointerType;
- typedef DataTreeType::ConstPointer DataTreeConstPointerType;
- typedef VectorDataType::DataNodeType DataNodeType;
- typedef DataNodeType::Pointer DataNodePointerType;
- typedef DataNodeType::PointType PointType;
- typedef DataNodeType::LineType LineType;
- typedef LineType::VertexListType VertexListType;
- typedef VertexListType::ConstPointer VertexListConstPointerType;
- typedef LineType::Pointer LinePointerType;
- typedef DataNodeType::PolygonType PolygonType;
- typedef PolygonType::Pointer PolygonPointerType;
- typedef DataNodeType::PolygonListType PolygonListType;
- typedef PolygonListType::Pointer PolygonListPointerType;
- typedef VectorDataType::Pointer VectorDataPointerType;
- typedef VectorDataType::ConstPointer VectorDataConstPointerType;
- typedef Superclass::SpacingType SpacingType;
- typedef Superclass::PointType OriginType;
+ /** Byte order using */
+ using ByteOrder = Superclass::ByteOrder;
+
+ /** Data using */
+ using VectorDataType = VectorData<double, 2>;
+ using DataTreeType = VectorDataType::DataTreeType;
+ using ChildrenListType = VectorDataType::ChildrenListType;
+ using DataNodeType = VectorDataType::DataNodeType;
+ using DataNodePointerType = DataNodeType::Pointer;
+ using PointType = DataNodeType::PointType;
+ using LineType = DataNodeType::LineType;
+ using VertexListType = LineType::VertexListType;
+ using VertexListConstPointerType = VertexListType::ConstPointer;
+ using LinePointerType = LineType::Pointer;
+ using PolygonType = DataNodeType::PolygonType;
+ using PolygonPointerType = PolygonType::Pointer;
+ using PolygonListType = DataNodeType::PolygonListType;
+ using PolygonListPointerType = PolygonListType::Pointer;
+ using VectorDataPointerType = VectorDataType::Pointer;
+ using VectorDataConstPointerType = VectorDataType::ConstPointer;
+ using SpacingType = Superclass::SpacingType;
+ using OriginType = Superclass::PointType;
/*-------- This part of the interface deals with reading data. ------ */
diff --git a/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx b/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx
index deb05333335342ce8ce4160e292c1c8282be5e6e..a6f8d73076b0c1d7d81dd54ecb1ba327ea70fe52 100644
--- a/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx
+++ b/Modules/Core/IO/IOGDAL/src/otbGDALImageIO.cxx
@@ -1383,7 +1383,7 @@ void GDALImageIO::InternalWriteImageInformation(const void* buffer)
m_BytePerPixel = sizeof(long);
if (m_BytePerPixel == 8)
{
- itkWarningMacro(<< "Cast a long (64 bits) image into an int (32 bits) one.")
+ itkWarningMacro(<< "Cast a long (64 bits) image into an int (32 bits) one.");
}
m_PxType->pixType = GDT_Int32;
}
@@ -1392,7 +1392,7 @@ void GDALImageIO::InternalWriteImageInformation(const void* buffer)
m_BytePerPixel = sizeof(unsigned long);
if (m_BytePerPixel == 8)
{
- itkWarningMacro(<< "Cast an unsigned long (64 bits) image into an unsigned int (32 bits) one.")
+ itkWarningMacro(<< "Cast an unsigned long (64 bits) image into an unsigned int (32 bits) one.");
}
m_PxType->pixType = GDT_UInt32;
}
@@ -1751,8 +1751,7 @@ bool GDALImageIO::GetOriginFromGMLBox(std::vector<double>& origin)
return false;
}
- std::vector<itksys::String> originValues;
- originValues = itksys::SystemTools::SplitString(originTag->GetText(), ' ', false);
+ auto originValues = itksys::SystemTools::SplitString(originTag->GetText(),' ', false);
// Compute origin in GDAL convention (the half-pixel shift is applied later)
std::istringstream ss0(originValues[0]);
diff --git a/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx b/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx
index fb404119541d1c3186bf618708ced1f7ebbfc2ba..5d07963031b1e0065fed5540a022217a6102aae8 100644
--- a/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx
+++ b/Modules/Core/IO/IOGDAL/src/otbOGRIOHelper.cxx
@@ -172,7 +172,7 @@ OGRIOHelper::~OGRIOHelper()
}
-void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNodeType* documentPtr) const
+void OGRIOHelper::ConvertOGRLayerToDataTreeNode(VectorDataPointerType vecDataTree, OGRLayer* layer, DataNodePointerType document) const
{
/** Temporary pointer to store the feature */
OGRFeature* feature;
@@ -195,9 +195,6 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
while ((feature = layer->GetNextFeature()) != nullptr)
{
- // A pointer to the current multi-geometry
- InternalTreeNodeType::Pointer multiPtr;
-
/** Temporary geometry container */
OGRGeometry* geometry = feature->GetGeometryRef();
@@ -221,74 +218,62 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
case wkbPoint:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- DataNodePointerType dataNode = DataNodeType::New();
+ DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(geometry, dataNode);
- newNode->Set(dataNode);
// Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- documentPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,document);
break;
}
case wkbPoint25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- DataNodePointerType dataNode = DataNodeType::New();
+ DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(geometry, dataNode);
- newNode->Set(dataNode);
// Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- documentPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,document);
break;
}
case wkbLineString:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- DataNodePointerType dataNode = DataNodeType::New();
+ DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(geometry, dataNode);
- newNode->Set(dataNode);
// Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- documentPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,document);
break;
}
case wkbLineString25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- DataNodePointerType dataNode = DataNodeType::New();
+ DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(geometry, dataNode);
- newNode->Set(dataNode);
// Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- documentPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,document);
break;
}
case wkbPolygon:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(geometry, dataNode);
- newNode->Set(dataNode);
// Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- documentPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,document);
break;
}
case wkbPolygon25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(geometry, dataNode);
- newNode->Set(dataNode);
// Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- documentPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,document);
break;
}
case wkbMultiPoint:
@@ -296,21 +281,17 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_MULTIPOINT);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRMultiPoint* ogrMulti = (OGRMultiPoint*)geometry;
for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
}
break;
}
@@ -318,22 +299,17 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_MULTIPOINT);
-
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRMultiPoint* ogrMulti = (OGRMultiPoint*)geometry;
for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
}
break;
}
@@ -341,22 +317,17 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_MULTILINE);
-
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRMultiLineString* ogrMulti = (OGRMultiLineString*)geometry;
for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
}
break;
}
@@ -364,22 +335,17 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_MULTILINE);
-
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRMultiLineString* ogrMulti = (OGRMultiLineString*)geometry;
for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
}
break;
}
@@ -387,22 +353,17 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_MULTIPOLYGON);
-
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRMultiPolygon* ogrMulti = (OGRMultiPolygon*)geometry;
for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
}
break;
}
@@ -410,22 +371,17 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_MULTIPOLYGON);
-
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRMultiPolygon* ogrMulti = (OGRMultiPolygon*)geometry;
for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
}
break;
}
@@ -433,10 +389,7 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_COLLECTION);
-
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRGeometryCollection* ogrMulti = (OGRGeometryCollection*)geometry;
@@ -446,68 +399,56 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
case wkbPoint:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbPoint25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbLineString:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbLineString25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbPolygon:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbPolygon25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = dataNode->GetMetaDataDictionary();
itk::EncapsulateMetaData<VectorDataKeywordlist>(dict, MetaDataKey::VectorDataKeywordlistKey, kwl);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
default:
@@ -523,10 +464,7 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_COLLECTION);
-
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- documentPtr->AddChild(multiPtr);
+ vecDataTree->Add(multi,document);
OGRGeometryCollection* ogrMulti = (OGRGeometryCollection*)geometry;
@@ -536,56 +474,44 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
{
case wkbPoint:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbPoint25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbLineString:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbLineString25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbPolygon:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
case wkbPolygon25D:
{
- InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
DataNodePointerType dataNode = DataNodeType::New();
ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex), dataNode);
- newNode->Set(dataNode);
- multiPtr->AddChild(newNode);
+ vecDataTree->Add(dataNode,multi);
break;
}
default:
@@ -614,20 +540,19 @@ void OGRIOHelper::ConvertOGRLayerToDataTreeNode(OGRLayer* layer, InternalTreeNod
}
-unsigned int OGRIOHelper::ProcessNodeWrite(InternalTreeNodeType* source, GDALDataset* m_DataSource, OGRGeometryCollection* ogrCollection,
+unsigned int OGRIOHelper::ProcessNodeWrite(VectorDataConstPointerType vdata, DataNodePointerType source, GDALDataset* m_DataSource, OGRGeometryCollection* ogrCollection,
OGRLayer* ogrCurrentLayer, OGRSpatialReference* oSRS)
{
unsigned int kept = 0;
bool fieldsAddedToOGRLayer = false;
// Get the children list from the input node
- typedef InternalTreeNodeType::ChildrenListType ChildrenListType;
- ChildrenListType children = source->GetChildrenList();
+ std::vector<DataNodePointerType> children = vdata->GetChildrenList(source);
// For each child
- for (ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
+ for (auto it = children.begin(); it != children.end(); ++it)
{
- DataNodePointerType dataNode = (*it)->Get();
- // otbMsgDevMacro(<< "Type of node " << dataNode->GetNodeType() << " id " << dataNode->GetNodeId());
+ DataNodePointerType dataNode = (*it);
+ otbMsgDevMacro(<< "Type of node " << dataNode->GetNodeType() << " id " << dataNode->GetNodeId());
++kept;
// Get the kwl
@@ -681,12 +606,12 @@ unsigned int OGRIOHelper::ProcessNodeWrite(InternalTreeNodeType* source, GDALDat
// New OGRLayer, set the flag to false
fieldsAddedToOGRLayer = false;
}
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ ProcessNodeWrite(vdata,*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
break;
}
case FOLDER:
{
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ ProcessNodeWrite(vdata,*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
break;
}
case FEATURE_POINT:
@@ -891,7 +816,7 @@ unsigned int OGRIOHelper::ProcessNodeWrite(InternalTreeNodeType* source, GDALDat
OGRMultiPoint* ogrMultiPoint = (OGRMultiPoint*)OGRGeometryFactory::createGeometry(wkbMultiPoint);
OGRFeature* ogrFeature;
- ProcessNodeWrite(*it, m_DataSource, ogrMultiPoint, ogrCurrentLayer, oSRS);
+ ProcessNodeWrite(vdata,*it, m_DataSource, ogrMultiPoint, ogrCurrentLayer, oSRS);
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
@@ -912,7 +837,7 @@ unsigned int OGRIOHelper::ProcessNodeWrite(InternalTreeNodeType* source, GDALDat
OGRFeature* ogrFeature;
- ProcessNodeWrite(*it, m_DataSource, ogrMultiLineString, ogrCurrentLayer, oSRS);
+ ProcessNodeWrite(vdata,*it, m_DataSource, ogrMultiLineString, ogrCurrentLayer, oSRS);
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
@@ -932,7 +857,7 @@ unsigned int OGRIOHelper::ProcessNodeWrite(InternalTreeNodeType* source, GDALDat
OGRMultiPolygon* ogrMultiPolygon = (OGRMultiPolygon*)OGRGeometryFactory::createGeometry(wkbMultiPolygon);
OGRFeature* ogrFeature;
- ProcessNodeWrite(*it, m_DataSource, ogrMultiPolygon, ogrCurrentLayer, oSRS);
+ ProcessNodeWrite(vdata,*it, m_DataSource, ogrMultiPolygon, ogrCurrentLayer, oSRS);
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
@@ -958,7 +883,7 @@ unsigned int OGRIOHelper::ProcessNodeWrite(InternalTreeNodeType* source, GDALDat
OGRFeature* ogrFeature;
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ ProcessNodeWrite(vdata,*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
// ogrFeature->SetField("Name", dataNode->GetNodeId());
@@ -981,7 +906,7 @@ unsigned int OGRIOHelper::ProcessNodeWrite(InternalTreeNodeType* source, GDALDat
* They may be several OGRLayers in this tree node.
* Return a vector of OGRLayer
**/
-std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(InternalTreeNodeType* source, GDALDataset* inMemoryDataSource, OGRLayer* ogrCurrentLayer,
+std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(VectorDataConstPointerType vdata,DataNodePointerType source, GDALDataset* inMemoryDataSource, OGRLayer* ogrCurrentLayer,
OGRSpatialReference* oSRS)
{
@@ -996,13 +921,12 @@ std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(InternalTreeN
// unsigned int kept = 0;
bool fieldsAddedToOGRLayer = false;
// Get the children list from the input node
- typedef InternalTreeNodeType::ChildrenListType ChildrenListType;
- ChildrenListType children = source->GetChildrenList();
+ std::vector<DataNodePointerType> children = vdata->GetChildrenList(source);
// For each child
- for (ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
+ for (auto it = children.begin(); it != children.end(); ++it)
{
- DataNodePointerType dataNode = (*it)->Get();
+ DataNodePointerType dataNode = (*it);
// Get the kwl
otb::VectorDataKeywordlist kwl;
@@ -1050,12 +974,12 @@ std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(InternalTreeN
fieldsAddedToOGRLayer = false;
}
ogrLayerVector.push_back(ogrCurrentLayer);
- ConvertDataTreeNodeToOGRLayers(*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
+ ConvertDataTreeNodeToOGRLayers(vdata,*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
break;
}
case FOLDER:
{
- ConvertDataTreeNodeToOGRLayers(*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
+ ConvertDataTreeNodeToOGRLayers(vdata,*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
break;
}
case FEATURE_POINT:
@@ -1233,7 +1157,7 @@ std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(InternalTreeN
{
itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ConvertDataTreeNodeToOGRLayers(*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
+ ConvertDataTreeNodeToOGRLayers(vdata,*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
break;
}
case FEATURE_MULTILINE:
@@ -1251,7 +1175,7 @@ std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(InternalTreeN
{
itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ConvertDataTreeNodeToOGRLayers(*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
+ ConvertDataTreeNodeToOGRLayers(vdata,*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
break;
}
case FEATURE_MULTIPOLYGON:
@@ -1268,7 +1192,7 @@ std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(InternalTreeN
{
itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ConvertDataTreeNodeToOGRLayers(*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
+ ConvertDataTreeNodeToOGRLayers(vdata,*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
break;
}
case FEATURE_COLLECTION:
@@ -1285,7 +1209,7 @@ std::vector<OGRLayer*> OGRIOHelper::ConvertDataTreeNodeToOGRLayers(InternalTreeN
{
itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ConvertDataTreeNodeToOGRLayers(*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
+ ConvertDataTreeNodeToOGRLayers(vdata,*it, inMemoryDataSource, ogrCurrentLayer, oSRS);
break;
}
}
diff --git a/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx b/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
index e3177c82a0298049509b2895e07d6aca891944dc..7e092ecead018ec19dadfad0df9d2f9678d07a05 100644
--- a/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
+++ b/Modules/Core/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
@@ -99,8 +99,7 @@ void OGRVectorDataIO::Read(itk::DataObject* datag)
otbMsgDevMacro(<< "Number of layers: " << m_DataSource->GetLayerCount());
// Retrieving root node
- DataTreePointerType tree = data->GetDataTree();
- DataNodePointerType root = tree->GetRoot()->Get();
+ DataNodePointerType root = data->GetRoot();
OGRSpatialReference* oSRS = nullptr;
// We take the assumption that the spatial reference is common to all layers
@@ -158,16 +157,12 @@ void OGRVectorDataIO::Read(itk::DataObject* datag)
// }
/** Adding the layer to the data tree */
- tree->Add(document, root);
-
- /// This is not good but we do not have the choice if we want to
- /// get a hook on the internal structure
- InternalTreeNodeType* documentPtr = const_cast<InternalTreeNodeType*>(tree->GetNode(document));
+ data->Add(document, root);
/** IO class helper to convert ogr layer*/
OGRIOHelper::Pointer OGRConversion = OGRIOHelper::New();
- OGRConversion->ConvertOGRLayerToDataTreeNode(layer, documentPtr);
+ OGRConversion->ConvertOGRLayerToDataTreeNode(data, layer, document);
} // end For each layer
@@ -268,12 +263,11 @@ void OGRVectorDataIO::Write(const itk::DataObject* datag, char** /** unused */)
}
// Retrieving root node
- DataTreeConstPointerType tree = data->GetDataTree();
- if (tree->GetRoot() == nullptr)
+ if (data->GetRoot() == nullptr)
{
itkExceptionMacro(<< "Data tree is empty: Root == NULL");
}
- DataNodePointerType root = tree->GetRoot()->Get();
+ DataNodePointerType root = data->GetRoot();
unsigned int layerKept;
OGRLayer* ogrCurrentLayer = nullptr;
@@ -281,12 +275,9 @@ void OGRVectorDataIO::Write(const itk::DataObject* datag, char** /** unused */)
OGRGeometryCollection* ogrCollection = nullptr;
// OGRGeometry * ogrCurrentGeometry = NULL;
- // Get the input tree root
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(tree->GetRoot());
-
// Refactoring SHPIO Manuel
OGRIOHelper::Pointer IOConversion = OGRIOHelper::New();
- layerKept = IOConversion->ProcessNodeWrite(inputRoot, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ layerKept = IOConversion->ProcessNodeWrite(data,root, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
otbMsgDevMacro(<< "layerKept " << layerKept);
(void)layerKept; // keep compiler happy
diff --git a/Modules/Core/IO/IOGDAL/test/otbDEMHandlerTest.cxx b/Modules/Core/IO/IOGDAL/test/otbDEMHandlerTest.cxx
index cdaf4708c97739d13eed5ab45b0cbd97757e376d..911df1119d2746795f1043b7eed402e11c654025 100644
--- a/Modules/Core/IO/IOGDAL/test/otbDEMHandlerTest.cxx
+++ b/Modules/Core/IO/IOGDAL/test/otbDEMHandlerTest.cxx
@@ -21,6 +21,7 @@
#include "itkMacro.h"
#include "otbDEMHandler.h"
+#include "vcl_legacy_aliases.h"
int otbDEMHandlerTest(int argc, char* argv[])
{
diff --git a/Modules/Core/IO/IOKML/include/otbKMLVectorDataIOFactory.h b/Modules/Core/IO/IOKML/include/otbKMLVectorDataIOFactory.h
index 0070174f69ebad282026228d3f4892e819041bd0..d7612e8b667dc81b995b5b55748d0cfc35c2d378 100644
--- a/Modules/Core/IO/IOKML/include/otbKMLVectorDataIOFactory.h
+++ b/Modules/Core/IO/IOKML/include/otbKMLVectorDataIOFactory.h
@@ -21,6 +21,7 @@
#ifndef otbKMLVectorDataIOFactory_h
#define otbKMLVectorDataIOFactory_h
+#include "OTBIORADExport.h"
#include "itkObjectFactoryBase.h"
namespace otb
diff --git a/Modules/Core/IO/IOKML/src/otbKMLVectorDataIO.cxx b/Modules/Core/IO/IOKML/src/otbKMLVectorDataIO.cxx
index 64ce85bda3eaa0b5e317409d77ca0f0d44857a22..92e86985ff417e4ec7f3de8c6d740508980b50e9 100644
--- a/Modules/Core/IO/IOKML/src/otbKMLVectorDataIO.cxx
+++ b/Modules/Core/IO/IOKML/src/otbKMLVectorDataIO.cxx
@@ -47,7 +47,6 @@
#include "otbSystem.h"
#include "itksys/SystemTools.hxx"
#include "otbDataNode.h"
-#include "itkPreOrderTreeIterator.h"
#include "otbMetaDataKey.h"
#include "otbStopwatch.h"
@@ -484,7 +483,7 @@ void KMLVectorDataIO::Read(itk::DataObject* datag)
// Retrieving root node
m_Tree = data->GetDataTree();
- DataNodePointerType rootNode = m_Tree->GetRoot()->Get();
+ DataNodePointerType rootNode = m_Tree->GetRoot();
DataNodePointerType document = DataNodeType::New();
document->SetNodeType(DOCUMENT);
@@ -551,21 +550,11 @@ void KMLVectorDataIO::Write(const itk::DataObject* datag, char** itkNotUsed(paps
kmldom::KmlPtr kml = factory->CreateKml();
- // Retrieving root node
- DataTreeConstPointerType tree = data->GetDataTree();
- DataNodePointerType root = tree->GetRoot()->Get();
-
- typedef itk::PreOrderTreeIterator<DataTreeType> TreeIteratorType;
-
- TreeIteratorType it(tree);
- it.GoToBegin();
-
kmldom::DocumentPtr currentDocument = nullptr;
kmldom::FolderPtr currentFolder = nullptr;
kmldom::MultiGeometryPtr currentMultiGeometry = nullptr;
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(tree->GetRoot());
- ProcessNodeWrite(inputRoot, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
+ ProcessNodeWrite(data->GetRoot(), factory, kml, currentDocument, currentFolder, currentMultiGeometry);
// Serialize to XML
std::string xml = kmldom::SerializePretty(kml);
diff --git a/Modules/Core/IO/ImageIO/include/otbImageFileReader.h b/Modules/Core/IO/ImageIO/include/otbImageFileReader.h
index 5b81b5fabe67d20b71aab540ef9bb9812b966d2e..6b269d09e97cbc8694ab76a524e86f4a264b2887 100644
--- a/Modules/Core/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/Core/IO/ImageIO/include/otbImageFileReader.h
@@ -30,7 +30,7 @@
#include "itkImageSource.h"
#endif
#include "otbImageIOBase.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include "itkImageRegion.h"
#include "OTBImageIOExport.h"
diff --git a/Modules/Core/IO/ImageIO/include/otbImageFileWriter.h b/Modules/Core/IO/ImageIO/include/otbImageFileWriter.h
index 7c3d51922fc79fba7fe6cfbf82c81ff00ea9ad1c..077eb811e56a8a0e24a61740961a7a1fad56f248 100644
--- a/Modules/Core/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/Core/IO/ImageIO/include/otbImageFileWriter.h
@@ -26,7 +26,7 @@
#include "itkProcessObject.h"
#include "otbStreamingManager.h"
#include "otbExtendedFilenameToWriterOptions.h"
-#include "itkFastMutexLock.h"
+#include <mutex>
#include <string>
#include "OTBImageIOExport.h"
@@ -284,7 +284,7 @@ private:
unsigned int m_IOComponents;
/** Lock to ensure thread-safety (added for the AbortGenerateData flag) */
- itk::SimpleFastMutexLock m_Lock;
+ mutable std::mutex m_Lock;
};
} // end namespace otb
diff --git a/Modules/Core/IO/ImageIO/include/otbImageFileWriter.hxx b/Modules/Core/IO/ImageIO/include/otbImageFileWriter.hxx
index 4b532ad2ff8aa1e4d9d58a38066840c13c1e12eb..237e62854c768191dd3c53cffc37aefcde5b078c 100644
--- a/Modules/Core/IO/ImageIO/include/otbImageFileWriter.hxx
+++ b/Modules/Core/IO/ImageIO/include/otbImageFileWriter.hxx
@@ -50,6 +50,7 @@
#include "otbStringUtils.h"
#include "otbUtils.h"
+#include "itkProgressTransformer.h"
namespace otb
{
@@ -579,12 +580,13 @@ void ImageFileWriter<TInputImage>::Update()
this->SetAbortGenerateData(0);
this->SetProgress(0.0);
+ itk::ProgressTransformer pt( 0.0f, 1.0f, this );
/**
* Tell all Observers that the filter is starting
*/
this->InvokeEvent(itk::StartEvent());
- this->UpdateProgress(0);
+ pt.GetProcessObject();
m_CurrentDivision = 0;
m_DivisionProgress = 0;
@@ -618,7 +620,7 @@ void ImageFileWriter<TInputImage>::Update()
InputImageRegionType streamRegion;
for (m_CurrentDivision = 0; m_CurrentDivision < m_NumberOfDivisions && !this->GetAbortGenerateData();
- m_CurrentDivision++, m_DivisionProgress = 0, this->UpdateFilterProgress())
+ m_CurrentDivision++, m_DivisionProgress = 0, pt.GetProcessObject())
{
streamRegion = m_StreamingManager->GetSplit(m_CurrentDivision);
@@ -812,10 +814,9 @@ const char* ImageFileWriter<TInputImage>::GetFileName() const
template <class TInputImage>
const bool& ImageFileWriter<TInputImage>::GetAbortGenerateData() const
{
- m_Lock.Lock();
+ std::lock_guard<std::mutex> mutexHolder(m_Lock);
// protected read here
bool ret = Superclass::GetAbortGenerateData();
- m_Lock.Unlock();
if (ret)
return otb::Utils::TrueConstant;
return otb::Utils::FalseConstant;
@@ -824,9 +825,8 @@ const bool& ImageFileWriter<TInputImage>::GetAbortGenerateData() const
template <class TInputImage>
void ImageFileWriter<TInputImage>::SetAbortGenerateData(bool val)
{
- m_Lock.Lock();
+ std::lock_guard<std::mutex> mutexHolder(m_Lock);
Superclass::SetAbortGenerateData(val);
- m_Lock.Unlock();
}
} // end namespace otb
diff --git a/Modules/Core/IO/ImageIO/include/otbMultiImageFileWriter.hxx b/Modules/Core/IO/ImageIO/include/otbMultiImageFileWriter.hxx
index b922468b4ad55426955eb724c90b287f1f39e68d..c930f5ea90124d6b9eaa0a1928a51f6468c7834e 100644
--- a/Modules/Core/IO/ImageIO/include/otbMultiImageFileWriter.hxx
+++ b/Modules/Core/IO/ImageIO/include/otbMultiImageFileWriter.hxx
@@ -30,7 +30,7 @@ namespace otb
template <class TImage>
MultiImageFileWriter::Sink<TImage>::Sink(typename TImage::ConstPointer inputImage, const std::string& fileName)
- : SinkBase(dynamic_cast<const ImageBaseType*>(inputImage.GetPointer())), m_Writer(otb::ImageFileWriter<TImage>::New()), m_ImageIO(NULL)
+ : SinkBase(dynamic_cast<const ImageBaseType*>(inputImage.GetPointer())), m_Writer(otb::ImageFileWriter<TImage>::New()), m_ImageIO(nullptr)
{
m_Writer->SetFileName(fileName);
m_Writer->SetInput(inputImage);
@@ -38,7 +38,7 @@ MultiImageFileWriter::Sink<TImage>::Sink(typename TImage::ConstPointer inputImag
template <class TImage>
MultiImageFileWriter::Sink<TImage>::Sink(typename otb::ImageFileWriter<TImage>::Pointer writer)
- : SinkBase(dynamic_cast<const ImageBaseType*>(writer->GetInput())), m_Writer(writer), m_ImageIO(NULL)
+ : SinkBase(dynamic_cast<const ImageBaseType*>(writer->GetInput())), m_Writer(writer), m_ImageIO(nullptr)
{
}
diff --git a/Modules/Core/IO/ImageIO/src/otbImageIOFactory.cxx b/Modules/Core/IO/ImageIO/src/otbImageIOFactory.cxx
index d3f092c614f8826a138ce9d49274a81155a10f63..1dc67e70376bd87620bc858bb30043bcd11bceaa 100644
--- a/Modules/Core/IO/ImageIO/src/otbImageIOFactory.cxx
+++ b/Modules/Core/IO/ImageIO/src/otbImageIOFactory.cxx
@@ -18,14 +18,11 @@
* limitations under the License.
*/
-
-#include "itkMutexLock.h"
-#include "itkMutexLockHolder.h"
-
#include "otbImageIOFactory.h"
#include "otbConfigure.h"
#include "otbGDALImageIOFactory.h"
+#include <mutex>
namespace otb
{
@@ -73,11 +70,11 @@ void ImageIOFactory::RegisterBuiltInFactories()
{
static bool firstTime = true;
- static itk::SimpleMutexLock mutex;
- {
+ static std::mutex mutex;
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ std::lock_guard<std::mutex> mutexHolder(mutex);
if (firstTime)
{
itk::ObjectFactoryBase::RegisterFactory(GDALImageIOFactory::New());
diff --git a/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.h b/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.h
index d269a1061e877a31cf0bcb7278bfe6ba63647ee1..0c9a2bc2f7533093a8645cb59d7118ac05f5ee63 100644
--- a/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.h
+++ b/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.h
@@ -105,7 +105,7 @@ protected:
* the portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& threadRegion, itk::ThreadIdType threadId) override;
diff --git a/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.hxx b/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.hxx
index d32c92697900f498356feab5b042083e93edddf9..a10fb86fc8074d9c5f6d027df41198c3124abd51 100644
--- a/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.hxx
+++ b/Modules/Core/IO/TestKernel/include/otbDifferenceImageFilter.hxx
@@ -36,6 +36,7 @@ namespace otb
template <class TInputImage, class TOutputImage>
DifferenceImageFilter<TInputImage, TOutputImage>::DifferenceImageFilter()
{
+ this->DynamicMultiThreadingOff();
// We require two inputs to execute.
this->SetNumberOfRequiredInputs(2);
@@ -99,7 +100,7 @@ void DifferenceImageFilter<TInputImage, TOutputImage>::Reset()
{
this->UpdateOutputInformation();
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
itk::NumericTraits<RealType>::SetLength(m_MeanDifference, this->GetInput(0)->GetNumberOfComponentsPerPixel());
itk::NumericTraits<AccumulateType>::SetLength(m_TotalDifference, this->GetInput(0)->GetNumberOfComponentsPerPixel());
@@ -263,7 +264,7 @@ template <class TInputImage, class TOutputImage>
void DifferenceImageFilter<TInputImage, TOutputImage>::Synthetize()
{
// Set statistics about difference image.
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
for (int i = 0; i < numberOfThreads; ++i)
{
m_TotalDifference += m_ThreadDifferenceSum[i];
diff --git a/Modules/Core/IO/TestKernel/include/otbTestMain.h b/Modules/Core/IO/TestKernel/include/otbTestMain.h
index b07e53bdabab790349fee3d0a9d59ea1fea299b0..2a1117241426d8c7921d5ce10c83de7e6116d92d 100644
--- a/Modules/Core/IO/TestKernel/include/otbTestMain.h
+++ b/Modules/Core/IO/TestKernel/include/otbTestMain.h
@@ -26,8 +26,8 @@
#include <map>
#include <string>
+#include "itkMultiThreaderBase.h"
-#include "itkMultiThreader.h"
#include "otbMacro.h"
#include "otbOGRDriversInit.h"
@@ -146,13 +146,13 @@ int main(int ac, char* av[])
if (CheckOption(av[1], "--with-threads", ac, 2))
{
int numThreads = atoi(av[2]);
- itk::MultiThreader::SetGlobalDefaultNumberOfThreads(numThreads);
+ itk::MultiThreaderBase::SetGlobalDefaultNumberOfThreads(numThreads);
av += 2;
ac -= 2;
- }
- else if (CheckOption(av[1], "--without-threads", ac, 1))
- {
- itk::MultiThreader::SetGlobalDefaultNumberOfThreads(1);
+ }
+ else if (CheckOption(av[1], "--without-threads",ac, 1))
+ {
+ itk::MultiThreaderBase::SetGlobalDefaultNumberOfThreads(1);
av += 1;
ac -= 1;
}
diff --git a/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileReader.h b/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileReader.h
index 4a8868dfebcd5810bc50acc91bae79a715226839..be836ecd72f729487dd2ff9277ef87ac92b5011d 100644
--- a/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileReader.h
+++ b/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileReader.h
@@ -23,6 +23,7 @@
#include "otbVectorDataSource.h"
#include "otbVectorDataIOBase.h"
+#include "OTBVectorDataIOExport.h"
#include <string>
namespace otb
@@ -84,7 +85,7 @@ public:
*/
template <class TOutputVectorData>
-class ITK_EXPORT VectorDataFileReader : public VectorDataSource<TOutputVectorData>
+class ITK_TEMPLATE_EXPORT VectorDataFileReader : public VectorDataSource<TOutputVectorData>
{
public:
/** Standard class typedefs. */
diff --git a/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileWriter.h b/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileWriter.h
index 1b577446ff1eb485cb664b59d684cfe4c3ba8fbe..ae447981273031b05b06fd9f48c5c813de6748bb 100644
--- a/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileWriter.h
+++ b/Modules/Core/IO/VectorDataIO/include/otbVectorDataFileWriter.h
@@ -23,6 +23,7 @@
#include "itkProcessObject.h"
#include "itkMacro.h"
+#include "OTBVectorDataIOExport.h"
#include "otbVectorDataIOBase.h"
#include <string>
@@ -62,7 +63,7 @@ public:
*/
template <class TInputVectorData>
-class ITK_EXPORT VectorDataFileWriter : public itk::ProcessObject
+class ITK_TEMPLATE_EXPORT VectorDataFileWriter : public itk::ProcessObject
{
public:
/** Standard class typedefs. */
diff --git a/Modules/Core/IO/VectorDataIO/include/otbVectorDataIOFactory.h b/Modules/Core/IO/VectorDataIO/include/otbVectorDataIOFactory.h
index d755fb63e2204854182b255e072d9e772317d817..22625ecb5a1839b8d8b68827e6b00999347c20dd 100644
--- a/Modules/Core/IO/VectorDataIO/include/otbVectorDataIOFactory.h
+++ b/Modules/Core/IO/VectorDataIO/include/otbVectorDataIOFactory.h
@@ -23,6 +23,7 @@
#include "itkObject.h"
#include "otbVectorDataIOBase.h"
+#include "OTBVectorDataIOExport.h"
namespace otb
{
@@ -31,7 +32,7 @@ namespace otb
*
* \ingroup OTBVectorDataIO
*/
-class ITK_EXPORT VectorDataIOFactory : public itk::Object
+class OTBVectorDataIO_EXPORT VectorDataIOFactory : public itk::Object
{
public:
/** Standard class typedefs. */
diff --git a/Modules/Core/IO/VectorDataIO/otb-module.cmake b/Modules/Core/IO/VectorDataIO/otb-module.cmake
index c5a81375aa3cbbd7ddff187d85191a5ce937a513..e6ed62ad4a8f29d070f63febbedcaa34f3ba8bd3 100644
--- a/Modules/Core/IO/VectorDataIO/otb-module.cmake
+++ b/Modules/Core/IO/VectorDataIO/otb-module.cmake
@@ -23,6 +23,7 @@ writing of vector data (see also VectorDataBase and VectorDataManipulation
modules).")
otb_module(OTBVectorDataIO
+ENABLE_SHARED
DEPENDS
OTBVectorDataBase
OTBIOGDAL
diff --git a/Modules/Core/IO/VectorDataIO/src/otbVectorDataIOFactory.cxx b/Modules/Core/IO/VectorDataIO/src/otbVectorDataIOFactory.cxx
index a4b5a3c49ef673d410efe4c8e7ef889455396952..2ee3e9311aad48e950b64d4c7e86f2b0bc607cb0 100644
--- a/Modules/Core/IO/VectorDataIO/src/otbVectorDataIOFactory.cxx
+++ b/Modules/Core/IO/VectorDataIO/src/otbVectorDataIOFactory.cxx
@@ -26,8 +26,7 @@
#endif
#include "itkObjectFactoryBase.h"
-#include "itkMutexLock.h"
-#include "itkMutexLockHolder.h"
+#include <mutex>
namespace otb
{
@@ -75,12 +74,11 @@ VectorDataIOFactory::VectorDataIOBasePointerType VectorDataIOFactory::CreateVect
void VectorDataIOFactory::RegisterBuiltInFactories()
{
static bool firstTime = true;
-
- static itk::SimpleMutexLock mutex;
- {
+ static std::mutex mutex;
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ std::lock_guard<std::mutex> mutexHolder(mutex);
if (firstTime)
{
itk::ObjectFactoryBase::RegisterFactory(OGRVectorDataIOFactory::New());
diff --git a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileReader.cxx b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileReader.cxx
index a739def42a795f0ecb5fd87eae60e1d4060559ee..0ca0072c9579019dc7f686539af643635719f83f 100644
--- a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileReader.cxx
+++ b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileReader.cxx
@@ -30,36 +30,16 @@ int otbVectorDataFileReader(int itkNotUsed(argc), char* argv[])
typedef otb::VectorDataFileReader<VectorDataType> VectorDataFileReaderType;
VectorDataFileReaderType::Pointer reader = VectorDataFileReaderType::New();
- typedef otb::DataNode<double, 2, double> DataNodeType;
- typedef DataNodeType::Pointer DataNodePointerType;
- typedef itk::TreeContainer<DataNodePointerType> DataTreeType;
-
itk::Indent indent;
reader->SetFileName(argv[1]);
reader->Update();
VectorDataType::Pointer data = reader->GetOutput();
- DataTreeType::Pointer dataTree = DataTreeType::New();
- dataTree = data->GetDataTree();
std::ofstream fout(argv[2]);
- itk::PreOrderTreeIterator<DataTreeType> it(dataTree);
- it.GoToBegin();
-
- while (!it.IsAtEnd())
- {
- itk::PreOrderTreeIterator<DataTreeType> itParent = it;
- bool goesOn = true;
- while (itParent.HasParent() && goesOn)
- {
- fout << indent;
- goesOn = itParent.GoToParent();
- }
- fout << "+" << it.Get()->GetNodeTypeAsString() << std::endl;
- ++it;
- }
+ data->Print(fout,indent);
/*added PrintSelf*/
fout.close();
diff --git a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriter.cxx b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriter.cxx
index 2861b3a7474f048a718d8e1043e857347574d123..58b7c64b02c87a43174eeb4d7ace96e14f5d7f6b 100644
--- a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriter.cxx
+++ b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriter.cxx
@@ -71,13 +71,13 @@ int otbVectorDataFileWriter(int itkNotUsed(argc), char* argv[])
l->AddVertex(p3);
line->SetLine(l);
- DataNodeType::Pointer root = data->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = data->GetRoot();
- data->GetDataTree()->Add(document, root);
- data->GetDataTree()->Add(folder1, document);
- data->GetDataTree()->Add(folder2, document);
- data->GetDataTree()->Add(folder3, document);
- data->GetDataTree()->Add(line, folder2);
+ data->Add(document, root);
+ data->Add(folder1, document);
+ data->Add(folder2, document);
+ data->Add(folder3, document);
+ data->Add(line, folder2);
writer->SetFileName(argv[1]);
writer->SetInput(data);
diff --git a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterMultiPolygons.cxx b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterMultiPolygons.cxx
index 6cf11ea5356c81804e93e3a740911f06f19dfdff..828ef8bfba83be480e7034eab13bec8d51df2ce1 100644
--- a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterMultiPolygons.cxx
+++ b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterMultiPolygons.cxx
@@ -88,14 +88,14 @@ int otbVectorDataFileWriterMultiPolygons(int itkNotUsed(argc), char* argv[])
polygon3 = polygon1;
polygon4 = polygon2;
- DataNodeType::Pointer root = data->GetDataTree()->GetRoot()->Get();
-
- data->GetDataTree()->Add(document, root);
- data->GetDataTree()->Add(folder, document);
- data->GetDataTree()->Add(polygon5, folder);
- data->GetDataTree()->Add(polygon1, polygon5);
- data->GetDataTree()->Add(polygon2, polygon5);
- data->GetDataTree()->Add(polygon3, polygon5);
+ DataNodeType::Pointer root = data->GetRoot();
+
+ data->Add(document, root);
+ data->Add(folder, document);
+ data->Add(polygon5, folder);
+ data->Add(polygon1, polygon5);
+ data->Add(polygon2, polygon5);
+ data->Add(polygon3, polygon5);
writer->SetFileName(argv[1]);
writer->SetInput(data);
diff --git a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterPolygons.cxx b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterPolygons.cxx
index 2a653aeedf734a1dbd4226dcb57ad58e05865037..d41bf4aad9eca7719d779119e3ca4451ceac2b08 100644
--- a/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterPolygons.cxx
+++ b/Modules/Core/IO/VectorDataIO/test/otbVectorDataFileWriterPolygons.cxx
@@ -76,15 +76,15 @@ int otbVectorDataFileWriterPolygons(int itkNotUsed(argc), char* argv[])
polygon4 = polygon1;
polygon5 = polygon1;
- DataNodeType::Pointer root = data->GetDataTree()->GetRoot()->Get();
-
- data->GetDataTree()->Add(document, root);
- data->GetDataTree()->Add(folder, document);
- data->GetDataTree()->Add(polygon1, folder);
- data->GetDataTree()->Add(polygon2, folder);
- data->GetDataTree()->Add(polygon3, folder);
- data->GetDataTree()->Add(polygon4, folder);
- data->GetDataTree()->Add(polygon5, folder);
+ DataNodeType::Pointer root = data->GetRoot();
+
+ data->Add(document, root);
+ data->Add(folder, document);
+ data->Add(polygon1, folder);
+ data->Add(polygon2, folder);
+ data->Add(polygon3, folder);
+ data->Add(polygon4, folder);
+ data->Add(polygon5, folder);
writer->SetFileName(argv[1]);
writer->SetInput(data);
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.h b/Modules/Core/ImageBase/include/otbExtractROI.h
index 17d5da0bce434ea4697aa20ddaa85e0b35b14b96..6844797c1f125785f1a54c5732bd01f7e423f557 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbExtractROI.h
@@ -77,7 +77,7 @@ public:
itkStaticConstMacro(InputImageDimension, unsigned int, InputImageType::ImageDimension);
itkStaticConstMacro(OutputImageDimension, unsigned int, OutputImageType::ImageDimension);
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
protected:
ExtractROI();
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.hxx b/Modules/Core/ImageBase/include/otbExtractROI.hxx
index 4beaf9069d14eba338b519e2c27519915c22dac1..6c9b0889c6f31a49540f720faf35b1efbaa7140e 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbExtractROI.hxx
@@ -34,6 +34,7 @@ namespace otb
template <class TInputPixel, class TOutputPixel>
ExtractROI<TInputPixel, TOutputPixel>::ExtractROI() //: ExtractROIBase< itk::Image<TInputPixel, VImageDimension> , itk::Image<TOutputPixel, VImageDimension> >()
{
+ this->DynamicMultiThreadingOn();
}
/**
@@ -62,7 +63,7 @@ void ExtractROI<TInputPixel, TOutputPixel>::GenerateOutputInformation()
}
template <class TInputPixel, class TOutputPixel>
-void ExtractROI<TInputPixel, TOutputPixel>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void ExtractROI<TInputPixel, TOutputPixel>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itkDebugMacro(<< "Actually executing");
@@ -70,9 +71,6 @@ void ExtractROI<TInputPixel, TOutputPixel>::ThreadedGenerateData(const OutputIma
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Define the portion of the input to walk for this thread
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -91,7 +89,6 @@ void ExtractROI<TInputPixel, TOutputPixel>::ThreadedGenerateData(const OutputIma
outIt.Set(inIt.Get());
++outIt;
++inIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.h b/Modules/Core/ImageBase/include/otbExtractROIBase.h
index e35901942e876e08a35534f25366ce8ef62bdb40..c0282fae08e4d92cda77f15cae79a7f1be17481c 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.h
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.h
@@ -140,7 +140,7 @@ protected:
* calling ThreadedGenerateData(). ThreadedGenerateData can only
* write to the portion of the output image specified by the
* parameter "outputRegionForThread"
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
// ATTENTION bizarre
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
index 8aa54cd33f22e22ff744c7b1cff41c04d30d0292..ea0bc85bc0d086be6056db7bcf34066e69ebdc60 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -100,9 +100,9 @@ protected:
void GenerateOutputInformation() override;
/** ExtractImageFilter can be implemented as a multithreaded filter.
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
ImageOfVectorsToMonoChannelExtractROI(const Self&) = delete;
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
index 69f68e0ebea0002eca998e860feac0ac6ed93dad..8c6850341f58a92dc6c717e38c5eb5190c5742c3 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
@@ -32,6 +32,7 @@ namespace otb
template <class TInputImage, class TOutputImage>
ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>::ImageOfVectorsToMonoChannelExtractROI() : m_Channel(1)
{
+ this->DynamicMultiThreadingOn();
}
/**
@@ -69,8 +70,7 @@ void ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>::GenerateO
}
template <class TInputImage, class TOutputImage>
-void ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itkDebugMacro(<< "Actually executing");
@@ -78,9 +78,6 @@ void ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>::ThreadedG
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Define the portion of the input to walk for this thread
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -104,7 +101,6 @@ void ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>::ThreadedG
outIt.Set(pixelOutput);
++outIt;
++inIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
index a74b3d52ac53e440e3e16a19411efdae959a84e4..c0c9f69b06f3de63e0a398f595d50285ab842d3e 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
@@ -134,9 +134,9 @@ protected:
void SetChannelsWorkWithLimits();
/** ExtractImageFilter can be implemented as a multithreaded filter.
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
MultiChannelExtractROI(const Self&) = delete;
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
index 0f0fcbe9167b38c5d7030bb3641c9e3239866876..1efec271c629ebed694ba094e48bdf5b3853eefd 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
@@ -26,7 +26,6 @@
#include "itkImageRegionIterator.h"
#include "itkObjectFactory.h"
#include "itkExtractImageFilterRegionCopier.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -39,6 +38,7 @@ MultiChannelExtractROI<TInputPixelType, TOutputPixelType>::MultiChannelExtractRO
: ExtractROIBase<VectorImage<TInputPixelType, 2>, VectorImage<TOutputPixelType, 2>>(), m_FirstChannel(0), m_LastChannel(0), m_ChannelsKind(0)
{
ClearChannels();
+ this->DynamicMultiThreadingOn();
}
/**
@@ -235,17 +235,13 @@ void MultiChannelExtractROI<TInputPixelType, TOutputPixelType>::GenerateOutputIn
}
template <class TInputPixelType, class TOutputPixelType>
-void MultiChannelExtractROI<TInputPixelType, TOutputPixelType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void MultiChannelExtractROI<TInputPixelType, TOutputPixelType>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itkDebugMacro(<< "Actually executing");
// Get the input and output pointers
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Define the portion of the input to walk for this thread
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -269,7 +265,6 @@ void MultiChannelExtractROI<TInputPixelType, TOutputPixelType>::ThreadedGenerate
outIt.Set(inIt.Get());
++outIt;
++inIt;
- progress.CompletedPixel();
}
}
// Specific behaviour
@@ -296,7 +291,6 @@ void MultiChannelExtractROI<TInputPixelType, TOutputPixelType>::ThreadedGenerate
outIt.Set(pixelOutput);
++outIt;
++inIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
index c028819a077eac0f0cec86a2485aba250936fe2e..b294137a315285db123bccce4491e21b7a1ecc72 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
@@ -108,9 +108,9 @@ protected:
void GenerateOutputInformation() override;
/** ExtractImageFilter can be implemented as a multithreaded filter.
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
MultiToMonoChannelExtractROI(const Self&) = delete;
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
index d5a66a8e1c2e7898cd859794f0cfe74ec3f622c9..049a4e15c869066633af31a4c66baf1b82e8f98d 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
@@ -33,6 +33,7 @@ template <class TInputPixelType, class TOutputPixelType>
MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>::MultiToMonoChannelExtractROI()
: ExtractROIBase<VectorImage<TInputPixelType, 2>, Image<TOutputPixelType, 2>>(), m_Channel(1)
{
+ this->DynamicMultiThreadingOn();
}
/**
@@ -70,8 +71,7 @@ void MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>::GenerateOu
}
template <class TInputPixelType, class TOutputPixelType>
-void MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itkDebugMacro(<< "Actually executing");
@@ -79,9 +79,6 @@ void MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>::ThreadedGe
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Define the portion of the input to walk for this thread
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -104,7 +101,6 @@ void MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>::ThreadedGe
outIt.Set(pixelOutput);
++outIt;
++inIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
index 341d2b04be487a9fe3bbaf64aa2ee0fccb348681..b308302a7cba2c27082c68115920c229b4c91f74 100644
--- a/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
+++ b/Modules/Core/ImageBase/include/otbRemoteSensingRegion.h
@@ -82,9 +82,9 @@ public:
/** ImageRegion typedef needed by the GetImageRegion() method */
typedef itk::ImageRegion<2> ImageRegionType;
- typename Superclass::RegionType GetRegionType() const override
+ typename Superclass::RegionEnum GetRegionType() const override
{
- return Superclass::ITK_STRUCTURED_REGION;
+ return Superclass::RegionEnum::ITK_STRUCTURED_REGION;
}
/** Constructor. RemoteSensingRegion is a lightweight object that is not reference
diff --git a/Modules/Core/ImageBase/test/otbImagePCAShapeModelEstimatorTest.cxx b/Modules/Core/ImageBase/test/otbImagePCAShapeModelEstimatorTest.cxx
index 39844f66a0b9318ca666dc94d1ac059abece42dd..d43425ff8d255deaacc0674f4d37df800da81733 100644
--- a/Modules/Core/ImageBase/test/otbImagePCAShapeModelEstimatorTest.cxx
+++ b/Modules/Core/ImageBase/test/otbImagePCAShapeModelEstimatorTest.cxx
@@ -32,6 +32,7 @@
#include "otbImageFileWriter.h"
#include "itkImagePCAShapeModelEstimator.h"
+#include "vcl_legacy_aliases.h"
// Data definitions
#define IMGWIDTH 2
diff --git a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
index 0f723971a23e61e4a2c3a6b8b0224220bed123ff..40e3f20ce44d1125154c35a3cb45148bd49d200a 100644
--- a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -139,9 +139,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Pad the inputs requested regions by radius
diff --git a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
index 51e21d7c3fc2da44de99d6a75efaaf64aada9479..24711f0aff957c8b73b9a94d060920fdb109f08e 100644
--- a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
@@ -25,7 +25,7 @@
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
#include "itkProgressReporter.h"
-
+#include "otbMacro.h"
namespace otb
{
@@ -153,8 +153,8 @@ void BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputIma
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction>
-void BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
// unsigned int i;
@@ -192,8 +192,6 @@ void BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputIma
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1>::FaceListType::iterator fit1;
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2>::FaceListType::iterator fit2;
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
@@ -217,7 +215,6 @@ void BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputIma
++neighInputIt1;
++neighInputIt2;
++outputIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
index c2e2c66a04093257fe22b1a8fa09d4345822a718..d8465935b31cc39a43de30a362fb6cfab985cf0d 100644
--- a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
@@ -127,9 +127,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Since the number of components per pixel depends on the radius range, one must reimplement
diff --git a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
index 90a8936bf60a1865c66479a3d7349cfc41d77300..68dd23f45a85fc308dd957861184e1ec53a07b84 100644
--- a/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
@@ -21,6 +21,8 @@
#ifndef otbBinaryFunctorNeighborhoodVectorImageFilter_hxx
#define otbBinaryFunctorNeighborhoodVectorImageFilter_hxx
+#include "otbMath.h"
+#include "otbMacro.h" //for
#include "otbBinaryFunctorNeighborhoodVectorImageFilter.h"
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
@@ -88,8 +90,8 @@ void BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOut
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction>
-void BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage1> nbc1;
@@ -127,9 +129,6 @@ void BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOut
TypeFace2 bC2;
faceList2 = bC2(inputPtr2, outputRegionForThread, r2);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Process each of the boundary faces.
// Center first and then left, right, up, down borders
for (fit1 = faceList1.begin(), fit2 = faceList2.begin(); fit1 != faceList1.end() && fit2 != faceList2.end(); ++fit1, ++fit2)
@@ -153,7 +152,6 @@ void BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOut
++neighInputIt2;
++outputIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h b/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
index fd51ee997fde65004dcde71dd0192e4d25d6c91e..b6adc6ac0545c7f1166228f7741a315f6f828131 100644
--- a/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
@@ -75,7 +75,7 @@ public:
}
/** Main computation method */
- void ThreadedGenerateData(const InputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const InputImageRegionType& outputRegionForThread) override;
void BeforeThreadedGenerateData() override;
void GenerateInputRequestedRegion() override;
diff --git a/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
index ccc992ed4e877adf93a528e3ae1f3743811fbc52..bf9283f7594202083146544ae30b8c94964dca59 100644
--- a/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
@@ -37,6 +37,7 @@ BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>::Bina
{
m_NeighborhoodRadius.Fill(1);
m_CountFunction = CountFunctionType::New();
+ this->DynamicMultiThreadingOn();
}
/** Destructor */
@@ -102,8 +103,7 @@ void BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>:
/** Main computation method */
template <class TInputImage, class TOutputImage, class TCountFunction>
-void BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>::ThreadedGenerateData(const InputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>::DynamicThreadedGenerateData(const InputImageRegionType& outputRegionForThread)
{
InputImagePointerType inputPtr = const_cast<InputImageType*>(this->GetInput());
OutputImagePointerType outputPtr = this->GetOutput();
@@ -121,8 +121,6 @@ void BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>:
itk::ImageRegionIterator<OutputImageType> itOut(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
typename InputImageType::IndexType index;
for (fit = faceList.begin(); fit != faceList.end(); ++fit)
@@ -144,7 +142,6 @@ void BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>:
++itOut;
++it;
- progress.CompletedPixel(); // potential exception thrown here
}
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h b/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
index 7458f407a59fa4191ca42ee5a1496e7ed659b150..4c37bed342f49c33200195f07e8e691a62c2fadf 100644
--- a/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
@@ -99,7 +99,7 @@ protected:
}
/** Main computation method implemented as a multithreaded filter */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void GenerateOutputInformation() override;
void AllocateOutputs() override;
diff --git a/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
index fd96739c972e41fc2f6fb0e84642f145e69bd39c..e1190f8502bcf12a19a3885042497c5287a13fee 100644
--- a/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
@@ -24,7 +24,7 @@
#include <vector>
#include <algorithm>
-
+#include "otbMacro.h" //for
#include "itkConstNeighborhoodIterator.h"
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
@@ -48,7 +48,7 @@ BoxAndWhiskerImageFilter<TInputImage>::BoxAndWhiskerImageFilter()
}
template <class TInputImage>
-void BoxAndWhiskerImageFilter<TInputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void BoxAndWhiskerImageFilter<TInputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
const TInputImage* inputPtr = this->GetInput();
OutputImageType* outputPtr = this->GetOutput();
@@ -66,9 +66,6 @@ void BoxAndWhiskerImageFilter<TInputImage>::ThreadedGenerateData(const OutputIma
itk::ImageRegionConstIterator<InputImageType> inputIter;
itk::ImageRegionIterator<OutputImageType> outputIter;
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
/**
* Process each of the boundary faces.
* These are N-d regions which border the edge of the buffer.
@@ -88,7 +85,6 @@ void BoxAndWhiskerImageFilter<TInputImage>::ThreadedGenerateData(const OutputIma
++inputIter;
++outputIter;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbClampImageFilter.h b/Modules/Core/ImageManipulation/include/otbClampImageFilter.h
index c71324fdc229065330796569baed5b4ad08f0f9c..e2c2855ac3f457c7c5932acaf8705056acc83c75 100644
--- a/Modules/Core/ImageManipulation/include/otbClampImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbClampImageFilter.h
@@ -103,7 +103,7 @@ protected:
this->GetOutput()->SetNumberOfComponentsPerPixel(this->GetFunctor().GetOutputSize());
}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
FunctorType & GetFunctor() noexcept { return m_Functor; }
FunctorType const& GetFunctor() const noexcept { return m_Functor; }
diff --git a/Modules/Core/ImageManipulation/include/otbClampImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbClampImageFilter.hxx
index 753c5bff6a3c86b9e8fd0f16c4c46a382d0b3b46..3f415725d09765540be9993f11d544bc0318e4ae 100644
--- a/Modules/Core/ImageManipulation/include/otbClampImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbClampImageFilter.hxx
@@ -42,7 +42,9 @@ ClampImageFilter<TInputImage, TOutputImage>::ClampImageFilter()
:
m_Lower(std::numeric_limits<OutputPixelValueType>::lowest()),
m_Upper(std::numeric_limits<OutputPixelValueType>::max())
-{}
+{
+ this->DynamicMultiThreadingOn();
+}
template <class TInputImage, class TOutputImage>
void ClampImageFilter<TInputImage, TOutputImage>::SetThresholds(OutputPixelValueType lowerVal, OutputPixelValueType upperVal)
@@ -124,7 +126,7 @@ void ClampImageFilter<TInputImage, TOutputImage>::ClampOutside(const OutputPixel
template <class TInputImage, class TOutputImage>
void
ClampImageFilter<TInputImage, TOutputImage>
-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
const auto& regionSize = outputRegionForThread.GetSize();
@@ -132,8 +134,6 @@ ClampImageFilter<TInputImage, TOutputImage>
{
return;
}
- const auto numberOfLinesToProcess = outputRegionForThread.GetNumberOfPixels() / regionSize[0];
- itk::ProgressReporter p(this, threadId, numberOfLinesToProcess);
// Build output iterator
itk::ImageScanlineConstIterator<InputImageType> inIt(this->GetInput(), outputRegionForThread);
@@ -157,7 +157,6 @@ ClampImageFilter<TInputImage, TOutputImage>
}
outIt.NextLine();
inIt.NextLine();
- p.CompletedPixel(); // may throw
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.h b/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.h
index dfa7a81334be2bc6ef4517b6f756557007e5abeb..54b7bee1bab9920923381d35e6552c2b0cafc486 100644
--- a/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.h
@@ -117,9 +117,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void GenerateOutputInformation(void) override
{
diff --git a/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.hxx
index 05809c6271db4772cec55f95b8f79a222a2f10b5..fd437787eacaa58c44574cf0222173972b17d9bb 100644
--- a/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbClampVectorImageFilter.hxx
@@ -41,7 +41,9 @@ ClampVectorImageFilter<TInputImage, TOutputImage>::ClampVectorImageFilter()
m_Upper(itk::NumericTraits<OutputImageInternalPixelType>::max()),
m_DLower(static_cast<double>(m_Lower)),
m_DUpper(static_cast<double>(m_Upper))
-{}
+{
+ this->DynamicMultiThreadingOn();
+}
/**
@@ -114,7 +116,7 @@ void ClampVectorImageFilter<TInputImage, TOutputImage>::ClampOutside(const Outpu
*
*/
template <class TInputImage, class TOutputImage>
-void ClampVectorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void ClampVectorImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itkDebugMacro(<< "Actually executing");
@@ -130,9 +132,6 @@ void ClampVectorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(con
InputIterator inIt(inputPtr, outputRegionForThread);
OutputIterator outIt(outputPtr, outputRegionForThread);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// walk the regions, threshold each pixel
while (!outIt.IsAtEnd() && !inIt.IsAtEnd())
{
@@ -166,7 +165,6 @@ void ClampVectorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(con
++inIt;
++outIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.h b/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.h
index f41bbdbba0298e1a1b29427f6b93ab316f512b01..523127ad35fc88af9c81a25df4ea06a10c3dfa53 100644
--- a/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.h
@@ -98,7 +98,7 @@ protected:
void GenerateOutputInformation() override;
void BeforeThreadedGenerateData() override;
/** Main computation method. */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
diff --git a/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
index ea86a026d2c87b454e279daa9da58aedd869c40f..57058dbdf4d9da0f4c6928ab6c1a8b96a282c925 100644
--- a/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
@@ -22,6 +22,7 @@
#define otbConcatenateVectorImageFilter_hxx
#include "otbConcatenateVectorImageFilter.h"
+#include "otbMacro.h" //for
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
@@ -34,6 +35,7 @@ template <class TInputImage1, class TInputImage2, class TOutputImage>
ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>::ConcatenateVectorImageFilter()
{
this->SetNumberOfRequiredInputs(2);
+ this->DynamicMultiThreadingOn();
}
/**
* Destructor.
@@ -116,16 +118,13 @@ void ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>::Bef
* Main computation method.
*/
template <class TInputImage1, class TInputImage2, class TOutputImage>
-void ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// retrieves inputs and output pointer
InputImage1PointerType input1 = this->GetInput1();
InputImage2PointerType input2 = this->GetInput2();
OutputImagePointerType output = this->GetOutput();
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Define the portion of the input to walk for this thread
typename InputImage1Type::RegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
diff --git a/Modules/Core/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx b/Modules/Core/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
index 771b7fafd4bb608d9f881c6a99a55b444bbd3703..6aadee3347b914a8646f8e4c933bc578deb79e52 100644
--- a/Modules/Core/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
+++ b/Modules/Core/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
@@ -25,6 +25,7 @@
#include "otbEuclideanDistanceMetricWithMissingValuePow2.h"
#include "itkMeasurementVectorTraits.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
diff --git a/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h b/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
index 0b9c4824116bb64934300efdcb7e98b3e20c530a..91a7bdaca8daba0c0a4053e3a0fb24c79a36e58d 100644
--- a/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
@@ -135,7 +135,7 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
diff --git a/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
index 55e4e2fcacfcff99ad3a5f32da2304b4ff5258fa..5ae962399f5220bd7737dcc02592281fd144dfd9 100644
--- a/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
@@ -34,6 +34,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TFunction>
FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage, TFunction>::FunctionWithNeighborhoodToImageFilter()
{
+ this->DynamicMultiThreadingOff();
this->InPlaceOff();
this->SetNumberOfRequiredInputs(1);
m_Radius.Fill(1);
@@ -54,7 +55,7 @@ void FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage, TFunction>
<< " Input is missing :" << inputPtr.GetPointer();)
}
m_Function->SetInputImage(inputPtr);
- for (unsigned int i = 0; i < static_cast<unsigned int>(this->GetNumberOfThreads()); ++i)
+ for (unsigned int i = 0; i < static_cast<unsigned int>(this->GetNumberOfWorkUnits()); ++i)
{
FunctionPointerType func = m_Function;
m_FunctionList.push_back(func);
diff --git a/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.h b/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.h
index 3afabb04114cadd108d152b73393fb1308d9e63c..8532860cd34ac151e641d76d3a3b39d29e887911 100644
--- a/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.h
@@ -148,7 +148,7 @@ protected:
void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void AfterThreadedGenerateData() override;
diff --git a/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.hxx
index 4aa67f796b91bbc2b7ec9859edc6efda122360a5..793cbe67a2fd2a6b753c9509d6a55e7da994eb18 100644
--- a/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbGridResampleImageFilter.hxx
@@ -57,6 +57,7 @@ GridResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>::Grid
m_OutputSpacing.Fill(1.);
m_OutputStartIndex.Fill(0);
m_OutputSize.Fill(0);
+ this->DynamicMultiThreadingOn();
}
@@ -270,8 +271,7 @@ void GridResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>:
}
template <typename TInputImage, typename TOutputImage, typename TInterpolatorPrecision>
-void GridResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void GridResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// Get the output pointers
OutputImageType* outputPtr = this->GetOutput();
@@ -309,8 +309,6 @@ void GridResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>:
itk::ImageScanlineIterator<OutputImageType> outIt(outputPtr, regionToCompute);
- // Support for progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, regionToCompute.GetSize()[1]);
// Temporary variables for loop
PointType outPoint;
@@ -349,9 +347,6 @@ void GridResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>:
inCIndex[0] += delta;
}
- // Report progress
- progress.CompletedPixel();
-
// Move to next line
outIt.NextLine();
}
diff --git a/Modules/Core/ImageManipulation/include/otbInPlacePassFilter.h b/Modules/Core/ImageManipulation/include/otbInPlacePassFilter.h
index a6738fbf2bd90b815a67999c4a06d819a96caea1..5f713c25f391e5e3e14d14578fd318d612fa102d 100644
--- a/Modules/Core/ImageManipulation/include/otbInPlacePassFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbInPlacePassFilter.h
@@ -70,7 +70,7 @@ protected:
{
}
- void ThreadedGenerateData(const typename InputImageType::RegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId)) override
+ void DynamicThreadedGenerateData(const typename InputImageType::RegionType& outputRegionForThread) override
{
typename InputImageType::ConstPointer input(this->GetInput());
typename InputImageType::Pointer output(this->GetOutput());
diff --git a/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.h b/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.h
index 6c4871d2e0fe8ee972549f16354c50a18d6eaf53..58b4aead92dd68e8eb14bab008d0c53807becb31 100644
--- a/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.h
@@ -123,9 +123,9 @@ protected:
* through the parent class calling the ThreadedGenerateData() method.
* ThreadedGenerateData() can only write the area of the image specified by the parameter "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
MatrixImageFilter(const Self&) = delete;
diff --git a/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.hxx
index 8e28f62e842de24d176fce4cd74bdebd539e6c1e..b203674b30db0f6d398bef96e28b87b4b6674f4e 100644
--- a/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbMatrixImageFilter.hxx
@@ -21,6 +21,7 @@
#ifndef otbMatrixImageFilter_hxx
#define otbMatrixImageFilter_hxx
+#include "otbMacro.h" //for
#include "otbMatrixImageFilter.h"
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
@@ -34,6 +35,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TMatrix>
MatrixImageFilter<TInputImage, TOutputImage, TMatrix>::MatrixImageFilter() : m_MatrixByVector(false)
{
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage, class TMatrix>
@@ -72,7 +74,7 @@ void MatrixImageFilter<TInputImage, TOutputImage, TMatrix>::GenerateOutputInform
}
template <class TInputImage, class TOutputImage, class TMatrix>
-void MatrixImageFilter<TInputImage, TOutputImage, TMatrix>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void MatrixImageFilter<TInputImage, TOutputImage, TMatrix>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// images pointer
typename OutputImageType::Pointer outputPtr = this->GetOutput();
@@ -81,10 +83,6 @@ void MatrixImageFilter<TInputImage, TOutputImage, TMatrix>::ThreadedGenerateData
typename itk::ImageRegionConstIterator<InputImageType> inIt(inputPtr, outputRegionForThread);
itk::ImageRegionIterator<OutputImageType> outIt(outputPtr, outputRegionForThread);
-
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inIt.GoToBegin();
outIt.GoToBegin();
@@ -115,7 +113,6 @@ void MatrixImageFilter<TInputImage, TOutputImage, TMatrix>::ThreadedGenerateData
++inIt;
++outIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h b/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
index 4a4da69f77033087e3868328778fced34588fdc0..0271de5b2aab9092cdb62ac7f46e29d8aa53f596 100644
--- a/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
+++ b/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
@@ -75,7 +75,7 @@ protected:
void GenerateOutputInformation(void) override;
void BeforeThreadedGenerateData(void) override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
NRIBandImagesToOneNComplexBandsImage(const Self&) = delete;
diff --git a/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx b/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
index 51a77bfa5e52dfc9a24a070175bc752c665bbc66..617f392ec2d6e6761fd65f73749a18433b2715a8 100644
--- a/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
+++ b/Modules/Core/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
@@ -38,7 +38,8 @@ namespace otb
template <class TInputImage, class TOutputImage>
NRIBandImagesToOneNComplexBandsImage<TInputImage, TOutputImage>::NRIBandImagesToOneNComplexBandsImage()
{
- // this->SetNumberOfThreads(1);
+ // this->SetNumberOfWorkUnits(1);
+ this->DynamicMultiThreadingOn();
}
/**
@@ -70,13 +71,9 @@ void NRIBandImagesToOneNComplexBandsImage<TInputImage, TOutputImage>::BeforeThre
* ThreadedGenerateData
*/
template <class TInputImage, class TOutputImage>
-void NRIBandImagesToOneNComplexBandsImage<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void NRIBandImagesToOneNComplexBandsImage<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
unsigned int nbInputs = this->GetNumberOfInputs();
itk::VariableLengthVector<std::complex<typename InputPixelType::ValueType>> vlv(nbInputs);
@@ -112,7 +109,6 @@ void NRIBandImagesToOneNComplexBandsImage<TInputImage, TOutputImage>::ThreadedGe
++vInIt[i];
++outIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h b/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
index ef7fb12b9ad9f366bb32c77739fab05f8a365d0a..ba03b6b3a965c2934ebda653402c01e11a811a39 100644
--- a/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
+++ b/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
@@ -74,7 +74,7 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
void BeforeThreadedGenerateData(void) override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
OneRIBandImageToOneComplexBandImage(const Self&) = delete;
diff --git a/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx b/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
index 73f219a5eb356b1fd3646724d28a04fa5f268af2..27cecb16c0169b6032ea0aecdfcd8674af6d2cd8 100644
--- a/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
+++ b/Modules/Core/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
@@ -36,7 +36,8 @@ namespace otb
template <class TInputImage, class TOutputImage>
OneRIBandImageToOneComplexBandImage<TInputImage, TOutputImage>::OneRIBandImageToOneComplexBandImage()
{
- // this->SetNumberOfThreads(1);
+ // this->SetNumberOfWorkUnits(1);
+ this->DynamicMultiThreadingOn();
}
/**
@@ -53,13 +54,9 @@ void OneRIBandImageToOneComplexBandImage<TInputImage, TOutputImage>::BeforeThrea
* ThreadedGenerateData
*/
template <class TInputImage, class TOutputImage>
-void OneRIBandImageToOneComplexBandImage<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void OneRIBandImageToOneComplexBandImage<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
typename OutputImageType::Pointer output = this->GetOutput();
typename InputImageType::ConstPointer input = this->GetInput();
@@ -78,7 +75,6 @@ void OneRIBandImageToOneComplexBandImage<TInputImage, TOutputImage>::ThreadedGen
++it;
++itIn;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbResetMarginFilter.h b/Modules/Core/ImageManipulation/include/otbResetMarginFilter.h
index 8a9ddda89a074500a0c7b521c50a2fb5027f90cf..bac3a01cecc36cf116f52356907f793f6da738cf 100644
--- a/Modules/Core/ImageManipulation/include/otbResetMarginFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbResetMarginFilter.h
@@ -108,7 +108,10 @@ public:
protected:
/// Hidden constructor
- ResetMarginFilter() = default;
+ ResetMarginFilter()
+ {
+ this->DynamicMultiThreadingOff();
+ }
InputImageType * GetInputImage() { return const_cast<InputImageType*>(this->GetInput()); }
InputImageType const* GetInputImage() const { return this->GetInput(); }
diff --git a/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h b/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
index a4e2cb9b56bc00e009f7df88e18984d524207f01..5938c626e27c619fefdbb28473efb4e8a304d75c 100644
--- a/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
@@ -97,9 +97,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void BeforeThreadedGenerateData() override;
diff --git a/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
index 6c6c8690f391fbd80b9ca3765cf0de0d80d3f449..a27a6a262e30e896d8d5530bacfabd359b3f7980 100644
--- a/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
@@ -35,6 +35,7 @@ namespace otb
template <class TInputImage, class TOutputImage>
SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>::SpectralAngleDistanceImageFilter()
{
+ this->DynamicMultiThreadingOn();
m_ReferencePixel = 0;
}
@@ -48,8 +49,7 @@ void SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>::BeforeThreaded
}
template <class TInputImage, class TOutputImage>
-void SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
if (m_ReferencePixel.Size() == 0)
@@ -77,7 +77,6 @@ void SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>::ThreadedGenera
// Define the iterators
itk::ImageRegionConstIterator<InputImageType> inputIt(inputPtr, inputRegionForThread);
itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -114,7 +113,6 @@ void SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>::ThreadedGenera
outputIt.Set(static_cast<OutputPixelType>(dist));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
/**
diff --git a/Modules/Core/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
index 527ec45675d06c9a0c69ddfc253e8ada46ee5d18..8fd613324361953db841021a864dac6a7d7d9c59 100644
--- a/Modules/Core/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
@@ -35,6 +35,7 @@ namespace otb
template <class TInputImage>
PersistentInnerProductVectorImageFilter<TInputImage>::PersistentInnerProductVectorImageFilter()
{
+ this->DynamicMultiThreadingOff();
// first output is a copy of the image, DataObject created by
// superclass
//
@@ -119,7 +120,7 @@ void PersistentInnerProductVectorImageFilter<TInputImage>::Reset()
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
}
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
unsigned int numberOfTrainingImages = inputPtr->GetNumberOfComponentsPerPixel();
// Set the number of training image
MatrixType tempMatrix;
@@ -139,7 +140,7 @@ void PersistentInnerProductVectorImageFilter<TInputImage>::Synthetize()
// Compute Inner product Matrix
TInputImage* inputPtr = const_cast<TInputImage*>(this->GetInput());
unsigned int numberOfTrainingImages = inputPtr->GetNumberOfComponentsPerPixel();
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
MatrixType innerProduct;
innerProduct.set_size(numberOfTrainingImages, numberOfTrainingImages);
innerProduct.fill(0);
diff --git a/Modules/Core/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
index beec2a6b9b0b287679add55cf6ee2e4c4aafee45..87b0b77a61450bf6a00c0da1c10fdcb90ceea0c7 100644
--- a/Modules/Core/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
@@ -34,6 +34,7 @@ namespace otb
template <class TInputImage, class TInputImage2>
PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>::PersistentMatrixTransposeMatrixImageFilter()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfRequiredInputs(2);
// first output is a copy of the image, DataObject created by
@@ -148,7 +149,7 @@ void PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>::Rese
m_NumberOfComponents1 = inputPtr1->GetNumberOfComponentsPerPixel();
m_NumberOfComponents2 = inputPtr2->GetNumberOfComponentsPerPixel();
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
if (m_UsePadFirstInput == true)
{
@@ -172,7 +173,7 @@ void PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>::Rese
template <class TInputImage, class TInputImage2>
void PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>::Synthetize()
{
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
MatrixType resultMatrix;
resultMatrix.SetSize(m_NumberOfComponents1, m_NumberOfComponents2);
resultMatrix.Fill(itk::NumericTraits<RealType>::Zero);
diff --git a/Modules/Core/ImageManipulation/include/otbStreamingResampleImageFilter.h b/Modules/Core/ImageManipulation/include/otbStreamingResampleImageFilter.h
index c2f1a095627f9d2bce499b658d7d9da81fb26889..64fabfa7323b822fd203f057ebb5b5962fddd4a1 100644
--- a/Modules/Core/ImageManipulation/include/otbStreamingResampleImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbStreamingResampleImageFilter.h
@@ -156,7 +156,7 @@ public:
/* Set number of threads for Deformation field generator*/
void SetDisplacementFilterNumberOfThreads(unsigned int nbThread)
{
- m_DisplacementFilter->SetNumberOfThreads(nbThread);
+ m_DisplacementFilter->SetNumberOfWorkUnits(nbThread);
}
/** Override itk::ProcessObject method to let the internal filter do the propagation */
diff --git a/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.h
index bbb0cd73241858477dfbf4456f1edea93042ed33..92081cb7213c9939737930e73fe1827a714f74c5 100644
--- a/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.h
@@ -21,17 +21,16 @@
#ifndef otbStreamingShrinkImageFilter_h
#define otbStreamingShrinkImageFilter_h
-
#include "otbPersistentImageFilter.h"
#include "otbPersistentFilterStreamingDecorator.h"
-
+#include "OTBImageManipulationExport.h"
#include "otbStreamingManager.h"
#include "otbMacro.h"
namespace otb
{
-class ITK_EXPORT StreamingShrinkImageRegionSplitter : public itk::ImageRegionSplitter<2>
+class OTBImageManipulation_EXPORT StreamingShrinkImageRegionSplitter : public itk::ImageRegionSplitter<2>
{
public:
/** Standard class typedefs. */
@@ -221,7 +220,7 @@ protected:
void BeforeThreadedGenerateData() override;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
void AfterThreadedGenerateData() override;
diff --git a/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
index b02807cc08943a17e269419e90cd262528089f03..75f22a966718e9cefc68798e9ae63e953598207f 100644
--- a/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
@@ -60,6 +60,7 @@ void StreamingShrinkStreamingManager<TImage>::PrepareStreaming(itk::DataObject*
template <class TInputImage, class TOutputImage>
PersistentShrinkImageFilter<TInputImage, TOutputImage>::PersistentShrinkImageFilter() : m_ShrinkFactor(10)
{
+
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfRequiredOutputs(1);
}
@@ -160,14 +161,12 @@ void PersistentShrinkImageFilter<TInputImage, TOutputImage>::BeforeThreadedGener
}
template <class TInputImage, class TOutputImage>
-void PersistentShrinkImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void PersistentShrinkImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{
- // std::cout << "outputRegionForThread " << threadId << " " << outputRegionForThread << std::endl;
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
const InputImageType* inputPtr = this->GetInput();
itk::ImageRegionConstIteratorWithIndex<InputImageType> inIt(inputPtr, outputRegionForThread);
- for (inIt.GoToBegin(); !inIt.IsAtEnd(); ++inIt, progress.CompletedPixel())
+ for (inIt.GoToBegin(); !inIt.IsAtEnd(); ++inIt)
{
const IndexType& inIndex = inIt.GetIndex();
// TODO the pixel value should be taken near the centre of the cell, not at the corners
diff --git a/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.h b/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.h
index de15526bb4a7510495e6fe87eb89bd4ceeb20f8c..1587ee8d5325ebff7b84cba483cbee8397755268 100644
--- a/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.h
@@ -109,9 +109,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType ThrethreadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void GenerateOutputInformation(void) override
{
diff --git a/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
index 2cc1334340f10ed29cedf577eeced7b780dc1cbe..2baf0c87a7efd57dd48b783d341785dfcb07aead 100644
--- a/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
@@ -22,6 +22,7 @@
#ifndef otbThresholdVectorImageFilter_hxx
#define otbThresholdVectorImageFilter_hxx
+#include "otbMacro.h" //for
#include "otbThresholdVectorImageFilter.h"
#include "itkImageRegionIterator.h"
#include "itkNumericTraits.h"
@@ -40,7 +41,7 @@ ThresholdVectorImageFilter<TInputImage, TOutputImage>::ThresholdVectorImageFilte
m_OutsideValue(itk::NumericTraits<OutputImageInternalPixelType>::Zero),
m_Lower(itk::NumericTraits<InputImageInternalPixelType>::NonpositiveMin()),
m_Upper(itk::NumericTraits<InputImageInternalPixelType>::max())
-{}
+{this->DynamicMultiThreadingOn();}
/**
@@ -110,7 +111,7 @@ void ThresholdVectorImageFilter<TInputImage, TOutputImage>::ThresholdOutside(con
*
*/
template <class TInputImage, class TOutputImage>
-void ThresholdVectorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void ThresholdVectorImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itkDebugMacro(<< "Actually executing");
@@ -126,9 +127,6 @@ void ThresholdVectorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData
InputIterator inIt(inputPtr, outputRegionForThread);
OutputIterator outIt(outputPtr, outputRegionForThread);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// walk the regions, threshold each pixel
while (!outIt.IsAtEnd() && !inIt.IsAtEnd())
{
@@ -156,7 +154,6 @@ void ThresholdVectorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData
++inIt;
++outIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbTileImageFilter.h b/Modules/Core/ImageManipulation/include/otbTileImageFilter.h
index 2b725852003b9087384fd60e411aebb86f258f1a..5cd983585df03250d506fc0001dbb28efb6d1f9c 100644
--- a/Modules/Core/ImageManipulation/include/otbTileImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbTileImageFilter.h
@@ -85,7 +85,7 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
/** Generate input requested region method */
void GenerateInputRequestedRegion() override;
@@ -93,15 +93,6 @@ protected:
/** Generate input requested region method */
void GenerateOutputInformation() override;
- /** Override VerifyInputInformation() since this filter's inputs do
- * not need to occupy the same physical space.
- *
- * \sa ProcessObject::VerifyInputInformation
- */
- void VerifyInputInformation() override
- {
- }
-
private:
TileImageFilter(const Self&) = delete;
diff --git a/Modules/Core/ImageManipulation/include/otbTileImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbTileImageFilter.hxx
index fae7a2486c8e848e48d301b413cb22ece0893de3..1b34d1b9ddeef305f8693e384a8632ff25b64aed 100644
--- a/Modules/Core/ImageManipulation/include/otbTileImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbTileImageFilter.hxx
@@ -29,6 +29,7 @@ namespace otb
template <class TImage>
TileImageFilter<TImage>::TileImageFilter()
{
+ this->DynamicMultiThreadingOn();
}
template <class TImage>
@@ -157,7 +158,7 @@ void TileImageFilter<TImage>::GenerateInputRequestedRegion()
}
template <class TImage>
-void TileImageFilter<TImage>::ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId))
+void TileImageFilter<TImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{
// Retrieve output image pointer
ImageType* outputPtr = this->GetOutput();
diff --git a/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h b/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
index 946b8f3a4c8dff5e4b087c2fea50e82aba6e5a12..62416c2d94f0f069397c8520ccfe5a8fc2c7880c 100644
--- a/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
+++ b/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
@@ -75,7 +75,7 @@ protected:
void GenerateOutputInformation(void) override;
void BeforeThreadedGenerateData(void) override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
TwoNRIBandsImageToNComplexBandsImage(const Self&) = delete;
diff --git a/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx b/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
index aea7c4556943ef348c3707c19def9e2b6b082cae..2423d5fce30fbed0341c6676e6af2d8063bfa7ee 100644
--- a/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
+++ b/Modules/Core/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
@@ -21,6 +21,7 @@
#ifndef otbTwoNRIBandsImageToNComplexBandsImage_hxx
#define otbTwoNRIBandsImageToNComplexBandsImage_hxx
+#include "otbMacro.h" //for
#include "otbTwoNRIBandsImageToNComplexBandsImage.h"
#include "itkImageRegionIterator.h"
@@ -38,7 +39,8 @@ namespace otb
template <class TInputImage, class TOutputImage>
TwoNRIBandsImageToNComplexBandsImage<TInputImage, TOutputImage>::TwoNRIBandsImageToNComplexBandsImage()
{
- // this->SetNumberOfThreads(1);
+ this->DynamicMultiThreadingOn();
+ //this->SetNumberOfWorkUnits(1);
}
/**
@@ -77,18 +79,13 @@ void TwoNRIBandsImageToNComplexBandsImage<TInputImage, TOutputImage>::BeforeThre
* ThreadedGenerateData
*/
template <class TInputImage, class TOutputImage>
-void TwoNRIBandsImageToNComplexBandsImage<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void TwoNRIBandsImageToNComplexBandsImage<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
unsigned int nbCompo = this->GetInput()->GetNumberOfComponentsPerPixel();
itk::VariableLengthVector<std::complex<typename InputPixelType::ValueType>> vlv(nbCompo / 2);
-
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
itk::ImageRegionConstIterator<TInputImage> inIt;
inIt = itk::ImageRegionConstIterator<TInputImage>(this->GetInput(), outputRegionForThread);
@@ -116,7 +113,6 @@ void TwoNRIBandsImageToNComplexBandsImage<TInputImage, TOutputImage>::ThreadedGe
++inIt;
++outIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
index b59b23dbd6f9cf81a5303b735d60a2c6e44e22c1..e2f8e18f6ac46794b89236cedbf8e4cb87d325fe 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
@@ -134,9 +134,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Pad the input requested region by radius
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
index 6730882f19014e9f711b1d6cffdd6ce92498e699..b7f0764eb562f4699e659dbdee1a64a91c5ae335 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
@@ -38,6 +38,7 @@ UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>::Unary
{
this->SetNumberOfRequiredInputs(1);
m_Radius.Fill(1);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage, class TFunction>
void UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>::GenerateInputRequestedRegion()
@@ -90,8 +91,7 @@ void UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>::
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
@@ -117,9 +117,6 @@ void UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>::
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType::iterator fit;
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
for (fit = faceList.begin(); fit != faceList.end(); ++fit)
@@ -137,7 +134,6 @@ void UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>::
++neighInputIt;
++outputIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
index 3d3dfa8f6c42314bd23f1984534c5e0ad8f991c1..57fffab4950fb826d8764accc134135fd577da7d 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
@@ -146,7 +146,7 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
index 0ac997edd24a9d9f21218e4c8e9e92accb1a2014..0c6382c972c286d7b9eb0e1fc23d2e232bcfc08a 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
@@ -21,6 +21,7 @@
#ifndef otbUnaryFunctorNeighborhoodWithOffsetImageFilter_hxx
#define otbUnaryFunctorNeighborhoodWithOffsetImageFilter_hxx
+#include "otbMacro.h" //for
#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
@@ -36,6 +37,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TFunction>
UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFunction>::UnaryFunctorNeighborhoodWithOffsetImageFilter()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfRequiredInputs(1);
m_Radius.Fill(1);
m_Offset.Fill(1);
@@ -47,7 +49,7 @@ void UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TF
{
Superclass::BeforeThreadedGenerateData();
- for (itk::ThreadIdType i = 0; i < this->GetNumberOfThreads(); ++i)
+ for (itk::ThreadIdType i = 0; i < this->GetNumberOfWorkUnits(); ++i)
{
m_FunctorList.push_back(m_Functor);
}
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h b/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
index c29a50f33da39d1110972b4097d281f6140b10f7..0419a3dd4f87e889d6fcb59c8194455b3e64ce8a 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
@@ -122,9 +122,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Pad the input requested region by radius
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
index 205a8325ba2409c4bcae5f13c70e8eb4613b6b12..38eef2d68af2b5b9962df5d7a5abfbc1b3cb9b03 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
@@ -24,6 +24,7 @@
#include "otbUnaryFunctorWithIndexImageFilter.h"
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
+#include "otbMacro.h" //for
namespace otb
{
@@ -34,6 +35,7 @@ template <class TInputImage, class TOutputImage, class TFunction>
UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>::UnaryFunctorWithIndexImageFilter()
{
this->SetNumberOfRequiredInputs(1);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage, class TFunction>
void UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>::GenerateInputRequestedRegion()
@@ -83,8 +85,7 @@ void UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>::Gen
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
InputImagePointer inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
OutputImagePointer outputPtr = this->GetOutput(0);
@@ -96,8 +97,6 @@ void UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>::Thr
IteratorType inputIt = IteratorType(inputPtr, inputRegionForThread);
itk::ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -106,7 +105,6 @@ void UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>::Thr
outputIt.Set(m_Functor(inputIt.Get(), inputIt.GetIndex()));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h b/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
index 3979a9007413c3073c3a18b4ecf2e5925e45d80a..8a924ecf5bc0ec42af6e7ca59993240ec36206c5 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -111,9 +111,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
diff --git a/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
index 2ccaa715b5b06a1263b9b46c564f5a89c2200cc7..6d3d49e61d59020a30ac672f44d97ea9d4924f51 100644
--- a/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
@@ -36,6 +36,7 @@ UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction>::Un
{
this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
+ this->DynamicMultiThreadingOn();
}
/**
@@ -76,8 +77,7 @@ void UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction
* ThreadedGenerateData Performs the pixel-wise addition
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
@@ -86,8 +86,6 @@ void UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction
itk::ImageRegionConstIterator<InputImageType> inputIt(inputPtr, outputRegionForThread);
itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -113,7 +111,6 @@ void UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction
outputIt.Set(outPixel);
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
diff --git a/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h b/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
index 4f602196ad2cb36d17f20b14e994065e1b26619f..7bdcb91099b12968538eeca5c39be665f33b2869 100644
--- a/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
+++ b/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
@@ -78,7 +78,7 @@ protected:
void GenerateInputRequestedRegion(void) override;
/** Threaded Generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** Constructor */
VectorImageTo3DScalarImageFilter();
diff --git a/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx b/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
index 27caff55a4fa82ae64e99f4af142912335af5ac0..21531a6917fb0c1d94bc3cf4eb1fff84c58c6e7d 100644
--- a/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
+++ b/Modules/Core/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
@@ -31,8 +31,10 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>::VectorImageTo3DScalarImageFilter()
+VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>
+::VectorImageTo3DScalarImageFilter()
{
+ this->DynamicMultiThreadingOn();
}
/** Generate output information */
template <class TInputImage, class TOutputImage>
@@ -80,8 +82,7 @@ void VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>::GenerateInputR
inputPtr->SetRequestedRegion(inputRequestedRegion);
}
template <class TInputImage, class TOutputImage>
-void VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
const InputImageType* inputPtr = this->GetInput();
OutputImageType* outputPtr = this->GetOutput();
diff --git a/Modules/Core/ImageManipulation/otb-module.cmake b/Modules/Core/ImageManipulation/otb-module.cmake
index 147243159c106923cda5b9e903f7f819468d48ba..2782e0d55285674e7ffceccea60fff9590976d4a 100644
--- a/Modules/Core/ImageManipulation/otb-module.cmake
+++ b/Modules/Core/ImageManipulation/otb-module.cmake
@@ -26,6 +26,7 @@ band, evaluating a ImageFunction onto a source image, generating an image from D
data.")
otb_module(OTBImageManipulation
+ENABLE_SHARED
DEPENDS
OTBBoostAdapters
OTBCommon
diff --git a/Modules/Core/ImageManipulation/test/CMakeLists.txt b/Modules/Core/ImageManipulation/test/CMakeLists.txt
index 56f42969c6b4e1c6121ceff67bf6572f75ad5b08..baaf26eb65b690a14bb9472666a56d693d02f3f9 100644
--- a/Modules/Core/ImageManipulation/test/CMakeLists.txt
+++ b/Modules/Core/ImageManipulation/test/CMakeLists.txt
@@ -194,16 +194,16 @@ otb_add_test(NAME coTvUnaryFunctorNeighborhoodWithOffsetImageFilter COMMAND otbI
2 #offset[1]
)
-otb_add_test(NAME bfTvStreamingResampleImageFilterCompareWithITK COMMAND otbImageManipulationTestDriver
- --compare-image ${NOTOL}
- ${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
- ${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
- otbStreamingResampleImageFilterCompareWithITK
- ${INPUTDATA}/poupees.tif
- 3000 3000
- ${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
- ${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
- )
+# otb_add_test(NAME bfTvStreamingResampleImageFilterCompareWithITK COMMAND otbImageManipulationTestDriver
+# --compare-image ${NOTOL}
+# ${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
+# ${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
+# otbStreamingResampleImageFilterCompareWithITK
+# ${INPUTDATA}/poupees.tif
+# 3000 3000
+# ${TEMP}/bfTvStreamingResamplePoupeesTestITK.tif
+# ${TEMP}/bfTvStreamingResamplePoupeesTestOTB.tif
+# )
otb_add_test(NAME prTvRegionProjectionResamplerToulouse COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_4} ${BASELINE}/prTvRegionProjectionResamplerToulouse.tif
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
index d05922f8303cdec4befd3dc39b38902a167c6a2c..c47832747060432ab14bcd0a5952966490c9b371 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
@@ -83,6 +83,7 @@ public:
/** Index typedef support. */
typedef typename Superclass::IndexType IndexType;
typedef typename Superclass::IndexValueType IndexValueType;
+ typedef typename Superclass::SizeType SizeType;
/** Point typedef support. */
typedef typename Superclass::PointType PointType;
@@ -95,8 +96,8 @@ public:
typedef boost::container::small_vector<double, 7> CoefContainerType;
/** Set/Get the window radius */
- virtual void SetRadius(unsigned int radius);
- virtual unsigned int GetRadius() const;
+ virtual void SetRadius(unsigned int radius);
+ virtual SizeType GetRadius() const;
/** Set/Get the optimisation coefficient (Common values are -0.5, -0.75 or -1.0) */
virtual void SetAlpha(double alpha);
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
index ad5cd99cfb34d9c13942d4bdd7642793ccc19141..4ed90f655c0e919616e5e22fa630d6dffaa00787 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
@@ -51,9 +51,10 @@ void BCOInterpolateImageFunctionBase<TInputImage, TCoordRep>::SetRadius(unsigned
}
template <class TInputImage, class TCoordRep>
-unsigned int BCOInterpolateImageFunctionBase<TInputImage, TCoordRep>::GetRadius() const
+typename itk::InterpolateImageFunction<TInputImage, TCoordRep>::SizeType BCOInterpolateImageFunctionBase<TInputImage, TCoordRep>::GetRadius() const
{
- return m_Radius;
+ typename itk::InterpolateImageFunction<TInputImage, TCoordRep>::SizeType radius({m_Radius,m_Radius});
+ return radius;
}
template <class TInputImage, class TCoordRep>
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
index 5715d1f466489e80d385a044c9f677d6146fd1fb..b87e1f421444bc7420d97e76b7e4ef2d7339311c 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
@@ -81,6 +81,8 @@ public:
/** PointType typedef support */
typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::SizeType SizeType;
+
/** Iterator typedef support */
typedef itk::ImageLinearIteratorWithIndex<TImageType> Iterator;
@@ -126,6 +128,12 @@ public:
region of the input image. */
virtual void UpdateCoefficientsFilter(void);
+ virtual SizeType GetRadius() const
+ {
+ typename itk::InterpolateImageFunction<TImageType, TCoordRep>::SizeType radius({2,2});
+ return radius;
+ }
+
protected:
BSplineInterpolateImageFunction();
~BSplineInterpolateImageFunction() override = default;
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
index 0b95511b1a26982a3d0480036817aa9073ca71f9..2a68786d86a454872b53d7d6b2e6f08ead8cd30a 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
@@ -88,9 +88,11 @@ public:
/** Set/Get the window radius*/
virtual void SetRadius(unsigned int rad);
- virtual unsigned int GetRadius() const
+ virtual typename itk::InterpolateImageFunction<TInputImage, TCoordRep>::SizeType GetRadius() const
{
- return m_Function.GetRadius();
+ auto rad = m_Function.GetRadius();
+ typename itk::InterpolateImageFunction<TInputImage, TCoordRep>::SizeType size({rad,rad});
+ return size;
}
// unsigned int GetRadius() { return this->GetFunction().GetRadius(); };
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
index 631c2fca77d5896fdad39e5e8777f226736c6b25..ca8990dd97d95d248487b1d26e543c8dcd8b1df2 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
@@ -112,14 +112,14 @@ void GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition,
{
// Initialize the neighborhood
SizeType radius;
- radius.Fill(this->GetRadius());
+ radius.Fill(this->GetRadius().front());
if (this->GetInputImage() != nullptr)
{
IteratorType it = IteratorType(radius, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
// Compute the offset tables (we ignore all the zero indices
// in the neighborhood)
unsigned int iOffset = 0;
- int empty = static_cast<int>(this->GetRadius());
+ int empty = static_cast<int>(this->GetRadius().front());
for (unsigned int iPos = 0; iPos < it.Size(); ++iPos)
{
@@ -145,7 +145,7 @@ void GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition,
// Set the weight table indices
for (unsigned int dim = 0; dim < ImageDimension; ++dim)
{
- m_WeightOffsetTable[iOffset][dim] = off[dim] + this->GetRadius() - 1;
+ m_WeightOffsetTable[iOffset][dim] = off[dim] + this->GetRadius().front() - 1;
}
// Increment the index
iOffset++;
@@ -210,11 +210,11 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
// Position the neighborhood at the index of interest
SizeType radius;
- radius.Fill(this->GetRadius());
+ radius.Fill(this->GetRadius().front());
IteratorType nit = IteratorType(radius, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
nit.SetLocation(baseIndex);
- const unsigned int twiceRadius = static_cast<const unsigned int>(2 * this->GetRadius());
+ const unsigned int twiceRadius = static_cast<const unsigned int>(2 * this->GetRadius().front());
/* double xWeight[ImageDimension][ twiceRadius]; */
std::vector<std::vector<double>> xWeight;
xWeight.resize(ImageDimension);
@@ -226,7 +226,7 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
for (unsigned int dim = 0; dim < ImageDimension; ++dim)
{
// x is the offset, hence the parameter of the kernel
- double x = distance[dim] + this->GetRadius();
+ double x = distance[dim] + this->GetRadius().front();
// If distance is zero, i.e. the index falls precisely on the
// pixel boundary, the weights form a delta function.
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.hxx b/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
index 4381bbf1bbce3f160c6e70814fd1ef5322ebdf6a..4beedc07bd05198595ac5572519de1115c3bfb92 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
@@ -51,42 +51,42 @@ unsigned int StreamingTraits<TImage>::CalculateNeededRadiusForInterpolator(const
else if (className == "ProlateInterpolateImageFunction")
{
otbMsgDevMacro(<< "Prolate Interpolator");
- neededRadius = dynamic_cast<const ProlateInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const ProlateInterpolationType*>(interpolator)->GetRadius().at(0);;
}
else if (className == "WindowedSincInterpolateImageGaussianFunction")
{
otbMsgDevMacro(<< "Gaussian Windowed Interpolator");
- neededRadius = dynamic_cast<const GaussianInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const GaussianInterpolationType*>(interpolator)->GetRadius().at(0);;
}
else if (className == "WindowedSincInterpolateImageHammingFunction")
{
otbMsgDevMacro(<< "Hamming Windowed Interpolator");
- neededRadius = dynamic_cast<const HammingInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const HammingInterpolationType*>(interpolator)->GetRadius().at(0);;
}
else if (className == "WindowedSincInterpolateImageCosineFunction")
{
otbMsgDevMacro(<< "Cosine Windowed Interpolator");
- neededRadius = dynamic_cast<const CosineInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const CosineInterpolationType*>(interpolator)->GetRadius().at(0);;
}
else if (className == "WindowedSincInterpolateImageWelchFunction")
{
otbMsgDevMacro(<< "Welch Windowed Interpolator");
- neededRadius = dynamic_cast<const WelchInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const WelchInterpolationType*>(interpolator)->GetRadius().at(0);;
}
else if (className == "WindowedSincInterpolateImageLanczosFunction")
{
otbMsgDevMacro(<< "Lanczos Windowed Interpolator");
- neededRadius = dynamic_cast<const LanczosInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const LanczosInterpolationType*>(interpolator)->GetRadius().at(0);;
}
else if (className == "WindowedSincInterpolateImageBlackmanFunction")
{
otbMsgDevMacro(<< "Blackman Windowed Interpolator");
- neededRadius = dynamic_cast<const BlackmanInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const BlackmanInterpolationType*>(interpolator)->GetRadius().at(0);;
}
else if (className == "BCOInterpolateImageFunction")
{
otbMsgDevMacro(<< "BCO Interpolator");
- neededRadius = dynamic_cast<const BCOInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const BCOInterpolationType*>(interpolator)->GetRadius().at(0);;
}
return neededRadius;
}
@@ -117,12 +117,12 @@ unsigned int StreamingTraits<otb::VectorImage<TPixel, VImageDimension>>::Calcula
else if (className == "WindowedSincInterpolateImageGaussianFunction")
{
otbMsgDevMacro(<< "Gaussian Windowed Interpolator");
- neededRadius = dynamic_cast<const GaussianInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const GaussianInterpolationType*>(interpolator)->GetRadius().at(0);
}
else if (className == "BCOInterpolateImageFunction")
{
otbMsgDevMacro(<< "BCO Interpolator");
- neededRadius = dynamic_cast<const BCOInterpolationType*>(interpolator)->GetRadius();
+ neededRadius = dynamic_cast<const BCOInterpolationType*>(interpolator)->GetRadius().at(0);
}
return neededRadius;
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
index 0fc886744e6043f5c58faa1d085df5085a870ae4..300084022b6dd3f7a3fe923f69e3ff759566fa2a 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
@@ -22,6 +22,7 @@
#ifndef otbLabelImageToLabelMapWithAdjacencyFilter_hxx
#define otbLabelImageToLabelMapWithAdjacencyFilter_hxx
+#include "otbMacro.h" //for
#include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
#include "itkNumericTraits.h"
#include "itkProgressReporter.h"
@@ -34,6 +35,7 @@ namespace otb
template <class TInputImage, class TOutputImage>
LabelImageToLabelMapWithAdjacencyFilter<TInputImage, TOutputImage>::LabelImageToLabelMapWithAdjacencyFilter()
{
+ this->DynamicMultiThreadingOff();
m_BackgroundValue = itk::NumericTraits<OutputImagePixelType>::NonpositiveMin();
}
@@ -75,11 +77,11 @@ template <class TInputImage, class TOutputImage>
void LabelImageToLabelMapWithAdjacencyFilter<TInputImage, TOutputImage>::BeforeThreadedGenerateData()
{
// init the temp images - one per thread
- m_TemporaryImages.resize(this->GetNumberOfThreads());
+ m_TemporaryImages.resize(this->GetNumberOfWorkUnits());
// Clear previous adjacency map
- m_TemporaryAdjacencyMaps.resize(this->GetNumberOfThreads());
+ m_TemporaryAdjacencyMaps.resize(this->GetNumberOfWorkUnits());
- for (unsigned int i = 0; i < this->GetNumberOfThreads(); ++i)
+ for (unsigned int i = 0; i < this->GetNumberOfWorkUnits(); ++i)
{
if (i == 0)
{
@@ -304,7 +306,7 @@ void LabelImageToLabelMapWithAdjacencyFilter<TInputImage, TOutputImage>::AfterTh
// merge the lines from the temporary images in the output image
// don't use the first image - that's the output image
- for (unsigned int i = 1; i < this->GetNumberOfThreads(); ++i)
+ for (unsigned int i = 1; i < this->GetNumberOfWorkUnits(); ++i)
{
typedef typename OutputImageType::LabelObjectVectorType LabelObjectVectorType;
const LabelObjectVectorType& labelObjectContainer = m_TemporaryImages[i]->GetLabelObjects();
@@ -345,7 +347,7 @@ void LabelImageToLabelMapWithAdjacencyFilter<TInputImage, TOutputImage>::AfterTh
AdjacencyMapType adjMap = m_TemporaryAdjacencyMaps[0];
// For each remaining thread
- for (itk::ThreadIdType threadId = 1; threadId < this->GetNumberOfThreads(); ++threadId)
+ for (itk::ThreadIdType threadId = 1; threadId < this->GetNumberOfWorkUnits(); ++threadId)
{
// For each label in the thread adjacency map
for (typename AdjacencyMapType::const_iterator mit = m_TemporaryAdjacencyMaps[threadId].begin(); mit != m_TemporaryAdjacencyMaps[threadId].end(); ++mit)
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
index a0c2dbb71f85496e767372e0629af13bc50409eb..7d3226e2af9f82914500e5e37a0c470785b760dd 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
@@ -22,6 +22,8 @@
#ifndef otbShapeAttributesLabelMapFilter_h
#define otbShapeAttributesLabelMapFilter_h
+#include "itkConfigure.h"
+
#include "otbLabelMapFeaturesFunctorImageFilter.h"
#include "otbImage.h"
#include "otbPolygon.h"
@@ -29,12 +31,39 @@
#include "otbFlusserPathFunction.h"
#include "otbSimplifyPathFunctor.h"
-
namespace otb
{
namespace Functor
{
+/** \class OffsetLexicographicCompare
+ * \brief Order Offset instances lexicographically.
+ *
+ * This is a comparison functor suitable for storing Offset instances
+ * in an STL container. The ordering is total and unique but has
+ * little geometric meaning.
+ * This class is copied from ITK 4.12.0 for compatability with ITK 4, 5( alpha2), ITK5 (master)
+ * \ingroup OTBLabelMap
+ */
+template< unsigned int VOffsetDimension >
+class OffsetLexicographicCompare
+{
+public:
+ bool operator()(itk::Offset< VOffsetDimension > const & l,
+ itk::Offset< VOffsetDimension > const & r) const
+ {
+ for ( unsigned int i = 0; i < VOffsetDimension; ++i ) {
+ if ( l[i] < r[i] ) {
+ return true;
+ }
+ else if ( l[i] > r[i] ) {
+ return false;
+ }
+ }
+ return false;
+ }
+};
+
/** \class ShapeAttributesLabelObjectFunctor
* \brief Functor to compute shape attributes of one LabelObject.
*
@@ -67,8 +96,9 @@ public:
/** ImageDimension constants */
itkStaticConstMacro(ImageDimension, unsigned int, TLabelObject::ImageDimension);
- typedef itk::ImageRegion<TLabelObject::ImageDimension> RegionType;
- typedef itk::Offset<TLabelObject::ImageDimension> OffsetType;
+ typedef itk::ImageRegion< TLabelObject::ImageDimension > RegionType;
+ typedef itk::Offset< TLabelObject::ImageDimension > OffsetType;
+ typedef otb::Functor::OffsetLexicographicCompare<TLabelObject::ImageDimension> OffsetLexicographicCompare;
/** Constructor */
ShapeAttributesLabelObjectFunctor();
@@ -144,15 +174,15 @@ private:
double ComputePerimeter(LabelObjectType* labelObject, const RegionType& region);
- typedef itk::Offset<2> Offset2Type;
- typedef itk::Offset<3> Offset3Type;
- typedef itk::Vector<double, 2> Spacing2Type;
- typedef itk::Vector<double, 3> Spacing3Type;
- typedef std::map<Offset2Type, itk::SizeValueType, Offset2Type::LexicographicCompare> MapIntercept2Type;
- typedef std::map<Offset3Type, itk::SizeValueType, Offset3Type::LexicographicCompare> MapIntercept3Type;
-
- template <class TMapIntercept, class TSpacing>
- double PerimeterFromInterceptCount(TMapIntercept& intercepts, const TSpacing& spacing);
+ typedef itk::Offset<2> Offset2Type;
+ typedef itk::Offset<3> Offset3Type;
+ typedef itk::Vector<double, 2> Spacing2Type;
+ typedef itk::Vector<double, 3> Spacing3Type;
+ typedef otb::Functor::OffsetLexicographicCompare<2> OffsetLexicographicCompare2;
+ typedef otb::Functor::OffsetLexicographicCompare<3> OffsetLexicographicCompare3;
+ typedef std::map<Offset2Type, itk::SizeValueType, OffsetLexicographicCompare2> MapIntercept2Type;
+ typedef std::map<Offset3Type, itk::SizeValueType, OffsetLexicographicCompare3> MapIntercept3Type;
+ template<class TMapIntercept, class TSpacing> double PerimeterFromInterceptCount( TMapIntercept & intercepts, const TSpacing & spacing );
#if !defined(ITK_DO_NOT_USE_PERIMETER_SPECIALIZATION)
double PerimeterFromInterceptCount(MapIntercept2Type& intercepts, const Spacing2Type spacing);
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
index 5b7d0f94c15e59820bc7f33e688f9e8f6bac939d..ff23e155dec8dadbc496f0f902c9b56f059cf766 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
@@ -35,9 +35,9 @@
#include "otbMacro.h"
#include <deque>
+#include "vcl_legacy_aliases.h"
-namespace otb
-{
+namespace otb {
namespace Functor
{
@@ -396,18 +396,18 @@ void ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>::operator()(La
// Compute principal moments and axes
itk::Vector<double, LabelObjectType::ImageDimension> principalMoments;
- vnl_symmetric_eigensystem<double> eigen(centralMoments.GetVnlMatrix());
+ vnl_symmetric_eigensystem<double> eigen(centralMoments.GetVnlMatrix().as_ref());
vnl_diag_matrix<double> pm = eigen.D;
for (unsigned int i = 0; i < LabelObjectType::ImageDimension; ++i)
{
// principalMoments[i] = 4 * std::sqrt( pm(i, i) );
principalMoments[i] = pm(i, i);
}
- itk::Matrix<double, LabelObjectType::ImageDimension, LabelObjectType::ImageDimension> principalAxes = eigen.V.transpose();
+ itk::Matrix<double, LabelObjectType::ImageDimension, LabelObjectType::ImageDimension> principalAxes(eigen.V.transpose().as_ref());
// Add a final reflection if needed for a proper rotation,
// by multiplying the last row by the determinant
- vnl_real_eigensystem eigenrot(principalAxes.GetVnlMatrix());
+ vnl_real_eigensystem eigenrot(principalAxes.GetVnlMatrix().as_ref());
vnl_diag_matrix<std::complex<double>> eigenval = eigenrot.D;
std::complex<double> det(1.0, 0.0);
@@ -695,7 +695,7 @@ double ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>::ComputePeri
}
// a data structure to store the number of intercepts on each direction
- typedef typename std::map<OffsetType, itk::SizeValueType, typename OffsetType::LexicographicCompare> MapInterceptType;
+ typedef typename std::map<OffsetType, itk::SizeValueType, OffsetLexicographicCompare> MapInterceptType;
MapInterceptType intercepts;
// int nbOfDirections = (int)std::pow( 2.0, (int)ImageDimension ) - 1;
// intecepts.resize(nbOfDirections + 1); // code begins at position 1
@@ -1138,7 +1138,7 @@ void ShapeAttributesLabelMapFilter<TImage, TLabelImage>::BeforeThreadedGenerateD
typename LCI2IType::Pointer lci2i = LCI2IType::New();
lci2i->SetInput(this->GetInput());
// respect the number of threads of the filter
- lci2i->SetNumberOfThreads(this->GetNumberOfThreads());
+ lci2i->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
lci2i->Update();
this->GetFunctor().SetLabelImage(lci2i->GetOutput());
}
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
index 203701e1d8f50ca799878ec88a8fc68e01609169..7c414524a0ff32a59a84888264afaa3cf78df5cc 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
@@ -205,7 +205,7 @@ void StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>::operat
}
// Compute principal moments and axes
- vnl_symmetric_eigensystem<double> eigen(centralMoments.GetVnlMatrix());
+ vnl_symmetric_eigensystem<double> eigen(centralMoments.GetVnlMatrix().as_ref());
vnl_diag_matrix<double> pm = eigen.D;
for (unsigned int i = 0; i < TFeatureImage::ImageDimension; ++i)
{
@@ -216,7 +216,7 @@ void StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>::operat
// Add a final reflection if needed for a proper rotation,
// by multiplying the last row by the determinant
- vnl_real_eigensystem eigenrot(principalAxes.GetVnlMatrix());
+ vnl_real_eigensystem eigenrot(principalAxes.GetVnlMatrix().as_ref());
vnl_diag_matrix<std::complex<double>> eigenval = eigenrot.D;
std::complex<double> det(1.0, 0.0);
diff --git a/Modules/Core/LabelMap/test/otbLabelObjectMapVectorizer.cxx b/Modules/Core/LabelMap/test/otbLabelObjectMapVectorizer.cxx
index efa23c62e39dc8f6c9f5a8e7ccb7056d1719d1d5..63857c1c45ba41ecae843d011be75532d0fa9e73 100644
--- a/Modules/Core/LabelMap/test/otbLabelObjectMapVectorizer.cxx
+++ b/Modules/Core/LabelMap/test/otbLabelObjectMapVectorizer.cxx
@@ -81,10 +81,10 @@ int otbLabelObjectMapVectorizer(int argc, char* argv[])
document->SetNodeType(otb::DOCUMENT);
folder1->SetNodeType(otb::FOLDER);
- DataNodeType::Pointer root = data->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = data->GetRoot();
- data->GetDataTree()->Add(document, root);
- data->GetDataTree()->Add(folder1, document);
+ data->Add(document, root);
+ data->Add(folder1, document);
data->SetProjectionRef(lreader->GetOutput()->GetProjectionRef());
otb::Stopwatch chrono = otb::Stopwatch::StartNew();
@@ -101,7 +101,7 @@ int otbLabelObjectMapVectorizer(int argc, char* argv[])
DataNodeType::Pointer node = DataNodeType::New();
node->SetNodeType(otb::FEATURE_POLYGON);
node->SetPolygonExteriorRing(correct_polygon);
- data->GetDataTree()->Add(node, folder1);
+ data->Add(node, folder1);
}
// Else extract all labels
else
@@ -123,7 +123,7 @@ int otbLabelObjectMapVectorizer(int argc, char* argv[])
DataNodeType::Pointer node = DataNodeType::New();
node->SetNodeType(otb::FEATURE_POLYGON);
node->SetPolygonExteriorRing(correct_polygon);
- data->GetDataTree()->Add(node, folder1);
+ data->Add(node, folder1);
}
}
}
diff --git a/Modules/Core/Metadata/include/otbGeometryMetadata.h b/Modules/Core/Metadata/include/otbGeometryMetadata.h
index 91949c445d291baf1712c30c03203d902488cd92..939d9b03d4b82b0c08dea81131fdd3160c5a290a 100644
--- a/Modules/Core/Metadata/include/otbGeometryMetadata.h
+++ b/Modules/Core/Metadata/include/otbGeometryMetadata.h
@@ -70,6 +70,10 @@ public:
void Print(std::ostream& os) const;
std::string ToJSON(bool multiline=false) const;
+ friend bool operator==(const GCP& lhs,const GCP& rhs)
+ {
+ return (lhs.m_GCPCol == rhs.m_GCPCol) && (lhs.m_GCPRow == rhs.m_GCPRow);
+ }
/** Keywordlist export */
void ToKeywordlist(MetaData::Keywordlist & kwl, const std::string & prefix) const;
diff --git a/Modules/Core/Metadata/include/otbNoDataHelper.h b/Modules/Core/Metadata/include/otbNoDataHelper.h
index 6250aa2d26042718bd3ffdbd18c100bf01d9e0ed..dcf638a7c08e1b5bb3edceb7e254f592c2a18f12 100644
--- a/Modules/Core/Metadata/include/otbNoDataHelper.h
+++ b/Modules/Core/Metadata/include/otbNoDataHelper.h
@@ -25,8 +25,8 @@
#include "vnl/vnl_math.h"
#include <itkVariableLengthVector.h>
#include "OTBMetadataExport.h"
-
#include "otbImageMetadata.h"
+#include "vcl_legacy_aliases.h"
namespace itk
{
diff --git a/Modules/Core/Metadata/src/otbImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbImageMetadataInterfaceFactory.cxx
index a7234c17d3ac7267d74dcba1f615f0bc6ae79084..336a93822bc45d33c0eb0513428601ed76c577a2 100644
--- a/Modules/Core/Metadata/src/otbImageMetadataInterfaceFactory.cxx
+++ b/Modules/Core/Metadata/src/otbImageMetadataInterfaceFactory.cxx
@@ -37,9 +37,7 @@
#include "otbSentinel1ImageMetadataInterfaceFactory.h"
#include "otbCosmoImageMetadataInterfaceFactory.h"
#include "otbRadarsat2ImageMetadataInterfaceFactory.h"
-
-#include "itkMutexLock.h"
-#include "itkMutexLockHolder.h"
+#include <mutex>
#include <iostream>
#include <iterator>
@@ -93,12 +91,11 @@ ImageMetadataInterfaceFactory
void ImageMetadataInterfaceFactory::RegisterBuiltInFactories()
{
static bool firstTime = true;
-
- static itk::SimpleMutexLock mutex;
- {
+ static std::mutex mutex;
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ std::lock_guard<std::mutex> mutexHolder(mutex);
if (firstTime)
{
itk::ObjectFactoryBase::RegisterFactory(IkonosImageMetadataInterfaceFactory::New());
diff --git a/Modules/Core/Metadata/src/otbOpticalImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbOpticalImageMetadataInterfaceFactory.cxx
index 00e680e359571fefed86ea20b7613e28eb98a56e..4c636847c79758bcf16c8285f74803acaa39de4e 100644
--- a/Modules/Core/Metadata/src/otbOpticalImageMetadataInterfaceFactory.cxx
+++ b/Modules/Core/Metadata/src/otbOpticalImageMetadataInterfaceFactory.cxx
@@ -30,9 +30,7 @@
#include "otbWorldView2ImageMetadataInterfaceFactory.h"
#include "otbPleiadesImageMetadataInterfaceFactory.h"
#include "otbSpot6ImageMetadataInterfaceFactory.h"
-
-#include "itkMutexLock.h"
-#include "itkMutexLockHolder.h"
+#include <mutex>
namespace otb
{
@@ -41,12 +39,11 @@ namespace otb
void OpticalImageMetadataInterfaceFactory::RegisterBuiltInFactories()
{
static bool firstTime = true;
-
- static itk::SimpleMutexLock mutex;
- {
+ static std::mutex mutex;
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ std::lock_guard<std::mutex> mutexHolder(mutex);
if (firstTime)
{
itk::ObjectFactoryBase::RegisterFactory(IkonosImageMetadataInterfaceFactory::New());
diff --git a/Modules/Core/Metadata/src/otbSarImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbSarImageMetadataInterfaceFactory.cxx
index ec05b395e8bb918dadc0dc6c61d7bb2b7b388c28..281d553900b6b681bc33c355e0fb179c4acfcf7d 100644
--- a/Modules/Core/Metadata/src/otbSarImageMetadataInterfaceFactory.cxx
+++ b/Modules/Core/Metadata/src/otbSarImageMetadataInterfaceFactory.cxx
@@ -27,9 +27,7 @@
#include "otbSentinel1ImageMetadataInterfaceFactory.h"
#include "otbCosmoImageMetadataInterfaceFactory.h"
#include "otbRadarsat2ImageMetadataInterfaceFactory.h"
-
-#include "itkMutexLock.h"
-#include "itkMutexLockHolder.h"
+#include <mutex>
namespace otb
{
@@ -74,12 +72,11 @@ SarImageMetadataInterfaceFactory
void SarImageMetadataInterfaceFactory::RegisterBuiltInFactories()
{
static bool firstTime = true;
-
- static itk::SimpleMutexLock mutex;
- {
+ static std::mutex mutex;
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ std::lock_guard<std::mutex> mutexHolder(mutex);
if (firstTime)
{
itk::ObjectFactoryBase::RegisterFactory(TerraSarXSarImageMetadataInterfaceFactory::New());
diff --git a/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.h b/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.h
index 3dec497cc06959fc320f9225f0b9c8e93a505031..dbf8050c073d7373445378771652519d4f1fb6aa 100644
--- a/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.h
+++ b/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.h
@@ -93,7 +93,7 @@ protected:
~RadiometricMomentsImageFilter() override
{
}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void GenerateInputRequestedRegion(void) override;
void GenerateOutputInformation(void) override;
diff --git a/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.hxx b/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.hxx
index fa7548376bac70ef553f4e7ca57e39d6a80687cc..0b7b1a7c57d8693e8bc7e06cd8149a71fe60e194 100644
--- a/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.hxx
+++ b/Modules/Core/Moments/include/otbRadiometricMomentsImageFilter.hxx
@@ -38,6 +38,7 @@ RadiometricMomentsImageFilter<TInputImage, TOutputImage>::RadiometricMomentsImag
{
this->SetNumberOfRequiredInputs(1);
m_Radius.Fill(1);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -100,8 +101,7 @@ void RadiometricMomentsImageFilter<TInputImage, TOutputImage>::GenerateOutputInf
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage, class TOutputImage>
-void RadiometricMomentsImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void RadiometricMomentsImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
@@ -127,9 +127,6 @@ void RadiometricMomentsImageFilter<TInputImage, TOutputImage>::ThreadedGenerateD
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType::iterator fit;
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
for (fit = faceList.begin(); fit != faceList.end(); ++fit)
@@ -146,7 +143,6 @@ void RadiometricMomentsImageFilter<TInputImage, TOutputImage>::ThreadedGenerateD
++neighInputIt;
++outputIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/Moments/test/otbRadiometricMomentsImageFilter.cxx b/Modules/Core/Moments/test/otbRadiometricMomentsImageFilter.cxx
index 0408f13943019a6c554ae91b84106295d052ab0c..69296ba0aa89f14ac7f5335e036afd502fcd5eba 100644
--- a/Modules/Core/Moments/test/otbRadiometricMomentsImageFilter.cxx
+++ b/Modules/Core/Moments/test/otbRadiometricMomentsImageFilter.cxx
@@ -47,7 +47,7 @@ int otbRadiometricMomentsImageFilter(int itkNotUsed(argc), char* argv[])
filter->SetInput(reader->GetOutput());
filter->SetRadius(atoi(argv[3]));
- filter->SetNumberOfThreads(1);
+ filter->SetNumberOfWorkUnits(1);
writer->SetFileName(argv[2]);
writer->SetInput(filter->GetOutput());
diff --git a/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.h b/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.h
index c7fff65f0e52992e63f9dda514066eef0c6bd715..bfc1d850018115533ad560bbcdd91a520688d3ff 100644
--- a/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.h
+++ b/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.h
@@ -127,7 +127,7 @@ protected:
}
/** Overridden methods */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
InternalValueType m_FeatheringTransitionDistance; // feathering transition
diff --git a/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.hxx b/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.hxx
index f4c9002de3c572b714c630a53eb14f59b6c5f567..9f873ddca406c56ef674be487cc188dd9c045d53 100644
--- a/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.hxx
+++ b/Modules/Core/Mosaic/include/otbStreamingFeatherMosaicFilter.hxx
@@ -38,16 +38,10 @@ StreamingFeatherMosaicFilter<TInputImage, TOutputImage, TDistanceImage, TInterna
* Processing
*/
template <class TInputImage, class TOutputImage, class TDistanceImage, class TInternalValueType>
-void StreamingFeatherMosaicFilter<TInputImage, TOutputImage, TDistanceImage, TInternalValueType>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void StreamingFeatherMosaicFilter<TInputImage, TOutputImage, TDistanceImage, TInternalValueType>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
- // Debug info
- itkDebugMacro(<< "Actually executing thread " << threadId << " in region " << outputRegionForThread);
-
- // Support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Get output pointer
OutputImageType* mosaicImage = this->GetOutput();
@@ -196,9 +190,6 @@ void StreamingFeatherMosaicFilter<TInputImage, TOutputImage, TDistanceImage, TIn
// Update output pixel value
outputIt.Set(outputPixel);
- // Update progress
- progress.CompletedPixel();
-
} // next output pixel
}
diff --git a/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h b/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h
index 0a00cc4c0b509a4297caf57910fca3f3f045911f..6c266a15ae54b706c6c9a6f0944580071ffaef1e 100644
--- a/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h
+++ b/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.h
@@ -116,7 +116,7 @@ protected:
}
/** Overridden method */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
}; // end of class
diff --git a/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.hxx b/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.hxx
index fab3e6c1b0f58775eb969b7415ade83c801ba093..3c4f2cf1cfc118246e6aee3acae902a52d30ae4c 100644
--- a/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.hxx
+++ b/Modules/Core/Mosaic/include/otbStreamingLargeFeatherMosaicFilter.hxx
@@ -31,16 +31,10 @@ namespace otb
* Processing
*/
template <class TInputImage, class TOutputImage, class TDistanceImage, class TInternalValueType>
-void StreamingLargeFeatherMosaicFilter<TInputImage, TOutputImage, TDistanceImage, TInternalValueType>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void StreamingLargeFeatherMosaicFilter<TInputImage, TOutputImage, TDistanceImage, TInternalValueType>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
- // Debug info
- itkDebugMacro(<< "Actually executing thread " << threadId << " in region " << outputRegionForThread);
-
- // Support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Get output pointer
OutputImageType* mosaicImage = this->GetOutput();
@@ -177,9 +171,6 @@ void StreamingLargeFeatherMosaicFilter<TInputImage, TOutputImage, TDistanceImage
// Update output pixel value
outputIt.Set(outputPixel);
- // Update progress
- progress.CompletedPixel();
-
} // next output pixel
}
diff --git a/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.h b/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.h
index e1fca6d2114d0b5e4589118058636f08ed82d54e..fc55a57cfe5a6789a5317190253fd52a80b01279 100644
--- a/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.h
+++ b/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.h
@@ -77,14 +77,13 @@ public:
protected:
StreamingSimpleMosaicFilter()
{
+ this->DynamicMultiThreadingOn();
}
- virtual ~StreamingSimpleMosaicFilter()
- {
- }
+ virtual ~StreamingSimpleMosaicFilter() = default;
/** Overridden methods */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
StreamingSimpleMosaicFilter(const Self&); // purposely not implemented
diff --git a/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.hxx b/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.hxx
index 8b287cf6bfd9c11c3b46fd179563b220758377a1..ea44bafe4ec394a9178ccf484e59a003b1c0604f 100644
--- a/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.hxx
+++ b/Modules/Core/Mosaic/include/otbStreamingSimpleMosaicFilter.hxx
@@ -31,16 +31,9 @@ namespace otb
* Processing
*/
template <class TInputImage, class TOutputImage, class TInternalValueType>
-void StreamingSimpleMosaicFilter<TInputImage, TOutputImage, TInternalValueType>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void StreamingSimpleMosaicFilter<TInputImage, TOutputImage, TInternalValueType>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
- // Debug info
- itkDebugMacro(<< "Actually executing thread " << threadId << " in region " << outputRegionForThread);
-
- // Support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Get output pointer
OutputImageType* mosaicImage = this->GetOutput();
@@ -112,9 +105,6 @@ void StreamingSimpleMosaicFilter<TInputImage, TOutputImage, TInternalValueType>:
// Update output pixel value
outputIt.Set(outputPixel);
- // Update progress
- progress.CompletedPixel();
-
} // next output pixel
}
diff --git a/Modules/Core/Mosaic/include/otbSummingFilter.h b/Modules/Core/Mosaic/include/otbSummingFilter.h
index 85060a90e4868bb7745ad803b1397f17be731d53..8e134e251147f3e91567b06b9ca78e32bd147379 100644
--- a/Modules/Core/Mosaic/include/otbSummingFilter.h
+++ b/Modules/Core/Mosaic/include/otbSummingFilter.h
@@ -80,6 +80,7 @@ public:
protected:
SummingFilter()
{
+ this->DynamicMultiThreadingOn();
}
virtual ~SummingFilter()
@@ -94,11 +95,11 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
/** Overridden methods */
- virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId);
+ virtual void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread);
virtual void GenerateOutputInformation(void);
diff --git a/Modules/Core/Mosaic/include/otbSummingFilter.hxx b/Modules/Core/Mosaic/include/otbSummingFilter.hxx
index c0972c9b471f1361e1ff14ed419bd28cd4ddd0d2..a82a2c8820f41fbb97696935fa74ad698be4aed8 100644
--- a/Modules/Core/Mosaic/include/otbSummingFilter.hxx
+++ b/Modules/Core/Mosaic/include/otbSummingFilter.hxx
@@ -42,15 +42,8 @@ void SummingFilter<TInputImage, TOutputImage>::GenerateOutputInformation(void)
* Processing.
*/
template <class TInputImage, class TOutputImage>
-void SummingFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void SummingFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
-
- // Debug info
- itkDebugMacro(<< "Actually executing thread " << threadId << " in region " << outputRegionForThread);
-
- // Support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Iterate through the thread region
OutputIteratorType outputIt(this->GetOutput(), outputRegionForThread);
@@ -83,9 +76,6 @@ void SummingFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const Output
++inputIt[i];
}
outputIt.Set(pix);
-
- // Update process
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.h b/Modules/Core/ObjectList/include/otbObjectListSource.h
index 02fccdb861af6f23422d75ce20fc613f64eedffb..63eb88c1089ad62b0ae1994893c882657ce274d6 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.h
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.h
@@ -190,7 +190,7 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void GenerateData(void) override;
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
index 7a1344695e4e5f36224e95dea1aa50c458bfdc61..1c88de1b28f8875665c384773612ff57f1fc3cbe 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
@@ -22,6 +22,8 @@
#define otbObjectListToObjectListFilter_h
#include "otbObjectListSource.h"
+#include "otbMacro.h" //for ITK_THREAD_RETURN_TYPE in ITK5
+#include "itkMultiThreaderBase.h"
namespace otb
{
@@ -105,7 +107,7 @@ protected:
/** Static function used as a "callback" by the MultiThreader. The threading
* library will call this routine for each thread, which will delegate the
* control to ThreadedGenerateData(). */
- static ITK_THREAD_RETURN_TYPE ThreaderCallback(void* arg);
+ static itk::ITK_THREAD_RETURN_TYPE ThreaderCallback(void *arg);
/** Internal structure used for passing image data into the threading library */
struct ThreadStruct
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
index 62e05279e6b7e540b1437eb3efbd5fc419fc1c20..1b6a5f8a22641db3d8548d9fa54d4617367c46ef 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
@@ -86,10 +86,10 @@ void ObjectListToObjectListFilter<TInputList, TOutputList>::GenerateData(void)
// Initializing object per thread
OutputListPointer defaultList;
- this->m_ObjectListPerThread = OutputListForThreadType(this->GetNumberOfThreads(), defaultList);
+ this->m_ObjectListPerThread = OutputListForThreadType(this->GetNumberOfWorkUnits(), defaultList);
// Setting up multithreader
- this->GetMultiThreader()->SetNumberOfThreads(this->GetNumberOfThreads());
+ this->GetMultiThreader()->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
this->GetMultiThreader()->SetSingleMethod(this->ThreaderCallback, &str);
// multithread the execution
@@ -122,16 +122,18 @@ void ObjectListToObjectListFilter<TInputList, TOutputList>::ThreadedGenerateData
}
template <class TInputList, class TOutputList>
-ITK_THREAD_RETURN_TYPE ObjectListToObjectListFilter<TInputList, TOutputList>::ThreaderCallback(void* arg)
+itk::ITK_THREAD_RETURN_TYPE
+ObjectListToObjectListFilter<TInputList, TOutputList>
+::ThreaderCallback(void *arg)
{
ThreadStruct* str;
itk::ThreadIdType threadId, threadCount;
unsigned int total, start, stop;
unsigned int requestedElements;
- threadId = ((itk::MultiThreader::ThreadInfoStruct*)(arg))->ThreadID;
- threadCount = ((itk::MultiThreader::ThreadInfoStruct*)(arg))->NumberOfThreads;
- str = (ThreadStruct*)(((itk::MultiThreader::ThreadInfoStruct*)(arg))->UserData);
+ threadId = ((itk::MultiThreaderBase::WorkUnitInfo *) (arg))->WorkUnitID;
+ threadCount = ((itk::MultiThreaderBase::WorkUnitInfo *) (arg))->NumberOfWorkUnits;
+ str = (ThreadStruct *) (((itk::MultiThreaderBase::WorkUnitInfo *) (arg))->UserData);
requestedElements = str->Filter->GetInput()->Size();
total = str->Filter->SplitRequestedRegion(threadId, threadCount, requestedElements, start, stop);
@@ -153,7 +155,7 @@ ITK_THREAD_RETURN_TYPE ObjectListToObjectListFilter<TInputList, TOutputList>::Th
// few threads idle.
// }
- return ITK_THREAD_RETURN_VALUE;
+ return itk::ITK_THREAD_RETURN_DEFAULT_VALUE;
}
/**
diff --git a/Modules/Core/OpticalCalibration/include/otbImageToRadianceImageFilter.h b/Modules/Core/OpticalCalibration/include/otbImageToRadianceImageFilter.h
index 8ca264479587d71aa75b84ab5479a6d74de73c67..3ca4853ba8197f615d9ab1d5f32df88818fdcfc5 100644
--- a/Modules/Core/OpticalCalibration/include/otbImageToRadianceImageFilter.h
+++ b/Modules/Core/OpticalCalibration/include/otbImageToRadianceImageFilter.h
@@ -158,7 +158,8 @@ public:
protected:
/** Constructor */
ImageToRadianceImageFilter()
- {
+ {
+
m_Alpha.SetSize(0);
m_Beta.SetSize(0);
};
diff --git a/Modules/Core/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h b/Modules/Core/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
index edf96b4af57a2336384465c7c7f2d969f3d21461..e3d317bde994eca217db8dcaf996079505b001ef 100644
--- a/Modules/Core/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
+++ b/Modules/Core/OpticalCalibration/include/otbRadianceToReflectanceImageFilter.h
@@ -239,16 +239,17 @@ public:
protected:
/** Constructor */
- RadianceToReflectanceImageFilter()
- : m_ZenithalSolarAngle(120.0), // invalid value which will lead to negative radiometry
- m_FluxNormalizationCoefficient(1.),
- m_Day(0),
- m_Month(0),
- m_SolarDistance(1.0),
- m_IsSetFluxNormalizationCoefficient(false),
- m_IsSetSolarDistance(false),
- m_UseClamp(true)
- {
+ RadianceToReflectanceImageFilter() :
+ m_ZenithalSolarAngle(120.0), //invalid value which will lead to negative radiometry
+ m_FluxNormalizationCoefficient(1.),
+ m_Day(0),
+ m_Month(0),
+ m_SolarDistance(1.0),
+ m_IsSetFluxNormalizationCoefficient(false),
+ m_IsSetSolarDistance(false),
+ m_UseClamp(true)
+ {
+
m_SolarIllumination.SetSize(0);
};
diff --git a/Modules/Core/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h b/Modules/Core/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
index 2dcabc63f857c06c4f1f10e31343e3f3eef7c83b..7c366077d3430f7b2f17d9528113c134bce5ae01 100644
--- a/Modules/Core/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
+++ b/Modules/Core/OpticalCalibration/include/otbReflectanceToRadianceImageFilter.h
@@ -223,15 +223,16 @@ public:
protected:
/** Constructor */
- ReflectanceToRadianceImageFilter()
- : m_ZenithalSolarAngle(120.0), // invalid value which will lead to negative radiometry
- m_FluxNormalizationCoefficient(1.),
- m_Day(0),
- m_Month(0),
- m_SolarDistance(1.0),
- m_IsSetFluxNormalizationCoefficient(false),
- m_IsSetSolarDistance(false)
- {
+ ReflectanceToRadianceImageFilter() :
+ m_ZenithalSolarAngle(120.0), //invalid value which will lead to negative radiometry
+ m_FluxNormalizationCoefficient(1.),
+ m_Day(0),
+ m_Month(0),
+ m_SolarDistance(1.0),
+ m_IsSetFluxNormalizationCoefficient(false),
+ m_IsSetSolarDistance(false)
+ {
+
m_SolarIllumination.SetSize(0);
};
diff --git a/Modules/Core/Path/include/otbCompacityPathFunction.hxx b/Modules/Core/Path/include/otbCompacityPathFunction.hxx
index b6af0e1cb6ff7ac4b686e0b6714c62124a2a54ec..c065831c06d6c241f1bef801b06b43d0db07bbd0 100644
--- a/Modules/Core/Path/include/otbCompacityPathFunction.hxx
+++ b/Modules/Core/Path/include/otbCompacityPathFunction.hxx
@@ -40,7 +40,6 @@ typename CompacityPathFunction<TInputPath, TOutput>::OutputType CompacityPathFun
{
VertexListPointer vertexList;
VertexType cindex;
- VertexType IndexOut;
int nbPath;
RealType Surface = 0.0;
RealType Perimeter = 0.0;
diff --git a/Modules/Core/Path/include/otbOrientationPathFunction.hxx b/Modules/Core/Path/include/otbOrientationPathFunction.hxx
index c6294b638389ccc9645e656284371786d374e064..2b894ef90cef4c269686e0da52635a9766e5c80d 100644
--- a/Modules/Core/Path/include/otbOrientationPathFunction.hxx
+++ b/Modules/Core/Path/include/otbOrientationPathFunction.hxx
@@ -41,7 +41,6 @@ typename OrientationPathFunction<TInputPath, TOutput>::OutputType OrientationPat
{
VertexListPointer vertexList;
VertexType cindex;
- VertexType IndexOut;
int nbPath;
RealType Theta;
diff --git a/Modules/Core/Path/test/otbImageFittingPolygonListFilter.cxx b/Modules/Core/Path/test/otbImageFittingPolygonListFilter.cxx
index 2d39ac4a552c03f4de87f3d39415da7c2b8c3685..1828d61881aa5285c8e332588ca55bbc29e4884b 100644
--- a/Modules/Core/Path/test/otbImageFittingPolygonListFilter.cxx
+++ b/Modules/Core/Path/test/otbImageFittingPolygonListFilter.cxx
@@ -54,8 +54,6 @@ int otbImageFittingPolygonListFilter(int itkNotUsed(argc), char* argv[])
// Read the original polygon list (kml file)
typedef otb::VectorData<> VectorDataType;
- typedef VectorDataType::DataTreeType DataTreeType;
- typedef itk::PreOrderTreeIterator<DataTreeType> TreeIteratorType;
typedef VectorDataType::DataNodeType DataNodeType;
typedef DataNodeType::Pointer DataNodePointerType;
typedef otb::VectorDataFileReader<VectorDataType> VectorDataFileReaderType;
@@ -68,12 +66,12 @@ int otbImageFittingPolygonListFilter(int itkNotUsed(argc), char* argv[])
typedef otb::ObjectList<PolygonType> PolygonListType;
PolygonListType::Pointer polygonList = PolygonListType::New();
- TreeIteratorType it(readerVector->GetOutput()->GetDataTree());
- it.GoToBegin();
+ auto itPair = readerVector->GetOutput()->GetIteratorPair();
+ auto it = itPair.first;
- while (!it.IsAtEnd())
+ while (it != itPair.second)
{
- DataNodePointerType dataNode = it.Get();
+ DataNodePointerType dataNode = readerVector->GetOutput()->Get(it);
if (dataNode->IsPolygonFeature())
{
polygonList->PushBack(dataNode->GetPolygonExteriorRing());
@@ -103,10 +101,10 @@ int otbImageFittingPolygonListFilter(int itkNotUsed(argc), char* argv[])
document->SetNodeId("DOCUMENT");
folder->SetNodeId("FOLDER");
- DataNodeType::Pointer root = data->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = data->GetRoot();
- data->GetDataTree()->Add(document, root);
- data->GetDataTree()->Add(folder, document);
+ data->Add(document, root);
+ data->Add(folder, document);
typedef PolygonListType::ConstIterator ListIteratorType;
ListIteratorType listIt = fittingPolygon->GetOutput()->Begin();
@@ -116,7 +114,7 @@ int otbImageFittingPolygonListFilter(int itkNotUsed(argc), char* argv[])
polygon->SetNodeType(otb::FEATURE_POLYGON);
polygon->SetNodeId("FEATURE_POLYGON");
polygon->SetPolygonExteriorRing(listIt.Get());
- data->GetDataTree()->Add(polygon, folder);
+ data->Add(polygon, folder);
++listIt;
}
diff --git a/Modules/Core/Path/test/otbImageToEdgePathFilter.cxx b/Modules/Core/Path/test/otbImageToEdgePathFilter.cxx
index 34f2e056b5247ed6abc85143a6f81a92f9622c1f..8624579b530675eb1b0ef6563fd3a1ca6250975c 100644
--- a/Modules/Core/Path/test/otbImageToEdgePathFilter.cxx
+++ b/Modules/Core/Path/test/otbImageToEdgePathFilter.cxx
@@ -64,7 +64,6 @@ int otbImageToEdgePathFilter(int itkNotUsed(argc), char* argv[])
typedef VertexListType::ConstPointer VertexListTypePointer;
VertexListTypePointer vertexList;
- VertexType cindex;
VertexListTypePointer ptrVertexList = outputPath->GetVertexList();
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
index ccc811ea88861ea222352b405f62ff3ff0faa3c1..4a06b2ceebd5348ce6f617ec36587d3b9f973d81 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
@@ -105,7 +105,7 @@ protected:
/** Static function used as a "callback" by the MultiThreader. The threading
* library will call this routine for each thread, which will delegate the
* control to ThreadedGenerateData(). */
- static ITK_THREAD_RETURN_TYPE ThreaderCallback(void* arg);
+ static itk::ITK_THREAD_RETURN_TYPE ThreaderCallback(void *arg);
/** Internal structure used for passing image data into the threading library */
struct ThreadStruct
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
index 7be61111ee795aef682f4ef85ac18b3b3bbbe886..e1fefc1397500fc1d094a878ea39a666b94c5c8b 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
@@ -22,6 +22,7 @@
#define otbImageToPointSetFilter_hxx
#include "otbImageToPointSetFilter.h"
+#include "itkMultiThreaderBase.h"
namespace otb
{
@@ -160,13 +161,13 @@ void ImageToPointSetFilter<TInputImage, TOutputPointSet>::GenerateData(void)
// Initializing object per thread
typename PointsContainerType::Pointer defaultPointsContainer = PointsContainerType::New();
- this->m_PointsContainerPerThread = OutputPointsContainerForThreadType(this->GetNumberOfThreads(), defaultPointsContainer);
+ this->m_PointsContainerPerThread = OutputPointsContainerForThreadType(this->GetNumberOfWorkUnits(), defaultPointsContainer);
typename PointDataContainerType::Pointer defaultPointDataContainer = PointDataContainerType::New();
- this->m_PointDataContainerPerThread = OutputPointDataContainerForThreadType(this->GetNumberOfThreads(), defaultPointDataContainer);
+ this->m_PointDataContainerPerThread = OutputPointDataContainerForThreadType(this->GetNumberOfWorkUnits(), defaultPointDataContainer);
// Setting up multithreader
- this->GetMultiThreader()->SetNumberOfThreads(this->GetNumberOfThreads());
+ this->GetMultiThreader()->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
this->GetMultiThreader()->SetSingleMethod(this->ThreaderCallback, &str);
// multithread the execution
@@ -235,15 +236,17 @@ void ImageToPointSetFilter<TInputImage, TOutputPointSet>::ThreadedGenerateData(c
}
template <class TInputImage, class TOutputPointSet>
-ITK_THREAD_RETURN_TYPE ImageToPointSetFilter<TInputImage, TOutputPointSet>::ThreaderCallback(void* arg)
+itk::ITK_THREAD_RETURN_TYPE
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
+::ThreaderCallback(void *arg)
{
ThreadStruct* str;
unsigned int total, threadCount;
itk::ThreadIdType threadId;
- threadId = ((itk::MultiThreader::ThreadInfoStruct*)(arg))->ThreadID;
- threadCount = ((itk::MultiThreader::ThreadInfoStruct*)(arg))->NumberOfThreads;
- str = (ThreadStruct*)(((itk::MultiThreader::ThreadInfoStruct*)(arg))->UserData);
+ threadId = ((itk::MultiThreaderBase::WorkUnitInfo *) (arg))->WorkUnitID;
+ threadCount = ((itk::MultiThreaderBase::WorkUnitInfo *) (arg))->NumberOfWorkUnits;
+ str = (ThreadStruct *) (((itk::MultiThreaderBase::WorkUnitInfo *) (arg))->UserData);
// execute the actual method with appropriate output region
// first find out how many pieces extent can be split into.
@@ -261,7 +264,7 @@ ITK_THREAD_RETURN_TYPE ImageToPointSetFilter<TInputImage, TOutputPointSet>::Thre
// few threads idle.
// }
- return ITK_THREAD_RETURN_VALUE;
+ return itk::ITK_THREAD_RETURN_DEFAULT_VALUE;
}
template <class TInputImage, class TOutputPointSet>
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.h b/Modules/Core/PointSet/include/otbPointSetFunction.h
index b6738c1a9176c22ca9a387ef5d25d444e28733b2..d8fd461d318fcfcc28262b621c6e0c741acb3a3b 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.h
@@ -47,22 +47,22 @@ public:
itkTypeMacro(PointSetFunction, itk::SpatialFunction);
/** PointSet Type typedef Support*/
- typedef TPointSet PointSetType;
- typedef typename PointSetType::ConstPointer PointSetPointerType;
-
- /** TOutput typedef suppoty*/
+ typedef TPointSet PointSetType;
+ typedef typename PointSetType::Pointer PointSetPointer;
+ typedef typename PointSetType::ConstPointer PointSetConstPointer;
+ /** TOutput typedef support*/
typedef TOutput OutputType;
/** Set the input image (reimplemented since we need to set the detector input) */
itkGetConstObjectMacro(PointSet, PointSetType);
- void SetPointSet(PointSetType* PointSet)
+ void SetPointSet(PointSetPointer PointSet)
{
m_PointSet = PointSet;
}
/** SetPointSet() to maintain the const correctness of the pointset*/
- void SetPointSet(PointSetPointerType PointSet)
+ void SetPointSet(PointSetConstPointer PointSet)
{
m_PointSet = PointSet;
}
@@ -79,7 +79,8 @@ private:
PointSetFunction(const Self&) = delete;
void operator=(const Self&) = delete;
- PointSetPointerType m_PointSet;
+ PointSetConstPointer m_PointSet;
+
};
} // end namespace otb
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
index 2b5ad66201093dd0d7abb3b3c8ad90aa84cebf4c..23ca762b5b7c24566c9488d0975ef909c3c9eb2f 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
@@ -24,8 +24,6 @@
#include "otbThresholdImageToPointSetFilter.h"
#include "itkImageRegionConstIterator.h"
-#include "itkProgressReporter.h"
-#include "otbMacro.h"
namespace otb
{
diff --git a/Modules/Core/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx b/Modules/Core/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
index 5fd83e467bc09374b8d3ff61ed989ad58ce6ed1b..58ff5f0db8c16dc1d9f31a4f53ae02a2c420fd8c 100644
--- a/Modules/Core/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
+++ b/Modules/Core/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
@@ -223,7 +223,7 @@ void GCPsToRPCSensorModelImageFilter<TImage>::ComputeErrors()
rsTransform->InstantiateTransform();
- double sum = 0.;
+ double sum = 0.;
m_MeanError = 0.;
// Clear Error container
@@ -235,11 +235,6 @@ void GCPsToRPCSensorModelImageFilter<TImage>::ComputeErrors()
const auto & sensorPoint = m_GCPsContainer[i].first;
const auto & groundPoint = m_GCPsContainer[i].second;
- // Compute Transform
- Point3DType groundPointTemp, sensorPointTemp;
- sensorPointTemp[0] = sensorPoint[0];
- sensorPointTemp[1] = sensorPoint[1];
-
auto outPoint = rsTransform->TransformPoint(sensorPoint);
Point2DType groundPoint2D;
diff --git a/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.h b/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.h
index 66d83223ca6093ec143c835ea94e692705965280..f7e8595b38e4ec44f781aced2dd6642963d49116 100644
--- a/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.h
+++ b/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.h
@@ -66,8 +66,7 @@ public:
typedef typename InternalTransformType::Pointer InternalTransformPointerType;
typedef typename OutputVectorDataType::DataNodeType OutputDataNodeType;
typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
- typedef typename OutputVectorDataType::DataTreePointerType OutputDataTreePointerType;
- typedef typename OutputVectorDataType::DataTreeType::TreeNodeType OutputInternalTreeNodeType;
+ typedef typename OutputVectorDataType::TreeNodeType OutputInternalTreeNodeType;
typedef typename OutputDataNodeType::PolygonType PolygonType;
/** Set input image */
diff --git a/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx b/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
index b9794bc4e464084f1f7169b173b9f6c55584823a..a0b098e0e3087c3ed89bd81bc1bfbbf3681535f4 100644
--- a/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
+++ b/Modules/Core/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
@@ -223,21 +223,14 @@ void ImageToEnvelopeVectorDataFilter<TInputImage, TOutputVectorData>::GenerateDa
edgeIndex[1] -= m_SamplingRate;
}
}
-
- // Add polygon to the VectorData tree
- OutputDataTreePointerType tree = outputPtr->GetDataTree();
-
- // Create the output tree root
- OutputDataNodePointerType root = tree->GetRoot()->Get();
-
OutputDataNodePointerType document = OutputDataNodeType::New();
document->SetNodeType(DOCUMENT);
- tree->Add(document, root);
+ outputPtr->Add(document, outputPtr->GetRoot());
OutputDataNodePointerType newDataNode = OutputDataNodeType::New();
newDataNode->SetPolygonExteriorRing(envelope);
- tree->Add(newDataNode, document);
+ outputPtr->Add(newDataNode, document);
}
} // end namespace otb
diff --git a/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h
index 0fdc5996ccb7de028fa1e598c3a29032c71a67f4..f7923c01903c796d369a90ad6bf92867b344f816 100644
--- a/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h
+++ b/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h
@@ -90,13 +90,9 @@ protected:
/** Generate output information */
void GenerateOutputInformation(void) override;
- /** Override VerifyInputInformation() since this filter's inputs do
- * not need to occupy the same physical space.
- *
- * \sa ProcessObject::VerifyInputInformation
- */
- void VerifyInputInformation() override
+ void VerifyInputInformation() const override
{
+
}
private:
diff --git a/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.h b/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.h
index d037d304fb0c06e68fb0c0d06a80b21e00e910b2..c5d6e52cb59b175c699475d0b21a4a26b9c4ea63 100644
--- a/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.h
+++ b/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.h
@@ -64,9 +64,6 @@ public:
typedef itk::Vector<double, 2> SpacingType;
typedef itk::Point<double, 2> OriginType;
- // use to display vectordata
- typedef itk::PreOrderTreeIterator<typename InputVectorDataType::DataTreeType> TreeIteratorType;
-
/** Method for creation through the object factory. */
itkNewMacro(Self);
diff --git a/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx b/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
index b41e9d9aec195a22ebca46727654e5f1a0d5ec48..b691acb32264a5d0ce0aba1d693fddf12b9a4f08 100644
--- a/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
+++ b/Modules/Core/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
@@ -196,25 +196,6 @@ void VectorDataIntoImageProjectionFilter<TInputVectorData, TInputImage>::Generat
m_VdProjFilter->Update();
- /*
- TreeIteratorType itVector(m_VdProjFilter->GetOutput()->GetDataTree());
- itVector.GoToBegin();
- while (!itVector.IsAtEnd())
- {
- if (itVector.Get()->IsPolygonFeature())
- {
- std::cout << "----------\n" <<itVector.Get()->GetNodeTypeAsString() << std::endl;
- std::cout << "List of vertices: " << ": " <<std::endl;
- for (unsigned int itPoints = 0; itPoints < itVector.Get()->GetPolygonExteriorRing()->GetVertexList()->Size(); itPoints++)
- {
- std::cout << "vertex[" << itPoints << "]: " << itVector.Get()->GetPolygonExteriorRing()->GetVertexList()->GetElement(itPoints) <<std::endl;
- }
- std::cout << "Polygon region: " << itVector.Get()->GetPolygonExteriorRing()->GetBoundingRegion() << std::endl;
- }
- ++itVector;
- }
- */
-
if (m_UseOutputSpacingAndOriginFromImage)
{
m_VdProjFilter->GetOutput()->SetProjectionRef("");
diff --git a/Modules/Core/Projection/include/otbVectorDataProjectionFilter.h b/Modules/Core/Projection/include/otbVectorDataProjectionFilter.h
index 89f693dde77287d9fccdde1ee835f1963a9a9b78..e236fb49e9997cf8417561ab4b6e53933d9f30c5 100644
--- a/Modules/Core/Projection/include/otbVectorDataProjectionFilter.h
+++ b/Modules/Core/Projection/include/otbVectorDataProjectionFilter.h
@@ -92,8 +92,8 @@ public:
typedef typename OutputVectorDataType::DataNodeType OutputDataNodeType;
typedef typename InputVectorDataType::DataNodeType InputDataNodeType;
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InputInternalTreeNodeType;
- typedef typename OutputVectorDataType::DataTreeType::TreeNodeType OutputInternalTreeNodeType;
+ typedef typename InputVectorDataType::TreeNodeType InputInternalTreeNodeType;
+ typedef typename OutputVectorDataType::TreeNodeType OutputInternalTreeNodeType;
typedef typename InputDataNodeType::PointType InputPointType;
typedef typename InputDataNodeType::LineType InputLineType;
diff --git a/Modules/Core/Projection/include/otbVectorDataProjectionFilter.hxx b/Modules/Core/Projection/include/otbVectorDataProjectionFilter.hxx
index baf667f2bd1dbb2d63161707cea2d0cd29db0fd6..fc84ef6880c664f2033982f4155b3a4987b42c87 100644
--- a/Modules/Core/Projection/include/otbVectorDataProjectionFilter.hxx
+++ b/Modules/Core/Projection/include/otbVectorDataProjectionFilter.hxx
@@ -290,24 +290,16 @@ void VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>::GenerateDa
// Instantiate the transform
this->InstantiateTransform();
- typedef typename OutputVectorDataType::DataTreePointerType OutputDataTreePointerType;
- OutputDataTreePointerType tree = outputPtr->GetDataTree();
-
- // Get the input tree root
- InputInternalTreeNodeType* inputRoot = const_cast<InputInternalTreeNodeType*>(inputPtr->GetDataTree()->GetRoot());
-
// Create the output tree root
- typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
- OutputDataNodePointerType newDataNode = OutputDataNodeType::New();
- newDataNode->SetNodeType(inputRoot->Get()->GetNodeType());
- newDataNode->SetNodeId(inputRoot->Get()->GetNodeId());
- typename OutputInternalTreeNodeType::Pointer outputRoot = OutputInternalTreeNodeType::New();
- outputRoot->Set(newDataNode);
- tree->SetRoot(outputRoot);
+ // typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
+ // OutputDataNodePointerType outputRoot = OutputDataNodeType::New();
+ // outputRoot->SetNodeType(inputPtr->GetRoot()->GetNodeType());
+ // outputRoot->SetNodeId(inputPtr->GetRoot()->GetNodeId());
+ // outputPtr->SetRoot(outputRoot);
// Start recursive processing
otb::Stopwatch chrono = otb::Stopwatch::StartNew();
- this->ProcessNode(inputRoot, outputRoot);
+ this->ProcessNode(inputPtr,inputPtr->GetRoot(),outputPtr,outputPtr->GetRoot());
chrono.Stop();
otbMsgDevMacro(<< "VectoDataProjectionFilter: features processed in " << chrono.GetElapsedMilliseconds() << " ms.");
}
diff --git a/Modules/Core/Projection/include/otbVectorDataTransformFilter.h b/Modules/Core/Projection/include/otbVectorDataTransformFilter.h
index f7973e77de9e46c377840cbe84a327d25e0d56a6..e0d3726a2ae1172922bcb429979d70a67b6f9871 100644
--- a/Modules/Core/Projection/include/otbVectorDataTransformFilter.h
+++ b/Modules/Core/Projection/include/otbVectorDataTransformFilter.h
@@ -66,11 +66,10 @@ public:
typedef typename InputVectorDataType::DataNodePointerType InputDataNodePointerType;
typedef typename OutputVectorDataType::DataNodeType OutputDataNodeType;
typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
- typedef typename OutputVectorDataType::DataTreePointerType OutputDataTreePointerType;
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InputInternalTreeNodeType;
- typedef typename OutputVectorDataType::DataTreeType::TreeNodeType OutputInternalTreeNodeType;
- typedef typename InputInternalTreeNodeType::ChildrenListType InputChildrenListType;
+ typedef typename InputVectorDataType::TreeNodeType InputInternalTreeNodeType;
+ typedef typename OutputVectorDataType::TreeNodeType OutputInternalTreeNodeType;
+ typedef typename InputVectorDataType::ChildrenListType InputChildrenListType;
typedef typename OutputDataNodeType::PointType PointType;
diff --git a/Modules/Core/Projection/include/otbVectorDataTransformFilter.hxx b/Modules/Core/Projection/include/otbVectorDataTransformFilter.hxx
index f5979ac98e783de9e3651f1d575436eb37c2e3f9..3d0104b9b3c0a67239d37075ae5923f1d3e4af24 100644
--- a/Modules/Core/Projection/include/otbVectorDataTransformFilter.hxx
+++ b/Modules/Core/Projection/include/otbVectorDataTransformFilter.hxx
@@ -25,6 +25,7 @@
#include "itkProgressReporter.h"
#include <itkContinuousIndex.h>
#include "otbStopwatch.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
@@ -141,22 +142,16 @@ void VectorDataTransformFilter<TInputVectorData, TOutputVectorData>::GenerateDat
OutputVectorDataPointer outputPtr = this->GetOutput();
outputPtr->SetProjectionRef(inputPtr->GetProjectionRef());
- OutputDataTreePointerType tree = outputPtr->GetDataTree();
- // Get the input tree root
- InputInternalTreeNodeType* inputRoot = const_cast<InputInternalTreeNodeType*>(inputPtr->GetDataTree()->GetRoot());
-
- // Create the output tree root
- OutputDataNodePointerType newDataNode = OutputDataNodeType::New();
- newDataNode->SetNodeType(inputRoot->Get()->GetNodeType());
- newDataNode->SetNodeId(inputRoot->Get()->GetNodeId());
- typename OutputInternalTreeNodeType::Pointer outputRoot = OutputInternalTreeNodeType::New();
- outputRoot->Set(newDataNode);
- tree->SetRoot(outputRoot);
+ // // Create the output tree root
+ // OutputDataNodePointerType newDataNode = OutputDataNodeType::New();
+ // newDataNode->SetNodeType(inputPtr->GetRoot()->GetNodeType());
+ // newDataNode->SetNodeId(inputPtr->GetRoot()->GetNodeId());
+ // outputPtr->SetRoot(newDataNode);
// Start recursive processing
otb::Stopwatch chrono = otb::Stopwatch::StartNew();
- this->ProcessNode(inputRoot, outputRoot);
+ this->ProcessNode(inputPtr,inputPtr->GetRoot(),outputPtr,outputPtr->GetRoot());
chrono.Stop();
otbMsgDevMacro(<< "VectorDataTransformFilter: features processed in " << chrono.GetElapsedMilliseconds() << " ms.");
}
diff --git a/Modules/Core/Projection/test/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx b/Modules/Core/Projection/test/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
index d24f09ce66d54810655ea8057c1022a45cbf5cf2..0305400dcdbbc373cbc23b2ce1ee9d7439c39aae 100644
--- a/Modules/Core/Projection/test/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
+++ b/Modules/Core/Projection/test/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
@@ -25,8 +25,9 @@
#include "otbGeographicalDistance.h"
#include "otbMacro.h"
#include <string>
+#include "vcl_legacy_aliases.h"
-int otbGCPsToRPCSensorModelImageFilterCheckRpcModel(int argc, char* argv[])
+int otbGCPsToRPCSensorModelImageFilterCheckRpcModel(int argc, char * argv[])
{
// Look for tolerance value
std::string s_tol = argv[argc - 1]; // last argument
diff --git a/Modules/Core/Projection/test/otbVectorDataIntoImageProjectionFilterTest.cxx b/Modules/Core/Projection/test/otbVectorDataIntoImageProjectionFilterTest.cxx
index e6a4b1e5ee49f6c16d612529171fd1808449011c..b7af6ad12e21da7c9a4fd66d40c6bb19a480e8ca 100644
--- a/Modules/Core/Projection/test/otbVectorDataIntoImageProjectionFilterTest.cxx
+++ b/Modules/Core/Projection/test/otbVectorDataIntoImageProjectionFilterTest.cxx
@@ -32,72 +32,6 @@
#include "otbVectorDataIntoImageProjectionFilter.h"
-/*
-* Tests prTvVectorDataIntoImageProjectionFilterTest_2 and
-* prTvVectorDataIntoImageProjectionFilterTest_4 failed because of the bug http://bugs.orfeo-toolbox.org/view.php?id=333.
-*/
-
-/*int otbVectorDataIntoImageProjectionFilterTest(int itkNotUsed(argc), char * argv[])
-{
- typedef float PixelType;
- typedef otb::VectorImage<PixelType, 2> VectorImageType;
- typedef otb::ImageFileReader<VectorImageType> ReaderType;
-
- // Vector Data
- typedef otb::VectorData<> VectorDataType;
- typedef otb::VectorDataFileReader<VectorDataType> VectorDataReaderType;
-
- typedef otb::VectorDataIntoImageProjectionFilter
- <VectorDataType, VectorImageType> VectorDataIntoImageProjectionFilterType;
-
- std::string imageInputFilename = argv[1];
- std::string vectorDataInputFilename = argv[2];
- std::string demDirectory = argv[3];
- int expectedFeatures = atoi(argv[4]);
-
- otb::DEMHandler::Instance()->OpenDEMDirectory(demDirectory);
-
- // Read the image
- ReaderType::Pointer reader = ReaderType::New();
- reader->SetFileName(imageInputFilename);
- reader->UpdateOutputInformation();
-
- // Read the Vector Data
- VectorDataReaderType::Pointer vdReader = VectorDataReaderType::New();
- vdReader->SetFileName(vectorDataInputFilename);
- vdReader->Update();
-
- VectorDataIntoImageProjectionFilterType::Pointer vdReProjFilter
- = VectorDataIntoImageProjectionFilterType::New();
- vdReProjFilter->SetInputImage(reader->GetOutput());
- vdReProjFilter->SetInputVectorData(vdReader->GetOutput());
- vdReProjFilter->Update();
-
- int nbElem = 0;
- typedef itk::PreOrderTreeIterator<VectorDataType::DataTreeType> TreeIteratorType;
- TreeIteratorType itVector(vdReProjFilter->GetOutput()->GetDataTree());
- itVector.GoToBegin();
- while (!itVector.IsAtEnd())
- {
- if ( !itVector.Get()->IsRoot()
- && !itVector.Get()->IsFolder()
- && !itVector.Get()->IsDocument())
- {
- nbElem++;
- }
- ++itVector;
- }
-
- if (nbElem != expectedFeatures)
- {
- std::cerr << "Kept " << nbElem << " features, but expected " << expectedFeatures << std::endl;
- return EXIT_FAILURE;
- }
-
- return EXIT_SUCCESS;
-}*/
-
-
int otbVectorDataIntoImageProjectionFilterCompareImplTest(int itkNotUsed(argc), char* argv[])
{
typedef float PixelType;
diff --git a/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.h b/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.h
index b87fe7851500643e04af63c194cf26ca8f78703e..7c53975cb7c9eeeb1bddbdf068572fcfc5b7b62f 100644
--- a/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.h
+++ b/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.h
@@ -104,7 +104,7 @@ protected:
/** Destructor */
~NLMeansFilter() override = default;
- void ThreadedGenerateData(const OutRegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId)) override;
+ void DynamicThreadedGenerateData(const OutRegionType& outputRegionForThread) override;
void GenerateInputRequestedRegion() override;
diff --git a/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.hxx b/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.hxx
index 3e79ed40c6ed7f6a3510138adcfdb6f2331446b4..ca507f59b15a2c4d2c915a61eaa4c201572a39e1 100644
--- a/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.hxx
+++ b/Modules/Core/Smoothing/include/otbFastNLMeansImageFilter.hxx
@@ -120,9 +120,8 @@ namespace otb
template<class TInputImage, class TOutputImage>
void
- NLMeansFilter<TInputImage, TOutputImage>::ThreadedGenerateData
- (const OutRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+ NLMeansFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData
+ (const OutRegionType& outputRegionForThread)
{
InImageConstPointerType inputPtr = this->GetInput();
auto regionAndMirror = OutputRegionToInputRegion(outputRegionForThread);
diff --git a/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.h b/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
index 141d2f9092a16d71fa596acdac916de0fead087c..51402de3ac5f0ee93c6b98df3f822dd08e45dbe9 100644
--- a/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
+++ b/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
@@ -588,7 +588,7 @@ protected:
* write to the portion of the output image specified by the
* parameter "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
diff --git a/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx b/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
index a19f864338fdd48224e0f7128326a210b6e1fb7b..64121d71d365826219e358f98df60a57a764d33e 100644
--- a/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
+++ b/Modules/Core/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
@@ -53,6 +53,7 @@ MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIterati
, m_BucketOptimization(false)
#endif
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfRequiredOutputs(4);
this->SetNthOutput(0, OutputImageType::New());
this->SetNthOutput(1, OutputSpatialImageType::New());
@@ -326,7 +327,7 @@ void MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIt
// Id.
unsigned int numThreads;
- numThreads = this->GetNumberOfThreads();
+ numThreads = this->GetNumberOfWorkUnits();
m_ThreadIdNumberOfBits = -1;
unsigned int n = numThreads;
while (n != 0)
@@ -781,9 +782,9 @@ void MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TKernel, TOutputIt
// New labels will be consecutive. The following vector contains the new
// start label for each thread.
itk::VariableLengthVector<LabelType> newLabelOffset;
- newLabelOffset.SetSize(this->GetNumberOfThreads());
+ newLabelOffset.SetSize(this->GetNumberOfWorkUnits());
newLabelOffset[0] = 0;
- for (itk::ThreadIdType i = 1; i < this->GetNumberOfThreads(); i++)
+ for (itk::ThreadIdType i = 1; i < this->GetNumberOfWorkUnits(); i++)
{
// Retrieve the number of labels in the thread by removing the threadId
// from the most significant bits
diff --git a/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilter.cxx b/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilter.cxx
index e1d19adf27dcc9ff47f281e2c0d7c4e968a393fb..598829a557ef4aa436d56355e77ac927704f91f0 100644
--- a/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilter.cxx
+++ b/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilter.cxx
@@ -76,7 +76,7 @@ int otbMeanShiftSmoothingImageFilter(int argc, char* argv[])
filter->SetMaxIterationNumber(maxiterationnumber);
filter->SetInput(reader->GetOutput());
filter->SetModeSearch(usemodesearch);
- // filter->SetNumberOfThreads(1);
+ // filter->SetNumberOfWorkUnits(1);
SpatialWriterType::Pointer writer1 = SpatialWriterType::New();
WriterType::Pointer writer2 = WriterType::New();
IterationWriterType::Pointer writer4 = IterationWriterType::New();
diff --git a/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilterThreading.cxx b/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilterThreading.cxx
index d8a82ee720bf0f064766bdd6d276772d369e15b8..99c2d08be57f0ff85e99a71942c552a89f581600 100644
--- a/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilterThreading.cxx
+++ b/Modules/Core/Smoothing/test/otbMeanShiftSmoothingImageFilterThreading.cxx
@@ -58,7 +58,7 @@ int otbMeanShiftSmoothingImageFilterThreading(int argc, char* argv[])
filterSingle->SetRangeBandwidth(rangeBandwidth);
filterSingle->SetInput(reader->GetOutput());
filterSingle->SetModeSearch(useModeSearch);
- filterSingle->SetNumberOfThreads(1);
+ filterSingle->SetNumberOfWorkUnits(1);
filterMulti->SetSpatialBandwidth(spatialBandwidth);
filterMulti->SetRangeBandwidth(rangeBandwidth);
diff --git a/Modules/Core/Statistics/include/otbListSampleGenerator.h b/Modules/Core/Statistics/include/otbListSampleGenerator.h
index 1a252df610aad90246a92d4615c8bd26107c4025..049c41e62db53a24885d8b2317557bd31bb1930d 100644
--- a/Modules/Core/Statistics/include/otbListSampleGenerator.h
+++ b/Modules/Core/Statistics/include/otbListSampleGenerator.h
@@ -24,7 +24,6 @@
#include "itkProcessObject.h"
#include "itkListSample.h"
-#include "itkPreOrderTreeIterator.h"
#include "itkMersenneTwisterRandomVariateGenerator.h"
#include <string>
@@ -174,7 +173,6 @@ private:
typedef typename DataNodeType::PolygonPointerType PolygonPointerType;
typedef typename DataNodeType::PolygonListType PolygonListType;
typedef typename DataNodeType::PolygonListPointerType PolygonListPointerType;
- typedef itk::PreOrderTreeIterator<typename VectorDataType::DataTreeType> TreeIteratorType;
void ComputeClassSelectionProbability();
diff --git a/Modules/Core/Statistics/include/otbListSampleGenerator.hxx b/Modules/Core/Statistics/include/otbListSampleGenerator.hxx
index edf832b40301ba406ef39452bc18939e84ab473a..810a17547231fd39a73314e80d775c448ebc4c11 100644
--- a/Modules/Core/Statistics/include/otbListSampleGenerator.hxx
+++ b/Modules/Core/Statistics/include/otbListSampleGenerator.hxx
@@ -31,35 +31,6 @@
namespace otb
{
-/*template <class TVectorData>
-void printVectorData(TVectorData * vectorData, string msg = "")
-{
- typedef TVectorData VectorDataType;
- typedef itk::PreOrderTreeIterator<typename VectorDataType::DataTreeType> TreeIteratorType;
-
- TreeIteratorType itVector(vectorData->GetDataTree());
- itVector.GoToBegin();
-
- if (!msg.empty())
- {
- std::cout<< msg << std::endl;
- }
-
- while (!itVector.IsAtEnd())
- {
- if (itVector.Get()->IsPolygonFeature())
- {
- std::cout << itVector.Get()->GetNodeTypeAsString() << std::endl;
- for (unsigned int itPoints = 0; itPoints < itVector.Get()->GetPolygonExteriorRing()->GetVertexList()->Size(); itPoints++)
- {
- std::cout << "vertex[" << itPoints << "]: " << itVector.Get()->GetPolygonExteriorRing()->GetVertexList()->GetElement(itPoints) <<std::endl;
- }
- std::cout << "Polygon bounding region:\n" << itVector.Get()->GetPolygonExteriorRing()->GetBoundingRegion() << std::endl;
- }
- ++itVector;
- }
-}*/
-
template <class TImage, class TVectorData>
ListSampleGenerator<TImage, TVectorData>::ListSampleGenerator()
: m_MaxTrainingSize(-1),
@@ -229,12 +200,13 @@ void ListSampleGenerator<TImage, TVectorData>::GenerateData()
typename ImageType::RegionType imageLargestRegion = image->GetLargestPossibleRegion();
- TreeIteratorType itVector(vectorData->GetDataTree());
- for (itVector.GoToBegin(); !itVector.IsAtEnd(); ++itVector)
+ auto itVectorPair = vectorData->GetIteratorPair();
+ auto currentIt = itVectorPair.first;
+ for (; currentIt != itVectorPair.second; ++currentIt)
{
- if (itVector.Get()->IsPolygonFeature())
+ if (vectorData->Get(currentIt)->IsPolygonFeature())
{
- PolygonPointerType exteriorRing = itVector.Get()->GetPolygonExteriorRing();
+ PolygonPointerType exteriorRing = vectorData->Get(currentIt)->GetPolygonExteriorRing();
typename ImageType::RegionType polygonRegion = otb::TransformPhysicalRegionToIndexRegion(exteriorRing->GetBoundingRegion(), image.GetPointer());
@@ -258,7 +230,7 @@ void ListSampleGenerator<TImage, TVectorData>::GenerateData()
if (exteriorRing->IsInside(point) || (this->GetPolygonEdgeInclusion() && exteriorRing->IsOnEdge(point)))
{
- PolygonListPointerType interiorRings = itVector.Get()->GetPolygonInteriorRings();
+ PolygonListPointerType interiorRings = vectorData->Get(currentIt)->GetPolygonInteriorRings();
bool isInsideInteriorRing = false;
for (typename PolygonListType::Iterator interiorRing = interiorRings->Begin(); interiorRing != interiorRings->End(); ++interiorRing)
@@ -275,20 +247,20 @@ void ListSampleGenerator<TImage, TVectorData>::GenerateData()
}
double randomValue = m_RandomGenerator->GetUniformVariate(0.0, 1.0);
- if (randomValue < m_ClassesProbTraining[itVector.Get()->GetFieldAsInt(m_ClassKey)])
+ if (randomValue < m_ClassesProbTraining[vectorData->Get(currentIt)->GetFieldAsInt(m_ClassKey)])
{
// Add the sample to the training list
trainingListSample->PushBack(it.Get());
- trainingListLabel->PushBack(itVector.Get()->GetFieldAsInt(m_ClassKey));
- m_ClassesSamplesNumberTraining[itVector.Get()->GetFieldAsInt(m_ClassKey)] += 1;
+ trainingListLabel->PushBack(vectorData->Get(currentIt)->GetFieldAsInt(m_ClassKey));
+ m_ClassesSamplesNumberTraining[vectorData->Get(currentIt)->GetFieldAsInt(m_ClassKey)] += 1;
}
else if (randomValue <
- m_ClassesProbTraining[itVector.Get()->GetFieldAsInt(m_ClassKey)] + m_ClassesProbValidation[itVector.Get()->GetFieldAsInt(m_ClassKey)])
+ m_ClassesProbTraining[vectorData->Get(currentIt)->GetFieldAsInt(m_ClassKey)] + m_ClassesProbValidation[vectorData->Get(currentIt)->GetFieldAsInt(m_ClassKey)])
{
// Add the sample to the validation list
validationListSample->PushBack(it.Get());
- validationListLabel->PushBack(itVector.Get()->GetFieldAsInt(m_ClassKey));
- m_ClassesSamplesNumberValidation[itVector.Get()->GetFieldAsInt(m_ClassKey)] += 1;
+ validationListLabel->PushBack(vectorData->Get(currentIt)->GetFieldAsInt(m_ClassKey));
+ m_ClassesSamplesNumberValidation[vectorData->Get(currentIt)->GetFieldAsInt(m_ClassKey)] += 1;
}
// Note: some samples may not be used at all
}
@@ -310,10 +282,11 @@ void ListSampleGenerator<TImage, TVectorData>::GenerateClassStatistics()
typename VectorDataType::ConstPointer vectorData = this->GetInputVectorData();
// Compute cumulative area of all polygons of each class
- TreeIteratorType itVector(vectorData->GetDataTree());
- for (itVector.GoToBegin(); !itVector.IsAtEnd(); ++itVector)
+ auto itVectorPair = vectorData->GetIteratorPair();
+ auto currentIt = itVectorPair.first;
+ for (; currentIt != itVectorPair.second; ++currentIt)
{
- DataNodeType* datanode = itVector.Get();
+ typename DataNodeType::Pointer datanode = vectorData->Get(currentIt);
if (datanode->IsPolygonFeature())
{
double area = GetPolygonAreaInPixelsUnits(datanode, image);
diff --git a/Modules/Core/Statistics/include/otbPatternSampler.h b/Modules/Core/Statistics/include/otbPatternSampler.h
index 921e6b9078283a1896a74d41620b7d3ffc8a43f5..3cc951569f4d3750dd4d86f109e5820b47b17283 100644
--- a/Modules/Core/Statistics/include/otbPatternSampler.h
+++ b/Modules/Core/Statistics/include/otbPatternSampler.h
@@ -22,6 +22,7 @@
#define otbPatternSampler_h
#include "otbSamplerBase.h"
+#include "OTBStatisticsExport.h"
#include <string>
namespace otb
@@ -36,7 +37,7 @@ namespace otb
*
* \ingroup OTBStatistics
*/
-class ITK_EXPORT PatternSampler : public SamplerBase
+class OTBStatistics_EXPORT PatternSampler : public SamplerBase
{
public:
typedef PatternSampler Self;
diff --git a/Modules/Core/Statistics/include/otbPeriodicSampler.h b/Modules/Core/Statistics/include/otbPeriodicSampler.h
index fc26cb40ca89691d22a9a9722e9ac46bd97d6b9b..f8381cb6a9b83d65e60f56bcd95a389ffac9c132 100644
--- a/Modules/Core/Statistics/include/otbPeriodicSampler.h
+++ b/Modules/Core/Statistics/include/otbPeriodicSampler.h
@@ -22,6 +22,7 @@
#define otbPeriodicSampler_h
#include "otbSamplerBase.h"
+#include "OTBStatisticsExport.h"
namespace otb
{
@@ -35,7 +36,7 @@ namespace otb
*
* \ingroup OTBStatistics
*/
-class ITK_EXPORT PeriodicSampler : public SamplerBase
+class OTBStatistics_EXPORT PeriodicSampler : public SamplerBase
{
public:
typedef PeriodicSampler Self;
diff --git a/Modules/Core/Statistics/include/otbRandomSampler.h b/Modules/Core/Statistics/include/otbRandomSampler.h
index 0d1c95cbe1690d531466ac53dc725a6528fb6622..7fd44a7c057ba9ecf440731db376164a70559b43 100644
--- a/Modules/Core/Statistics/include/otbRandomSampler.h
+++ b/Modules/Core/Statistics/include/otbRandomSampler.h
@@ -22,6 +22,7 @@
#define otbRandomSampler_h
#include "otbSamplerBase.h"
+#include "OTBStatisticsExport.h"
namespace otb
{
@@ -36,7 +37,7 @@ namespace otb
*
* \ingroup OTBStatistics
*/
-class ITK_EXPORT RandomSampler : public SamplerBase
+class OTBStatistics_EXPORT RandomSampler : public SamplerBase
{
public:
typedef RandomSampler Self;
diff --git a/Modules/Core/Statistics/include/otbSamplerBase.h b/Modules/Core/Statistics/include/otbSamplerBase.h
index dfb144b3e274b884913ad91d7db323ccd881e8b9..959e75a1717ee12b688c782de768fe8877fa6f85 100644
--- a/Modules/Core/Statistics/include/otbSamplerBase.h
+++ b/Modules/Core/Statistics/include/otbSamplerBase.h
@@ -23,6 +23,7 @@
#include "itkObject.h"
#include "itkObjectFactory.h"
+#include "OTBStatisticsExport.h"
namespace otb
{
@@ -34,7 +35,7 @@ namespace otb
*
* \ingroup OTBStatistics
*/
-class ITK_EXPORT SamplerBase : public itk::Object
+class OTBStatistics_EXPORT SamplerBase : public itk::Object
{
public:
typedef SamplerBase Self;
diff --git a/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.h b/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.h
index ab1a2fb146af530ee67b38416710faf6727b44ba..36a076d876d7c153810f11a415575306a9d17f8e 100644
--- a/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.h
+++ b/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.h
@@ -159,7 +159,7 @@ protected:
/** Allows skipping the verification of physical space between
* the two input images (see flag m_PhysicalSpaceCheck)
*/
- void VerifyInputInformation() override;
+ void VerifyInputInformation() const override;
private:
PersistentCompareImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.hxx b/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.hxx
index e07c50bc6ca310e3cfad0b71a7e6f6796f5f2acb..528530b199c459cacf66924c0844f519df5b57ab 100644
--- a/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingCompareImageFilter.hxx
@@ -34,7 +34,8 @@ template <class TInputImage>
PersistentCompareImageFilter<TInputImage>::PersistentCompareImageFilter()
: m_SquareOfDifferences(1), m_AbsoluteValueOfDifferences(1), m_ThreadMinRef(1), m_ThreadMaxRef(1), m_Count(1), m_DiffCount(1), m_PhysicalSpaceCheck(true)
{
- this->SetNumberOfRequiredInputs(2);
+ this->DynamicMultiThreadingOff();
+ this->SetNumberOfRequiredInputs( 2 );
// first output is a copy of the image, DataObject created by
// superclass
@@ -196,7 +197,7 @@ void PersistentCompareImageFilter<TInputImage>::Synthetize()
unsigned long diffCount;
RealType squareOfDifferences, absoluteValueOfDifferences;
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
PixelType minimumRef, maximumRef;
RealType mse;
@@ -247,7 +248,7 @@ void PersistentCompareImageFilter<TInputImage>::Synthetize()
template <class TInputImage>
void PersistentCompareImageFilter<TInputImage>::Reset()
{
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
// Resize the thread temporaries
m_Count.SetSize(numberOfThreads);
@@ -268,7 +269,7 @@ void PersistentCompareImageFilter<TInputImage>::Reset()
}
template <class TInputImage>
-void PersistentCompareImageFilter<TInputImage>::VerifyInputInformation()
+void PersistentCompareImageFilter<TInputImage>::VerifyInputInformation() const
{
if (m_PhysicalSpaceCheck)
Superclass::VerifyInputInformation();
diff --git a/Modules/Core/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx b/Modules/Core/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
index baeb4795fa92e4cf99cd0bce7456ba77072ab7ab..3012f05d558e65c13602d8d2e1726264d6e588c2 100644
--- a/Modules/Core/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
@@ -46,9 +46,8 @@ PersistentHistogramVectorImageFilter<TInputImage>::PersistentHistogramVectorImag
//
// allocate the data objects for the outputs which are
// just decorators around pixel types and histogram list
-
+ this->DynamicMultiThreadingOff();
m_Size.Fill(255);
-
HistogramListPointerType output = static_cast<HistogramListType*>(this->MakeOutput(1).GetPointer());
this->itk::ProcessObject::SetNthOutput(1, output.GetPointer());
}
@@ -114,7 +113,7 @@ void PersistentHistogramVectorImageFilter<TInputImage>::Reset()
TInputImage* inputPtr = const_cast<TInputImage*>(this->GetInput());
inputPtr->UpdateOutputInformation();
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
unsigned int numberOfComponent = inputPtr->GetNumberOfComponentsPerPixel();
// TODO which is the good value ? (false in MVD2)
@@ -188,7 +187,7 @@ void PersistentHistogramVectorImageFilter<TInputImage>::Synthetize()
{
HistogramListType* outputHisto = this->GetHistogramListOutput();
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
unsigned int numberOfComponent = this->GetInput()->GetNumberOfComponentsPerPixel();
// copy histograms to output
diff --git a/Modules/Core/Statistics/include/otbStreamingMinMaxImageFilter.hxx b/Modules/Core/Statistics/include/otbStreamingMinMaxImageFilter.hxx
index c3be0aba88487138881cf94ba0a1ec855863bf26..3b28cccfb514f1a6e4daf30191ecb24056e48baf 100644
--- a/Modules/Core/Statistics/include/otbStreamingMinMaxImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingMinMaxImageFilter.hxx
@@ -34,6 +34,7 @@ namespace otb
template <class TInputImage>
PersistentMinMaxImageFilter<TInputImage>::PersistentMinMaxImageFilter()
{
+ this->DynamicMultiThreadingOff();
// TODO : SetNumberOfRequiredOutputs
// first output is a copy of the image, DataObject created by
@@ -151,7 +152,7 @@ template <class TInputImage>
void PersistentMinMaxImageFilter<TInputImage>::Synthetize()
{
int i;
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
PixelType minimum = itk::NumericTraits<PixelType>::max();
PixelType maximum = itk::NumericTraits<PixelType>::NonpositiveMin();
@@ -182,7 +183,7 @@ void PersistentMinMaxImageFilter<TInputImage>::Synthetize()
template <class TInputImage>
void PersistentMinMaxImageFilter<TInputImage>::Reset()
{
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
m_ThreadMin.resize(numberOfThreads);
m_ThreadMax.resize(numberOfThreads);
diff --git a/Modules/Core/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx b/Modules/Core/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
index 94dcb2843d74a0ac26ebbadc86e62882ef2edfee..ba30a16bc639e8a72dedb73e2155163986be36a0 100644
--- a/Modules/Core/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
@@ -36,12 +36,13 @@ template <class TInputImage>
PersistentMinMaxVectorImageFilter<TInputImage>::PersistentMinMaxVectorImageFilter()
: m_NoDataFlag(false), m_NoDataValue(itk::NumericTraits<InternalPixelType>::Zero)
{
+
// first output is a copy of the image, DataObject created by
// superclass
//
// allocate the data objects for the outputs which are
// just decorators around pixel types
-
+ this->DynamicMultiThreadingOff();
for (int i = 1; i < 3; ++i)
{
typename PixelObjectType::Pointer output = static_cast<PixelObjectType*>(this->MakeOutput(i).GetPointer());
@@ -122,7 +123,7 @@ void PersistentMinMaxVectorImageFilter<TInputImage>::Reset()
TInputImage* inputPtr = const_cast<TInputImage*>(this->GetInput());
inputPtr->UpdateOutputInformation();
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
unsigned int numberOfComponent = inputPtr->GetNumberOfComponentsPerPixel();
// Variable Initialization
@@ -148,7 +149,7 @@ void PersistentMinMaxVectorImageFilter<TInputImage>::Synthetize()
{
int i;
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
unsigned int numberOfComponent = this->GetInput()->GetNumberOfComponentsPerPixel();
PixelType minimumVector;
diff --git a/Modules/Core/Statistics/include/otbStreamingStatisticsImageFilter.hxx b/Modules/Core/Statistics/include/otbStreamingStatisticsImageFilter.hxx
index b946a654596700de9ba60bed0e02b36b609572e3..dfbc133e01c624488b5ca6467e1967f52fd06cd8 100644
--- a/Modules/Core/Statistics/include/otbStreamingStatisticsImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingStatisticsImageFilter.hxx
@@ -26,14 +26,23 @@
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
#include "otbMacro.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
-template <class TInputImage>
-PersistentStatisticsImageFilter<TInputImage>::PersistentStatisticsImageFilter()
- : m_ThreadSum(1), m_SumOfSquares(1), m_Count(1), m_ThreadMin(1), m_ThreadMax(1), m_IgnoreInfiniteValues(true), m_IgnoreUserDefinedValue(false)
+template<class TInputImage>
+PersistentStatisticsImageFilter<TInputImage>
+::PersistentStatisticsImageFilter()
+ : m_ThreadSum(1),
+ m_SumOfSquares(1),
+ m_Count(1),
+ m_ThreadMin(1),
+ m_ThreadMax(1),
+ m_IgnoreInfiniteValues(true),
+ m_IgnoreUserDefinedValue(false)
{
+ this->DynamicMultiThreadingOff();
// first output is a copy of the image, DataObject created by
// superclass
//
@@ -60,8 +69,8 @@ PersistentStatisticsImageFilter<TInputImage>::PersistentStatisticsImageFilter()
this->GetSumOutput()->Set(itk::NumericTraits<RealType>::Zero);
// Initiate the infinite ignored pixel counters
- m_IgnoredInfinitePixelCount = std::vector<unsigned int>(this->GetNumberOfThreads(), 0);
- m_IgnoredUserPixelCount = std::vector<unsigned int>(this->GetNumberOfThreads(), 0);
+ m_IgnoredInfinitePixelCount = std::vector<unsigned int>(this->GetNumberOfWorkUnits(), 0);
+ m_IgnoredUserPixelCount = std::vector<unsigned int>(this->GetNumberOfWorkUnits(), 0);
this->Reset();
}
@@ -196,7 +205,7 @@ void PersistentStatisticsImageFilter<TInputImage>::Synthetize()
long count;
RealType sumOfSquares;
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
PixelType minimum;
PixelType maximum;
@@ -256,7 +265,7 @@ void PersistentStatisticsImageFilter<TInputImage>::Synthetize()
template <class TInputImage>
void PersistentStatisticsImageFilter<TInputImage>::Reset()
{
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
// Resize the thread temporaries
m_Count.SetSize(numberOfThreads);
@@ -277,7 +286,7 @@ void PersistentStatisticsImageFilter<TInputImage>::Reset()
if (m_IgnoreUserDefinedValue)
{
- m_IgnoredUserPixelCount = std::vector<unsigned int>(this->GetNumberOfThreads(), 0);
+ m_IgnoredUserPixelCount = std::vector<unsigned int>(this->GetNumberOfWorkUnits(), 0);
}
}
diff --git a/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
index 5f0f71f1cb22daa2b720a9f9115f272494ec7e18..b6200a2b6f8a0bf0f1d4caa0ff330c30ee7a8a24 100644
--- a/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+++ b/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
@@ -53,9 +53,9 @@ template <class TRealVectorPixelType>
class StatisticsAccumulator
{
public:
- typedef typename TRealVectorPixelType::ValueType RealValueType;
- typedef uint64_t PixelCountType;
- typedef itk::VariableLengthVector<PixelCountType> PixelCountVectorType;
+ using RealValueType = typename TRealVectorPixelType::ValueType;
+ using PixelCountType = std::uint64_t;
+ using PixelCountVectorType = itk::VariableLengthVector<PixelCountType>;
// Constructor (default)
StatisticsAccumulator() : m_Count(), m_NoDataValue(), m_UseNoDataValue()
diff --git a/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx b/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
index 6932b387d150d0bcda10ffe13eac0366bed56979..e90e7163b8ea1ef6432288eb39e8d616dd4ee994 100644
--- a/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
@@ -42,7 +42,9 @@ PersistentStreamingStatisticsMapFromLabelImageFilter<TInputVectorImage, TLabelIm
//
// allocate the data objects for the outputs which are
// just decorators around pixel types
- typename PixelValueMapObjectType::Pointer output = static_cast<PixelValueMapObjectType*>(this->MakeOutput(1).GetPointer());
+ this->DynamicMultiThreadingOff();
+ typename PixelValueMapObjectType::Pointer output
+ = static_cast<PixelValueMapObjectType*>(this->MakeOutput(1).GetPointer());
this->itk::ProcessObject::SetNthOutput(1, output.GetPointer());
this->Reset();
@@ -208,7 +210,7 @@ void PersistentStreamingStatisticsMapFromLabelImageFilter<TInputVectorImage, TLa
m_MinRadiometricValue.clear();
m_MaxRadiometricValue.clear();
m_LabelPopulation.clear();
- m_AccumulatorMaps.resize(this->GetNumberOfThreads());
+ m_AccumulatorMaps.resize(this->GetNumberOfWorkUnits());
}
template <class TInputVectorImage, class TLabelImage>
diff --git a/Modules/Core/Statistics/include/otbStreamingStatisticsMosaicFilter.hxx b/Modules/Core/Statistics/include/otbStreamingStatisticsMosaicFilter.hxx
index 11f518ad43598bf552684245f0aa0ac5bb2f0d6f..71204c505e27126d5544dbd9226b7d99215b1acd 100644
--- a/Modules/Core/Statistics/include/otbStreamingStatisticsMosaicFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingStatisticsMosaicFilter.hxx
@@ -30,7 +30,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TInternalValueType>
PersistentStatisticsMosaicFilter<TInputImage, TOutputImage, TInternalValueType>::PersistentStatisticsMosaicFilter()
{
-
+ this->DynamicMultiThreadingOff();
// allocate the data objects for the outputs which are
// just decorators around pixel types
// 1: means
@@ -166,7 +166,7 @@ void PersistentStatisticsMosaicFilter<TInputImage, TOutputImage, TInternalValueT
Superclass::GenerateOutputInformation();
// Prepare threads result
- const unsigned int numberOfThreads = this->GetNumberOfThreads();
+ const unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
const unsigned int nBands = this->GetNumberOfBands();
const unsigned int nbImages = this->GetNumberOfInputImages();
diff --git a/Modules/Core/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx b/Modules/Core/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
index b6b171a55fb2b76328aac32ef3047a076021adc7..8ccf810ec749fa8e98e2220582a08d2ab39a86e1 100644
--- a/Modules/Core/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
@@ -26,6 +26,8 @@
#include "itkImageRegionConstIteratorWithIndex.h"
#include "itkProgressReporter.h"
#include "otbMacro.h"
+#include "vcl_legacy_aliases.h"
+
namespace otb
{
@@ -40,6 +42,7 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::Persist
m_IgnoreUserDefinedValue(false),
m_UserIgnoredValue(itk::NumericTraits<InternalPixelType>::Zero)
{
+ this->DynamicMultiThreadingOff();
// first output is a copy of the image, DataObject created by
// superclass
@@ -50,8 +53,8 @@ PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::Persist
this->itk::ProcessObject::SetNthOutput(i, this->MakeOutput(i).GetPointer());
}
// Initiate ignored pixel counters
- m_IgnoredInfinitePixelCount = std::vector<unsigned int>(this->GetNumberOfThreads(), 0);
- m_IgnoredUserPixelCount = std::vector<unsigned int>(this->GetNumberOfThreads(), 0);
+ m_IgnoredInfinitePixelCount = std::vector<unsigned int>(this->GetNumberOfWorkUnits(), 0);
+ m_IgnoredUserPixelCount = std::vector<unsigned int>(this->GetNumberOfWorkUnits(), 0);
}
template <class TInputImage, class TPrecision>
@@ -267,7 +270,7 @@ void PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::Re
TInputImage* inputPtr = const_cast<TInputImage*>(this->GetInput());
inputPtr->UpdateOutputInformation();
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
unsigned int numberOfComponent = inputPtr->GetNumberOfComponentsPerPixel();
if (m_EnableMinMax)
@@ -328,12 +331,14 @@ void PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::Re
if (m_IgnoreInfiniteValues)
{
- m_IgnoredInfinitePixelCount = std::vector<unsigned int>(numberOfThreads, 0);
+ m_IgnoredInfinitePixelCount.clear();
+ m_IgnoredInfinitePixelCount.resize(numberOfThreads,0);
}
if (m_IgnoreUserDefinedValue)
{
- m_IgnoredUserPixelCount = std::vector<unsigned int>(this->GetNumberOfThreads(), 0);
+ m_IgnoredUserPixelCount.clear();
+ m_IgnoredUserPixelCount.resize(this->GetNumberOfWorkUnits(),0);
}
}
@@ -363,7 +368,7 @@ void PersistentStreamingStatisticsVectorImageFilter<TInputImage, TPrecision>::Sy
unsigned int ignoredUserPixelCount = 0;
// Accumulate results from all threads
- const itk::ThreadIdType numberOfThreads = this->GetNumberOfThreads();
+ const itk::ThreadIdType numberOfThreads = this->GetNumberOfWorkUnits();
for (itk::ThreadIdType threadId = 0; threadId < numberOfThreads; ++threadId)
{
if (m_EnableMinMax)
diff --git a/Modules/Core/Statistics/include/otbVarianceImageFilter.h b/Modules/Core/Statistics/include/otbVarianceImageFilter.h
index 75336586727808b870c47cae135efe5337bf1a30..b9689e65395cd0e43cdd51e30a413799eed0ef3d 100644
--- a/Modules/Core/Statistics/include/otbVarianceImageFilter.h
+++ b/Modules/Core/Statistics/include/otbVarianceImageFilter.h
@@ -112,9 +112,9 @@ protected:
* write to the portion of the output image specified by the
* parameter "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
VarianceImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Statistics/include/otbVarianceImageFilter.hxx b/Modules/Core/Statistics/include/otbVarianceImageFilter.hxx
index e8e598f6fd117fc6d3fb41a3edba06a2d2cac7c4..1bb5f8d6df03cf262ca02278fce2be4edc9de5cb 100644
--- a/Modules/Core/Statistics/include/otbVarianceImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbVarianceImageFilter.hxx
@@ -37,6 +37,7 @@ template <class TInputImage, class TOutputImage>
VarianceImageFilter<TInputImage, TOutputImage>::VarianceImageFilter()
{
m_Radius.Fill(1);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -86,7 +87,7 @@ void VarianceImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegio
}
template <class TInputImage, class TOutputImage>
-void VarianceImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void VarianceImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
@@ -105,9 +106,6 @@ void VarianceImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
InputRealType sum;
InputRealType sumOfSquares;
@@ -138,7 +136,6 @@ void VarianceImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const
++bit;
++it;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.h b/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.h
index 86ac6a27b38d02695526d4363beb8aa467724f31..2aa958914757bc085b06c43be5730a1f7553057e 100644
--- a/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.h
+++ b/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.h
@@ -91,9 +91,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
VectorImageToIntensityImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.hxx b/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
index 7ac69d685abb331c0d23d83e2c096adf2392b84d..63e2cbf59cf9d60cc66133371698fc9b0766b73e 100644
--- a/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
@@ -24,7 +24,6 @@
#include "otbVectorImageToIntensityImageFilter.h"
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
-#include "otbMacro.h"
#include "otbMath.h"
namespace otb
@@ -35,11 +34,11 @@ namespace otb
template <class TInputImage, class TOutputImage>
VectorImageToIntensityImageFilter<TInputImage, TOutputImage>::VectorImageToIntensityImageFilter()
{
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
-void VectorImageToIntensityImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void VectorImageToIntensityImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
InputImageConstPointerType inputPtr = this->GetInput();
@@ -54,7 +53,6 @@ void VectorImageToIntensityImageFilter<TInputImage, TOutputImage>::ThreadedGener
// Define the iterators
itk::ImageRegionConstIterator<InputImageType> inputIt(inputPtr, inputRegionForThread);
itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -72,7 +70,6 @@ void VectorImageToIntensityImageFilter<TInputImage, TOutputImage>::ThreadedGener
outputIt.Set(static_cast<OutputPixelType>(sum));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
/**
diff --git a/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.h b/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.h
index 33249b66b140eaf5d8a0002465b133acf0e6e599..47923d1606b240f03724572560556dafd457fff2 100644
--- a/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.h
+++ b/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.h
@@ -117,7 +117,7 @@ protected:
{
}
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
private:
PersistentVectorImageToMatrixFilter(const Self&) = delete;
diff --git a/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.hxx b/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
index 30201fdfeeeb412934eb98856b03c1bc0df0a881..7759dd6ef53ee9a547aa48dd489bd229a79a1129 100644
--- a/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
+++ b/Modules/Core/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
@@ -25,8 +25,6 @@
#include "itkImageRegionIterator.h"
#include "itkImageRegionConstIteratorWithIndex.h"
-#include "itkProgressReporter.h"
-#include "otbMacro.h"
namespace otb
{
@@ -39,6 +37,7 @@ PersistentVectorImageToMatrixFilter<TInputImage>::PersistentVectorImageToMatrixF
//
// allocate the data objects for the outputs which are
// just decorators around vector/matric types
+ this->DynamicMultiThreadingOn();
this->itk::ProcessObject::SetNthOutput(1, this->MakeOutput(1).GetPointer());
}
@@ -113,17 +112,14 @@ void PersistentVectorImageToMatrixFilter<TInputImage>::Synthetize()
}
template <class TInputImage>
-void PersistentVectorImageToMatrixFilter<TInputImage>::ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void PersistentVectorImageToMatrixFilter<TInputImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{
- // Support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Grab the input
InputImagePointer inputPtr = const_cast<TInputImage*>(this->GetInput());
const unsigned int width = this->GetInput()->GetLargestPossibleRegion().GetSize()[0];
itk::ImageRegionConstIteratorWithIndex<TInputImage> it(inputPtr, outputRegionForThread);
- for (it.GoToBegin(); !it.IsAtEnd(); ++it, progress.CompletedPixel())
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
{
const IndexType& idx = it.GetIndex();
diff --git a/Modules/Core/Statistics/otb-module.cmake b/Modules/Core/Statistics/otb-module.cmake
index 1ba40ba9ba2463bc91fd561a5c2e985d5b542237..0625226fda1966c6a0f424813f85cbb1b313a8be 100644
--- a/Modules/Core/Statistics/otb-module.cmake
+++ b/Modules/Core/Statistics/otb-module.cmake
@@ -26,6 +26,7 @@ of the input sample list, and so on. The other part works on images and labelMap
and allows the calculation of classical statistics (min max mean histogram).")
otb_module(OTBStatistics
+ENABLE_SHARED
DEPENDS
OTBCommon
OTBITK
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
index af5415f39e1fe2124ed1d397f38ae269dd6ac06f..8145987f4dd38e7330b09a7b394b8a090822b35e 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
@@ -42,7 +42,8 @@ void NumberOfDivisionsStrippedStreamingManager<TImage>::PrepareStreaming(itk::Da
{
otbMsgDevMacro(<< "Activating NumberOfDivisionsStrippedStreamingManager streaming mode") if (m_NumberOfDivisions < 1)
{
- itkWarningMacro(<< "NumberOfDivisions set to 0 : streaming disabled") m_NumberOfDivisions = 1;
+ itkWarningMacro(<< "NumberOfDivisions set to 0 : streaming disabled");
+ m_NumberOfDivisions = 1;
}
this->m_Splitter = itk::ImageRegionSplitterSlowDimension::New();
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
index b3c7d6626a68c858719ce88b88f3fcab921f330b..877081193708f2ad2f70bcc53428f706c41ed861 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
@@ -43,7 +43,8 @@ void NumberOfDivisionsTiledStreamingManager<TImage>::PrepareStreaming(itk::DataO
{
otbMsgDevMacro(<< "Activating NumberOfDivisionsTiledStreamingManager streaming mode") if (m_NumberOfDivisions < 1)
{
- itkWarningMacro(<< "NumberOfDivisions set to 0 : streaming disabled") m_NumberOfDivisions = 1;
+ itkWarningMacro(<< "NumberOfDivisions set to 0 : streaming disabled");
+ m_NumberOfDivisions = 1;
}
this->m_Splitter = otb::ImageRegionSquareTileSplitter<itkGetStaticConstMacro(ImageDimension)>::New();
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
index 16a7d9bf45819f7cdfb90007fcde6a88d1446af1..cd40e8d267496349a8da74ef0054396307a9e329 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
@@ -42,7 +42,7 @@ void NumberOfLinesStrippedStreamingManager<TImage>::PrepareStreaming(itk::DataOb
{
otbMsgDevMacro(<< "Activating STRIPPED_SET_NUMBEROFLINES streaming mode") if (m_NumberOfLinesPerStrip < 1)
{
- itkWarningMacro(<< "DesiredNumberOfLines set to 0 : streaming disabled")
+ itkWarningMacro(<< "DesiredNumberOfLines set to 0 : streaming disabled");
}
// Calculate number of splits
diff --git a/Modules/Core/Streaming/include/otbPersistentImageFilter.h b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
index 9b371d466da05a7535d4ade831a20f1dcf1fc3b1..525654deb55bf6fc773159ae1b73384005582fd8 100644
--- a/Modules/Core/Streaming/include/otbPersistentImageFilter.h
+++ b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
@@ -83,6 +83,8 @@ protected:
Superclass::PrintSelf(os, indent);
}
+ virtual void VerifyInputInformation() const {};
+
private:
PersistentImageFilter(const Self&) = delete;
void operator=(const Self&) = delete;
diff --git a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
index 3af6ea0d4a8e33f3bd0a9fb08e141521a2ea10dd..6aa56cba0a91780571234438f9b6b57ee633e407 100644
--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
@@ -22,11 +22,6 @@
#define otbPipelineMemoryPrintCalculator_h
#include "itkProcessObject.h"
-#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
-#include "itksys/FundamentalType.h"
-#else
-#include "itk_kwiml.h"
-#endif
#include <set>
#include <iosfwd>
@@ -74,22 +69,18 @@ class OTBStreaming_EXPORT PipelineMemoryPrintCalculator : public itk::Object
{
public:
/** Standard class typedefs */
- typedef PipelineMemoryPrintCalculator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ using Self = PipelineMemoryPrintCalculator;
+ using Superclass = itk::Object;
+ using Pointer = itk::SmartPointer<Self>;
+ using ConstPointer = itk::SmartPointer<const Self>;
/** Useful typedefs */
- typedef itk::ProcessObject ProcessObjectType;
- typedef ProcessObjectType::Pointer ProcessObjectPointerType;
- typedef itk::DataObject DataObjectType;
- typedef DataObjectType::Pointer DataObjectPointerType;
-#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
- typedef ::itksysFundamentalType_UInt64 MemoryPrintType;
-#else
- typedef KWIML_INT_uint64_t MemoryPrintType;
-#endif
- typedef std::set<const ProcessObjectType*> ProcessObjectPointerSetType;
+ using ProcessObjectType = itk::ProcessObject;
+ using ProcessObjectPointerType = ProcessObjectType::Pointer;
+ using DataObjectType = itk::DataObject;
+ using DataObjectPointerType = DataObjectType::Pointer;
+ using MemoryPrintType = std::uint64_t;
+ using ProcessObjectPointerSetType = std::set<const ProcessObjectType*> ;
/** Run-time type information (and related methods). */
itkTypeMacro(PipelineMemoryPrintCalculator, itk::Object);
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
index 9b38996a6c8456e04163c59178d7982a0218179e..e14f02846b8caca491eb465fe290c32b8999ac76 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
@@ -24,7 +24,7 @@
#include "itkMacro.h"
#include "itkImageToImageFilter.h"
#include "otbStreamingManager.h"
-#include "itkFastMutexLock.h"
+#include <mutex>
namespace otb
{
@@ -193,7 +193,8 @@ private:
unsigned long m_ObserverID;
/** Lock to ensure thread-safety (added for the AbortGenerateData flag) */
- itk::SimpleFastMutexLock m_Lock;
+ mutable std::mutex m_Lock;
+
};
} // end namespace otb
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
index fe9deaf3a9aaa0efea18c61cbfe3ebed267c5af7..6d12a27ca5f36ebc4e440ae8abce788f2e45ed92 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
@@ -270,9 +270,9 @@ void StreamingImageVirtualWriter<TInputImage>::GenerateData(void)
template <class TInputImage>
const bool& StreamingImageVirtualWriter<TInputImage>::GetAbortGenerateData() const
{
- m_Lock.Lock();
+ std::lock_guard<std::mutex> mutexHolder(m_Lock);
bool ret = Superclass::GetAbortGenerateData();
- m_Lock.Unlock();
+ m_Lock.unlock();
if (ret)
return otb::Utils::TrueConstant;
return otb::Utils::FalseConstant;
@@ -281,9 +281,8 @@ const bool& StreamingImageVirtualWriter<TInputImage>::GetAbortGenerateData() con
template <class TInputImage>
void StreamingImageVirtualWriter<TInputImage>::SetAbortGenerateData(bool val)
{
- m_Lock.Lock();
+ std::lock_guard<std::mutex> mutexHolder(m_Lock);
Superclass::SetAbortGenerateData(val);
- m_Lock.Unlock();
}
} // end namespace otb
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
index 18c6f1e9faa990fe121982d3d599c08bfd5f58fa..6583ecf6598b1dd2d2014f9d7d22ec4c881fe004 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
@@ -43,7 +43,8 @@ void TileDimensionTiledStreamingManager<TImage>::PrepareStreaming(itk::DataObjec
{
if (m_TileDimension < 16)
{
- itkWarningMacro(<< "TileDimension inferior to 16 : using 16 as tile dimension") m_TileDimension = 16;
+ itkWarningMacro(<< "TileDimension inferior to 16 : using 16 as tile dimension");
+ m_TileDimension = 16;
}
// Calculate number of split
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
index 2c81130ab6491431713a5b5a9505fc51e7a4408c..f183b942b4ab384ab726c4574fca17f41417d6bd 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
@@ -111,7 +111,7 @@ protected:
/**
* Re-implement the method ThreadedGenerateData to mask area outside the deformation grid
*/
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
StreamingWarpImageFilter(const Self&) = delete;
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
index 724d9fb4f0e8322b8072465fa6dd72f780fc758c..db6c4630bd72d1c96abdc46f887183d5e97f341b 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
@@ -35,6 +35,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TDisplacementField>
StreamingWarpImageFilter<TInputImage, TOutputImage, TDisplacementField>::StreamingWarpImageFilter()
{
+ this->DynamicMultiThreadingOn();
// Fill the default maximum displacement
m_MaximumDisplacement.Fill(1);
m_OutputSignedSpacing = this->Superclass::GetOutputSpacing();
@@ -284,11 +285,10 @@ void StreamingWarpImageFilter<TInputImage, TOutputImage, TDisplacementField>::Ge
}
template <class TInputImage, class TOutputImage, class TDisplacementField>
-void StreamingWarpImageFilter<TInputImage, TOutputImage, TDisplacementField>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void StreamingWarpImageFilter<TInputImage, TOutputImage, TDisplacementField>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// the superclass itk::WarpImageFilter is doing the actual warping
- Superclass::ThreadedGenerateData(outputRegionForThread, threadId);
+ Superclass::DynamicThreadedGenerateData(outputRegionForThread);
// second pass on the thread region to mask pixels outside the displacement grid
const PixelType paddingValue = this->GetEdgePaddingValue();
diff --git a/Modules/Core/Transform/src/otbBilinearProjection.cxx b/Modules/Core/Transform/src/otbBilinearProjection.cxx
index 1e637f7c443f77e4874588bc176919aafc9b8557..5b403cf42dfce1e3ee315050d522919da52ce6be 100644
--- a/Modules/Core/Transform/src/otbBilinearProjection.cxx
+++ b/Modules/Core/Transform/src/otbBilinearProjection.cxx
@@ -130,7 +130,7 @@ void BilinearProjection::computeLS()
otbGenericExceptionMacro(itk::ExceptionObject, <<"Difference between the number of linesample points and world points");
}
- for (uint64_t i = 0; i < m_LineSamplePoints.size(); ++i)
+ for (std::uint64_t i = 0; i < m_LineSamplePoints.size(); ++i)
{
Point2DType currentWorldPoint;
currentWorldPoint[0] = m_worldPoints[i][0];
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.h b/Modules/Core/VectorDataBase/include/otbDataNode.h
index 8af65b5a1669faee232d3e38a4e0f7ba5db63390..91ab71caab57fd5ae6f12cc740940dae1207d096 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.h
@@ -283,6 +283,19 @@ public:
*/
// void ClearFields();
+ /**
+ * \brief Perform a reset of all fields of a datanode using an input node
+ * \warning Be aware that m_data contains itk smart pointers to polygon =>
+ * if you modify this polygon it will be modified in the input data node
+ * \param inputNode
+ */
+ void Reset(const DataNode& inputNode)
+ {
+ this->SetNodeType(inputNode.GetNodeType());
+ this->SetNodeId(inputNode.GetNodeId());
+ CopyFieldList(&inputNode);
+ this->m_Data = inputNode.m_Data;
+ }
protected:
/** Constructor */
DataNode();
@@ -298,7 +311,7 @@ protected:
private:
DataNode(const Self&) = delete;
void operator=(const Self&) = delete;
-
+//TODO Refactor modern cpp
/** typedef of the data associated with the node */
typedef struct
{
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.h b/Modules/Core/VectorDataBase/include/otbVectorData.h
index 5cba11b16e78e435823edadb4e2b5645fa636163..ca47520ab8b00626ebc0738658e4ad7089b2e6e8 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.h
@@ -21,9 +21,11 @@
#ifndef otbVectorData_h
#define otbVectorData_h
-#include "itkTreeContainer.h"
#include "itkDataObject.h"
#include "otbDataNode.h"
+#include <boost/graph/graph_as_tree.hpp>
+#include <boost/graph/adjacency_list.hpp>
+#include <boost/graph/copy.hpp>
namespace otb
{
@@ -54,66 +56,66 @@ namespace otb
*
* \ingroup OTBVectorDataBase
*/
+
template <class TPrecision = double, unsigned int VDimension = 2, class TValuePrecision = double>
class VectorData : public itk::DataObject
{
public:
- /** Standard class typedefs */
- typedef VectorData Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ /** Standard class usings */
+ using Self = VectorData;
+ using Superclass = itk::DataObject;
+ using Pointer = itk::SmartPointer<Self>;
+ using ConstPointer = itk::SmartPointer<const Self>;
/** Standard macros */
itkNewMacro(Self);
itkTypeMacro(VectorData, DataObject);
itkStaticConstMacro(Dimension, unsigned int, VDimension);
- /** Template parameters typedef */
- typedef TPrecision PrecisionType;
- typedef TValuePrecision ValuePrecisionType;
+ /** Template parameters using */
+ using PrecisionType = TPrecision;
+ using ValuePrecisionType = TValuePrecision;
// define VDimension Dimension;
- typedef otb::DataNode<TPrecision, VDimension, TValuePrecision> DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef itk::TreeContainer<DataNodePointerType> DataTreeType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
-
- typedef typename DataNodeType::PointType PointType;
- typedef typename DataNodeType::LineType LineType;
- typedef typename DataNodeType::PolygonType PolygonType;
-
- typedef itk::Vector<double, 2> SpacingType;
- typedef itk::Point<double, 2> OriginType;
-
- itkGetObjectMacro(DataTree, DataTreeType);
- itkGetConstObjectMacro(DataTree, DataTreeType);
-
- virtual void SetProjectionRef(const std::string& projectionRef);
- virtual std::string GetProjectionRef() const;
+ using DataNodeType = otb::DataNode<TPrecision, VDimension, TValuePrecision>;
+ using DataNodePointerType = typename DataNodeType::Pointer;
+ using PointType = typename DataNodeType::PointType;
+ using LineType = typename DataNodeType::LineType;
+ using PolygonType = typename DataNodeType::PolygonType;
+ using SpacingType = itk::Vector<double, 2>;
+ using OriginType = itk::Point<double, 2>;
+ using DataTreeType = boost::adjacency_list< boost::vecS, boost::vecS, boost::directedS, DataNodePointerType >;
+ using TreeNodeType = typename boost::graph_traits< DataTreeType >::vertex_descriptor;
+ using TreeEdgeType = typename boost::graph_traits< DataTreeType >::edge_descriptor;
+ using ChildrenListType = std::vector<DataNodePointerType>;
+ using VertexIterator = typename boost::graph_traits<DataTreeType>::vertex_iterator;
+
+ void SetProjectionRef(const std::string& projectionRef);
+ std::string GetProjectionRef() const;
/** Set the origin of the vector data to put it in the corresponding
* image coordinates
* \sa GetOrigin() */
itkSetMacro(Origin, OriginType);
- virtual void SetOrigin(const double origin[2]);
- virtual void SetOrigin(const float origin[2]);
+ void SetOrigin(const double origin[2]);
+ void SetOrigin(const float origin[2]);
itkGetConstReferenceMacro(Origin, OriginType);
-
+
/** Set the spacing of the vector data to put it in the corresponding
* image coordinates
* \sa GetSignedSpacing() */
- virtual void SetSpacing(const SpacingType& spacing);
- virtual void SetSpacing(const double spacing[2]);
- virtual void SetSpacing(const float spacing[2]);
+ void SetSpacing(const SpacingType& spacing);
+ void SetSpacing(const double spacing[2]);
+ void SetSpacing(const float spacing[2]);
+
itkGetConstReferenceMacro(Spacing, SpacingType);
/** Clear the vector data */
- virtual bool Clear();
+ void Clear();
/** Return the number of element in the tree */
- virtual int Size() const;
+ int Size() const;
void TransformPointToPhysicalPoint(const PointType& point, PointType& physicalPoint) const
{
@@ -130,6 +132,62 @@ public:
* VectorDataSource::GraftOutput(). */
void Graft(const itk::DataObject* data) override;
+ void SetRoot(DataNodePointerType rootNode)
+ {
+ ResetRoot(*rootNode);
+ }
+
+ DataNodePointerType GetRoot() const
+ {
+ return m_root;
+ };
+
+ void Add(DataNodePointerType nodeToAdd,DataNodePointerType rootForNode)
+ {
+ // Add the vertex then create an edge between these vertex
+ TreeNodeType nodevertex = boost::add_vertex(nodeToAdd,m_DataTree);
+ // find the corresponding root vertex in the tree
+ TreeNodeType rootvertex = ConvertToTreeNodeType(rootForNode);
+ // add an edge between the node and its root
+ boost::add_edge(rootvertex,nodevertex,m_DataTree);
+ };
+
+ std::vector<DataNodePointerType> GetChildrenList(DataNodePointerType parentNode) const
+ {
+ //typename boost::property_map<DataTreeType, boost::vertex_bundle_t>::type pmap = boost::get(boost::vertex_bundle, m_DataTree);
+ std::vector<DataNodePointerType> childrenslist;
+ VertexIterator it,it_end;
+ boost::tie(it, it_end) = boost::vertices(m_DataTree);
+
+ for (;it!=it_end;it++)
+ {
+ if(m_DataTree[*it] == parentNode)
+ {
+ typename boost::graph_traits<DataTreeType>::adjacency_iterator eit, eend;
+ std::tie(eit, eend) = boost::adjacent_vertices(*it, m_DataTree);
+ for(;eit != eend;eit++)
+ {
+ childrenslist.push_back(m_DataTree[*eit]);
+ }
+ break;
+ }
+ }
+ return childrenslist;
+ };
+
+ std::pair<VertexIterator,VertexIterator> GetIteratorPair() const
+ {
+ VertexIterator it,it_end;
+ boost::tie(it, it_end) = boost::vertices(m_DataTree);
+
+ return std::make_pair(it,it_end);
+ }
+
+ DataNodePointerType Get(VertexIterator dataIt) const
+ {
+ return m_DataTree[*dataIt];
+ }
+
protected:
/** Constructor */
VectorData();
@@ -140,13 +198,45 @@ protected:
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
+ TreeNodeType ConvertToTreeNodeType(DataNodePointerType datanode)
+ {
+ typename boost::graph_traits<DataTreeType>::vertex_iterator it,it_end;
+ boost::tie(it, it_end) = boost::vertices(m_DataTree);
+ for (;it!=it_end;it++)
+ {
+ if(m_DataTree[*it] == datanode)
+ {
+ return *it;
+ }
+ }
+ //Default case : return the vertex descriptor to the root of the graph
+ return *boost::vertices(m_DataTree).first;
+ };
+
+ void Reset(const Self& inputVD)
+ {
+ boost::copy_graph(inputVD.m_DataTree,this->m_DataTree);
+ this->m_root = inputVD.m_root;
+ this->m_Spacing = inputVD.m_Spacing;
+ this->m_Origin = inputVD.m_Origin;
+ }
+
+ void ResetRoot(const DataNodeType& rootNode)
+ {
+ this->m_root->Reset(rootNode);
+ }
+
private:
VectorData(const Self&) = delete;
- void operator=(const Self&) = delete;
- /** Data tree */
- DataTreePointerType m_DataTree;
+ void CopyDataTree(const Self* inputVD)
+ {
+ boost::copy_graph(inputVD->m_DataTree,this->m_DataTree);
+ }
+ /** Data tree */
+ DataTreeType m_DataTree;
+ DataNodePointerType m_root;
SpacingType m_Spacing;
OriginType m_Origin;
};
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.hxx b/Modules/Core/VectorDataBase/include/otbVectorData.hxx
index 436aac874d97a5293c5dddac1fb63b3431c93a9d..a622b7db8c036f960c1f166a53321fa31a19c639 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.hxx
@@ -22,7 +22,6 @@
#define otbVectorData_hxx
#include "otbVectorData.h"
-#include "itkPreOrderTreeIterator.h"
#include "otbMetaDataKey.h"
namespace otb
@@ -31,10 +30,10 @@ namespace otb
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
VectorData<TPrecision, VDimension, TValuePrecision>::VectorData()
{
- m_DataTree = DataTreeType::New();
- DataNodePointerType root = DataNodeType::New();
- root->SetNodeId("Root");
- m_DataTree->SetRoot(root);
+ m_root = DataNodeType::New();
+ m_root->SetNodeType(otb::ROOT);
+ m_root->SetNodeId("Root");
+ boost::add_vertex(m_root, m_DataTree);
m_Origin.Fill(0);
m_Spacing.Fill(1);
}
@@ -103,37 +102,41 @@ void VectorData<TPrecision, VDimension, TValuePrecision>::SetOrigin(const float
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-bool VectorData<TPrecision, VDimension, TValuePrecision>::Clear()
+void VectorData<TPrecision, VDimension, TValuePrecision>::Clear()
{
- return m_DataTree->Clear();
+ m_DataTree.clear();
+ //Always add a root node by default
+ boost::add_vertex(m_root,m_DataTree);
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
int VectorData<TPrecision, VDimension, TValuePrecision>::Size() const
{
- return m_DataTree->Count();
+ return boost::num_vertices(m_DataTree);
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
void VectorData<TPrecision, VDimension, TValuePrecision>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os << std::endl;
+ os << "\n";
- itk::PreOrderTreeIterator<DataTreeType> it(m_DataTree);
- it.GoToBegin();
-
- while (!it.IsAtEnd())
+ typename boost::graph_traits<DataTreeType>::vertex_iterator it,it_end;
+ boost::tie(it, it_end) = vertices(m_DataTree);
+ uint8_t indentcounts = 0;
+ for (;it!=it_end;it++)
{
- itk::PreOrderTreeIterator<DataTreeType> itParent = it;
- bool goesOn = true;
- while (itParent.HasParent() && goesOn)
+ for(auto i = 0; i<indentcounts;i++)
{
os << indent;
- goesOn = itParent.GoToParent();
}
- os << "+" << it.Get()->GetNodeTypeAsString() << std::endl;
- ++it;
+ os << "+" << m_DataTree[*it]->GetNodeTypeAsString() << "\n";
+ typename boost::graph_traits<DataTreeType>::adjacency_iterator ai, a_end;
+ boost::tie(ai, a_end) = boost::adjacent_vertices(*it, m_DataTree);
+ for (; ai != a_end; ai++) {
+ indentcounts++;
+ break;
+ }
}
}
@@ -146,25 +149,18 @@ void VectorData<TPrecision, VDimension, TValuePrecision>::Graft(const itk::DataO
if (data)
{
// Attempt to cast data to an Image
- const Self* vdData;
-
- try
- {
- vdData = dynamic_cast<const Self*>(data);
- }
- catch (...)
- {
- return;
- }
+ const Self* vdData = dynamic_cast<const Self*>(data);
if (vdData)
{
// Copy all the needed data : DataTree, spacing, origin and
// Projection Ref
- m_DataTree = const_cast<DataTreeType*>(vdData->GetDataTree());
+ this->m_DataTree.clear(); //Before copy make sure the datatree is EMPTY
+ this->CopyDataTree(vdData);
this->SetSpacing(vdData->GetSpacing());
this->SetOrigin(vdData->GetOrigin());
this->SetProjectionRef(vdData->GetProjectionRef());
+ this->m_root = vdData->GetRoot();
}
else
{
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h b/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
index 06a0f7d8d21261119cd982b7ce93a09f449f6647..d89858cb4631f60cc9b2cdaa094b69232a6511ea 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
@@ -160,6 +160,26 @@ public:
/** Deep copy operator*/
void operator=(const Self&);
+ friend bool operator==(const Self &lhs, const Self &rhs)
+ {
+ unsigned int equalfields = 0;
+ if(lhs.GetNumberOfFields()==rhs.GetNumberOfFields())
+ {
+ for(unsigned int i = 0; i < lhs.m_FieldList.size(); ++i)
+ {
+ if(lhs.HasField((rhs.m_FieldList[i].first)->GetNameRef()))
+ {
+ equalfields++;
+ }
+ }
+ }
+ if (equalfields == lhs.GetNumberOfFields())
+ {
+ return true;
+ }
+ return false;
+ };
+
protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
index db46e1f2caf87904e3612bf082dfe8531a13035a..a41941c150c5bfcebcff4f86cf2fdf1cc3289a57 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
@@ -54,9 +54,7 @@ public:
typedef typename VectorDataType::DataNodeType DataNodeType;
typedef typename DataNodeType::Pointer DataNodePointerType;
typedef typename DataNodeType::PolygonType PolygonType;
-
- typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename VectorDataType::ChildrenListType ChildrenListType;
typedef typename PolygonType::RegionType RegionType;
typedef typename RegionType::Pointer RegionPointerType;
@@ -101,7 +99,7 @@ protected:
/**PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
- void ProcessNode(InternalTreeNodeType* source);
+ void ProcessNode(VectorDataType* inputVdata,DataNodePointerType source);
bool IsBoundingRegionNull();
private:
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
index 8567a41acb19770a7be479400ab86e6a6e58d3d2..bf81d00d099608b7775e198a0a0598f78b3f4c98 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
@@ -75,37 +75,36 @@ void VectorDataProperties<TVectorData>::ComputeBoundingRegion()
m_BoundingRegion.SetSize(size);
/** Compute the bounding region*/
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(m_VectorDataObject->GetDataTree()->GetRoot());
- ProcessNode(inputRoot);
+ ProcessNode(m_VectorDataObject,m_VectorDataObject->GetRoot());
}
template <class TVectorData>
-void VectorDataProperties<TVectorData>::ProcessNode(InternalTreeNodeType* source)
+void VectorDataProperties<TVectorData>::ProcessNode(VectorDataType* inputVdata,DataNodePointerType source)
{
// Get the children list from the input node
- ChildrenListType children = source->GetChildrenList();
+ ChildrenListType children = inputVdata->GetChildrenList(source);
// For each child
for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
{
// Copy input DataNode info
- DataNodePointerType dataNode = (*it)->Get();
+ DataNodePointerType dataNode = (*it);
switch (dataNode->GetNodeType())
{
case otb::ROOT:
{
- ProcessNode((*it));
+ //ProcessNode(inputVdata,(*it));
break;
}
case otb::DOCUMENT:
{
- ProcessNode((*it));
+ ProcessNode(inputVdata,(*it));
break;
}
case otb::FOLDER:
{
- ProcessNode((*it));
+ ProcessNode(inputVdata,(*it));
break;
}
case FEATURE_POINT:
diff --git a/Modules/Core/VectorDataBase/src/otbVectorDataKeywordlist.cxx b/Modules/Core/VectorDataBase/src/otbVectorDataKeywordlist.cxx
index a1c2fde16be19ae8916c7cf09e3c6bb6b8229a25..314d89d9133676101a4e3d10558e1bbea5336f1d 100644
--- a/Modules/Core/VectorDataBase/src/otbVectorDataKeywordlist.cxx
+++ b/Modules/Core/VectorDataBase/src/otbVectorDataKeywordlist.cxx
@@ -350,6 +350,7 @@ void VectorDataKeywordlist::operator=(const Self& p)
}
}
+
void VectorDataKeywordlist::Print(std::ostream& os, itk::Indent indent) const
{
this->PrintSelf(os, indent.GetNextIndent());
diff --git a/Modules/Core/VectorDataBase/test/otbVectorData.cxx b/Modules/Core/VectorDataBase/test/otbVectorData.cxx
index aa55119673411516b59bbec37b33df669df5a7a1..d4bcca61813395ed18024e3113f274f58d480bda 100644
--- a/Modules/Core/VectorDataBase/test/otbVectorData.cxx
+++ b/Modules/Core/VectorDataBase/test/otbVectorData.cxx
@@ -63,13 +63,13 @@ int otbVectorData(int argc, char* argv[])
PolygonType::Pointer pol = PolygonType::New();
polygon->SetPolygonExteriorRing(pol);
- DataNodeType::Pointer root = data->GetDataTree()->GetRoot()->Get();
+ DataNodeType::Pointer root = data->GetRoot();
- data->GetDataTree()->Add(document, root);
- data->GetDataTree()->Add(folder, document);
- data->GetDataTree()->Add(point, folder);
- data->GetDataTree()->Add(line, folder);
- data->GetDataTree()->Add(polygon, folder);
+ data->Add(document, root);
+ data->Add(folder, document);
+ data->Add(point, folder);
+ data->Add(line, folder);
+ data->Add(polygon, folder);
if (argc < 2)
{
diff --git a/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
index d1e7eef02760fec0c0846f41ed3a807faa2c2141..579eaa2082e7dc69f7a04dae912f0ea529794e83 100644
--- a/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
+++ b/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
@@ -33,39 +33,25 @@ int otbVectorDataKeywordlist(int itkNotUsed(argc), char* argv[])
typedef otb::VectorData<> VectorDataType;
typedef otb::VectorDataFileReader<VectorDataType> VectorDataFileReaderType;
VectorDataFileReaderType::Pointer reader = VectorDataFileReaderType::New();
-
- typedef otb::DataNode<double, 2, double> DataNodeType;
- typedef DataNodeType::Pointer DataNodePointerType;
- typedef itk::TreeContainer<DataNodePointerType> DataTreeType;
-
itk::Indent indent;
reader->SetFileName(argv[1]);
reader->Update();
VectorDataType::Pointer data = reader->GetOutput();
- DataTreeType::Pointer dataTree = DataTreeType::New();
- dataTree = data->GetDataTree();
std::ofstream fout(argv[2]);
- itk::PreOrderTreeIterator<DataTreeType> it(dataTree);
- it.GoToBegin();
+ auto itPair = data->GetIteratorPair();
+ auto it = itPair.first;
- while (!it.IsAtEnd())
+ while (it != itPair.second)
{
- itk::PreOrderTreeIterator<DataTreeType> itParent = it;
- bool goesOn = true;
- while (itParent.HasParent() && goesOn)
- {
- fout << indent;
- goesOn = itParent.GoToParent();
- }
- if (it.Get()->GetMetaDataDictionary().HasKey(otb::MetaDataKey::VectorDataKeywordlistKey))
+ if (data->Get(it)->GetMetaDataDictionary().HasKey(otb::MetaDataKey::VectorDataKeywordlistKey))
{
otb::VectorDataKeywordlist kwl;
kwl.GetNameOfClass();
- itk::ExposeMetaData<otb::VectorDataKeywordlist>(it.Get()->GetMetaDataDictionary(), otb::MetaDataKey::VectorDataKeywordlistKey, kwl);
+ itk::ExposeMetaData<otb::VectorDataKeywordlist>(data->Get(it)->GetMetaDataDictionary(), otb::MetaDataKey::VectorDataKeywordlistKey, kwl);
fout << "New node: " << kwl.GetNumberOfFields() << " fields" << std::endl;
fout << "- HasField(\"name\"): " << kwl.HasField("name") << std::endl;
if (kwl.HasField("name"))
@@ -75,7 +61,7 @@ int otbVectorDataKeywordlist(int itkNotUsed(argc), char* argv[])
fout << std::endl;
}
- ++it;
+ it++;
}
/*added PrintSelf*/
diff --git a/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h b/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
index 34feb778aaf7d48cf815975bdd96241506cc1e19..ff371f3c06534e00a2cd283bdf20ca4a34a431b1 100644
--- a/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
+++ b/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
@@ -23,7 +23,6 @@
#include "otbVectorDataToVectorDataFilter.h"
#include "otbVectorData.h"
-#include "itkPreOrderTreeIterator.h"
namespace otb
{
@@ -67,8 +66,8 @@ public:
typedef typename DataNodeType::PolygonType::VertexType VertexType;
typedef typename DataNodeType::LineType LineType;
typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataTreeType::TreeNodeType TreeNodeType;
- typedef typename TreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename VectorDataType::TreeNodeType TreeNodeType;
+ typedef typename VectorDataType::ChildrenListType ChildrenListType;
typedef typename std::vector<PointType> PointVectorType;
@@ -89,7 +88,7 @@ protected:
void GenerateData(void) override;
/** Recursive method to visit efficiently the vectordata*/
- void ProcessNode(TreeNodeType* source, DataNodeType* outputDocument);
+ void ProcessNode(const VectorDataType* inputVd, DataNodeType* source, VectorDataType* outputVd, DataNodeType* outputDocument);
private:
ConcatenateVectorDataFilter(const Self&) = delete;
diff --git a/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx b/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
index 818e4f0e3552f15f201904d80f8e4a0ab34c4eee..3703c10f8878464b0ec2f3ad115c7e85268067fc 100644
--- a/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
+++ b/Modules/Core/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
@@ -82,98 +82,93 @@ void ConcatenateVectorDataFilter<TVectorData>::GenerateData()
// this->GetOutput()->SetMetaDataDictionary(this->GetInput(0)->GetMetaDataDictionary());
// Prepare the output
- // typename DataNodeType::Pointer outputRoot = this->GetOutput()->GetDataTree()->GetRoot()->Get();
-
-
- typename DataTreeType::Pointer outputTree = this->GetOutput()->GetDataTree();
- typename TreeNodeType::Pointer inputRoot = const_cast<TreeNodeType*>(this->GetInput(0)->GetDataTree()->GetRoot());
-
- outputTree->SetRoot(inputRoot);
-
- typename DataNodeType::Pointer outputDocument = this->GetOutput()->GetDataTree()->GetRoot()->GetChild(0)->Get();
+ // typename DataNodeType::Pointer outputRoot = this->GetOutput()->GetRoot();
+ auto outputPtr = this->GetOutput();
+ auto inputPtr = this->GetInput(0);
+ outputPtr->Graft(inputPtr);
+ typename DataNodeType::Pointer outputDocument = outputPtr->GetChildrenList(outputPtr->GetRoot()).at(0);
+ //outputPtr->Add(outputDocument,outputPtr->GetRoot());
// Adding the layer to the data tree
- // this->GetOutput()->GetDataTree()->Add(m_Document, outputRoot);
- // this->GetOutput()->GetDataTree()->Add(m_Folder, m_Document);
+ // this->GetOutput()->Add(m_Document, outputRoot);
+ // this->GetOutput()->Add(m_Folder, m_Document);
// Retrieve all the inputs
for (unsigned int idx = 1; idx < this->GetNumberOfInputs(); ++idx)
{
// Add the current vectordata
- TreeNodeType* currentInputRoot = const_cast<TreeNodeType*>(this->GetInput(idx)->GetDataTree()->GetRoot());
-
- ProcessNode(currentInputRoot, outputDocument);
+ ProcessNode(this->GetInput(idx),this->GetInput(idx)->GetRoot(),outputPtr, outputDocument);
}
}
template <class TVectorData>
-void ConcatenateVectorDataFilter<TVectorData>::ProcessNode(TreeNodeType* source, DataNodeType* outputDocument)
+void ConcatenateVectorDataFilter<TVectorData>::ProcessNode(const VectorDataType* inputVd,DataNodeType* source, VectorDataType* outputVd,DataNodeType* outputDocument)
{
if (source == nullptr)
return;
// Get the children list from the input node
- ChildrenListType children = source->GetChildrenList();
+ ChildrenListType children = inputVd->GetChildrenList(source);
// For each child
typename ChildrenListType::iterator it;
for (it = children.begin(); it != children.end(); ++it)
{
// get the data node
- DataNodePointerType dataNode = (*it)->Get();
+ DataNodePointerType dataNode = (*it);
switch (dataNode->GetNodeType())
{
case ROOT:
{
- ProcessNode((*it), outputDocument);
+ //ProcessNode(inputVd,dataNode,outputVd,outputDocument);
break;
}
case DOCUMENT:
{
- ProcessNode((*it), outputDocument);
+ ProcessNode(inputVd,dataNode,outputVd,outputDocument);
break;
}
case FOLDER:
{
- ProcessNode((*it), outputDocument);
+ ProcessNode(inputVd,dataNode,outputVd,outputDocument);
break;
}
case FEATURE_POINT:
{
- this->GetOutput()->GetDataTree()->Add(dataNode, outputDocument);
+ outputVd->Add(dataNode, outputDocument);
break;
}
case FEATURE_LINE:
{
- this->GetOutput()->GetDataTree()->Add(dataNode, outputDocument);
+ outputVd->Add(dataNode, outputDocument);
break;
}
case FEATURE_POLYGON:
{
- this->GetOutput()->GetDataTree()->Add(dataNode, outputDocument);
+ outputVd->Add(dataNode, outputDocument);
break;
}
case FEATURE_MULTIPOINT:
{
- ProcessNode((*it), outputDocument);
+ ProcessNode(inputVd,dataNode,outputVd,outputDocument);
break;
}
case FEATURE_MULTILINE:
{
- ProcessNode((*it), outputDocument);
+ ProcessNode(inputVd,dataNode,outputVd,outputDocument);
break;
}
case FEATURE_MULTIPOLYGON:
{
- ProcessNode((*it), outputDocument);
+ ProcessNode(inputVd,dataNode,outputVd,outputDocument);
break;
}
case FEATURE_COLLECTION:
{
- ProcessNode((*it), outputDocument);
+ ProcessNode(inputVd,dataNode,outputVd,outputDocument);
break;
}
}
diff --git a/Modules/Core/VectorDataManipulation/include/otbPolygonCompacityFunctor.h b/Modules/Core/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
index d1a5e98c770740b833234fca2c8762298bfa3c96..94df6beebfcb0feb051984cd77913ff8b567921a 100644
--- a/Modules/Core/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
+++ b/Modules/Core/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
@@ -22,6 +22,8 @@
#define otbPolygonCompacityFunctor_h
#include "otbMath.h"
+#include "vcl_legacy_aliases.h"
+#include "vnl/vnl_math.h"
namespace otb
{
diff --git a/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.h b/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.h
index 6c598d63a64d7d3fe2b0854ee2da320998f62498..c9f8750c01ca62eaff7c311129f05ad55314339e 100644
--- a/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.h
+++ b/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.h
@@ -24,7 +24,6 @@
#include "otbVectorDataToVectorDataFilter.h"
#include "otbRemoteSensingRegion.h"
#include "itkMacro.h"
-#include "itkPreOrderTreeIterator.h"
namespace otb
{
@@ -68,6 +67,8 @@ public:
/** Image type information*/
typedef TVectorData VectorDataType;
+ typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
typedef typename VectorDataType::DataNodeType DataNodeType;
typedef typename DataNodeType::Pointer DataNodePointerType;
typedef typename VectorDataType::DataTreeType DataTreeType;
@@ -89,9 +90,7 @@ public:
typedef itk::Point<typename VertexType::CoordRepType, IndexType::IndexDimension> ProjPointType;
- typedef itk::PreOrderTreeIterator<typename VectorDataType::DataTreeType> InputTreeIteratorType;
- typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename VectorDataType::ChildrenListType ChildrenListType;
/** Method to Set/Get the Region of interest*/
void SetRegion(const RegionType& region)
@@ -131,7 +130,7 @@ protected:
/** Method to check if the line Bounding Box ha ve a non-null intersection with the ROI*/
virtual bool IsLineIntersectionNotNull(LinePointerType line);
- virtual void ProcessNode(InternalTreeNodeType* source, InternalTreeNodeType* destination);
+ virtual void ProcessNode(VectorDataConstPointerType inputVdata, DataNodePointerType source, VectorDataPointerType outputVdata, DataNodePointerType destination);
using Superclass::ProcessNode;
private:
diff --git a/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.hxx b/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
index 26183672e4432727d0f7094863c75e0410eb6c9b..5d76e08dae98e01eab52e3c34598f0b8cae9bd95 100644
--- a/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
+++ b/Modules/Core/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
@@ -85,41 +85,30 @@ void VectorDataExtractROI<TVectorData>::GenerateData(void)
otbMsgDevMacro(<< "ROI: " << this->m_ROI);
otbMsgDevMacro(<< "GeoROI: " << this->m_GeoROI);
- // Retrieve the output tree
- typename VectorDataType::DataTreePointerType tree = outputPtr->GetDataTree();
-
- // Get the input tree root
- InternalTreeNodeType* inputRoot = const_cast<InternalTreeNodeType*>(inputPtr->GetDataTree()->GetRoot());
-
// Create the output tree root
- DataNodePointerType newDataNode = DataNodeType::New();
- newDataNode->SetNodeType(inputRoot->Get()->GetNodeType());
- newDataNode->SetNodeId(inputRoot->Get()->GetNodeId());
-
- typename InternalTreeNodeType::Pointer outputRoot = InternalTreeNodeType::New();
- outputRoot->Set(newDataNode);
- tree->SetRoot(outputRoot);
+ // DataNodePointerType outputRoot = DataNodeType::New();
+ // outputRoot->SetNodeType(inputPtr->GetRoot()->GetNodeType());
+ // outputRoot->SetNodeId(inputPtr->GetRoot()->GetNodeId());
+ // outputPtr->SetRoot(outputRoot);
m_Kept = 0;
// Start recursive processing
otb::Stopwatch chrono = otb::Stopwatch::StartNew();
- ProcessNode(inputRoot, outputRoot);
+ ProcessNode(inputPtr,inputPtr->GetRoot(),outputPtr,outputPtr->GetRoot());
chrono.Stop();
otbMsgDevMacro(<< "VectorDataExtractROI: " << m_Kept << " features processed in " << chrono.GetElapsedMilliseconds() << " ms.");
} /*End GenerateData()*/
template <class TVectorData>
-void VectorDataExtractROI<TVectorData>::ProcessNode(InternalTreeNodeType* source, InternalTreeNodeType* destination)
+void VectorDataExtractROI<TVectorData>::ProcessNode(VectorDataConstPointerType inputVdata, DataNodePointerType source, VectorDataPointerType outputVdata, DataNodePointerType destination)
{
// Get the children list from the input node
- ChildrenListType children = source->GetChildrenList();
+ ChildrenListType children = inputVdata->GetChildrenList(source);
// For each child
for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
{
- typename InternalTreeNodeType::Pointer newContainer;
-
- DataNodePointerType dataNode = (*it)->Get();
+ DataNodePointerType dataNode = (*it);
DataNodePointerType newDataNode = DataNodeType::New();
newDataNode->SetNodeType(dataNode->GetNodeType());
newDataNode->SetNodeId(dataNode->GetNodeId());
@@ -129,29 +118,23 @@ void VectorDataExtractROI<TVectorData>::ProcessNode(InternalTreeNodeType* source
{
case ROOT:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
- ++m_Kept;
+ //outputVdata->Add(newDataNode,destination);
+ //ProcessNode(inputVdata,(*it), outputVdata, newDataNode);
+ //++m_Kept;
break;
}
case DOCUMENT:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
- ProcessNode((*it), newContainer);
+ ProcessNode(inputVdata,(*it), outputVdata, newDataNode);
break;
}
case FOLDER:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
- ProcessNode((*it), newContainer);
+ ProcessNode(inputVdata,(*it), outputVdata, newDataNode);
break;
}
case FEATURE_POINT:
@@ -159,9 +142,7 @@ void VectorDataExtractROI<TVectorData>::ProcessNode(InternalTreeNodeType* source
if (m_GeoROI.IsInside(this->PointToContinuousIndex(dataNode->GetPoint())))
{
newDataNode->SetPoint(dataNode->GetPoint());
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
}
break;
@@ -171,9 +152,7 @@ void VectorDataExtractROI<TVectorData>::ProcessNode(InternalTreeNodeType* source
if (this->IsLineIntersectionNotNull(dataNode->GetLine()))
{
newDataNode->SetLine(dataNode->GetLine());
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
}
break;
@@ -184,47 +163,37 @@ void VectorDataExtractROI<TVectorData>::ProcessNode(InternalTreeNodeType* source
{
newDataNode->SetPolygonExteriorRing(dataNode->GetPolygonExteriorRing());
newDataNode->SetPolygonInteriorRings(dataNode->GetPolygonInteriorRings());
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
}
break;
}
case FEATURE_MULTIPOINT:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
- ProcessNode((*it), newContainer);
+ ProcessNode(inputVdata,(*it), outputVdata, newDataNode);
break;
}
case FEATURE_MULTILINE:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
- ProcessNode((*it), newContainer);
+ ProcessNode(inputVdata,(*it), outputVdata, newDataNode);
break;
}
case FEATURE_MULTIPOLYGON:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
- ProcessNode((*it), newContainer);
+ ProcessNode(inputVdata,(*it), outputVdata, newDataNode);
break;
}
case FEATURE_COLLECTION:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ outputVdata->Add(newDataNode,destination);
++m_Kept;
- ProcessNode((*it), newContainer);
+ ProcessNode(inputVdata,(*it), outputVdata, newDataNode);
break;
}
}
diff --git a/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h b/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
index eab5325f61b8c2468b3ff6dcaf5a54f360bb1b4f..6d9c49d6a1c0c3381266145668bfdac81c076a88 100644
--- a/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
+++ b/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
@@ -23,7 +23,6 @@
#include "otbVectorDataSource.h"
#include "otbVectorData.h"
-#include "itkPreOrderTreeIterator.h"
#include "itkMersenneTwisterRandomVariateGenerator.h"
#include <string>
@@ -70,8 +69,6 @@ public:
typedef typename DataNodeType::LineType::VertexType VertexType;
typedef typename std::vector<PointType> PointVectorType;
- typedef itk::PreOrderTreeIterator<typename VectorDataType::DataTreeType> TreeIteratorType;
-
typedef itk::Statistics::MersenneTwisterRandomVariateGenerator RandomGeneratorType;
/** Connects the VectorData from which the extend will be extracted. */
diff --git a/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx b/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
index 45c3e1410d2e1bf1f974ceaae4ad6343938e9d79..3b01c644ed36f7f3f3fb8aaf10a84b44d51ac7f6 100644
--- a/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
+++ b/Modules/Core/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
@@ -105,21 +105,21 @@ void VectorDataToRandomLineGenerator<TVectorData>::GenerateData()
this->GetOutput()->SetMetaDataDictionary(this->GetInput()->GetMetaDataDictionary());
// Retrieving root node
- typename DataNodeType::Pointer root = this->GetOutput()->GetDataTree()->GetRoot()->Get();
+ typename DataNodeType::Pointer root = this->GetOutput()->GetRoot();
// Create the document node
typename DataNodeType::Pointer document = DataNodeType::New();
document->SetNodeType(otb::DOCUMENT);
// Adding the layer to the data tree
- this->GetOutput(0)->GetDataTree()->Add(document, root);
+ this->GetOutput(0)->Add(document, root);
// Iterates through the polygon features and generates random Lines inside the polygon
typename VectorDataType::ConstPointer vectorData = static_cast<const VectorDataType*>(this->GetInput());
- TreeIteratorType itVector(vectorData->GetDataTree());
- itVector.GoToBegin();
- while (!itVector.IsAtEnd())
+ auto itVectorPair = vectorData->GetIteratorPair();
+ auto currentIt = itVectorPair.first;
+ while (currentIt != itVectorPair.second)
{
- if (itVector.Get()->IsPolygonFeature())
+ if (vectorData->Get(currentIt)->IsPolygonFeature())
{
for (unsigned int i = 0; i < this->GetNumberOfOutputLine(); ++i)
@@ -129,7 +129,7 @@ void VectorDataToRandomLineGenerator<TVectorData>::GenerateData()
currentGeometry->SetNodeType(otb::FEATURE_LINE);
typename LineType::Pointer line = LineType::New();
currentGeometry->SetLine(line);
- PointVectorType vPoints = RandomPointsGenerator(itVector.Get());
+ PointVectorType vPoints = RandomPointsGenerator(vectorData->Get(currentIt));
for (typename PointVectorType::const_iterator it = vPoints.begin(); it != vPoints.end(); ++it)
{
VertexType vertex;
@@ -137,10 +137,10 @@ void VectorDataToRandomLineGenerator<TVectorData>::GenerateData()
vertex[1] = (*it)[1];
currentGeometry->GetLine()->AddVertex(vertex);
}
- this->GetOutput(0)->GetDataTree()->Add(currentGeometry, document);
+ this->GetOutput(0)->Add(currentGeometry, document);
}
}
- ++itVector;
+ ++currentIt;
}
}
diff --git a/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h b/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
index c9b52f2f5714c99d538d7c72ecfa2e0755589acd..d0b2bb4601cfa00436ec5e7c3c4518a927b3150a 100644
--- a/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
+++ b/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
@@ -58,13 +58,15 @@ public:
/** Some typedefs. */
typedef TInputVectorData InputVectorDataType;
typedef TOutputVectorData OutputVectorDataType;
- typedef typename TInputVectorData::ConstPointer InputVectorDataPointer;
+ typedef typename TInputVectorData::ConstPointer InputVectorDataPointer;
typedef typename TOutputVectorData::Pointer OutputVectorDataPointer;
- typedef typename InputVectorDataType::DataNodeType InputDataNodeType;
- typedef typename OutputVectorDataType::DataNodeType OutputDataNodeType;
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InputInternalTreeNodeType;
- typedef typename OutputVectorDataType::DataTreeType::TreeNodeType OutputInternalTreeNodeType;
+ typedef typename InputVectorDataType::DataNodeType InputDataNodeType;
+ typedef typename itk::SmartPointer<InputDataNodeType> InputDataNodePointerType;
+ typedef typename OutputVectorDataType::DataNodeType OutputDataNodeType;
+ typedef typename itk::SmartPointer<OutputDataNodeType> OutputDataNodePointerType;
+ typedef typename InputVectorDataType::TreeNodeType InputInternalTreeNodeType;
+ typedef typename OutputVectorDataType::TreeNodeType OutputInternalTreeNodeType;
typedef typename InputDataNodeType::PointType InputPointType;
typedef typename InputDataNodeType::LineType InputLineType;
@@ -88,7 +90,7 @@ public:
using Superclass::SetInput;
virtual void SetInput(const InputVectorDataType* input);
- const InputVectorDataType* GetInput(void);
+ InputVectorDataType* GetInput(void);
protected:
/** Constructor */
@@ -119,7 +121,7 @@ protected:
void GenerateData(void) override;
/** Go through the vector data tree and process the nodes */
- virtual void ProcessNode(InputInternalTreeNodeType* source, OutputInternalTreeNodeType* destination) const;
+ virtual void ProcessNode(InputVectorDataPointer inputVdata,InputDataNodePointerType source, OutputVectorDataPointer outputVdata, OutputDataNodePointerType destination) const;
/**PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
diff --git a/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx b/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
index fe93fb82c069f0bbbea4af4ead8bff36c6d1e3e7..219079e024d96f1fee4e2d797bb180af427e91f9 100644
--- a/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
+++ b/Modules/Core/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
@@ -46,7 +46,7 @@ void VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::SetInput
}
template <class TInputVectorData, class TOutputVectorData>
-const typename VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::InputVectorDataType*
+typename VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::InputVectorDataType*
VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
@@ -54,7 +54,7 @@ VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::GetInput(void
return nullptr;
}
- return static_cast<const TInputVectorData*>(this->itk::ProcessObject::GetInput(0));
+ return static_cast<TInputVectorData*>(this->itk::ProcessObject::GetInput(0));
}
template <class TInputVectorData, class TOutputVectorData>
@@ -77,131 +77,104 @@ void VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::Generate
InputVectorDataPointer inputPtr = this->GetInput();
OutputVectorDataPointer outputPtr = this->GetOutput();
- typedef typename OutputVectorDataType::DataTreePointerType OutputDataTreePointerType;
- OutputDataTreePointerType tree = outputPtr->GetDataTree();
-
// Get the input tree root
- InputInternalTreeNodeType* inputRoot = const_cast<InputInternalTreeNodeType*>(inputPtr->GetDataTree()->GetRoot());
+ typename InputDataNodeType::Pointer inputRoot = inputPtr->GetRoot();
- // Create the output tree root
- typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
- OutputDataNodePointerType newDataNode = OutputDataNodeType::New();
- newDataNode->SetNodeType(inputRoot->Get()->GetNodeType());
- newDataNode->SetNodeId(inputRoot->Get()->GetNodeId());
- typename OutputInternalTreeNodeType::Pointer outputRoot = OutputInternalTreeNodeType::New();
- outputRoot->Set(newDataNode);
- tree->SetRoot(outputRoot);
+ // // Create the output tree root
+ // typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
+ // OutputDataNodePointerType outputRoot = OutputDataNodeType::New();
+ // outputRoot->SetNodeType(inputRoot->GetNodeType());
+ // outputRoot->SetNodeId(inputRoot->GetNodeId());
+ // outputPtr->SetRoot(outputRoot);
// Start recursive processing
otb::Stopwatch chrono = otb::Stopwatch::StartNew();
- this->ProcessNode(inputRoot, outputRoot);
+ this->ProcessNode(inputPtr,inputRoot,outputPtr,outputPtr->GetRoot());
chrono.Stop();
otbMsgDevMacro(<< "VectoDataProjectionFilter: features processed in " << chrono.GetElapsedMilliseconds() << " ms.");
}
template <class TInputVectorData, class TOutputVectorData>
-void VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::ProcessNode(InputInternalTreeNodeType* source,
- OutputInternalTreeNodeType* destination) const
+void VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::ProcessNode(InputVectorDataPointer inputVdata,
+ InputDataNodePointerType source,
+ OutputVectorDataPointer outputVdata,
+ OutputDataNodePointerType destination) const
{
// Get the children list from the input node
- typedef typename InputInternalTreeNodeType::ChildrenListType InputChildrenListType;
- InputChildrenListType children = source->GetChildrenList();
+ typedef typename InputVectorDataType::ChildrenListType InputChildrenListType;
+ InputChildrenListType children = inputVdata->GetChildrenList(source);
// For each child
typename InputChildrenListType::const_iterator it = children.begin();
while (it != children.end())
{
- typename OutputInternalTreeNodeType::Pointer newContainer;
- typedef typename InputVectorDataType::DataNodePointerType InputDataNodePointerType;
- typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
// Copy input DataNode info
- InputDataNodePointerType dataNode = (*it)->Get();
OutputDataNodePointerType newDataNode = OutputDataNodeType::New();
- newDataNode->SetNodeType(dataNode->GetNodeType());
- newDataNode->SetNodeId(dataNode->GetNodeId());
- newDataNode->SetMetaDataDictionary(dataNode->GetMetaDataDictionary());
+ newDataNode->SetNodeType((*it)->GetNodeType());
+ newDataNode->SetNodeId((*it)->GetNodeId());
+ newDataNode->SetMetaDataDictionary((*it)->GetMetaDataDictionary());
- switch (dataNode->GetNodeType())
+ switch ((*it)->GetNodeType())
{
case ROOT:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
+ //outputVdata->Add(newDataNode,destination);
+ //ProcessNode(inputVdata,(*it),outputVdata,newDataNode);
break;
}
case DOCUMENT:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
+ outputVdata->Add(newDataNode,destination);
+ ProcessNode(inputVdata,(*it),outputVdata,newDataNode);
break;
}
case FOLDER:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
+ outputVdata->Add(newDataNode,destination);
+ ProcessNode(inputVdata,(*it),outputVdata,newDataNode);
break;
}
case FEATURE_POINT:
{
- newDataNode->SetPoint(this->ProcessPoint(dataNode->GetPoint()));
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ newDataNode->SetPoint(this->ProcessPoint((*it)->GetPoint()));
+ outputVdata->Add(newDataNode,destination);
break;
}
case FEATURE_LINE:
{
- newDataNode->SetLine(this->ProcessLine(dataNode->GetLine()));
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ newDataNode->SetLine(this->ProcessLine((*it)->GetLine()));
+ outputVdata->Add(newDataNode,destination);
break;
}
case FEATURE_POLYGON:
{
- newDataNode->SetPolygonExteriorRing(this->ProcessPolygon(dataNode->GetPolygonExteriorRing()));
- newDataNode->SetPolygonInteriorRings(this->ProcessPolygonList(dataNode->GetPolygonInteriorRings()));
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
+ newDataNode->SetPolygonExteriorRing(this->ProcessPolygon((*it)->GetPolygonExteriorRing()));
+ newDataNode->SetPolygonInteriorRings(this->ProcessPolygonList((*it)->GetPolygonInteriorRings()));
+ outputVdata->Add(newDataNode,destination);
break;
}
case FEATURE_MULTIPOINT:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
+ outputVdata->Add(newDataNode,destination);
+ ProcessNode(inputVdata,(*it),outputVdata,newDataNode);
break;
}
case FEATURE_MULTILINE:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
+ outputVdata->Add(newDataNode,destination);
+ ProcessNode(inputVdata,(*it),outputVdata,newDataNode);
break;
}
case FEATURE_MULTIPOLYGON:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
+ outputVdata->Add(newDataNode,destination);
+ ProcessNode(inputVdata,(*it),outputVdata,newDataNode);
break;
}
case FEATURE_COLLECTION:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it), newContainer);
+ outputVdata->Add(newDataNode,destination);
+ ProcessNode(inputVdata,(*it),outputVdata,newDataNode);
break;
}
}
diff --git a/Modules/Core/Wrappers/ApplicationEngine/src/otbWrapperApplicationRegistry.cxx b/Modules/Core/Wrappers/ApplicationEngine/src/otbWrapperApplicationRegistry.cxx
index 76535c46a7cd0631885494aee3351a914024dbb7..93363d4134799244bf76299dad4a732d030bf7df 100644
--- a/Modules/Core/Wrappers/ApplicationEngine/src/otbWrapperApplicationRegistry.cxx
+++ b/Modules/Core/Wrappers/ApplicationEngine/src/otbWrapperApplicationRegistry.cxx
@@ -24,8 +24,7 @@
#include "itksys/SystemTools.hxx"
#include "itkDynamicLoader.h"
#include "itkDirectory.h"
-#include "itkMutexLock.h"
-#include "itkMutexLockHolder.h"
+#include <mutex>
#include <iterator>
@@ -50,8 +49,8 @@ public:
if (app && handle)
{
// mutex lock to ensure thread safety
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(m_Mutex);
- pair.first = app;
+ std::lock_guard<std::mutex> mutexHolder(m_Mutex);
+ pair.first = app;
pair.second = handle;
m_Container.push_back(pair);
return true;
@@ -65,8 +64,8 @@ public:
if (app)
{
// mutex lock to ensure thread safety
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(m_Mutex);
- AppHandleContainerType::iterator it = m_Container.begin();
+ std::lock_guard<std::mutex> mutexHolder(m_Mutex);
+ AppHandleContainerType::iterator it = m_Container.begin();
while (it != m_Container.end())
{
if ((*it).first == app)
@@ -80,11 +79,11 @@ public:
/** Release the library handles from applications already deleted */
void ReleaseUnusedHandle()
- {
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(m_Mutex);
- AppHandleContainerType::iterator it;
- for (it = m_Container.begin(); it != m_Container.end(); ++it)
{
+ std::lock_guard<std::mutex> mutexHolder(m_Mutex);
+ AppHandleContainerType::iterator it;
+ for (it = m_Container.begin() ; it != m_Container.end() ; ++it)
+ {
if ((*it).first == nullptr)
{
itk::DynamicLoader::CloseLibrary(static_cast<itk::LibHandle>((*it).second));
@@ -111,8 +110,9 @@ public:
private:
AppHandleContainerType m_Container;
+
+ std::mutex m_Mutex;
- itk::SimpleMutexLock m_Mutex;
};
// static finalizer to close opened libraries
static ApplicationPrivateRegistry m_ApplicationPrivateRegistryGlobal;
@@ -239,7 +239,7 @@ Application::Pointer ApplicationRegistry::CreateApplicationFaster(const std::str
#endif
std::string otbAppPath = GetApplicationPath();
- std::vector<itksys::String> pathList;
+ std::vector<std::string> pathList;
if (!otbAppPath.empty())
{
pathList = itksys::SystemTools::SplitString(otbAppPath, pathSeparator, false);
@@ -287,7 +287,7 @@ std::vector<std::string> ApplicationRegistry::GetAvailableApplications(bool useF
#endif
std::string otbAppPath = GetApplicationPath();
- std::vector<itksys::String> pathList;
+ std::vector<std::string> pathList;
if (!otbAppPath.empty())
{
pathList = itksys::SystemTools::SplitString(otbAppPath, pathSeparator, false);
diff --git a/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx b/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
index ef726923c7817e2d44a21307b5c24d57df0d4eea..118bb4d1a0e040e01da9c2530f8477311a780ae2 100644
--- a/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
+++ b/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
@@ -27,7 +27,7 @@
#include "otbImageFileReader.h"
#include "otbWrapperTypes.h"
#include "otbWrapperApplicationRegistry.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
#include <boost/test/unit_test.hpp>
#include <vector>
diff --git a/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperParameterKeyTest.cxx b/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperParameterKeyTest.cxx
index 2e263d24ba1e6818deb9895f62f93ceb143edef6..a2239e4fd1fdb741b03dc1b680f907538da52139 100644
--- a/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperParameterKeyTest.cxx
+++ b/Modules/Core/Wrappers/ApplicationEngine/test/otbWrapperParameterKeyTest.cxx
@@ -23,6 +23,7 @@
#endif
#include "otbWrapperParameterKey.h"
+#include <iostream>
int otbWrapperParameterKey(int itkNotUsed(argc), char* itkNotUsed(argv)[])
{
diff --git a/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx b/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
index ce027a87fea95378e01cf2dbb1076d63beea8c33..693e3f6eb431c1e24f29a5aee903e6a4679ef7fd 100644
--- a/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
+++ b/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
@@ -489,7 +489,7 @@ bool CommandLineLauncher::CheckOutputPathsValidity(const std::string& paramKey)
if (m_Application->HasValue(paramKey) && type == ParameterType_OutputFilename)
{
std::string filename = m_Application->GetParameterString(paramKey);
- itksys::String path = itksys::SystemTools::GetFilenamePath(filename);
+ std::string path = itksys::SystemTools::GetFilenamePath(filename);
if (path != "" && !itksys::SystemTools::FileIsDirectory(path))
{
std::cerr << "ERROR: Directory doesn't exist : " << path << std::endl;
diff --git a/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx b/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
index 0a8ce56f5b06ae5be73f9700b1dbcf562492f750..881a83e36357e7c93779d50cf178d923eeab1303 100644
--- a/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
+++ b/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
@@ -149,8 +149,7 @@ CommandLineParser::ParseResultType CommandLineParser::GetPaths(std::vector<std::
if (tempModPath.size() > 0)
{
- std::vector<itksys::String> pathAttribute = itksys::SystemTools::SplitString(tempModPath, ' ', false);
-
+ std::vector<std::string> pathAttribute = itksys::SystemTools::SplitString(tempModPath, ' ', false);
// Remove " " string element
for (unsigned int i = 0; i < pathAttribute.size(); i++)
@@ -210,7 +209,7 @@ CommandLineParser::ParseResultType CommandLineParser::GetModuleName(std::string&
CommandLineParser::ParseResultType CommandLineParser::GetModuleName(std::string& modName, const std::string& exp)
{
- std::vector<itksys::String> spaceSplitExp = itksys::SystemTools::SplitString(exp, ' ', false);
+ auto spaceSplitExp = itksys::SystemTools::SplitString(exp, ' ', false);
// if the chain is " module", SplitString will return: [ ], [module]
for (unsigned int i = 0; i < spaceSplitExp.size(); i++)
{
@@ -352,7 +351,7 @@ std::vector<std::string> CommandLineParser::GetAttribute(const std::string& key,
// Only if the key has values associated
if (tempModKey.size() > 0)
{
- std::vector<itksys::String> spaceSplit = itksys::SystemTools::SplitString(tempModKey.substr(0, tempModKey.size()), ' ', false);
+ std::vector<std::string> spaceSplit = itksys::SystemTools::SplitString(tempModKey.substr(0, tempModKey.size()), ' ', false);
// Remove " " string element
for (unsigned int i = 0; i < spaceSplit.size(); i++)
diff --git a/Modules/Core/Wrappers/SWIG/otb-module-init.cmake b/Modules/Core/Wrappers/SWIG/otb-module-init.cmake
index 667532f626ad512978b75e7c0a2d7da6cd90f748..43078037892a358b94f2c29391e757247c4aa3fe 100644
--- a/Modules/Core/Wrappers/SWIG/otb-module-init.cmake
+++ b/Modules/Core/Wrappers/SWIG/otb-module-init.cmake
@@ -21,7 +21,7 @@
option ( OTB_WRAP_PYTHON "Wrap Python" OFF )
if ( OTB_WRAP_PYTHON )
- find_package ( SWIG REQUIRED )
+ find_package ( SWIG 3.0.12 REQUIRED )
mark_as_advanced(SWIG_DIR)
mark_as_advanced(SWIG_EXECUTABLE)
mark_as_advanced(SWIG_VERSION)
diff --git a/Modules/Core/Wrappers/SWIG/src/itkBase.i b/Modules/Core/Wrappers/SWIG/src/itkBase.i
index 2d46bd7e6733566e8ba3982b409c1a481ebecf54..ec4773c2ce99d7b5ea4597578a0460d1732470f7 100644
--- a/Modules/Core/Wrappers/SWIG/src/itkBase.i
+++ b/Modules/Core/Wrappers/SWIG/src/itkBase.i
@@ -293,7 +293,7 @@ class itkIndent {
class itkProcessObject : public itkObject {
public:
virtual itkLightObject_Pointer CreateAnother() const;
- const float& GetProgress();
+ const float GetProgress();
protected:
itkProcessObject();
};
diff --git a/Modules/Core/Wrappers/SWIG/src/python/StandaloneWrapper.in b/Modules/Core/Wrappers/SWIG/src/python/StandaloneWrapper.in
index d6d595d55ed7e6519d729ab948f437843b094eb5..8d1333eae21a90d41f72aa94a4cf5cca287c16ae 100644
--- a/Modules/Core/Wrappers/SWIG/src/python/StandaloneWrapper.in
+++ b/Modules/Core/Wrappers/SWIG/src/python/StandaloneWrapper.in
@@ -53,7 +53,7 @@ file(GLOB OTBPythonWrappers_SOURCES "*.cxx")
# declare the python wrapper library
add_library(PythonWrapperLib MODULE ${OTBPythonWrappers_SOURCES})
-target_link_libraries(PythonWrapperLib ${Python_LIBRARIES} OTBApplicationEngine)
+target_link_libraries(PythonWrapperLib ${Python_LIBRARIES} ${OTB_LIBRARIES})
set_target_properties(PythonWrapperLib PROPERTIES
OUTPUT_NAME "_otbApplication"
diff --git a/Modules/FeaturesExtraction/Applications/app/otbColorMapping.cxx b/Modules/FeaturesExtraction/Applications/app/otbColorMapping.cxx
index aeb68efcf7ab50b24f6e342ba3f1aeec21486f6c..2520e7ac445ed942838c6b538c085bdf28f92cfe 100644
--- a/Modules/FeaturesExtraction/Applications/app/otbColorMapping.cxx
+++ b/Modules/FeaturesExtraction/Applications/app/otbColorMapping.cxx
@@ -810,7 +810,7 @@ private:
ChangeLabelFilterType::Pointer m_CustomMapper;
ColorMapFilterType::Pointer m_ContinuousColorMapper;
LabelToRGBFilterType::Pointer m_SegmentationColorMapper;
- std::map<std::string, unsigned int> m_LutMap;
+ std::map<std::string, itk::ScalarToRGBColormapImageFilterEnums::RGBColormapFilter> m_LutMap;
ChangeLabelFilterType::Pointer m_RBGFromImageMapper;
StreamingStatisticsMapFromLabelImageFilterType::Pointer m_StatisticsMapFromLabelImageFilter;
diff --git a/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h b/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
index bac6315e7b8c94a354fab6e68d88a012482ce8f3..b0f36c2fd373611e839ea1549f38cab325a07006 100644
--- a/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
+++ b/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
@@ -23,7 +23,6 @@
#include "otbVectorDataToVectorDataFilter.h"
-#include "itkPreOrderTreeIterator.h"
#include "otbMath.h"
namespace otb
@@ -71,8 +70,6 @@ public:
typedef typename LineType::VertexType VertexType;
typedef typename LineType::VertexListType VertexListType;
- typedef itk::PreOrderTreeIterator<typename VectorDataType::DataTreeType> TreeIteratorType;
-
/** Set/Get the thresholds*/
itkGetMacro(DistanceThreshold, double);
itkSetMacro(DistanceThreshold, double);
diff --git a/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx b/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
index 8dcba49777aff8a0501d3559f125c6522c2c5cc5..83c9a33de6c64f779d01aea44aa6f67461980795 100644
--- a/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
+++ b/Modules/FeaturesExtraction/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
@@ -46,51 +46,51 @@ void VectorDataToRightAngleVectorDataFilter<TVectorData>::GenerateData()
this->GetOutput(0)->SetMetaDataDictionary(vData->GetMetaDataDictionary());
// Retrieving root node
- typename DataNodeType::Pointer root = this->GetOutput(0)->GetDataTree()->GetRoot()->Get();
+ typename DataNodeType::Pointer root = this->GetOutput(0)->GetRoot();
// Create the document node
typename DataNodeType::Pointer document = DataNodeType::New();
document->SetNodeType(otb::DOCUMENT);
// Adding the layer to the data tree
- this->GetOutput(0)->GetDataTree()->Add(document, root);
+ this->GetOutput(0)->Add(document, root);
// Create the folder node
typename DataNodeType::Pointer folder = DataNodeType::New();
folder->SetNodeType(otb::FOLDER);
- this->GetOutput(0)->GetDataTree()->Add(folder, document);
+ this->GetOutput(0)->Add(folder, document);
this->GetOutput(0)->SetProjectionRef(vData->GetProjectionRef());
// Itterate on the vector data
- TreeIteratorType itVectorRef(vData->GetDataTree()); // Reference
- itVectorRef.GoToBegin();
+ auto itPair = vData->GetIteratorPair(); // Reference
+ auto itVectorRef = itPair.first;
- while (!itVectorRef.IsAtEnd())
+ while (itVectorRef != itPair.second)
{
- if (!itVectorRef.Get()->IsLineFeature())
+ if (!vData->Get(itVectorRef)->IsLineFeature())
{
++itVectorRef;
continue; // do not process if it's not a line
}
- TreeIteratorType itVectorCur = itVectorRef; // Current
+ auto itVectorCur = itVectorRef; // Current
- while (!itVectorCur.IsAtEnd())
+ while (itVectorCur != itPair.second)
{
- if (!itVectorCur.Get()->IsLineFeature())
+ if (!vData->Get(itVectorCur)->IsLineFeature())
{
++itVectorCur;
continue; // do not process if it's not a line
}
// Compute the angle formed by the two segments
- double Angle = this->ComputeAngleFormedBySegments(itVectorRef.Get()->GetLine(), itVectorCur.Get()->GetLine());
+ double Angle = this->ComputeAngleFormedBySegments(vData->Get(itVectorRef)->GetLine(), vData->Get(itVectorCur)->GetLine());
// Check if the angle is a right one
if (std::abs(Angle - CONST_PI_2) <= m_AngleThreshold)
{
// Right angle coordinate
PointType RightAngleCoordinate;
- RightAngleCoordinate = this->ComputeRightAngleCoordinate(itVectorRef.Get()->GetLine(), itVectorCur.Get()->GetLine());
+ RightAngleCoordinate = this->ComputeRightAngleCoordinate(vData->Get(itVectorRef)->GetLine(), vData->Get(itVectorCur)->GetLine());
// Compute the distance between the two segments and the right angle formed by this segments
- double dist1_2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate, itVectorRef.Get()->GetLine());
- double dist2_2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate, itVectorCur.Get()->GetLine());
+ double dist1_2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate, vData->Get(itVectorRef)->GetLine());
+ double dist2_2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate, vData->Get(itVectorCur)->GetLine());
double threshold_2 = m_DistanceThreshold * m_DistanceThreshold;
if (dist1_2 < threshold_2 && dist2_2 < threshold_2)
@@ -100,7 +100,7 @@ void VectorDataToRightAngleVectorDataFilter<TVectorData>::GenerateData()
CurrentGeometry->SetNodeId("FEATURE_POINT");
CurrentGeometry->SetNodeType(otb::FEATURE_POINT);
CurrentGeometry->SetPoint(RightAngleCoordinate);
- this->GetOutput(0)->GetDataTree()->Add(CurrentGeometry, folder);
+ this->GetOutput(0)->Add(CurrentGeometry, folder);
}
}
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbSFSTexturesImageFilter.hxx b/Modules/FeaturesExtraction/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
index 35b9d50c47ea0b9ce32bb28e4c85d074cc739d02..ac50952ec54b405af7f2bd0a04c2ee1e40fbb4b5 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
@@ -27,13 +27,14 @@
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
#include "otbMath.h"
-
+#include "otbMacro.h" //for
namespace otb
{
template <class TInputImage, class TOutputImage>
SFSTexturesImageFilter<TInputImage, TOutputImage>::SFSTexturesImageFilter()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfRequiredOutputs(6);
@@ -233,7 +234,7 @@ void SFSTexturesImageFilter<TInputImage, TOutputImage>::BeforeThreadedGenerateDa
itkExceptionMacro(<< "Spatial Threshold (" << this->GetSpatialThreshold() << ") is lower than Ration Max Consideration Number ("
<< this->GetRatioMaxConsiderationNumber() << ") what is not allowed.");
}
- for (unsigned int i = 0; i < this->GetNumberOfThreads(); ++i)
+ for (unsigned int i = 0; i < this->GetNumberOfWorkUnits(); ++i)
{
m_FunctorList.push_back(m_Functor);
}
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
index 56255d930d2783555684e4beae54b96ca4f17e8f..1013ae606febb4e9b77809925ac62c0243539e8a 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
@@ -222,7 +222,7 @@ protected:
/** Before Parallel textures extraction */
void BeforeThreadedGenerateData() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputRegionType& outputRegion) override;
private:
ScalarImageToAdvancedTexturesFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
index 9c9d5e9d8d7b4d58deca3b42d5e6011f1a80a181..1cedd0444e6c983f3c3238ce74c5ad7dcc4ade39 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
@@ -28,7 +28,7 @@
#include "itkProgressReporter.h"
#include "itkNumericTraits.h"
#include <algorithm>
-
+#include "otbMacro.h" //for
namespace otb
{
template <class TInputImage, class TOutputImage>
@@ -42,6 +42,7 @@ ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage>::ScalarImageToAdv
m_SubsampleFactor(),
m_SubsampleOffset()
{
+ this->DynamicMultiThreadingOn();
// There are 10 outputs corresponding to the 9 textures indices
this->SetNumberOfRequiredOutputs(10);
@@ -284,8 +285,7 @@ void ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage>::BeforeThrea
}
template <class TInputImage, class TOutputImage>
-void ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread)
{
// Retrieve the input and output pointers
InputImagePointerType inputPtr = const_cast<InputImageType*>(this->GetInput());
@@ -330,9 +330,6 @@ void ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage>::ThreadedGen
InputRegionType inputLargest = inputPtr->GetLargestPossibleRegion();
- // Set-up progress reporting
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Iterate on outputs to compute textures
while (!varianceIt.IsAtEnd() && !meanIt.IsAtEnd() && !dissimilarityIt.IsAtEnd() && !sumAverageIt.IsAtEnd() && !sumVarianceIt.IsAtEnd() &&
!sumEntropytIt.IsAtEnd() && !differenceEntropyIt.IsAtEnd() && !differenceVarianceIt.IsAtEnd() && !ic1It.IsAtEnd() && !ic2It.IsAtEnd())
@@ -518,9 +515,6 @@ void ScalarImageToAdvancedTexturesFilter<TInputImage, TOutputImage>::ThreadedGen
ic1It.Set(m_IC1);
ic2It.Set(m_IC2);
- // Update progress
- progress.CompletedPixel();
-
// Increment iterators
++varianceIt;
++meanIt;
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
index 177e7022436f6873e4085b1453560ef404b156e8..6b945de59c8a86049fc2a00c9b9b1c0db85cefe2 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
@@ -189,7 +189,7 @@ protected:
/** Generate the input requested region */
void GenerateInputRequestedRegion() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputRegionType& outputRegion) override;
private:
ScalarImageToHigherOrderTexturesFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
index b804672649634621b31375897353d440fb7c2766..083e3ac079f22a18149d902a680d69e57a0e1519 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
@@ -21,6 +21,7 @@
#ifndef otbScalarImageToHigherOrderTexturesFilter_hxx
#define otbScalarImageToHigherOrderTexturesFilter_hxx
+#include "otbMacro.h" //for
#include "otbScalarImageToHigherOrderTexturesFilter.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "itkImageRegionIterator.h"
@@ -32,10 +33,11 @@ template <class TInputImage, class TOutputImage>
ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>::ScalarImageToHigherOrderTexturesFilter()
: m_Radius(), m_NumberOfBinsPerAxis(8), m_InputImageMinimum(0), m_InputImageMaximum(255), m_FastCalculations(false), m_SubsampleFactor(), m_SubsampleOffset()
{
+ this->DynamicMultiThreadingOn();
// There are 10 outputs corresponding to the 8 textures indices
this->SetNumberOfRequiredOutputs(10);
- // Create the 11 outputs
+ // Create the 10 outputs
this->SetNthOutput(0, OutputImageType::New());
this->SetNthOutput(1, OutputImageType::New());
this->SetNthOutput(2, OutputImageType::New());
@@ -235,8 +237,7 @@ void ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>::Generate
}
template <class TInputImage, class TOutputImage>
-void ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread)
{
// Retrieve the input and output pointers
const InputImageType* inputPtr = this->GetInput();
@@ -259,9 +260,6 @@ void ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>::Threaded
InputRegionType inputLargest = inputPtr->GetLargestPossibleRegion();
- // Set-up progress reporting
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Iterate on outputs to compute textures
while (!outputImagesIterators[0].IsAtEnd())
{
@@ -318,8 +316,6 @@ void ScalarImageToHigherOrderTexturesFilter<TInputImage, TOutputImage>::Threaded
// Increment iterators
++outputImagesIterators[i];
}
- // Update progress
- progress.CompletedPixel();
}
}
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
index a95332c0312294f34d4f0b67f3cfb85f48d9af12..a6237788f7a2c924ad375834f6a3e8c92c6349cd 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
@@ -117,7 +117,7 @@ protected:
/** Generate the input requested region */
void GenerateInputRequestedRegion() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputRegionType& outputRegion) override;
private:
ScalarImageToPanTexTextureFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
index a38973b0a0c78ef3e468a15c0147802bafdb7d6a..3c37289de44b11804357dd9081eb04ea7ed671b9 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
@@ -34,6 +34,7 @@ template <class TInputImage, class TOutputImage>
ScalarImageToPanTexTextureFilter<TInputImage, TOutputImage>::ScalarImageToPanTexTextureFilter()
: m_Radius(), m_NumberOfBinsPerAxis(8), m_InputImageMinimum(0), m_InputImageMaximum(255)
{
+ this->DynamicMultiThreadingOn();
// There are 1 output corresponding to the Pan Tex texture indice
this->SetNumberOfRequiredOutputs(1);
@@ -86,8 +87,7 @@ void ScalarImageToPanTexTextureFilter<TInputImage, TOutputImage>::GenerateInputR
}
template <class TInputImage, class TOutputImage>
-void ScalarImageToPanTexTextureFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void ScalarImageToPanTexTextureFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread)
{
// Retrieve the input and output pointers
InputImagePointerType inputPtr = const_cast<InputImageType*>(this->GetInput());
@@ -95,10 +95,6 @@ void ScalarImageToPanTexTextureFilter<TInputImage, TOutputImage>::ThreadedGenera
itk::ImageRegionIteratorWithIndex<OutputImageType> outputIt(outputPtr, outputRegionForThread);
outputIt.GoToBegin();
-
- // Set-up progress reporting
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Iterate on outputs to compute textures
while (!outputIt.IsAtEnd())
{
@@ -182,7 +178,6 @@ void ScalarImageToPanTexTextureFilter<TInputImage, TOutputImage>::ThreadedGenera
outputIt.Set(out);
++outputIt;
- progress.CompletedPixel();
}
}
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.h b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.h
index 4790f3bd0ac7d9fe8559e16d6394022fc9225bc9..96a68ba2e9d512b137a5faf6eb4bae3ec7e309db 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.h
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.h
@@ -216,7 +216,7 @@ protected:
/** Before Parallel textures extraction */
void BeforeThreadedGenerateData() override;
/** Parallel textures extraction */
- void ThreadedGenerateData(const OutputRegionType& outputRegion, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputRegionType& outputRegion) override;
private:
ScalarImageToTexturesFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
index 09272a14da72f2e68f854fa6e2a42e64edf76a66..ad2068d6032ebf5aa40e2f8a38be862a35a56985 100644
--- a/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
+++ b/Modules/FeaturesExtraction/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
@@ -259,7 +259,7 @@ void ScalarImageToTexturesFilter<TInputImage, TOutputImage>::BeforeThreadedGener
}
template <class TInputImage, class TOutputImage>
-void ScalarImageToTexturesFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void ScalarImageToTexturesFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread)
{
// Retrieve the input and output pointers
InputImagePointerType inputPtr = const_cast<InputImageType*>(this->GetInput());
@@ -296,9 +296,6 @@ void ScalarImageToTexturesFilter<TInputImage, TOutputImage>::ThreadedGenerateDat
InputRegionType inputLargest = inputPtr->GetLargestPossibleRegion();
- // Set-up progress reporting
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Iterate on outputs to compute textures
while (!energyIt.IsAtEnd() && !entropyIt.IsAtEnd() && !correlationIt.IsAtEnd() && !invDiffMomentIt.IsAtEnd() && !inertiaIt.IsAtEnd() &&
!clusterShadeIt.IsAtEnd() && !clusterProminenceIt.IsAtEnd() && !haralickCorIt.IsAtEnd())
@@ -451,9 +448,6 @@ void ScalarImageToTexturesFilter<TInputImage, TOutputImage>::ThreadedGenerateDat
clusterProminenceIt.Set(clusterProminence);
haralickCorIt.Set(haralickCorrelation);
- // Update progress
- progress.CompletedPixel();
-
// Increment iterators
++energyIt;
++entropyIt;
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index 2e1348b21d17bcb0440f07bd74fd956a63c56ccc..89ecc6794e44573bca0e4c56bda838d000b5d286 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -157,9 +157,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/**
* Pad the inputs requested regions by radius
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
index dae0ea8ecc1fff3c5382a2d7ff1abe6c26fa2a18..faf77345a8b6412c01751fe03c8c7b57dc5786f2 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
@@ -263,8 +263,8 @@ void BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction>
-void BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage1> nbc1;
itk::ZeroFluxNeumannBoundaryCondition<TInputImage2> nbc2;
@@ -298,9 +298,6 @@ void BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1>::FaceListType::iterator fit1;
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2>::FaceListType::iterator fit2;
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
for (fit1 = faceList1.begin(), fit2 = faceList2.begin(); fit1 != faceList1.end() && fit2 != faceList2.end(); ++fit1, ++fit2)
@@ -323,7 +320,6 @@ void BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage
++neighInputIt1;
++neighInputIt2;
++outputIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
index 7619a97cd841ca64b184c01c5b72f38e84ddfcfe..c04553f29c07fb92cc18a4d65b6fa0ea9323c057 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
@@ -77,12 +77,8 @@ public:
itkTypeMacro(CBAMIChangeDetector, SuperClass);
protected:
- CBAMIChangeDetector()
- {
- }
- ~CBAMIChangeDetector() override
- {
- }
+ CBAMIChangeDetector() {}
+ ~CBAMIChangeDetector() override {}
private:
CBAMIChangeDetector(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
index 3defafdfe95e5ea3ee7dd8a9a059176fc2a8774f..4121ea75b4e95d62c842fc3ee68bc76f76572319 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
@@ -78,12 +78,8 @@ public:
itkTypeMacro(CorrelationChangeDetector, SuperClass);
protected:
- CorrelationChangeDetector()
- {
- }
- ~CorrelationChangeDetector() override
- {
- }
+ CorrelationChangeDetector() = default;
+ ~CorrelationChangeDetector() = default;
private:
CorrelationChangeDetector(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
index deb14f12a19b7eb1ed6b2ee889b2db912442013f..dfb0448fba82f2cdfb1fcd1b0a0919b63950f73e 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
@@ -23,6 +23,7 @@
#include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
#include "otbJoinHistogramMI.h"
+#include "otbMacro.h" //for
namespace otb
{
@@ -79,12 +80,8 @@ public:
itkTypeMacro(JoinHistogramMIImageFilter, SuperClass);
protected:
- JoinHistogramMIImageFilter()
- {
- }
- ~JoinHistogramMIImageFilter() override
- {
- }
+ JoinHistogramMIImageFilter() = default;
+ ~JoinHistogramMIImageFilter() = default;
private:
JoinHistogramMIImageFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
index 3eefcd97f7703f1edf9afd6038c48c3082236434..640ea6584d4fe9c54f7656774f29e303a6c6349d 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
@@ -26,6 +26,7 @@
#include "otbKullbackLeiblerProfileImageFilter.h"
#include "otbMath.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
index d7653e3d712f93b6483f874657df741a0f61a6f0..25d27b4b0445a9f08f589529b2c462f9eb798ae8 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
@@ -76,12 +76,8 @@ public:
itkTypeMacro(MeanDifferenceImageFilter, SuperClass);
protected:
- MeanDifferenceImageFilter()
- {
- }
- ~MeanDifferenceImageFilter() override
- {
- }
+ MeanDifferenceImageFilter() = default;
+ ~MeanDifferenceImageFilter() = default;
private:
MeanDifferenceImageFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
index 98e122858b0520e441616e535fe6e1cfa72c7f7c..9ae92b78ef2f5d72c3b4a438dda0d6d2011fc8cd 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
@@ -158,7 +158,7 @@ protected:
{
}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void GenerateOutputInformation() override;
diff --git a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
index e8d360a3a7f60628d2b623886e83127d327e8e0e..ff949750e8d41750bf5379a0c1fd4dad91cb1c27 100644
--- a/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
@@ -37,6 +37,7 @@ MultivariateAlterationDetectorImageFilter<TInputImage, TOutputImage>::Multivaria
{
this->SetNumberOfRequiredInputs(2);
m_CovarianceEstimator = CovarianceEstimatorType::New();
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -135,7 +136,7 @@ void MultivariateAlterationDetectorImageFilter<TInputImage, TOutputImage>::Gener
{
// Case where nbbands1 == nbbands2
- VnlMatrixType invs22 = vnl_matrix_inverse<RealType>(s22);
+ VnlMatrixType invs22 = vnl_matrix_inverse<RealType>(s22).as_matrix();
// Build the generalized eigensystem
VnlMatrixType s12s22is21 = s12 * invs22 * s21;
@@ -261,8 +262,7 @@ void MultivariateAlterationDetectorImageFilter<TInputImage, TOutputImage>::Gener
}
template <class TInputImage, class TOutputImage>
-void MultivariateAlterationDetectorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void MultivariateAlterationDetectorImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// Retrieve input images pointers
const TInputImage* input1Ptr = this->GetInput1();
@@ -287,8 +287,6 @@ void MultivariateAlterationDetectorImageFilter<TInputImage, TOutputImage>::Threa
unsigned int outNbComp = outputPtr->GetNumberOfComponentsPerPixel();
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
while (!inIt1.IsAtEnd() && !inIt2.IsAtEnd() && !outIt.IsAtEnd())
{
VnlVectorType x1(nbComp1, 0);
@@ -349,7 +347,6 @@ void MultivariateAlterationDetectorImageFilter<TInputImage, TOutputImage>::Threa
++inIt1;
++inIt2;
++outIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.h b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.h
index 9fb21350c547f37996f648f2bb51371e0e8dd0a7..8d8df9c7ba76dd41cf3f9513540fd2fe465a4c9f 100644
--- a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.h
@@ -111,8 +111,12 @@ protected:
void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
- void VerifyInputInformation() override{};
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
+
+ void VerifyInputInformation() const override
+ {
+
+ }
private:
ApplyGainFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.hxx b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.hxx
index c6ae424f94777040198629f4fb7b1b97a0a98d2e..a2954585ab6ca8cf502bf16e1cbee00c661f1599 100644
--- a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbApplyGainFilter.hxx
@@ -40,6 +40,7 @@ ApplyGainFilter<TInputImage, TLut, TOutputImage>::ApplyGainFilter()
m_NoDataFlag = false;
m_ThumbSizeFromSpacing = true;
m_Step = -1;
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TLut, class TOutputImage>
@@ -97,14 +98,9 @@ void ApplyGainFilter<TInputImage, TLut, TOutputImage>::BeforeThreadedGenerateDat
}
template <class TInputImage, class TLut, class TOutputImage>
-void ApplyGainFilter<TInputImage, TLut, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void ApplyGainFilter<TInputImage, TLut, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
assert(m_Step > 0);
- // TODO error
- // support progress methods/callbacks
- // itk::ProgressReporter progress(this , threadId ,
- // outputRegionForThread.GetNumberOfPixels() );
typename InputImageType::ConstPointer input(GetInputImage());
typename LutType::ConstPointer lut(GetInputLut());
diff --git a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.h b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.h
index d55596fbe260640c311218e4585aa711ece9ad02..22efef81f4be06217fc2082ca816d2a701efeed9 100644
--- a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.h
@@ -84,7 +84,7 @@ protected:
void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
ComputeGainLutFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.hxx b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
index e67227d470b6b8f3400f63649394ec13fa810c9a..d4613e059feb27bc1bcbd7ce471457fc7b191d66 100644
--- a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
@@ -38,6 +38,7 @@ ComputeGainLutFilter<TInputImage, TOutputImage>::ComputeGainLutFilter()
m_Min = std::numeric_limits<double>::quiet_NaN();
m_Max = std::numeric_limits<double>::quiet_NaN();
m_Step = -1;
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -48,14 +49,10 @@ void ComputeGainLutFilter<TInputImage, TOutputImage>::BeforeThreadedGenerateData
}
template <class TInputImage, class TOutputImage>
-void ComputeGainLutFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void ComputeGainLutFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
assert(m_Step > 0);
assert(m_NbBin > 0);
- // TODO error
- // itk::ProgressReporter progress(this , threadId ,
- // outputRegionForThread.GetNumberOfPixels() );
typename InputImageType::ConstPointer input(this->GetInput());
typename OutputImageType::Pointer output(this->GetOutput());
diff --git a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.h b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.h
index 01b232540fac31a55cf466e4e45c41e2462f967b..d7198878a8de0f87b2be2f115cd0c3a0fe8704c2 100644
--- a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.h
@@ -123,6 +123,11 @@ protected:
void GenerateOutputRequestedRegion(itk::DataObject* output) override;
+ void VerifyInputInformation() const override
+ {
+
+ }
+
private:
ComputeHistoFilter(const Self&) = delete;
void operator=(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.hxx b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.hxx
index 97c20ddc91c1f2f798518c56ad7ed68148dda17b..0035b19e8718e04c4d763ee17a4b68f844b474f1 100644
--- a/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/Contrast/include/otbComputeHistoFilter.hxx
@@ -22,7 +22,7 @@
#define otbComputeHistoFilter_hxx
#include "otbComputeHistoFilter.h"
-
+#include "otbMacro.h"
#include <limits>
namespace otb
@@ -31,6 +31,7 @@ namespace otb
template <class TInputImage, class TOutputImage>
ComputeHistoFilter<TInputImage, TOutputImage>::ComputeHistoFilter()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfRequiredOutputs(2);
this->SetNthOutput(0, this->MakeOutput(0));
this->SetNthOutput(1, this->MakeOutput(1));
@@ -149,11 +150,11 @@ void ComputeHistoFilter<TInputImage, TOutputImage>::GenerateData()
// Get the output pointer
const OutputImageType* outputPtr(this->GetOutput());
const itk::ImageRegionSplitterBase* splitter(this->GetImageRegionSplitter());
- m_ValidThreads = splitter->GetNumberOfSplits(outputPtr->GetRequestedRegion(), this->GetNumberOfThreads());
+ m_ValidThreads = splitter->GetNumberOfSplits(outputPtr->GetRequestedRegion(), this->GetNumberOfWorkUnits());
this->BeforeThreadedGenerateData();
- this->GetMultiThreader()->SetNumberOfThreads(m_ValidThreads);
+ this->GetMultiThreader()->SetNumberOfWorkUnits(m_ValidThreads);
this->GetMultiThreader()->SetSingleMethod(this->ThreaderCallback, &str);
// multithread the execution
this->GetMultiThreader()->SingleMethodExecute();
@@ -183,10 +184,6 @@ template <class TInputImage, class TOutputImage>
void ComputeHistoFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
{
assert(m_Step > 0);
- // TODO throw error
-
- // itk::ProgressReporter progress(this , threadId ,
- // outputRegionForThread.GetNumberOfPixels() );
typename InputImageType::ConstPointer input(this->GetInput());
typename OutputImageType::Pointer output(this->GetHistoOutput());
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
index 9494cd55e10c71dfb9571422cfaf45f0b872601b..5c4c06a79328f3ed46879ff226313972f4cfa3a3 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
@@ -94,7 +94,7 @@ protected:
}
void GenerateOutputInformation() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadID) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
AngularProjectionBinaryImageFilter(const Self&); // not implemented
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
index 7f5de774be17cd18bd06a5101081c8a75ae28263..7d6e5db778cd23814d6feb3b0d8491ba6a7634a8 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
@@ -34,6 +34,7 @@ template <class TInputImage, class TOutputImage, class TPrecision>
AngularProjectionBinaryImageFilter<TInputImage, TOutputImage, TPrecision>::AngularProjectionBinaryImageFilter()
{
this->SetNumberOfRequiredInputs(2);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage, class TPrecision>
@@ -93,10 +94,8 @@ void AngularProjectionBinaryImageFilter<TInputImage, TOutputImage, TPrecision>::
}
template <class TInputImage, class TOutputImage, class TPrecision>
-void AngularProjectionBinaryImageFilter<TInputImage, TOutputImage, TPrecision>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void AngularProjectionBinaryImageFilter<TInputImage, TOutputImage, TPrecision>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
- itk::ProgressReporter reporter(this, threadId, outputRegionForThread.GetNumberOfPixels());
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -124,8 +123,6 @@ void AngularProjectionBinaryImageFilter<TInputImage, TOutputImage, TPrecision>::
++iter1;
++iter2;
-
- reporter.CompletedPixel();
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
index b362bf346187fbbb6e83172ec5dffbeea1679416..6b83619615c88579a0307877ac7244197c22cc90 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
@@ -96,7 +96,7 @@ protected:
{
}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadID) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
virtual OutputImagePixelType InternalGenerateData(const ImageRegionConstIteratorVectorType&) const;
private:
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
index b4f2956e0a6d0826716f203ea7835699dbac3bc3..fd7f0b1159d35ad92115f954910f2d2ac7547749 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
@@ -35,6 +35,7 @@ AngularProjectionImageFilter<TInputImage, TOutputImage, TAngleArray, TPrecision>
{
// this->SetNumberOfRequiredInputs(NumberOfInputImages);
this->SetNumberOfRequiredOutputs(1);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage, class TAngleArray, class TPrecision>
@@ -55,11 +56,8 @@ const TInputImage* AngularProjectionImageFilter<TInputImage, TOutputImage, TAngl
}
template <class TInputImage, class TOutputImage, class TAngleArray, class TPrecision>
-void AngularProjectionImageFilter<TInputImage, TOutputImage, TAngleArray, TPrecision>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void AngularProjectionImageFilter<TInputImage, TOutputImage, TAngleArray, TPrecision>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
- itk::ProgressReporter reporter(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -87,8 +85,6 @@ void AngularProjectionImageFilter<TInputImage, TOutputImage, TAngleArray, TPreci
if (it[i].IsAtEnd())
iteratorsAtEnd = true;
}
-
- reporter.CompletedPixel();
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
index 66b135c53909101e00432d65f57b5437a6de08bf..6d386c817ed23236f0350a673407dd97c5e68206 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
@@ -93,7 +93,7 @@ protected:
**/
void BeforeThreadedGenerateData() override;
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
private:
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
index 0c14ae3680036f7b4c2ebc012ac0ae593d2b74a4..c802da28f6bd25caf6ab1d6dc1b62f59d68ae537 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
@@ -36,6 +36,7 @@ template <class TInputImage, class TOutputImage>
EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>::EstimateInnerProductPCAImageFilter()
: m_NumberOfPrincipalComponentsRequired(1), m_CenterData(true)
{
+ this->DynamicMultiThreadingOn();
}
/**
@@ -77,8 +78,7 @@ void EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>::BeforeThread
}
template <class TInputImage, class TOutputImage>
-void EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
typename InputImageType::ConstPointer inputPtr = this->GetInput();
typename OutputImageType::Pointer outputPtr = this->GetOutput();
@@ -95,8 +95,6 @@ void EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>::ThreadedGene
itk::ImageRegionConstIterator<TInputImage> inputIt(inputPtr, inputRegionForThread);
itk::ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -119,7 +117,6 @@ void EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>::ThreadedGene
outputIt.Set(outputPixel);
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
index e0593b77eeef31a6766cd2604b8055e64ab17a86..f15bae1701bdfb7dcb5bd5deaf25e57ebe301019 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
@@ -266,7 +266,7 @@ void FastICAImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>::
// Decorrelation of the W vectors
InternalMatrixType W_tmp = W * W.transpose();
vnl_svd<MatrixElementType> solver(W_tmp);
- InternalMatrixType valP = solver.W();
+ InternalMatrixType valP = solver.W().as_matrix();
for (unsigned int i = 0; i < valP.rows(); ++i)
valP(i, i) = 1. / std::sqrt(static_cast<double>(valP(i, i))); // Watch for 0 or neg
InternalMatrixType transf = solver.U();
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
index c8bb7db24c367b899d0b9fdb600f6945e86fa4d0..3fef9e5ce81b710f033d3b6a1fcd1ac0395a4ce2 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
@@ -35,7 +35,7 @@ template <class TInputImage, class TOutputImage>
FastICAInternalOptimizerVectorImageFilter<TInputImage, TOutputImage>::FastICAInternalOptimizerVectorImageFilter()
{
this->SetNumberOfRequiredInputs(2);
-
+ this->DynamicMultiThreadingOff();
m_CurrentBandForLoop = 0;
m_Beta = 0.;
m_Den = 0.;
@@ -62,9 +62,9 @@ void FastICAInternalOptimizerVectorImageFilter<TInputImage, TOutputImage>::Reset
throw itk::ExceptionObject(__FILE__, __LINE__, "Give the initial W matrix", ITK_LOCATION);
}
- m_BetaVector.resize(this->GetNumberOfThreads());
- m_DenVector.resize(this->GetNumberOfThreads());
- m_NbSamples.resize(this->GetNumberOfThreads());
+ m_BetaVector.resize(this->GetNumberOfWorkUnits());
+ m_DenVector.resize(this->GetNumberOfWorkUnits());
+ m_NbSamples.resize(this->GetNumberOfWorkUnits());
std::fill(m_BetaVector.begin(), m_BetaVector.end(), 0.);
std::fill(m_DenVector.begin(), m_DenVector.end(), 0.);
@@ -126,7 +126,7 @@ void FastICAInternalOptimizerVectorImageFilter<TInputImage, TOutputImage>::Synth
double den = 0.;
double nbSample = 0;
- for (itk::ThreadIdType i = 0; i < this->GetNumberOfThreads(); ++i)
+ for (itk::ThreadIdType i = 0; i < this->GetNumberOfWorkUnits(); ++i)
{
beta += m_BetaVector[i];
den += m_DenVector[i];
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
index 42c2b14e2a4300b3a3724aedff8d928bd571f430..22df6f8f3cb57640cc5fe971e257b0059909d663 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbLocalActivityVectorImageFilter.h
@@ -108,12 +108,8 @@ public:
itkTypeMacro(LocalActivityVectorImageFilter, ImageToImageFilter);
protected:
- LocalActivityVectorImageFilter()
- {
- }
- ~LocalActivityVectorImageFilter() override
- {
- }
+ LocalActivityVectorImageFilter() = default;
+ ~LocalActivityVectorImageFilter() = default;
private:
LocalActivityVectorImageFilter(const Self&); // Not implemented
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
index 4a2e01bcac3a1f806eb288e256dd52cf53b87bbb..774f66c593dd3c6e0f9f7436ec2cd58a65d93f40 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
@@ -207,7 +207,7 @@ void MNFImageFilter<TInputImage, TOutputImage, TNoiseImageFilter, TDirectionOfTr
m_IsTransformationMatrixForward = false;
if (m_TransformationMatrix.Rows() == m_TransformationMatrix.Cols())
- m_TransformationMatrix = vnl_matrix_inverse<MatrixElementType>(m_TransformationMatrix.GetVnlMatrix());
+ m_TransformationMatrix = vnl_matrix_inverse<MatrixElementType>(m_TransformationMatrix.GetVnlMatrix()).as_matrix();
else
{
vnl_svd<MatrixElementType> invertor(m_TransformationMatrix.GetVnlMatrix());
@@ -220,7 +220,7 @@ void MNFImageFilter<TInputImage, TOutputImage, TNoiseImageFilter, TDirectionOfTr
m_IsTransformationMatrixForward = false;
if (m_TransformationMatrix.Rows() == m_TransformationMatrix.Cols())
{
- m_TransformationMatrix = vnl_matrix_inverse<MatrixElementType>(m_TransformationMatrix.GetVnlMatrix());
+ m_TransformationMatrix = vnl_matrix_inverse<MatrixElementType>(m_TransformationMatrix.GetVnlMatrix()).as_matrix();
}
else
{
@@ -306,12 +306,12 @@ void MNFImageFilter<TInputImage, TOutputImage, TNoiseImageFilter, TDirectionOfTr
{
vnl_cholesky choleskySolver(m_NoiseCovarianceMatrix.GetVnlMatrix(), vnl_cholesky::estimate_condition);
InternalMatrixType Rn = choleskySolver.lower_triangle();
- InternalMatrixType Rn_inv = vnl_matrix_inverse<MatrixElementType>(Rn.transpose());
+ InternalMatrixType Rn_inv = vnl_matrix_inverse<MatrixElementType>(Rn.transpose()).as_matrix();
InternalMatrixType C = Rn_inv.transpose() * m_CovarianceMatrix.GetVnlMatrix() * Rn_inv;
vnl_svd<MatrixElementType> solver(C);
InternalMatrixType U = solver.U();
- InternalMatrixType valP = solver.W();
+ InternalMatrixType valP = solver.W().as_matrix();
InternalMatrixType transf = Rn_inv * U;
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
index 289fcb68db79f3d90aba0bf891e429b27dce4167..696bbbdbc267d2c5ebb5a1ecd1949d3a8c6d0dae 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
@@ -136,7 +136,7 @@ protected:
{
}
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void GenerateOutputInformation() override;
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
index 7be2f7954264411257b425c062a595045b1779fd..7ebe37dd5ef6d51b9556e5edad09e0728fe18d71 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
@@ -38,9 +38,10 @@ namespace otb
template <class TInputImage, class TOutputImage>
MaximumAutocorrelationFactorImageFilter<TInputImage, TOutputImage>::MaximumAutocorrelationFactorImageFilter()
{
- m_CovarianceEstimator = CovarianceEstimatorType::New();
+ m_CovarianceEstimator = CovarianceEstimatorType::New();
m_CovarianceEstimatorH = CovarianceEstimatorType::New();
m_CovarianceEstimatorV = CovarianceEstimatorType::New();
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -143,7 +144,7 @@ void MaximumAutocorrelationFactorImageFilter<TInputImage, TOutputImage>::Generat
}
vnl_generalized_eigensystem ges(sigmad, sigma);
- VnlMatrixType d = ges.D;
+ VnlMatrixType d = ges.D.as_matrix();
m_V = ges.V;
m_AutoCorrelation = VnlVectorType(nbComp, 1.);
@@ -179,8 +180,7 @@ void MaximumAutocorrelationFactorImageFilter<TInputImage, TOutputImage>::Generat
}
template <class TInputImage, class TOutputImage>
-void MaximumAutocorrelationFactorImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void MaximumAutocorrelationFactorImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// Retrieve input images pointers
const TInputImage* inputPtr = this->GetInput();
@@ -199,9 +199,6 @@ void MaximumAutocorrelationFactorImageFilter<TInputImage, TOutputImage>::Threade
// Get the number of components for each image
unsigned int outNbComp = outputPtr->GetNumberOfComponentsPerPixel();
-
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
while (!inIt.IsAtEnd() && !outIt.IsAtEnd())
{
VnlVectorType x(outNbComp, 0);
@@ -225,7 +222,6 @@ void MaximumAutocorrelationFactorImageFilter<TInputImage, TOutputImage>::Threade
++inIt;
++outIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
index 9772366ecb96ff605d77a4922811a4f0cae6596d..ce75546948188a31cdf15c9c076d2e0427956fee 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
@@ -60,7 +60,7 @@ void NAPCAImageFilter<TInputImage, TOutputImage, TNoiseImageFilter, TDirectionOf
}
Fn = Fn * valPn;
- InternalMatrixType Ax = vnl_matrix_inverse<MatrixElementType>(this->GetCovarianceMatrix().GetVnlMatrix());
+ InternalMatrixType Ax = vnl_matrix_inverse<MatrixElementType>(this->GetCovarianceMatrix().GetVnlMatrix()).as_matrix();
InternalMatrixType Aadj = Fn.transpose() * Ax * Fn;
InternalMatrixType Fadj;
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
index 905b6b88d0c9f482b1a7ea4ea5e399d7ee78e20d..beed21058238212b776afbec838444d005cf6815 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
@@ -104,9 +104,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** BeforeThreadedGenerateData method */
void BeforeThreadedGenerateData() override;
diff --git a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
index 72754e8bba4bff73cdb145c77df33216f502b3f0..c72a193b7137e4b150fc063b8bda3aec0f02371c 100644
--- a/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
@@ -23,7 +23,6 @@
#include "otbNormalizeInnerProductPCAImageFilter.h"
#include "itkImageRegionIterator.h"
-#include "itkProgressReporter.h"
#include "itkNumericTraits.h"
namespace otb
@@ -38,7 +37,7 @@ NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>::NormalizeInnerPr
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfRequiredOutputs(1);
this->InPlaceOff();
-
+ this->DynamicMultiThreadingOn();
m_UseUnbiasedEstimator = true;
}
@@ -81,8 +80,7 @@ void NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>::BeforeThrea
* ThreadedGenerateData Performs the pixel-wise addition
*/
template <class TInputImage, class TOutputImage>
-void NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
@@ -91,8 +89,6 @@ void NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>::ThreadedGen
itk::ImageRegionConstIterator<InputImageType> inputIt(inputPtr, outputRegionForThread);
itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -115,7 +111,6 @@ void NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>::ThreadedGen
outputIt.Set(outPixel);
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.h b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.h
index d9883f9d02e2af1bc57ddae743a1dadfe6f2a306..26648a8fd385c4d6c109f66402f6fc4574606b9f 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.h
@@ -109,9 +109,9 @@ protected:
* through the parent class calling the ThreadedGenerateData() method.
* ThreadedGenerateData() can only write the area of the image specified by the parameter "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
FrostImageFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
index e02b9d9129780626851a2a89935bd2e62423b9ee..c3eafb00b69ae4a87da0f57d8a61af5d067b6db4 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
@@ -29,7 +29,6 @@
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
#include "itkOffset.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -42,6 +41,7 @@ FrostImageFilter<TInputImage, TOutputImage>::FrostImageFilter()
{
m_Radius.Fill(1);
m_Deramp = 2;
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -93,7 +93,7 @@ void FrostImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
}
template <class TInputImage, class TOutputImage>
-void FrostImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void FrostImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
@@ -112,9 +112,6 @@ void FrostImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const Out
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
InputRealType sum;
InputRealType sum2;
@@ -198,7 +195,6 @@ void FrostImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const Out
++bit;
++it;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
index 881d77bda5374f43f78e6598c18e277d3692a81d..d4507b4b52fafc9fb5149a75f64210691562dd5b 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
@@ -98,7 +98,7 @@ protected:
/** GammaMAPImageFilter can be multithreaded.
*/
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
GammaMAPImageFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
index bd015b27a34a4fb6bf44f4408ae7c00626ec0ef7..5d9548a6068a828f959b24be72b9f91a3d66458f 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
@@ -29,7 +29,7 @@
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
#include "itkOffset.h"
-#include "itkProgressReporter.h"
+
namespace otb
{
@@ -42,6 +42,7 @@ GammaMAPImageFilter<TInputImage, TOutputImage>::GammaMAPImageFilter()
{
m_Radius.Fill(1);
SetNbLooks(1.0);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -93,7 +94,7 @@ void GammaMAPImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegio
}
template <class TInputImage, class TOutputImage>
-void GammaMAPImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void GammaMAPImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
@@ -111,9 +112,6 @@ void GammaMAPImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// InputRealType pixel;
InputRealType sum;
InputRealType sum2;
@@ -195,8 +193,6 @@ void GammaMAPImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const
++bit;
++it;
-
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.h b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.h
index af4f1a971d2ac381ca3ed984ad606f7a8ff336ae..17ec3253c17e7a112007db198eb9367cd46131bd 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.h
@@ -98,7 +98,7 @@ protected:
/** KuanImageFilter can be multithreaded.
*/
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
KuanImageFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
index 239ef155fc61b9dfaf867d00245e5702f89b76db..c24e954d416e9fa974dda3f82c26ac4e2f354b61 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
@@ -29,7 +29,6 @@
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
#include "itkOffset.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -42,6 +41,7 @@ KuanImageFilter<TInputImage, TOutputImage>::KuanImageFilter()
{
m_Radius.Fill(1);
SetNbLooks(1.0);
+ this->DynamicMultiThreadingOn();
}
template <class TInputImage, class TOutputImage>
@@ -93,7 +93,7 @@ void KuanImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
}
template <class TInputImage, class TOutputImage>
-void KuanImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void KuanImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
@@ -111,9 +111,6 @@ void KuanImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const Outp
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// InputRealType pixel;
InputRealType sum;
InputRealType sum2;
@@ -185,7 +182,6 @@ void KuanImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const Outp
++bit;
++it;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.h b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.h
index a7394eb144d9c6a755ec38ff7eba18223f1d6d49..cd950b76ffcc7ee1d08c6eaa7d1114c1df51d149 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.h
@@ -110,9 +110,9 @@ protected:
* \f$ Cv = 1 / \sqrt(L) \f$ with L the number of look.
* \f$ Cr = \sqrt(Var(I)) / E[I] where Var(I) = E[I^2] - E[I]^2 \f$
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
private:
LeeImageFilter(const Self&) = delete;
diff --git a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
index a34f66d9287ccd71c7aab3a12c02a9490aa110bd..ca9637caa82696cf2e246048bce81dd11195fa67 100644
--- a/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
@@ -29,7 +29,6 @@
#include "itkImageRegionIterator.h"
#include "itkNeighborhoodAlgorithm.h"
#include "itkOffset.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -93,7 +92,7 @@ void LeeImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
}
template <class TInputImage, class TOutputImage>
-void LeeImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId)
+void LeeImageFilter<TInputImage, TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
@@ -111,9 +110,6 @@ void LeeImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const Outpu
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// InputRealType pixel;
InputRealType sum;
InputRealType sum2;
@@ -184,8 +180,6 @@ void LeeImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(const Outpu
++bit;
++it;
-
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/MathParser/include/otbBandMathImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/MathParser/include/otbBandMathImageFilter.hxx
index 98fcd16f221826da7ad7a7a3121fed8a6660e133..4db13e9b78d03cf5f41eb9785f45973a214b6b31 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParser/include/otbBandMathImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/MathParser/include/otbBandMathImageFilter.hxx
@@ -39,6 +39,7 @@ namespace otb
template <class TImage>
BandMathImageFilter<TImage>::BandMathImageFilter()
{
+ this->DynamicMultiThreadingOff();
// This number will be incremented each time an image
// is added over the one minimumrequired
this->SetNumberOfRequiredInputs(1);
@@ -134,7 +135,7 @@ template <typename TImage>
void BandMathImageFilter<TImage>::BeforeThreadedGenerateData()
{
typename std::vector<ParserType::Pointer>::iterator itParser;
- unsigned int nbThreads = this->GetNumberOfThreads();
+ unsigned int nbThreads = this->GetNumberOfWorkUnits();
unsigned int nbInputImages = this->GetNumberOfInputs();
unsigned int nbAccessIndex = 4; // to give access to image and physical index
unsigned int i, j;
@@ -205,7 +206,7 @@ void BandMathImageFilter<TImage>::BeforeThreadedGenerateData()
template <typename TImage>
void BandMathImageFilter<TImage>::AfterThreadedGenerateData()
{
- unsigned int nbThreads = this->GetNumberOfThreads();
+ unsigned int nbThreads = this->GetNumberOfWorkUnits();
unsigned int i;
m_UnderflowCount = 0;
diff --git a/Modules/FeaturesExtraction/Filtering/MathParser/include/otbMaskMuParserFilter.hxx b/Modules/FeaturesExtraction/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
index c35788e45307992ac72bd31b6c22539b71cd9597..8dc6e86b66efc9d51a5aec381e46f89e53fde47a 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
@@ -35,6 +35,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TFunction>
MaskMuParserFilter<TInputImage, TOutputImage, TFunction>::MaskMuParserFilter()
{
+ this->DynamicMultiThreadingOff();
m_UnderflowCount = 0;
m_OverflowCount = 0;
m_ThreadUnderflow.SetSize(1);
@@ -145,7 +146,7 @@ void MaskMuParserFilter<TInputImage, TOutputImage, TFunction>::BeforeThreadedGen
{
typename std::vector<FunctorPointer>::iterator itFunctor;
- unsigned int nbThreads = this->GetNumberOfThreads();
+ unsigned int nbThreads = this->GetNumberOfWorkUnits();
unsigned int thread_index;
std::ostringstream varName;
diff --git a/Modules/FeaturesExtraction/Filtering/MathParser/include/otbParser.h b/Modules/FeaturesExtraction/Filtering/MathParser/include/otbParser.h
index 27953093a593ae523bf593486667be3e1cac675e..5153b27833780ed678119c6cce75f8667ea3cafd 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParser/include/otbParser.h
+++ b/Modules/FeaturesExtraction/Filtering/MathParser/include/otbParser.h
@@ -25,6 +25,7 @@
#include "itkObjectFactory.h"
#include "otb_muparser.h"
+#include "OTBMathParserExport.h"
namespace otb
{
@@ -41,7 +42,7 @@ class ParserImpl;
*
* \ingroup OTBMathParser
*/
-class ITK_EXPORT Parser : public itk::LightObject
+class OTBMathParser_EXPORT Parser : public itk::LightObject
{
public:
/** Standard class typedefs. */
diff --git a/Modules/FeaturesExtraction/Filtering/MathParser/otb-module.cmake b/Modules/FeaturesExtraction/Filtering/MathParser/otb-module.cmake
index 62cae0a4b08f94dc01683f5c43f8370b97029b41..6e15cef90fd09ba3fab3814528d2933a03b675b2 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParser/otb-module.cmake
+++ b/Modules/FeaturesExtraction/Filtering/MathParser/otb-module.cmake
@@ -23,6 +23,7 @@ expression to the pixels of an image. Note that classes based on MuParserX have
better capabilities than the ones based on MuParser.")
otb_module(OTBMathParser
+ENABLE_SHARED
DEPENDS
OTBCommon
OTBITK
diff --git a/Modules/FeaturesExtraction/Filtering/MathParser/test/otbBandMathImageFilter.cxx b/Modules/FeaturesExtraction/Filtering/MathParser/test/otbBandMathImageFilter.cxx
index 7a3ef47d78dd93985200221bdf4008ecdf324baf..cf2e052635e7ab61fb618eb83c1a5a2a087943a0 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParser/test/otbBandMathImageFilter.cxx
+++ b/Modules/FeaturesExtraction/Filtering/MathParser/test/otbBandMathImageFilter.cxx
@@ -27,7 +27,7 @@
#include "otbImage.h"
#include "otbBandMathImageFilter.h"
#include "otbImageFileWriter.h"
-
+#include "vcl_legacy_aliases.h"
int otbBandMathImageFilter(int itkNotUsed(argc), char* itkNotUsed(argv)[])
{
@@ -85,7 +85,7 @@ int otbBandMathImageFilter(int itkNotUsed(argc), char* itkNotUsed(argv)[])
FilterType::Pointer filter = FilterType::New();
- std::cout << "Number Of Threads : " << filter->GetNumberOfThreads() << std::endl;
+ std::cout << "Number Of Threads : " << filter->GetNumberOfWorkUnits() << std::endl;
filter->SetNthInput(0, image1);
@@ -243,7 +243,7 @@ int otbBandMathImageFilterWithIdx(int itkNotUsed(argc), char* argv[])
FilterType::Pointer filter = FilterType::New();
- std::cout << "Number Of Threads : " << filter->GetNumberOfThreads() << std::endl;
+ std::cout << "Number Of Threads : " << filter->GetNumberOfWorkUnits() << std::endl;
filter->SetNthInput(0, image1);
diff --git a/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
index 6b4f3f4dd265a50a077b9ef5aab4edb89651a9a5..9caaf23edb2e2a1a57513071334f62f7c54ab004 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
@@ -47,7 +47,7 @@ BandMathXImageFilter<TImage>::BandMathXImageFilter()
// This number will be incremented each time an image
// is added over the one minimumrequired
this->SetNumberOfRequiredInputs(1);
-
+ this->DynamicMultiThreadingOff();
m_UnderflowCount = 0;
m_OverflowCount = 0;
m_ThreadUnderflow.SetSize(1);
@@ -596,7 +596,7 @@ void BandMathXImageFilter<TImage>::PrepareParsers()
// Register variables for each parser (important : one parser per thread and per expression)
m_VParser.clear();
- unsigned int nbThreads = this->GetNumberOfThreads();
+ unsigned int nbThreads = this->GetNumberOfWorkUnits();
for (unsigned int k = 0; k < nbThreads; k++)
{
std::vector<ParserType::Pointer> parserList;
@@ -963,7 +963,7 @@ template <typename TImage>
void BandMathXImageFilter<TImage>::BeforeThreadedGenerateData()
{
- unsigned int nbThreads = this->GetNumberOfThreads();
+ unsigned int nbThreads = this->GetNumberOfWorkUnits();
// Allocate and initialize the thread temporaries
m_ThreadUnderflow.SetSize(nbThreads);
m_ThreadUnderflow.Fill(0);
@@ -975,7 +975,7 @@ void BandMathXImageFilter<TImage>::BeforeThreadedGenerateData()
template <typename TImage>
void BandMathXImageFilter<TImage>::AfterThreadedGenerateData()
{
- unsigned int nbThreads = this->GetNumberOfThreads();
+ unsigned int nbThreads = this->GetNumberOfWorkUnits();
unsigned int i;
m_UnderflowCount = 0;
diff --git a/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbParserX.h b/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbParserX.h
index b00531aaad374c484b4520f87c946a7267a30874..39b2c8bd8082aec576dc3aa36209a4dfa4285a07 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbParserX.h
+++ b/Modules/FeaturesExtraction/Filtering/MathParserX/include/otbParserX.h
@@ -43,6 +43,7 @@
#else
#include "mpParser.h"
#endif
+#include "OTBMathParserXExport.h"
namespace otb
{
@@ -59,7 +60,7 @@ class ParserXImpl;
*
* \ingroup OTBMathParserX
*/
-class ITK_EXPORT ParserX : public itk::LightObject
+class OTBMathParserX_EXPORT ParserX : public itk::LightObject
{
public:
/** Standard class typedefs. */
diff --git a/Modules/FeaturesExtraction/Filtering/MathParserX/otb-module.cmake b/Modules/FeaturesExtraction/Filtering/MathParserX/otb-module.cmake
index a207b315e6d78fbaf6da7ec638e9c29d15a056b1..a376f3bac147e2d8d2839676aba5a2dc595abf80 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParserX/otb-module.cmake
+++ b/Modules/FeaturesExtraction/Filtering/MathParserX/otb-module.cmake
@@ -21,6 +21,7 @@
set(DOCUMENTATION "TODO")
otb_module(OTBMathParserX
+ENABLE_SHARED
DEPENDS
OTBCommon
OTBITK
diff --git a/Modules/FeaturesExtraction/Filtering/MathParserX/src/otbParserXPlugins.cxx b/Modules/FeaturesExtraction/Filtering/MathParserX/src/otbParserXPlugins.cxx
index 654b4fcabc0669cc0ef916d7301ccccaee061466..02e82c1b0f7524aed1e6e805820245abf722c55c 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParserX/src/otbParserXPlugins.cxx
+++ b/Modules/FeaturesExtraction/Filtering/MathParserX/src/otbParserXPlugins.cxx
@@ -23,7 +23,7 @@
#include "otbMath.h"
#include "itkNumericTraits.h"
-#include <itkExceptionObject.h>
+#include "itkMacro.h"
#include <vector>
diff --git a/Modules/FeaturesExtraction/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx b/Modules/FeaturesExtraction/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx
index 4529ca24a955821631ea9ac483aff53cc71eb2db..32bcf2f931e2dd761e2bdbf2a85731acbe11c9e3 100644
--- a/Modules/FeaturesExtraction/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx
+++ b/Modules/FeaturesExtraction/Filtering/MathParserX/test/otbBandMathXImageFilter.cxx
@@ -115,7 +115,7 @@ int otbBandMathXImageFilter(int itkNotUsed(argc), char* itkNotUsed(argv)[])
FilterType::Pointer filter = FilterType::New();
- std::cout << "Number Of Threads : " << filter->GetNumberOfThreads() << std::endl;
+ std::cout << "Number Of Threads : " << filter->GetNumberOfWorkUnits() << std::endl;
filter->SetNthInput(0, image1);
filter->SetNthInput(1, image2);
@@ -399,7 +399,7 @@ int otbBandMathXImageFilterConv(int itkNotUsed(argc), char* argv[])
imageAb3Var = (n / (n - 1)) * (imageAb3Var / n - imageAb3Mean * imageAb3Mean); // unbiased
FilterType::Pointer filter = FilterType::New();
- std::cout << "Number Of Threads : " << filter->GetNumberOfThreads() << std::endl;
+ std::cout << "Number Of Threads : " << filter->GetNumberOfWorkUnits() << std::endl;
double expo = 1.1;
@@ -616,7 +616,7 @@ int otbBandMathXImageFilterWithIdx(int itkNotUsed(argc), char* argv[])
}
FilterType::Pointer filter = FilterType::New();
- std::cout << "Number Of Threads : " << filter->GetNumberOfThreads() << std::endl;
+ std::cout << "Number Of Threads : " << filter->GetNumberOfWorkUnits() << std::endl;
filter->SetNthInput(0, image1);
filter->SetNthInput(1, image2);
diff --git a/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h b/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
index 764eeec98e64da476a3a0cca075213957f56c9ed..946a4cf49b782348652778c1ff359b65a1a2a5e1 100644
--- a/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -178,9 +178,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** Computation of the electromagnetic fields Ei Er */
void ComputeElectromagneticFields();
diff --git a/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx b/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
index 1c732d3a13587de489e1f84a2d4b1982858d4ecd..09a4f21cd0104e8c84874dd210b35b68a686ad55 100644
--- a/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
@@ -25,7 +25,6 @@
#include "otbMultiChannelsPolarimetricSynthesisFilter.h"
#include "itkImageRegionIterator.h"
-#include "itkProgressReporter.h"
#include "otbMath.h"
namespace otb
@@ -41,6 +40,7 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>::
this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
m_ArchitectureType = PolarimetricData::New();
+ this->DynamicMultiThreadingOn();
}
/**
@@ -138,8 +138,7 @@ void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFuncti
* ThreadedGenerateData Performs the pixel-wise addition
*/
template <class TInputImage, class TOutputImage, class TFunction>
-void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
InputImagePointer inputPtr = this->GetInput();
@@ -155,8 +154,6 @@ void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFuncti
itk::ImageRegionConstIterator<TInputImage> inputIt(inputPtr, inputRegionForThread);
itk::ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
inputIt.GoToBegin();
outputIt.GoToBegin();
@@ -171,7 +168,6 @@ void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFuncti
outputIt.Set(m_Gain * GetFunctor()(inputIt.Get()[0], inputIt.Get()[1], inputIt.Get()[2], inputIt.Get()[3]));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
break;
@@ -182,7 +178,6 @@ void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFuncti
outputIt.Set(m_Gain * GetFunctor()(inputIt.Get()[0], inputIt.Get()[1], inputIt.Get()[1], inputIt.Get()[2]));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
break;
@@ -193,7 +188,6 @@ void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFuncti
outputIt.Set(m_Gain * GetFunctor()(inputIt.Get()[0], inputIt.Get()[1], 0, 0));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
break;
@@ -204,7 +198,6 @@ void MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFuncti
outputIt.Set(m_Gain * GetFunctor()(0, 0, inputIt.Get()[2], inputIt.Get()[3]));
++inputIt;
++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
}
break;
diff --git a/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbPolarimetricData.h b/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbPolarimetricData.h
index 4d588ab1c1ff7df9576509847f8c8f4296147710..39dc8d7d5df30a7717157d65a6f0ba26ced3e487 100644
--- a/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbPolarimetricData.h
+++ b/Modules/FeaturesExtraction/Filtering/Polarimetry/include/otbPolarimetricData.h
@@ -23,6 +23,7 @@
#include "itkDataObject.h"
#include "itkObjectFactory.h"
+#include "OTBPolarimetryExport.h"
namespace otb
{
@@ -42,7 +43,7 @@ typedef enum { HH_HV_VH_VV = 0, HH_HV_VV = 1, HH_VH_VV = 2, HH_HV = 3, VH_VV = 4
* \ingroup OTBPolarimetry
*/
-class ITK_EXPORT PolarimetricData : public itk::DataObject
+class OTBPolarimetry_EXPORT PolarimetricData : public itk::DataObject
{
public:
/** Standard typedefs */
diff --git a/Modules/FeaturesExtraction/Filtering/Polarimetry/otb-module.cmake b/Modules/FeaturesExtraction/Filtering/Polarimetry/otb-module.cmake
index 6073d1dbaa865e6ca85ddfcabe8d7fa69bd33446..1c12661d1956a09484f95ab680a0f5cd44cd3025 100644
--- a/Modules/FeaturesExtraction/Filtering/Polarimetry/otb-module.cmake
+++ b/Modules/FeaturesExtraction/Filtering/Polarimetry/otb-module.cmake
@@ -26,6 +26,7 @@ representations of a polarisation state, to perform polarimetry synthesis, and s
on.")
otb_module(OTBPolarimetry
+ENABLE_SHARED
DEPENDS
OTBCommon
OTBITK
diff --git a/Modules/FeaturesExtraction/Filtering/Polarimetry/test/otbPolarimetricSynthesisFunctor.cxx b/Modules/FeaturesExtraction/Filtering/Polarimetry/test/otbPolarimetricSynthesisFunctor.cxx
index 4b4d9de61945aee0693238a78dbe62fecbe71b90..6e8737335e74287d6406fdc56eaff89a4d15e056 100644
--- a/Modules/FeaturesExtraction/Filtering/Polarimetry/test/otbPolarimetricSynthesisFunctor.cxx
+++ b/Modules/FeaturesExtraction/Filtering/Polarimetry/test/otbPolarimetricSynthesisFunctor.cxx
@@ -21,6 +21,7 @@
#include <complex>
#include <cmath>
#include "otbPolarimetricSynthesisFunctor.h"
+#include <iostream>
int otbPolarimetricSynthesisFunctor(int itkNotUsed(argc), char* itkNotUsed(argv)[])
{
diff --git a/Modules/FeaturesExtraction/Filtering/TimeSeries/test/CMakeLists.txt b/Modules/FeaturesExtraction/Filtering/TimeSeries/test/CMakeLists.txt
index d72fe0138fadca1cae6add9fd370eb7bafbe4ac6..76c61692083744f82448a95b2e507b754529202e 100644
--- a/Modules/FeaturesExtraction/Filtering/TimeSeries/test/CMakeLists.txt
+++ b/Modules/FeaturesExtraction/Filtering/TimeSeries/test/CMakeLists.txt
@@ -18,6 +18,8 @@
# limitations under the License.
#
+# This test module causes undeclared declspec import on windows which is not understandable
+if(NOT WIN32)
otb_module_test()
set(OTBTimeSeriesTests
otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
@@ -51,3 +53,4 @@ otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctorWeights COMMAND otbTim
otbTimeSeriesLeastSquareFittingFunctorWeightsTest
1 2 3
)
+endif()
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.h b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.h
index 667892874fe543b25f47e854011e497d08c57ee8..6e05506661f7ade554ebb2ee916484c74134df0d 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.h
@@ -25,6 +25,7 @@
#include "itkImageToImageFilter.h"
#include "itkImage.h"
+#include "otbMacro.h" //for
// Just to get the forward/inverse definitions
#include "otbWaveletOperatorBase.h"
@@ -98,9 +99,10 @@ public:
}
protected:
- SubsampleImageFilter()
- {
+ SubsampleImageFilter ()
+ {
m_SubsampleFactor.Fill(1);
+ this->DynamicMultiThreadingOn();
}
~SubsampleImageFilter() override
{
@@ -124,7 +126,7 @@ protected:
void BeforeThreadedGenerateData() override;
/** Allows multithreading */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
void PrintSelf(std::ostream& os, itk::Indent indent) const override;
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
index 6edab0e51e33dd1136fcdfb96ec78c617032bfaa..5fb79255416e189da271ebfc079260e6b81979bf 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
@@ -27,7 +27,6 @@
#include "otbMacro.h"
#include "otbSubsampledImageRegionIterator.h"
#include "itkImageRegionIterator.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -128,8 +127,7 @@ void SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
}
template <class TInputImage, class TOutputImage, Wavelet::WaveletDirection TDirectionOfTransformation>
-void SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
OutputImagePointerType output = this->GetOutput();
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.h b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.h
index b36dd50994f1efbf9350e9bf1920a863a47648f3..faf9f7e0547418ab6399396bc5b8ebadb112d7be 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.h
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.h
@@ -100,7 +100,10 @@ public:
itkTypeMacro(WaveletFilterBank, ImageToImageFilter);
protected:
- WaveletFilterBank();
+ WaveletFilterBank()
+ {
+ this->DynamicMultiThreadingOff();
+ }
virtual ~WaveletFilterBank();
private:
@@ -393,7 +396,7 @@ protected:
{
}
- void VerifyInputInformation() override
+ void VerifyInputInformation() const override
{
}
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.hxx b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
index 118f4b52b47c9ba4f768ae37f83f26bf25833d66..7003aa5c10390e25b643ce7512099c695d2cc841 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
@@ -39,6 +39,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TWaveletOperator>
WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>::WaveletFilterBank()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfRequiredInputs(1);
@@ -346,6 +347,8 @@ void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FOR
{
unsigned int dir = InputImageDimension - 1;
+ itk::ProgressReporter reporter(this, threadId, outputRegionForThread.GetNumberOfPixels() * this->GetNumberOfInputs());
+
if ((1 << dir) >= static_cast<int>(this->GetNumberOfOutputs()))
{
std::ostringstream msg;
@@ -354,8 +357,6 @@ void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FOR
throw itk::ExceptionObject(__FILE__, __LINE__, msg.str(), ITK_LOCATION);
}
- itk::ProgressReporter reporter(this, threadId, outputRegionForThread.GetNumberOfPixels() * this->GetNumberOfOutputs() * 2);
-
const InputImageType* input = this->GetInput();
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -577,6 +578,7 @@ void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FOR
template <class TInputImage, class TOutputImage, class TWaveletOperator>
WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>::WaveletFilterBank()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfRequiredInputs(1 << InputImageDimension);
m_UpSampleFilterFactor = 0;
@@ -584,7 +586,7 @@ WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
// TODO: For now, we force the number threads to 1 because there is a bug with multithreading in INVERSE transform
// Resulting in discontinuities in the reconstructed images
- this->SetNumberOfThreads(1);
+ this->SetNumberOfWorkUnits(1);
}
template <class TInputImage, class TOutputImage, class TWaveletOperator>
@@ -1098,7 +1100,7 @@ void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INV
typename FilterType::Pointer overSampledLowPass = FilterType::New();
overSampledLowPass->SetInput(cropedLowPass);
overSampledLowPass->SetSubsampleFactor(delta);
- overSampledLowPass->SetNumberOfThreads(1);
+ overSampledLowPass->SetNumberOfWorkUnits(1);
overSampledLowPass->Update();
InputImagePointerType cropedHighPass = InputImageType::New();
@@ -1116,7 +1118,7 @@ void WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INV
typename FilterType::Pointer overSampledHighPass = FilterType::New();
overSampledHighPass->SetInput(cropedHighPass);
overSampledHighPass->SetSubsampleFactor(delta);
- overSampledHighPass->SetNumberOfThreads(1);
+ overSampledHighPass->SetNumberOfWorkUnits(1);
overSampledHighPass->Update();
InnerProductType innerProduct;
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletGenerator.h b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletGenerator.h
index 04f587b1c72e942d03b2e9dc326e7ee24ff89275..740d08b3051668fea273238d2f4deecea99a918c 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletGenerator.h
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletGenerator.h
@@ -26,6 +26,7 @@
#include <vector>
#include "itkLightObject.h"
#include "itkObjectFactory.h"
+#include "OTBWaveletExport.h"
namespace otb
{
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
index f79ca6e119d595484010a2bd47efd314719ad149..74ab104be7188cbc7a401e7d34eee53f8d9e8d69 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
@@ -66,7 +66,7 @@ public:
protected:
/** Main computation method */
- virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ virtual void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
/** GenerateOutputInformation
* Set the number of bands of the output.
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
index c729f3393a9bd874e7e31f0af869cd285035a41c..62f03ad492de115756e33712acbfd68a8453435a 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
@@ -24,8 +24,6 @@
#include "otbWaveletsBandsListToWaveletsSynopsisImageFilter.h"
#include "itkImageRegionIterator.h"
#include "itkImageRegionConstIterator.h"
-#include "otbMacro.h"
-#include "itkProgressReporter.h"
namespace otb
{
@@ -95,16 +93,12 @@ void WaveletsBandsListToWaveletsSynopsisImageFilter<TImageList, TImage>::Generat
* Main computation method
*/
template <class TImageList, class TImage>
-void WaveletsBandsListToWaveletsSynopsisImageFilter<TImageList, TImage>::ThreadedGenerateData(const RegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void WaveletsBandsListToWaveletsSynopsisImageFilter<TImageList, TImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{
// Retrieve input and output pointers
typename InputImageListType::Pointer inputPtr = this->GetInput();
typename OutputImageType::Pointer outputPtr = this->GetOutput();
- // Set up progress reporting
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// defines input and output iterators
typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
@@ -197,7 +191,6 @@ void WaveletsBandsListToWaveletsSynopsisImageFilter<TImageList, TImage>::Threade
// Step forward
++inIt;
++outIt;
- progress.CompletedPixel();
}
}
}
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/otb-module.cmake b/Modules/FeaturesExtraction/Filtering/Wavelet/otb-module.cmake
index feca994e5f60cba718a42c91f1458f3ab6123aaf..fb6d02d381a8465520d82deb1b78feef5bc5c571 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/otb-module.cmake
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/otb-module.cmake
@@ -21,6 +21,7 @@
set(DOCUMENTATION "This module contains classes for wavelet analysis.")
otb_module(OTBWavelet
+ENABLE_SHARED
DEPENDS
OTBCommon
OTBITK
diff --git a/Modules/FeaturesExtraction/Filtering/Wavelet/test/otbWaveletTransform.cxx b/Modules/FeaturesExtraction/Filtering/Wavelet/test/otbWaveletTransform.cxx
index c8813916ce92380f357aa3f1494a7e29a91ded9d..1e7e3a42c681f593c4a9ea9bb7a5fbc603549d06 100644
--- a/Modules/FeaturesExtraction/Filtering/Wavelet/test/otbWaveletTransform.cxx
+++ b/Modules/FeaturesExtraction/Filtering/Wavelet/test/otbWaveletTransform.cxx
@@ -41,8 +41,8 @@ int otbWaveletTransform_generic(int argc, char* argv[])
if (argc == 7)
{
- unsigned int NbOfThreads = atoi(argv[6]);
- itk::MultiThreader::SetGlobalDefaultNumberOfThreads(NbOfThreads);
+ unsigned int NbOfThreads = atoi(argv[6]);
+ itk::MultiThreaderBase::SetGlobalDefaultNumberOfThreads(NbOfThreads);
}
diff --git a/Modules/Hyperspectral/Applications/app/otbHyperspectralUnmixing.cxx b/Modules/Hyperspectral/Applications/app/otbHyperspectralUnmixing.cxx
index 6c8c7c3e5c4885d468e2fe054ff230faa2be8fc6..8bd5643d7288b8fbd342c92f8ebcd323794a9a78 100644
--- a/Modules/Hyperspectral/Applications/app/otbHyperspectralUnmixing.cxx
+++ b/Modules/Hyperspectral/Applications/app/otbHyperspectralUnmixing.cxx
@@ -187,7 +187,7 @@ private:
unmixer->SetInput(inputImage);
unmixer->GetModifiableFunctor().SetMatrix(endMembersMatrix);
- unmixer->SetNumberOfThreads(1); // FIXME : currently buggy
+ unmixer->SetNumberOfWorkUnits(1); // FIXME : currently buggy
abundanceMap = unmixer->GetOutput();
m_ProcessObjects.push_back(unmixer.GetPointer());
diff --git a/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
index c71d209259203b03750710a5ce37f45af84c3e43..9c3f48e121be9ac1a92683524fed304cb7d974c1 100644
--- a/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
+++ b/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
@@ -60,7 +60,7 @@ int otbISRAUnmixingImageFilterTest(int itkNotUsed(argc), char* argv[])
unmixer->SetInput(readerImage->GetOutput());
unmixer->GetModifiableFunctor().SetMaxIteration(maxIter);
- // unmixer->SetNumberOfThreads(1);
+ // unmixer->SetNumberOfWorkUnits(1);
unmixer->GetModifiableFunctor().SetEndmembersMatrix(endMember2Matrix->GetMatrix());
WriterType::Pointer writer = WriterType::New();
diff --git a/Modules/Learning/Applications/app/otbKMeansClassification.cxx b/Modules/Learning/Applications/app/otbKMeansClassification.cxx
index f282fb54c5a35c7624503fcba2101d666701fce9..bbe71173b8d0c0f901240f7cb084552d70d04749 100644
--- a/Modules/Learning/Applications/app/otbKMeansClassification.cxx
+++ b/Modules/Learning/Applications/app/otbKMeansClassification.cxx
@@ -311,7 +311,7 @@ public:
private:
bool RemoveFile(const std::string& filePath)
{
- bool res = true;
+ itksys::Status res;
if (itksys::SystemTools::FileExists(filePath))
{
size_t posExt = filePath.rfind('.');
@@ -325,12 +325,9 @@ public:
RemoveFile(prjPath);
}
res = itksys::SystemTools::RemoveFile(filePath);
- if (!res)
- {
- // otbAppLogINFO( <<"Unable to remove file "<<filePath );
- }
}
- return res;
+ bool status = res.GetKind() == itksys::Status::Kind::Success;
+ return status;
}
};
};
diff --git a/Modules/Learning/Applications/app/otbMultiImageSamplingRate.cxx b/Modules/Learning/Applications/app/otbMultiImageSamplingRate.cxx
index 3b6e5043f523c05b2eae03810a814d4b7eb31e62..8cc251a34fa953cbe2f80a0a4a03d7045a7960df 100644
--- a/Modules/Learning/Applications/app/otbMultiImageSamplingRate.cxx
+++ b/Modules/Learning/Applications/app/otbMultiImageSamplingRate.cxx
@@ -245,7 +245,7 @@ private:
// constant
case 1:
{
- std::vector<itksys::String> parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.constant.nb"), ' ');
+ std::vector<std::string> parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.constant.nb"), ' ');
std::vector<unsigned long> countList;
for (unsigned int i = 0; i < parts.size(); i++)
{
@@ -275,7 +275,7 @@ private:
// percent
case 3:
{
- std::vector<itksys::String> parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.percent.p"), ' ');
+ std::vector<std::string> parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.percent.p"), ' ');
std::vector<double> percentList;
for (unsigned int i = 0; i < parts.size(); i++)
{
@@ -304,7 +304,7 @@ private:
// total
case 4:
{
- std::vector<itksys::String> parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.total.v"), ' ');
+ auto parts = itksys::SystemTools::SplitString(this->GetParameterString("strategy.total.v"), ' ');
std::vector<unsigned long> totalList;
for (unsigned int i = 0; i < parts.size(); i++)
{
diff --git a/Modules/Learning/Applications/app/otbTrainImagesRegression.cxx b/Modules/Learning/Applications/app/otbTrainImagesRegression.cxx
index d3abc266659c497cc1a5c8cd0d82113c67b47516..67477de8ca3e45a21a017e8c68a4e6fd56d6a11e 100644
--- a/Modules/Learning/Applications/app/otbTrainImagesRegression.cxx
+++ b/Modules/Learning/Applications/app/otbTrainImagesRegression.cxx
@@ -455,12 +455,11 @@ private:
* For .shp file, this method also removes .shx, .dbf and .prj associated files.*/
bool ClearFileHandler()
{
- bool res = true;
+ itksys::Status res;
for (const auto& fileNameList : m_FileHandler)
{
for (const auto& filename : fileNameList.second)
{
- res = true;
if (itksys::SystemTools::FileExists(filename))
{
size_t posExt = filename.rfind('.');
@@ -478,7 +477,8 @@ private:
}
}
m_FileHandler.clear();
- return res;
+ bool status = res.GetKind() == itksys::Status::Kind::Success;
+ return status;
}
void PerformSampling(const SamplingParameters& params)
diff --git a/Modules/Learning/Applications/app/otbTrainRegression.cxx b/Modules/Learning/Applications/app/otbTrainRegression.cxx
index 8b56a274dbc349adcf5664da67e00f9734798a80..13c828c53dbd33e9fe32af35672abefcb17bf1e0 100644
--- a/Modules/Learning/Applications/app/otbTrainRegression.cxx
+++ b/Modules/Learning/Applications/app/otbTrainRegression.cxx
@@ -24,7 +24,6 @@
#include "otbListSampleGenerator.h"
#include "otbImageToEnvelopeVectorDataFilter.h"
-#include "itkPreOrderTreeIterator.h"
// Statistic XML Reader
#include "otbStatisticsXMLFileReader.h"
@@ -86,7 +85,6 @@ public:
typedef otb::ImageToEnvelopeVectorDataFilter<SampleImageType, VectorDataType> EnvelopeFilterType;
- typedef itk::PreOrderTreeIterator<VectorDataType::DataTreeType> TreeIteratorType;
typedef itk::Statistics::MersenneTwisterRandomVariateGenerator RandomGeneratorType;
@@ -227,7 +225,7 @@ private:
// Avoid commented lines or too short ones
if (!line.empty() && line[0] != '#')
{
- std::vector<itksys::String> words = itksys::SystemTools::SplitString(line, sep);
+ std::vector<std::string> words = itksys::SystemTools::SplitString(line, sep);
if (nbCols == 0)
{
// detect separator and feature size
@@ -329,12 +327,13 @@ private:
VectorDataType::Pointer envelope = envelopeFilter->GetOutput();
- TreeIteratorType itVector(envelope->GetDataTree());
- for (itVector.GoToBegin(); !itVector.IsAtEnd(); ++itVector)
+ auto itVectorPair = envelope->GetIteratorPair();
+ auto currentIt = itVectorPair.first;
+ for (; currentIt != itVectorPair.second; ++currentIt)
{
- if (itVector.Get()->IsPolygonFeature())
+ if (envelope->Get(currentIt)->IsPolygonFeature())
{
- itVector.Get()->SetFieldAsInt(std::string("class"), 1);
+ envelope->Get(currentIt)->SetFieldAsInt(std::string("class"), 1);
}
}
diff --git a/Modules/Learning/Applications/include/otbTrainImagesBase.h b/Modules/Learning/Applications/include/otbTrainImagesBase.h
index 6dbca2915f5294c93192d948cc75813eefa74564..aa9c6e0b316e4cb7fc5cec0f6044a70d7fb2c858 100644
--- a/Modules/Learning/Applications/include/otbTrainImagesBase.h
+++ b/Modules/Learning/Applications/include/otbTrainImagesBase.h
@@ -260,7 +260,7 @@ protected:
private:
bool RemoveFile(std::string& filePath)
{
- bool res = true;
+ itksys::Status res;
if (itksys::SystemTools::FileExists(filePath))
{
size_t posExt = filePath.rfind('.');
@@ -274,12 +274,9 @@ protected:
RemoveFile(prjPath);
}
res = itksys::SystemTools::RemoveFile(filePath);
- if (!res)
- {
- // otbAppLogINFO( <<"Unable to remove file "<<filePath );
- }
}
- return res;
+ bool status = res.GetKind() == itksys::Status::Kind::Success;
+ return status;
}
};
};
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
index 8f6b3a08268dd2ff495cb7a08c9757dadafb8041..6900b653045923aa673bcada3cfd91e6728ca4b8 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
@@ -146,7 +146,7 @@ protected:
/** Generate output information */
void GenerateOutputInformation() override;
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** Before threaded generate data */
void BeforeThreadedGenerateData() override;
/**PrintSelf method */
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
index 6d5a3bc30e232c7759ffbdee9b892e65dda09819..ac21f0d6cb02881656eeb8794e9a428c306feddb 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
@@ -462,17 +462,13 @@ DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>::Optimiz
template <class TInputImage, class TOutputImage, class TMaskImage>
-void DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
// Get the input pointers
InputImageConstPointerType inputPtr = this->GetInput();
MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
OutputImagePointerType outputPtr = this->GetOutput();
- // Progress reporting
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Define iterators
typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
@@ -511,7 +507,6 @@ void DSFusionOfClassifiersImageFilter<TInputImage, TOutputImage, TMaskImage>::Th
// else, outIt is set to the m_LabelForNoDataPixels value
outIt.Set(m_LabelForNoDataPixels);
}
- progress.CompletedPixel();
}
}
/**
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
index 2c865b1222129928890a4f878dda362a4e71e105..25d1961c034a518b42ffc1f8e8b42034b7d23c6b 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
@@ -30,7 +30,7 @@
#include "otbPCAModelFactory.h"
#endif
-#include "itkMutexLockHolder.h"
+#include <mutex>
namespace otb
{
@@ -97,9 +97,11 @@ DimensionalityReductionModelFactory<TInputValue, TOutputValue>::CreateDimensiona
}
template <class TInputValue, class TOutputValue>
-void DimensionalityReductionModelFactory<TInputValue, TOutputValue>::RegisterBuiltInFactories()
-{
- itk::MutexLockHolder<itk::SimpleMutexLock> lockHolder(mutex);
+void
+DimensionalityReductionModelFactory<TInputValue,TOutputValue>
+::RegisterBuiltInFactories()
+{
+ std::lock_guard<std::mutex> lockHolder(mutex);
RegisterFactory(SOM2DModelFactory<TInputValue, TOutputValue>::New());
RegisterFactory(SOM3DModelFactory<TInputValue, TOutputValue>::New());
@@ -125,7 +127,7 @@ void DimensionalityReductionModelFactory<TInputValue, TOutputValue>::RegisterFac
template <class TInputValue, class TOutputValue>
void DimensionalityReductionModelFactory<TInputValue, TOutputValue>::CleanFactories()
{
- itk::MutexLockHolder<itk::SimpleMutexLock> lockHolder(mutex);
+ std::lock_guard<std::mutex> lockHolder(mutex);
std::list<itk::ObjectFactoryBase*> factories = itk::ObjectFactoryBase::GetRegisteredFactories();
std::list<itk::ObjectFactoryBase*>::iterator itFac;
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
index d3595b7f037bbfe3a0a217fad443e3900e2f8c42..68c2aa7eaadc023bd1b35b76d0ea45c83d91ffbf 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
@@ -32,6 +32,7 @@ namespace otb
template <class TInputImage, class TOutputImage, class TMaskImage>
ImageDimensionalityReductionFilter<TInputImage, TOutputImage, TMaskImage>::ImageDimensionalityReductionFilter()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfIndexedInputs(2);
this->SetNumberOfRequiredInputs(1);
@@ -77,7 +78,7 @@ void ImageDimensionalityReductionFilter<TInputImage, TOutputImage, TMaskImage>::
{
#ifdef _OPENMP
// OpenMP will take care of threading
- this->SetNumberOfThreads(1);
+ this->SetNumberOfWorkUnits(1);
#endif
}
}
diff --git a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
index ff616c1558498f4824af56e61fac18332d7f867e..aa86b838d7b9c8e437416d25fa32004de2748f43 100644
--- a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
+++ b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
@@ -22,6 +22,7 @@
#define otbImageClassificationFilter_hxx
#include "otbImageClassificationFilter.h"
+#include "otbMacro.h" //for
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
@@ -33,10 +34,11 @@ namespace otb
template <class TInputImage, class TOutputImage, class TMaskImage>
ImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>::ImageClassificationFilter()
{
+ this->DynamicMultiThreadingOff();
this->SetNumberOfIndexedInputs(2);
this->SetNumberOfRequiredInputs(1);
m_DefaultLabel = itk::NumericTraits<LabelType>::ZeroValue();
-
+
this->SetNumberOfRequiredOutputs(3);
this->SetNthOutput(0, TOutputImage::New());
this->SetNthOutput(1, ConfidenceImageType::New());
@@ -97,7 +99,7 @@ void ImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>::BeforeThr
{
#ifdef _OPENMP
// OpenMP will take care of threading
- this->SetNumberOfThreads(1);
+ this->SetNumberOfWorkUnits(1);
#endif
}
}
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
index a7c811b63754bb82185e073e67a15abfde8e0828..f7fe54abc905daadcf25ca10344a1be184955ee3 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
@@ -108,7 +108,7 @@ protected:
~KMeansImageClassificationFilter() override = default;
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** Before threaded generate data */
void BeforeThreadedGenerateData() override;
/**PrintSelf method */
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
index 55abacff639e770003e4f89f77643ae8b8498806..95d10eb8050b190713434614d37f7856ff83e200 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
@@ -21,6 +21,7 @@
#ifndef otbKMeansImageClassificationFilter_hxx
#define otbKMeansImageClassificationFilter_hxx
+#include "otbMacro.h" //for
#include "otbKMeansImageClassificationFilter.h"
#include "itkImageRegionIterator.h"
#include "itkNumericTraits.h"
@@ -75,8 +76,8 @@ void KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimens
}
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension, class TMaskImage>
-void KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId))
+void KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>::DynamicThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread)
{
InputImageConstPointerType inputPtr = this->GetInput();
MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx b/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
index c00750b961383dcb4c4e39cdee9a11b8ddfb7ce6..434ba47bf0506fc40e7a275ee6bf0d22a49899fb 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
@@ -26,8 +26,7 @@
#endif
#include "otbMachineLearningModel.h"
-
-#include "itkMultiThreader.h"
+#include "itkMultiThreaderBase.h"
namespace otb
{
@@ -100,13 +99,13 @@ MachineLearningModel<TInputValue, TOutputValue, TConfidenceValue>::PredictBatch(
#pragma omp parallel shared(nb_threads, nb_batches) private(threadId)
{
- // Get number of threads configured with ITK
- omp_set_num_threads(itk::MultiThreader::GetGlobalDefaultNumberOfThreads());
- nb_threads = omp_get_num_threads();
- threadId = omp_get_thread_num();
- nb_batches = std::min(nb_threads, (unsigned int)input->Size());
- // Ensure that we do not spawn unnecessary threads
- if (threadId < nb_batches)
+ // Get number of threads configured with ITK
+ omp_set_num_threads(itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads());
+ nb_threads = omp_get_num_threads();
+ threadId = omp_get_thread_num();
+ nb_batches = std::min(nb_threads,(unsigned int)input->Size());
+ // Ensure that we do not spawn unnecessary threads
+ if(threadId<nb_batches)
{
unsigned int batch_size = ((unsigned int)input->Size() / nb_batches);
unsigned int batch_start = threadId * batch_size;
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
index eb5eb0d3232a8946caaa270a1dba42d1455b1270..6bd145938bc8a10bec36e6c924bf754f8bc54ea4 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
@@ -21,7 +21,9 @@
#ifndef otbMachineLearningModelFactoryBase_h
#define otbMachineLearningModelFactoryBase_h
-#include "itkMutexLock.h"
+#include "itkObject.h"
+#include <mutex>
+
#include "OTBLearningBaseExport.h"
namespace otb
@@ -50,7 +52,7 @@ protected:
MachineLearningModelFactoryBase();
~MachineLearningModelFactoryBase() override;
- static itk::SimpleMutexLock mutex;
+ static std::mutex mutex;
private:
MachineLearningModelFactoryBase(const Self&) = delete;
diff --git a/Modules/Learning/LearningBase/src/otbMachineLearningModelFactoryBase.cxx b/Modules/Learning/LearningBase/src/otbMachineLearningModelFactoryBase.cxx
index fce233762b221a253b3e928dc8fd63961ba7b6fb..5c370d6191feb253b005c8e356c6d2ad534f7d72 100644
--- a/Modules/Learning/LearningBase/src/otbMachineLearningModelFactoryBase.cxx
+++ b/Modules/Learning/LearningBase/src/otbMachineLearningModelFactoryBase.cxx
@@ -22,6 +22,5 @@
namespace otb
{
-
-itk::SimpleMutexLock MachineLearningModelFactoryBase::mutex;
+std::mutex MachineLearningModelFactoryBase::mutex;
} // end namespace otb
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
index f9facf696b2fb8b8a7dc3b68b62613eda4140be7..20368c2280312c9e120d2926d6596a5f41d9827d 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
@@ -23,6 +23,7 @@
#define otbMRFEnergyEdgeFidelity_h
#include "otbMRFEnergy.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
index 34c43b8b03a2f68876961faf63eb2e98d52e0a46..93106a81889a462227572cc8db5ad265ceabfefe 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
@@ -25,6 +25,7 @@
#include "otbMRFEnergy.h"
#include "otbMath.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
index a5be6375087a060045d9bb075945dedf528a197c..befe5f26800aac803348927fd41189b8d677f52d 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
@@ -23,6 +23,7 @@
#include "otbMRFEnergy.h"
#include "otbMath.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
index 150a048fa517266ff94edc4c06722f271f5d90b1..c3c84959b3b5573183cfbdac7a7e1262f2e9e657 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
@@ -108,7 +108,7 @@ protected:
}
/** Threaded generate data */
- void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread) override;
/** Before threaded generate data */
void BeforeThreadedGenerateData() override;
/**PrintSelf method */
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
index 96a5c94a5cfb4315e91e7f6b370c434f83bb0030..82e1d14caa88ae9821a944cb32d3096e799ca9e6 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
@@ -65,8 +65,7 @@ void SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage
}
template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage>
-void SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
{
InputImageConstPointerType inputPtr = this->GetInput();
MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
diff --git a/Modules/Learning/SOM/test/MapActivation.cxx b/Modules/Learning/SOM/test/MapActivation.cxx
index e262f52b514b27aaa7afcdb6e7c6d1ac86b6d6f6..0d43ba707a7c1315cc31a899defd78885354d4b7 100644
--- a/Modules/Learning/SOM/test/MapActivation.cxx
+++ b/Modules/Learning/SOM/test/MapActivation.cxx
@@ -33,7 +33,6 @@
#include "otbSOMMap.h"
#include "otbSOM.h"
#include "otbSOMActivationBuilder.h"
-#include "itkVectorExpandImageFilter.h"
#include "itkVectorNearestNeighborInterpolateImageFunction.h"
#include "itkExpandImageFilter.h"
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
index e0fde86e176113ec675b38f021d1d2c13de9b746..fa218247a785239217aa93daced515788a296eb6 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
@@ -49,7 +49,7 @@ void PersistentOGRDataToClassStatisticsFilter<TInputImage, TMaskImage>::Syntheti
classCount.clear();
polygonSize.clear();
// Copy temporary stats to outputs
- for (unsigned int k = 0; k < this->GetNumberOfThreads(); k++)
+ for (unsigned int k = 0; k < this->GetNumberOfWorkUnits(); k++)
{
ClassCountMapType::iterator itClass = m_ElmtsInClassThread[k].begin();
for (; itClass != m_ElmtsInClassThread[k].end(); ++itClass)
@@ -89,11 +89,11 @@ void PersistentOGRDataToClassStatisticsFilter<TInputImage, TMaskImage>::Reset(vo
m_PolygonThread.clear();
m_NbPixelsThread.clear();
- m_ElmtsInClassThread.resize(this->GetNumberOfThreads());
- m_PolygonThread.resize(this->GetNumberOfThreads());
- m_NbPixelsThread.resize(this->GetNumberOfThreads());
- m_CurrentClass.resize(this->GetNumberOfThreads());
- m_CurrentFID.resize(this->GetNumberOfThreads());
+ m_ElmtsInClassThread.resize(this->GetNumberOfWorkUnits());
+ m_PolygonThread.resize(this->GetNumberOfWorkUnits());
+ m_NbPixelsThread.resize(this->GetNumberOfWorkUnits());
+ m_CurrentClass.resize(this->GetNumberOfWorkUnits());
+ m_CurrentFID.resize(this->GetNumberOfWorkUnits());
}
template <class TInputImage, class TMaskImage>
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
index 743c3ee6143940f95af90ca7181f3e00779e75d7..bfc01dc53b79a6f3aab9393c01162cf84f7961f7 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
@@ -205,7 +205,7 @@ void PersistentOGRDataToSamplePositionFilter<TInputImage, TMaskImage, TSampler>:
inLayer.SetSpatialFilter(&tmpPolygon);
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
std::vector<ogr::Layer> tmpLayers;
for (unsigned int i = 0; i < numberOfThreads; i++)
{
@@ -238,7 +238,7 @@ void PersistentOGRDataToSamplePositionFilter<TInputImage, TMaskImage, TSampler>:
classCounts[it->first] = it->second->GetTotalElements();
}
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfWorkUnits();
typedef std::vector<unsigned long> LoadVectorType;
LoadVectorType currentLoad;
currentLoad.resize(numberOfThreads, 0UL);
diff --git a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
index de09df9d64f51da862b0ba4f83ce248eb6a4d9d0..2a90630563b9642376f299b9a5646497411f2854 100644
--- a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
+++ b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
@@ -24,6 +24,7 @@
#include "otbPersistentImageFilter.h"
#include "otbOGRDataSourceWrapper.h"
#include "otbImage.h"
+#include "otbMacro.h" //for ITK_THREAD_RETURN_TYPE in ITK5
#include <string>
namespace otb
@@ -175,7 +176,7 @@ protected:
const std::vector<SimpleFieldDefn>& GetAdditionalFields();
/** Callback function to launch VectorThreadedGenerateData in each thread */
- static ITK_THREAD_RETURN_TYPE VectorThreaderCallback(void* arg);
+ static itk::ITK_THREAD_RETURN_TYPE VectorThreaderCallback(void *arg);
/** basically the same struct as itk::ImageSource::ThreadStruct */
struct VectorThreadStruct
diff --git a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
index 1813342b635e07c64b61cbb79f6a94c175e69629..a9166e38b9f19f01b16999b89bfbb431b10b8f0a 100644
--- a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
+++ b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
@@ -28,6 +28,7 @@
#include "otbMacro.h"
#include "otbStopwatch.h"
#include "itkProgressReporter.h"
+#include "itkMultiThreaderBase.h"
namespace otb
{
@@ -161,7 +162,7 @@ void PersistentSamplingFilterBase<TInputImage, TMaskImage>::GenerateData(void)
// Get the output pointer
// const InputImageType *outputPtr = this->GetOutput();
- this->GetMultiThreader()->SetNumberOfThreads(this->GetNumberOfThreads());
+ this->GetMultiThreader()->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
this->GetMultiThreader()->SetSingleMethod(this->VectorThreaderCallback, &str);
// multithread the execution
@@ -181,7 +182,7 @@ void PersistentSamplingFilterBase<TInputImage, TMaskImage>::AllocateOutputs(void
ogr::DataSource* vectors = const_cast<ogr::DataSource*>(this->GetOGRData());
ogr::Layer inLayer = vectors->GetLayer(m_LayerIndex);
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
// Prepare temporary input
this->m_InMemoryInputs.clear();
@@ -279,7 +280,7 @@ void PersistentSamplingFilterBase<TInputImage, TMaskImage>::FillOneOutput(unsign
itkExceptionMacro(<< "Unable to start transaction for OGR layer " << outLayer.ogr().GetName() << ".");
}
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
for (unsigned int thread = 0; thread < numberOfThreads; thread++)
{
ogr::Layer inLayer = this->m_InMemoryOutputs[thread][outIdx]->GetLayerChecked(0);
@@ -646,7 +647,7 @@ void PersistentSamplingFilterBase<TInputImage, TMaskImage>::DispatchInputVectors
inLayer.SetSpatialFilter(&tmpPolygon);
- unsigned int numberOfThreads = this->GetNumberOfThreads();
+ unsigned int numberOfThreads = this->GetNumberOfWorkUnits();
std::vector<ogr::Layer> tmpLayers;
tmpLayers.reserve(numberOfThreads);
for (unsigned int i = 0; i < numberOfThreads; i++)
@@ -777,22 +778,23 @@ PersistentSamplingFilterBase<TInputImage, TMaskImage>::GetAdditionalFields()
return this->m_AdditionalFields;
}
-template <class TInputImage, class TMaskImage>
-ITK_THREAD_RETURN_TYPE PersistentSamplingFilterBase<TInputImage, TMaskImage>::VectorThreaderCallback(void* arg)
+template<class TInputImage, class TMaskImage>
+itk::ITK_THREAD_RETURN_TYPE
+PersistentSamplingFilterBase<TInputImage,TMaskImage>
+::VectorThreaderCallback(void *arg)
{
- VectorThreadStruct* str = (VectorThreadStruct*)(((itk::MultiThreader::ThreadInfoStruct*)(arg))->UserData);
-
- int threadId = ((itk::MultiThreader::ThreadInfoStruct*)(arg))->ThreadID;
- int threadCount = ((itk::MultiThreader::ThreadInfoStruct*)(arg))->NumberOfThreads;
+ VectorThreadStruct *str = (VectorThreadStruct*)(((itk::MultiThreaderBase::WorkUnitInfo *)(arg))->UserData);
+ int threadId = ((itk::MultiThreaderBase::WorkUnitInfo *)(arg))->WorkUnitID;
+ int threadCount = ((itk::MultiThreaderBase::WorkUnitInfo *)(arg))->NumberOfWorkUnits;
ogr::Layer layer = str->Filter->GetInMemoryInput(threadId);
if (threadId < threadCount)
- {
- str->Filter->ThreadedGenerateVectorData(layer, threadId);
- }
-
- return ITK_THREAD_RETURN_VALUE;
+ {
+ str->Filter->ThreadedGenerateVectorData(layer,threadId);
+ }
+
+ return itk::ITK_THREAD_RETURN_DEFAULT_VALUE;
}
template <class TInputImage, class TMaskImage>
diff --git a/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx b/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
index da87457ec47a4e42d5271be8beac662c166a9ff3..cbe7c8399d409c7a977bd243cafb85561b09f450 100644
--- a/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
+++ b/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
@@ -33,7 +33,7 @@ LabelMapClassifier<TInputImage>::LabelMapClassifier()
// Force to single-threaded in case the learning model is not thread safe
// This way, we benefit of the LabelMapFilter design and only need
// to implement ThreadedProcessLabelObject
- this->SetNumberOfThreads(1); // TODO : check if still needed
+ this->SetNumberOfWorkUnits(1); // TODO : check if still needed
}
template <class TInputImage>
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
index b5fabf4f7a17105a30dc36fd9300999056dea364..f2b92c5f238acb5f9b1b07de950ea1ae0433b63f 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
@@ -43,8 +43,7 @@
#include "otbSharkKMeansMachineLearningModelFactory.h"
#endif
-#include "itkMutexLockHolder.h"
-
+#include <mutex>
namespace otb
{
@@ -91,8 +90,8 @@ MachineLearningModelFactory<TInputValue, TOutputValue>::CreateMachineLearningMod
template <class TInputValue, class TOutputValue>
void MachineLearningModelFactory<TInputValue, TOutputValue>::RegisterBuiltInFactories()
{
- itk::MutexLockHolder<itk::SimpleMutexLock> lockHolder(mutex);
-
+ std::lock_guard<std::mutex> lockHolder(mutex);
+
#ifdef OTB_USE_LIBSVM
RegisterFactory(LibSVMMachineLearningModelFactory<TInputValue, TOutputValue>::New());
#endif
@@ -126,7 +125,7 @@ void MachineLearningModelFactory<TInputValue, TOutputValue>::RegisterFactory(itk
template <class TInputValue, class TOutputValue>
void MachineLearningModelFactory<TInputValue, TOutputValue>::CleanFactories()
{
- itk::MutexLockHolder<itk::SimpleMutexLock> lockHolder(mutex);
+ std::lock_guard<std::mutex> lockHolder(mutex);
std::list<itk::ObjectFactoryBase*> factories = itk::ObjectFactoryBase::GetRegisteredFactories();
std::list<itk::ObjectFactoryBase*>::iterator itFac;
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
index 51c4966927914aada260949d163da10e5d5af3b1..f5f6730ec6c038663ff9a4dd4cd0d5bc49705571 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
@@ -59,9 +59,9 @@ template <class TInputValue, class TOutputValue>
void SharkRandomForestsMachineLearningModel<TInputValue, TOutputValue>::Train()
{
#ifdef _OPENMP
- omp_set_num_threads(itk::MultiThreader::GetGlobalDefaultNumberOfThreads());
-#endif
-
+ omp_set_num_threads(itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads());
+#endif // _OPENMP
+
std::vector<shark::RealVector> features;
std::vector<unsigned int> class_labels;
@@ -167,10 +167,10 @@ void SharkRandomForestsMachineLearningModel<TInputValue, TOutputValue>::DoPredic
shark::Data<shark::RealVector> inputSamples = shark::createDataFromRange(features);
#ifdef _OPENMP
- omp_set_num_threads(itk::MultiThreader::GetGlobalDefaultNumberOfThreads());
+ omp_set_num_threads(itk::MultiThreaderBase::GetGlobalDefaultNumberOfThreads());
+#endif // _OPENMP
-#endif
- if (proba != nullptr || quality != nullptr)
+ if( proba !=nullptr || quality != nullptr)
{
shark::Data<shark::RealVector> probas = m_RFModel.decisionFunction()(inputSamples);
if (proba != nullptr)
diff --git a/Modules/Miscellaneous/Applications/app/CMakeLists.txt b/Modules/Miscellaneous/Applications/app/CMakeLists.txt
index 4becdc9fd5bbc3b7fcb0d8ef23581611f3a32768..250075d83e396f57eb3d71fd9d0e9f816b6c9330 100644
--- a/Modules/Miscellaneous/Applications/app/CMakeLists.txt
+++ b/Modules/Miscellaneous/Applications/app/CMakeLists.txt
@@ -26,7 +26,7 @@ otb_create_application(
otb_create_application(
NAME DomainTransform
SOURCES otbDomainTransform.cxx
-LINK_LIBRARIES ${${otb-module}_LIBRARIES})
+LINK_LIBRARIES ${${otb-module}_LIBRARIES} ${OTBITK_LIBRARIES})
OTB_CREATE_APPLICATION(
NAME TrainDimensionalityReduction
diff --git a/Modules/Miscellaneous/Applications/test/CMakeLists.txt b/Modules/Miscellaneous/Applications/test/CMakeLists.txt
index c5fe7c65bb2d487eb891cb25cec873e988dfc7f7..eeddc4533eb9fe0ca89d330bcfaf0ad4573801af 100644
--- a/Modules/Miscellaneous/Applications/test/CMakeLists.txt
+++ b/Modules/Miscellaneous/Applications/test/CMakeLists.txt
@@ -49,23 +49,23 @@ OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
-out ${TEMP}/apTvDomainTransform_wav_haar_inv.tif
)
-otb_test_application(NAME apTvDomainTransform_fft_shift_fwd
-APP DomainTransform
-OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
--mode fft
--mode.fft.shift true
--direction forward
--out ${TEMP}/apTvDomainTransform_fft_shift_fwd.tif
-)
-
-
-otb_test_application(NAME apTvDomainTransform_fft_inv
-APP DomainTransform
-OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
--mode fft
--direction inverse
--out ${TEMP}/apTvDomainTransform_fft_shift_inv.tif
-)
+# otb_test_application(NAME apTvDomainTransform_fft_shift_fwd
+# APP DomainTransform
+# OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
+# -mode fft
+# -mode.fft.shift true
+# -direction forward
+# -out ${TEMP}/apTvDomainTransform_fft_shift_fwd.tif
+# )
+
+
+# otb_test_application(NAME apTvDomainTransform_fft_inv
+# APP DomainTransform
+# OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
+# -mode fft
+# -direction inverse
+# -out ${TEMP}/apTvDomainTransform_fft_shift_inv.tif
+# )
#----------------------Dimensionnality reduction TESTS-------------------
set(algos som)
diff --git a/Modules/Miscellaneous/Simulation/include/otbImageSimulationMethod.hxx b/Modules/Miscellaneous/Simulation/include/otbImageSimulationMethod.hxx
index 4ded5c72f4ab0c24f578670172ed1b57e606c349..cb1ec855a46e01cd35af72471a03b0ad4aaf85c2 100644
--- a/Modules/Miscellaneous/Simulation/include/otbImageSimulationMethod.hxx
+++ b/Modules/Miscellaneous/Simulation/include/otbImageSimulationMethod.hxx
@@ -147,7 +147,7 @@ void ImageSimulationMethod<TInputVectorData, TSpatialisation, TSimulationStep1,
m_LabelMapToSimulatedImageFilter->SetInput(m_Spatialisation->GetOutput());
m_LabelMapToSimulatedImageFilter->SetNumberOfComponentsPerPixel(m_NumberOfComponentsPerPixel);
m_LabelMapToSimulatedImageFilter->SetSatRSRFilename(m_SatRSRFilename);
- m_LabelMapToSimulatedImageFilter->SetNumberOfThreads(1);
+ m_LabelMapToSimulatedImageFilter->SetNumberOfWorkUnits(1);
m_LabelMapToSimulatedImageFilter->SetPathRoot(m_PathRoot);
m_LabelMapToSimulatedImageFilter->SetMean(m_Mean);
m_LabelMapToSimulatedImageFilter->SetVariance(m_Variance);
@@ -201,7 +201,7 @@ void ImageSimulationMethod<TInputVectorData, TSpatialisation, TSimulationStep1,
// m_LabelMapToSimulatedImageFilter->SetInput(m_Spatialisation->GetOutput());
// m_LabelMapToSimulatedImageFilter->SetNumberOfComponentsPerPixel(m_NumberOfComponentsPerPixel);
// m_LabelMapToSimulatedImageFilter->SetSatRSRFilename(m_SatRSRFilename);
-// m_LabelMapToSimulatedImageFilter->SetNumberOfThreads(1);
+// m_LabelMapToSimulatedImageFilter->SetNumberOfWorkUnits(1);
// m_LabelMapToSimulatedImageFilter->SetPathRoot(m_PathRoot);
// m_LabelMapToSimulatedImageFilter->SetMean(m_Mean);
// m_LabelMapToSimulatedImageFilter->SetVariance(m_Variance);
diff --git a/Modules/Miscellaneous/Simulation/test/otbLabelMapToSimulatedImageFilterTest.cxx b/Modules/Miscellaneous/Simulation/test/otbLabelMapToSimulatedImageFilterTest.cxx
index dcda901fda5e30c4ea7a9ec5d5147adc160781b9..4739f7385ebb85acc45b2631f19d8c80f7524f1a 100644
--- a/Modules/Miscellaneous/Simulation/test/otbLabelMapToSimulatedImageFilterTest.cxx
+++ b/Modules/Miscellaneous/Simulation/test/otbLabelMapToSimulatedImageFilterTest.cxx
@@ -68,7 +68,7 @@ int otbLabelMapToSimulatedImageFilterTest(int itkNotUsed(argc), char* argv[])
labelMapToImageFilter->SetInput(vectorDataToLabelMap->GetOutput());
labelMapToImageFilter->SetNumberOfComponentsPerPixel(nbBands);
labelMapToImageFilter->SetSatRSRFilename(satRSRFilename);
- labelMapToImageFilter->SetNumberOfThreads(1); // must be set to 1
+ labelMapToImageFilter->SetNumberOfWorkUnits(1); // must be set to 1
labelMapToImageFilter->SetPathRoot(rootPath);
// Write the result to an image file
diff --git a/Modules/Miscellaneous/Simulation/test/otbSoilDBTest.cxx b/Modules/Miscellaneous/Simulation/test/otbSoilDBTest.cxx
index 2a6fe11dcc3e81caa654804fe6afbe9c461c68d7..4ff2d9b7334ad82944a9356c2fc6e166c2f0f71d 100644
--- a/Modules/Miscellaneous/Simulation/test/otbSoilDBTest.cxx
+++ b/Modules/Miscellaneous/Simulation/test/otbSoilDBTest.cxx
@@ -23,7 +23,9 @@
#include "otbSoilDataBase.h"
#include <iostream>
-int otbSoilDataBaseParseFile(int argc, char* argv[])
+#include <math.h> /* fabs */
+
+int otbSoilDataBaseParseFile(int argc, char * argv[])
{
if (argc < 5)
{
diff --git a/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.h b/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.h
index 254a28a36dc826ed382af93fcab4fa3f76866c6a..a404fc05c787a594972b66dbf7aaee924528aa38 100644
--- a/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.h
+++ b/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.h
@@ -83,7 +83,7 @@ protected:
virtual void GenerateInputRequestedRegion() override;
// Actual processing
- virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ virtual void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
RegionType OutputRegionToInputRegion(const RegionType& outputRegion) const;
diff --git a/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.hxx b/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.hxx
index 893b7c068dbec08a5ae9d891eaa6bc49abaea3f3..e88ad9d25c267b3006119aae277e04afa2b85ac8 100644
--- a/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.hxx
+++ b/Modules/SAR/SARCalibration/include/otbSarBurstExtractionImageFilter.hxx
@@ -178,7 +178,7 @@ void SarBurstExtractionImageFilter<TImage>::GenerateInputRequestedRegion()
// Actual processing
template <class TImage>
-void SarBurstExtractionImageFilter<TImage>::ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId))
+void SarBurstExtractionImageFilter<TImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{
// Compute corresponding input region
RegionType inputRegionForThread = OutputRegionToInputRegion(outputRegionForThread);
diff --git a/Modules/SAR/SARCalibration/include/otbSarConcatenateBurstsImageFilter.h b/Modules/SAR/SARCalibration/include/otbSarConcatenateBurstsImageFilter.h
index 36529f8af6ec2645f349e7794d15d6ae887100ae..db6238458582dcaae348a4024e88f25a494e0d3a 100644
--- a/Modules/SAR/SARCalibration/include/otbSarConcatenateBurstsImageFilter.h
+++ b/Modules/SAR/SARCalibration/include/otbSarConcatenateBurstsImageFilter.h
@@ -95,6 +95,10 @@ protected:
/** Generate input requested region method */
void GenerateOutputInformation() override;
+ void VerifyInputInformation() const override
+ {
+
+ }
private:
SarConcatenateBurstsImageFilter(const Self&) = delete;
diff --git a/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.h b/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.h
index fbc21192d5c8b2bda435fe6120ca1eae7bdd58b8..55d16e2d8882d1b944bad039eba8b5e01776f58a 100644
--- a/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.h
+++ b/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.h
@@ -73,16 +73,16 @@ protected:
SarDeburstImageFilter();
// Destructor
- virtual ~SarDeburstImageFilter() override{};
+ ~SarDeburstImageFilter() = default;
// Needs to be re-implemented since size of output is modified
- virtual void GenerateOutputInformation() override;
+ void GenerateOutputInformation() override;
// Needs to be re-implemented since size of output is modified
- virtual void GenerateInputRequestedRegion() override;
+ void GenerateInputRequestedRegion() override;
// Actual processing
- virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
void ThreadedGenerateDataWithAllSamples(const RegionType& outputRegionForThread, itk::ThreadIdType threadId);
void ThreadedGenerateDataWithOnlyValidSamples(const RegionType& outputRegionForThread, itk::ThreadIdType threadId);
diff --git a/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.hxx b/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.hxx
index 5fd825fe7d0323bc6ae2009b144a0194ed735310..17aebac7691bc75d450b5622a870d401bb99faeb 100644
--- a/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.hxx
+++ b/Modules/SAR/SARCalibration/include/otbSarDeburstImageFilter.hxx
@@ -216,7 +216,7 @@ void SarDeburstImageFilter<TImage>::GenerateInputRequestedRegion()
// Actual processing
template <class TImage>
-void SarDeburstImageFilter<TImage>::ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType itkNotUsed(threadId))
+void SarDeburstImageFilter<TImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{
if (m_OnlyValidSample)
{
diff --git a/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctor.cxx b/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctor.cxx
index c2230283289c1377e1df071a450c082f93287bd8..c43d8263e6481320df3b8d298e8b9a2fb343e84c 100644
--- a/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctor.cxx
+++ b/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctor.cxx
@@ -21,6 +21,7 @@
#include "itkMacro.h"
#include "otbSarBrightnessFunctor.h"
#include "otbMath.h"
+#include <iostream>
int otbSarBrightnessFunctor(int itkNotUsed(argc), char* itkNotUsed(argv)[])
{
diff --git a/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctorWithoutNoise.cxx b/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctorWithoutNoise.cxx
index b1748de99d09c813470d98ef931e6487e156d4b1..d58ee4f93d63307966e7e75c9f22b85313721bb0 100644
--- a/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctorWithoutNoise.cxx
+++ b/Modules/SAR/SARCalibration/test/otbSarBrightnessFunctorWithoutNoise.cxx
@@ -21,6 +21,7 @@
#include "itkMacro.h"
#include "otbSarBrightnessFunctor.h"
#include "otbMath.h"
+#include <iostream>
int otbSarBrightnessFunctorWithoutNoise(int itkNotUsed(argc), char* itkNotUsed(argv)[])
{
diff --git a/Modules/SAR/SARCalibration/test/otbSarParametricMapFunctionTest.cxx b/Modules/SAR/SARCalibration/test/otbSarParametricMapFunctionTest.cxx
index 0c90a8c759065d2471bcdf311e2d0df0a185462a..a57202e513b1a8ef282761a0e9b237329da77b5f 100644
--- a/Modules/SAR/SARCalibration/test/otbSarParametricMapFunctionTest.cxx
+++ b/Modules/SAR/SARCalibration/test/otbSarParametricMapFunctionTest.cxx
@@ -59,8 +59,6 @@ int otbSarParametricMapFunctionTest(int itkNotUsed(argc), char* argv[])
FunctionType::PointType p0;
IndexType index;
InputPixelType value;
- FunctionType::PointType pDst;
-
p0[0] = static_cast<unsigned int>(size[0] / 2.);
p0[1] = static_cast<unsigned int>(size[1] / 4.);
diff --git a/Modules/Segmentation/Applications/app/otbLSMSSegmentation.cxx b/Modules/Segmentation/Applications/app/otbLSMSSegmentation.cxx
index 084def956f4a43842ba8f647d37bf8faf1b621ef..6f96412298cdc2516d9c0a0ba4597a9080c9057a 100644
--- a/Modules/Segmentation/Applications/app/otbLSMSSegmentation.cxx
+++ b/Modules/Segmentation/Applications/app/otbLSMSSegmentation.cxx
@@ -147,19 +147,36 @@ private:
if (itksys::SystemTools::FileExists(geomfile))
{
- bool res = itksys::SystemTools::RemoveFile(geomfile);
- if (!res)
- {
- otbAppLogINFO(<< "Unable to remove file " << geomfile);
- }
+ //Compatibility : for ITK 5 < 5.3 the Status class was not provided
+ #if ITK_VERSION_MINOR > 2
+ itksys::Status res = itksys::SystemTools::RemoveFile(geomfile);
+ if (res.GetKind() != itksys::Status::Kind::Success)
+ {
+ otbAppLogINFO(<< "Unable to remove file " << geomfile);
+ }
+ #else
+ bool res = itksys::SystemTools::RemoveFile(geomfile);
+ if (!res)
+ {
+ otbAppLogINFO(<< "Unable to remove file " << geomfile);
+ }
+ #endif
}
if (itksys::SystemTools::FileExists(tile))
{
- bool res = itksys::SystemTools::RemoveFile(tile);
- if (!res)
- {
- otbAppLogINFO(<< "Unable to remove file " << tile);
- }
+ #if ITK_VERSION_MINOR > 2
+ itksys::Status res = itksys::SystemTools::RemoveFile(tile);
+ if (res.GetKind() != itksys::Status::Kind::Success)
+ {
+ otbAppLogINFO(<< "Unable to remove file " << tile);
+ }
+ #else
+ bool res = itksys::SystemTools::RemoveFile(tile);
+ if (!res)
+ {
+ otbAppLogINFO(<< "Unable to remove file " << tile);
+ }
+ #endif
}
}
}
diff --git a/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
index 2196e7a35e37b94159236e664684e389526e48d2..e506af25b4523e8b3896e3435fe28f1f6572e3ec 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelToBoundaryImageFilter.h
@@ -23,7 +23,7 @@
#define otbLabelToBoundaryImageFilter_h
#include "otbUnaryFunctorNeighborhoodImageFilter.h"
-
+#include "otbMacro.h"
namespace otb
{
namespace Functor
@@ -95,6 +95,7 @@ public:
protected:
LabelToBoundaryImageFilter()
{
+
this->SetRadius(1);
}
~LabelToBoundaryImageFilter() override
diff --git a/Modules/Segmentation/MeanShift/test/otbMeanShiftSegmentationFilter.cxx b/Modules/Segmentation/MeanShift/test/otbMeanShiftSegmentationFilter.cxx
index d9ff6d638aef73f1818bf3cd1c50680d8184dff4..21703825373de355c748619c2a3c0c9276eac7d3 100644
--- a/Modules/Segmentation/MeanShift/test/otbMeanShiftSegmentationFilter.cxx
+++ b/Modules/Segmentation/MeanShift/test/otbMeanShiftSegmentationFilter.cxx
@@ -71,7 +71,7 @@ int otbMeanShiftSegmentationFilter(int argc, char* argv[])
filter->SetMinRegionSize(minregionsize);
filter->SetInput(reader->GetOutput());
- // filter->SetNumberOfThreads(1);
+ // filter->SetNumberOfWorkUnits(1);
ClusteredWriterType::Pointer writerClustered = ClusteredWriterType::New();
LabelWriterType::Pointer writerLabel = LabelWriterType::New();
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
index b0b5acf2edf7d8745ac87b6125bf5b3333c73642..a528f5057a2941d6a0383e5161759a2f276fdac0 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
@@ -177,11 +177,12 @@ private:
* \ingroup OTBMorphologicalProfiles
*/
template <class TInputImage, class TOutputImage>
-using MultiScaleConvexOrConcaveClassificationFilter =
- FunctorImageFilter<Functor::MultiScaleConvexOrConcaveDecisionRule<typename TInputImage::PixelType, typename TOutputImage::PixelType>,
- std::tuple<Functor::MultiScaleConvexOrConcaveDecisionRule_tags::max_opening_profile_derivative,
- Functor::MultiScaleConvexOrConcaveDecisionRule_tags::max_closing_profile_derivative,
- Functor::MultiScaleConvexOrConcaveDecisionRule_tags::opening_profile_characteristics,
- Functor::MultiScaleConvexOrConcaveDecisionRule_tags::closing_profile_characteristics>>;
+using MultiScaleConvexOrConcaveClassificationFilter
+= FunctorImageFilter<Functor::MultiScaleConvexOrConcaveDecisionRule<typename TInputImage::PixelType, typename TOutputImage::PixelType>,
+ std::tuple<Functor::MultiScaleConvexOrConcaveDecisionRule_tags::max_opening_profile_derivative,
+ Functor::MultiScaleConvexOrConcaveDecisionRule_tags::max_closing_profile_derivative,
+ Functor::MultiScaleConvexOrConcaveDecisionRule_tags::opening_profile_characteristics,
+ Functor::MultiScaleConvexOrConcaveDecisionRule_tags::closing_profile_characteristics> >;
+
} // End namespace otb
#endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesSegmentationFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesSegmentationFilter.cxx
index 0f4b6858822d3af627da94c5915709e4aadcd933..a6e55cc069486842585828adfda6cf6d5fc20c6b 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesSegmentationFilter.cxx
+++ b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesSegmentationFilter.cxx
@@ -59,7 +59,7 @@ int otbMorphologicalProfilesSegmentationFilter(int argc, char* argv[])
filter->SetProfileStep(step);
filter->SetInput(reader->GetOutput());
- // filter->SetNumberOfThreads(1);
+ // filter->SetNumberOfWorkUnits(1);
LabelWriterType::Pointer writerLabel = LabelWriterType::New();
writerLabel->SetFileName(outputFileName);
diff --git a/Modules/StereoProcessing/Applications/app/otbGridBasedImageResampling.cxx b/Modules/StereoProcessing/Applications/app/otbGridBasedImageResampling.cxx
index 73bbb3846a6d56c06eaa242e89a6436a6186e3e5..3738200fb48cb7100569d14949044adcbe1aea28 100644
--- a/Modules/StereoProcessing/Applications/app/otbGridBasedImageResampling.cxx
+++ b/Modules/StereoProcessing/Applications/app/otbGridBasedImageResampling.cxx
@@ -29,7 +29,7 @@
#include "otbConcatenateVectorImageFilter.h"
#include "otbMultiToMonoChannelExtractROI.h"
#include "otbImageToVectorImageCastFilter.h"
-#include "itkVectorCastImageFilter.h"
+#include "itkCastImageFilter.h"
namespace otb
@@ -56,7 +56,7 @@ public:
typedef itk::Vector<double, 2> DisplacementType;
typedef otb::Image<DisplacementType> DisplacementFieldType;
- typedef itk::VectorCastImageFilter<FloatVectorImageType, DisplacementFieldType> DisplacementFieldCastFilterType;
+ typedef itk::CastImageFilter<FloatVectorImageType, DisplacementFieldType> DisplacementFieldCastFilterType;
typedef otb::StreamingWarpImageFilter<FloatVectorImageType, FloatVectorImageType, DisplacementFieldType> WarpFilterType;
diff --git a/Modules/StereoProcessing/Applications/app/otbStereoFramework.cxx b/Modules/StereoProcessing/Applications/app/otbStereoFramework.cxx
index 50ee5c8db13afc15c3bfe3dac0032e0cde2320a7..e7cdcccef6e0c98a50bcffd29d28961ab6e6ab7f 100644
--- a/Modules/StereoProcessing/Applications/app/otbStereoFramework.cxx
+++ b/Modules/StereoProcessing/Applications/app/otbStereoFramework.cxx
@@ -37,7 +37,7 @@
#include "otbImageToNoDataMaskFilter.h"
#include "itkUnaryFunctorImageFilter.h"
-#include "itkVectorCastImageFilter.h"
+#include "itkCastImageFilter.h"
#include "itkInverseDisplacementFieldImageFilter.h"
#include "itkRescaleIntensityImageFilter.h"
@@ -90,7 +90,7 @@ public:
typedef itk::Vector<float, 2> DisplacementType;
typedef otb::Image<DisplacementType> DisplacementFieldType;
- typedef itk::VectorCastImageFilter<FloatVectorImageType, DisplacementFieldType> DisplacementFieldCastFilterType;
+ typedef itk::CastImageFilter<FloatVectorImageType, DisplacementFieldType> DisplacementFieldCastFilterType;
typedef itk::InverseDisplacementFieldImageFilter<DisplacementFieldType, DisplacementFieldType> InverseDisplacementFieldFilterType;
diff --git a/Modules/StereoProcessing/Applications/app/otbStereoRectificationGridGenerator.cxx b/Modules/StereoProcessing/Applications/app/otbStereoRectificationGridGenerator.cxx
index 2f0e3a815676db010c12aeb4aa0f061d8201b255..7658343015a926e2dfe6a8ca990df65d80666754 100644
--- a/Modules/StereoProcessing/Applications/app/otbStereoRectificationGridGenerator.cxx
+++ b/Modules/StereoProcessing/Applications/app/otbStereoRectificationGridGenerator.cxx
@@ -25,7 +25,7 @@
// Elevation handler
#include "otbWrapperElevationParametersHandler.h"
#include "itkInverseDisplacementFieldImageFilter.h"
-#include "itkVectorCastImageFilter.h"
+#include "itkCastImageFilter.h"
#include "itkVectorIndexSelectionCastImageFilter.h"
#include "otbImageList.h"
#include "otbImageListToVectorImageFilter.h"
@@ -51,7 +51,7 @@ public:
typedef itk::Vector<double, 2> DisplacementType;
typedef otb::Image<DisplacementType> DisplacementFieldType;
- typedef itk::VectorCastImageFilter<FloatVectorImageType, DisplacementFieldType> DisplacementFieldCastFilterType;
+ typedef itk::CastImageFilter<FloatVectorImageType, DisplacementFieldType> DisplacementFieldCastFilterType;
typedef itk::InverseDisplacementFieldImageFilter<DisplacementFieldType, DisplacementFieldType> InverseDisplacementFieldFilterType;
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.h b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.h
index c06a098cfeb9a2d06b7676e22a0f84f2623a60b4..66b1455bfd9b9a962360e2d70b32fd13f8f7e263 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.h
+++ b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.h
@@ -152,14 +152,14 @@ protected:
void BeforeThreadedGenerateData() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() override
+ void VerifyInputInformation() const override
{
}
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.hxx b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
index e65c47c8d1e60ab208484c3c320cc13f4e3f7c1a..618d56085b59406775d4a037ef6fbd5016bcf13b 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
+++ b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
@@ -203,8 +203,8 @@ void DisparityMapTo3DFilter<TDisparityImage, TOutputImage, TEpipolarGridImage, T
}
template <class TDisparityImage, class TOutputImage, class TEpipolarGridImage, class TMaskImage>
-void DisparityMapTo3DFilter<TDisparityImage, TOutputImage, TEpipolarGridImage, TMaskImage>::ThreadedGenerateData(
- const RegionType& itkNotUsed(outputRegionForThread), itk::ThreadIdType itkNotUsed(threadId))
+void DisparityMapTo3DFilter<TDisparityImage, TOutputImage, TEpipolarGridImage, TMaskImage>::DynamicThreadedGenerateData(
+ const RegionType& itkNotUsed(outputRegionForThread))
{
const TDisparityImage* horizDisp = this->GetHorizontalDisparityMapInput();
const TDisparityImage* vertiDisp = this->GetVerticalDisparityMapInput();
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.h b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.h
index 1363d7916559e49e0d99ef94c1784781b9757da3..d5e16a8af5cd790107a63a111bf4f5bf45abdd85 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.h
+++ b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.h
@@ -169,7 +169,7 @@ protected:
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() override
+ void VerifyInputInformation() const override
{
}
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.hxx b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
index 1607e6e27e56eb4f50daddf7c52018b4494f0f83..9a234943ccccb8360e16b140b96b4f17b79c5b9c 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
+++ b/Modules/StereoProcessing/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
@@ -31,6 +31,7 @@ namespace otb
template <class TDisparityImage, class TInputImage, class TOutputDEMImage, class TEpipolarGridImage, class TMaskImage>
DisparityMapToDEMFilter<TDisparityImage, TInputImage, TOutputDEMImage, TEpipolarGridImage, TMaskImage>::DisparityMapToDEMFilter()
{
+ this->DynamicMultiThreadingOff();
// Set the number of inputs
this->SetNumberOfRequiredInputs(7);
this->SetNumberOfRequiredInputs(1);
@@ -586,7 +587,7 @@ void DisparityMapToDEMFilter<TDisparityImage, TInputImage, TOutputDEMImage, TEpi
typename DisparityMapType::RegionType requestedRegion = horizDisp->GetRequestedRegion();
- m_UsedInputSplits = m_InputSplitter->GetNumberOfSplits(requestedRegion, this->GetNumberOfThreads());
+ m_UsedInputSplits = m_InputSplitter->GetNumberOfSplits(requestedRegion, this->GetNumberOfWorkUnits());
m_LeftToGroundTransform = RSTransformType::New();
m_RightToGroundTransform = RSTransformType::New();
@@ -603,7 +604,7 @@ void DisparityMapToDEMFilter<TDisparityImage, TInputImage, TOutputDEMImage, TEpi
m_UsedInputSplits = 0;
}
- if (m_UsedInputSplits <= static_cast<unsigned int>(this->GetNumberOfThreads()))
+ if (m_UsedInputSplits <= static_cast<unsigned int>(this->GetNumberOfWorkUnits()))
{
m_TempDEMRegions.clear();
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.h b/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.h
index 090f73543421592b66d9543fca8b1e3275102481..a08ee11e6956d59622a190a2b45c46c433012cee 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.h
+++ b/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.h
@@ -126,14 +126,14 @@ protected:
void GenerateInputRequestedRegion() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
/** Override VerifyInputInformation() since this filter's inputs do
* not need to occupy the same physical space.
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() override
+ void VerifyInputInformation() const override
{
}
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.hxx b/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.hxx
index 181359186402e4c94b4ce54eac4ad3f5dd133853..6db9f82970ba404e226109278423ddceea28fa34 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.hxx
+++ b/Modules/StereoProcessing/DisparityMap/include/otbDisparityTranslateFilter.hxx
@@ -34,6 +34,7 @@ template <class TDisparityImage, class TGridImage, class TSensorImage, class TMa
DisparityTranslateFilter<TDisparityImage, TGridImage, TSensorImage, TMaskImage>::DisparityTranslateFilter()
: m_NoDataValue(-32768)
{
+ this->DynamicMultiThreadingOn();
// Set the number of inputs (1 moving image by default -> 3 inputs)
this->SetNumberOfRequiredInputs(6);
this->SetNumberOfRequiredInputs(1);
@@ -312,8 +313,7 @@ void DisparityTranslateFilter<TDisparityImage, TGridImage, TSensorImage, TMaskIm
}
template <class TDisparityImage, class TGridImage, class TSensorImage, class TMaskImage>
-void DisparityTranslateFilter<TDisparityImage, TGridImage, TSensorImage, TMaskImage>::ThreadedGenerateData(const RegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void DisparityTranslateFilter<TDisparityImage, TGridImage, TSensorImage, TMaskImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{
const TGridImage* leftGrid = this->GetInverseEpipolarLeftGrid();
const TGridImage* rightGrid = this->GetDirectEpipolarRightGrid();
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h b/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
index 897770e34c04f3384a6e3b1d31773ff2e7305df0..dc7da6d14c35f790cf37d839dcc25ee9b2616d5c 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
+++ b/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
@@ -157,7 +157,7 @@ protected:
void GenerateInputRequestedRegion() override;
/** Threaded generate data */
- void ThreadedGenerateData(const RegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const RegionType& outputRegionForThread) override;
private:
MultiDisparityMapTo3DFilter(const Self&) = delete;
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx b/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
index 33f30cfae38e4169ab788205c571450ec18dd03d..534f80423f004da55f0663f7e3ea7461e2e5aabd 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
+++ b/Modules/StereoProcessing/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
@@ -278,8 +278,7 @@ void MultiDisparityMapTo3DFilter<TDisparityImage, TOutputImage, TMaskImage, TRes
}
template <class TDisparityImage, class TOutputImage, class TMaskImage, class TResidueImage>
-void MultiDisparityMapTo3DFilter<TDisparityImage, TOutputImage, TMaskImage, TResidueImage>::ThreadedGenerateData(const RegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void MultiDisparityMapTo3DFilter<TDisparityImage, TOutputImage, TMaskImage, TResidueImage>::DynamicThreadedGenerateData(const RegionType& outputRegionForThread)
{ // Instantiate all transforms
auto referenceToGroundTransform = RSTransformType::New();
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbNCCRegistrationFunction.hxx b/Modules/StereoProcessing/DisparityMap/include/otbNCCRegistrationFunction.hxx
index 02a08778670c91dfef1b9d76f7f34f3432efc973..1b08b32d936aeba80b46cc99036769f9ffe6cf1a 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbNCCRegistrationFunction.hxx
+++ b/Modules/StereoProcessing/DisparityMap/include/otbNCCRegistrationFunction.hxx
@@ -27,6 +27,7 @@
#include "otbMacro.h"
#include "otbNCCRegistrationFunction.h"
+#include "vcl_legacy_aliases.h"
namespace otb
{
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx b/Modules/StereoProcessing/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
index e50fab8637531a4335dad248889b17b03d4497cc..151dd54a1d856d8ca48b5ebd5fe3dc4a33813569 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
+++ b/Modules/StereoProcessing/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
@@ -31,6 +31,7 @@ template <class TInputImage, class TOutputMetricImage, class TOutputDisparityIma
PixelWiseBlockMatchingImageFilter<TInputImage, TOutputMetricImage, TOutputDisparityImage, TMaskImage,
TBlockMatchingFunctor>::PixelWiseBlockMatchingImageFilter()
{
+ this->DynamicMultiThreadingOff();
// Set the number of inputs
this->SetNumberOfRequiredInputs(6);
this->SetNumberOfRequiredInputs(2);
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.h b/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.h
index c40e41dcd03c162fbecac827666c8da825d2854f..b6ba7bbedb077b290c2ea59ad22574e2d90545ec 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.h
+++ b/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.h
@@ -210,7 +210,7 @@ protected:
* This method needs to be re-implemented from ImageToImageFilter since
* the initial images and disparity maps may not have the same size
*/
- void VerifyInputInformation() override;
+ void VerifyInputInformation() const override;
/** Generate output information */
void GenerateOutputInformation() override;
diff --git a/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx b/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
index b8176aabf742f42ea4cf653984b8091c231a0070..ccb4464af0f5834c4767a77650e07a785b5b4a54 100644
--- a/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
+++ b/Modules/StereoProcessing/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
@@ -28,6 +28,7 @@ namespace otb
template <class TInputImage, class TOutputMetricImage, class TDisparityImage, class TMaskImage, class TBlockMatchingFunctor>
SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityImage, TMaskImage, TBlockMatchingFunctor>::SubPixelDisparityImageFilter()
{
+ this->DynamicMultiThreadingOff();
// Set the number of required inputs
this->SetNumberOfRequiredInputs(3);
@@ -283,7 +284,7 @@ void SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityIma
}
template <class TInputImage, class TOutputMetricImage, class TDisparityImage, class TMaskImage, class TBlockMatchingFunctor>
-void SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityImage, TMaskImage, TBlockMatchingFunctor>::VerifyInputInformation()
+void SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityImage, TMaskImage, TBlockMatchingFunctor>::VerifyInputInformation() const
{
// Retrieve input pointers
const TInputImage* inLeftPtr = this->GetLeftInput();
@@ -503,7 +504,7 @@ void SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityIma
outHDispPtr->FillBuffer(static_cast<DisparityPixelType>(m_MinimumHorizontalDisparity) / static_cast<DisparityPixelType>(this->m_Step));
outVDispPtr->FillBuffer(static_cast<DisparityPixelType>(m_MinimumVerticalDisparity) / static_cast<DisparityPixelType>(this->m_Step));
- m_WrongExtrema.resize(this->GetNumberOfThreads());
+ m_WrongExtrema.resize(this->GetNumberOfWorkUnits());
}
template <class TInputImage, class TOutputMetricImage, class TDisparityImage, class TMaskImage, class TBlockMatchingFunctor>
@@ -906,7 +907,7 @@ void SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityIma
resampler = ResamplerFilterType::New();
resampler->SetInput(fakeRightPtr);
resampler->SetSize(windowSize);
- resampler->SetNumberOfThreads(1);
+ resampler->SetNumberOfWorkUnits(1);
resampler->SetTransform(transfo);
resampler->SetOutputStartIndex(upleftCorner);
@@ -1344,7 +1345,7 @@ void SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityIma
resampler = ResamplerFilterType::New();
resampler->SetInput(fakeRightPtr);
resampler->SetSize(windowSize);
- resampler->SetNumberOfThreads(1);
+ resampler->SetNumberOfWorkUnits(1);
resampler->SetTransform(transfo);
resampler->SetOutputStartIndex(upleftCorner);
@@ -1554,7 +1555,7 @@ void SubPixelDisparityImageFilter<TInputImage, TOutputMetricImage, TDisparityIma
resampler = ResamplerFilterType::New();
resampler->SetInput(fakeRightPtr);
resampler->SetSize(windowSize);
- resampler->SetNumberOfThreads(1);
+ resampler->SetNumberOfWorkUnits(1);
resampler->SetTransform(transfo);
resampler->SetOutputStartIndex(upleftCorner);
diff --git a/Modules/StereoProcessing/Stereo/include/otbAdhesionCorrectionFilter.hxx b/Modules/StereoProcessing/Stereo/include/otbAdhesionCorrectionFilter.hxx
index 6d1161ab7bfca54c7adb965d0dc6d43f86e1a8fd..b59ff7e11e90230a592f387560c8dd2607364461 100644
--- a/Modules/StereoProcessing/Stereo/include/otbAdhesionCorrectionFilter.hxx
+++ b/Modules/StereoProcessing/Stereo/include/otbAdhesionCorrectionFilter.hxx
@@ -27,7 +27,7 @@
#include "itkLinearInterpolateImageFunction.h"
#include "itkImageRegionIteratorWithIndex.h"
#include "itkNormalizedCorrelationImageToImageMetric.h"
-#include "itkExceptionObject.h"
+#include "itkMacro.h"
namespace otb
{
diff --git a/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.h b/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.h
index ba15fef33a45c913dd09688384a99de7dd5857bb..9648a4541c0ca6638fd47645ce1eaf1dc1d761ed 100644
--- a/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.h
+++ b/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.h
@@ -121,7 +121,7 @@ protected:
void GenerateInputRequestedRegion() override;
/** Threaded generate data */
- void ThreadedGenerateData(const OutputRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread) override;
private:
BijectionCoherencyFilter(const Self&) = delete;
diff --git a/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.hxx b/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.hxx
index 7596cbe6816d42328b5c7c95c1fef90f08fc36da..8a304848535eb233d92de008c8bfa0f0d9faa2eb 100644
--- a/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.hxx
+++ b/Modules/StereoProcessing/Stereo/include/otbBijectionCoherencyFilter.hxx
@@ -197,8 +197,7 @@ void BijectionCoherencyFilter<TDisparityImage, TOutputImage>::GenerateInputReque
}
template <class TDisparityImage, class TOutputImage>
-void BijectionCoherencyFilter<TDisparityImage, TOutputImage>::ThreadedGenerateData(const OutputRegionType& outputRegionForThread,
- itk::ThreadIdType itkNotUsed(threadId))
+void BijectionCoherencyFilter<TDisparityImage, TOutputImage>::DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread)
{
const TDisparityImage* directHmap = this->GetDirectHorizontalDisparityMapInput();
const TDisparityImage* directVmap = this->GetDirectVerticalDisparityMapInput();
diff --git a/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.h b/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.h
index e42d46de820a21502f64905c98b9b9cf981bdafd..6d9ece0306a71e0e21156300f7ed95c64cdaf7d4 100644
--- a/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.h
+++ b/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.h
@@ -246,7 +246,7 @@ protected:
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() override
+ void VerifyInputInformation() const override
{
}
diff --git a/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.hxx b/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.hxx
index 70d4a0d15628cffea10d62b1adbca16cf3b72b5a..79605f1a66519028e0e4dc54544c585e992101c0 100644
--- a/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.hxx
+++ b/Modules/StereoProcessing/Stereo/include/otbMulti3DMapToDEMFilter.hxx
@@ -33,6 +33,7 @@ namespace otb
template <class T3DImage, class TMaskImage, class TOutputDEMImage>
Multi3DMapToDEMFilter<T3DImage, TMaskImage, TOutputDEMImage>::Multi3DMapToDEMFilter()
{
+ this->DynamicMultiThreadingOff();
// Set the number of inputs (1 image one optional mask)
this->SetNumberOfIndexedInputs(2);
this->SetNumberOfRequiredInputs(1);
@@ -484,7 +485,7 @@ void Multi3DMapToDEMFilter<T3DImage, TMaskImage, TOutputDEMImage>::BeforeThreade
unsigned int regionsNumber = 0;
if (requestedSize[0] * requestedSize[1] != 0)
{
- regionsNumber = m_MapSplitterList->GetNthElement(k)->GetNumberOfSplits(requestedRegion, this->GetNumberOfThreads());
+ regionsNumber = m_MapSplitterList->GetNthElement(k)->GetNumberOfSplits(requestedRegion, this->GetNumberOfWorkUnits());
}
m_NumberOfSplit[k] = regionsNumber;
otbMsgDevMacro("map " << k << " will be split into " << regionsNumber << " regions");
diff --git a/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.h b/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
index a520c2318aa7cc0fac0848854e5e87a9bca51f76..17aab819908f5a17588474ca1a0e168649ad7501 100644
--- a/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
+++ b/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
@@ -191,7 +191,7 @@ protected:
~StereoSensorModelToElevationFilter() override;
/** Threaded generate data */
- void ThreadedGenerateData(const OutputRegionType& outputRegionForThread, itk::ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread) override;
/** Generate the input requested regions */
void GenerateInputRequestedRegion(void) override;
@@ -204,7 +204,7 @@ protected:
*
* \sa ProcessObject::VerifyInputInformation
*/
- void VerifyInputInformation() override
+ void VerifyInputInformation() const override
{
}
diff --git a/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx b/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
index 2a7bd2d593490ea8f89c7c01bf9e62a38278c8d9..e946dc895193aa008ded777ea79578abaf95d889 100644
--- a/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
+++ b/Modules/StereoProcessing/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
@@ -294,8 +294,7 @@ void StereoSensorModelToElevationFilter<TInputImage, TOutputHeight>::BeforeThrea
}
template <class TInputImage, class TOutputHeight>
-void StereoSensorModelToElevationFilter<TInputImage, TOutputHeight>::ThreadedGenerateData(const OutputRegionType& outputRegionForThread,
- itk::ThreadIdType threadId)
+void StereoSensorModelToElevationFilter<TInputImage, TOutputHeight>::DynamicThreadedGenerateData(const OutputRegionType& outputRegionForThread)
{
// Retrieve pointers
const InputImageType* masterPtr = this->GetMasterInput();
@@ -352,9 +351,6 @@ void StereoSensorModelToElevationFilter<TInputImage, TOutputHeight>::ThreadedGen
// }
- // support progress methods/callbacks
- itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
// Define an iterator on the output elevation map
itk::ConstNeighborhoodIterator<InputImageType> inputIt(m_Radius, masterPtr, outputRegionForThread);
itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr, outputRegionForThread);
@@ -491,9 +487,6 @@ void StereoSensorModelToElevationFilter<TInputImage, TOutputHeight>::ThreadedGen
correlIt.Set(0);
}
- // Update progress
- progress.CompletedPixel();
-
// And iterators
++inputIt;
++outputIt;
diff --git a/Modules/StereoProcessing/Stereo/test/otbMulti3DMapToDEMFilter.cxx b/Modules/StereoProcessing/Stereo/test/otbMulti3DMapToDEMFilter.cxx
index 418dc9671a26b12a7eba3bf9e39cc7fc2054ebb7..18c4f2f21e88bff97ae075a232e1024c218898f1 100644
--- a/Modules/StereoProcessing/Stereo/test/otbMulti3DMapToDEMFilter.cxx
+++ b/Modules/StereoProcessing/Stereo/test/otbMulti3DMapToDEMFilter.cxx
@@ -125,7 +125,7 @@ int otbMulti3DMapToDEMFilterEPSG(int argc, char* argv[])
multiFilter->SetProjectionRef(projectionRef);
WriterType::Pointer writer = WriterType::New();
- multiFilter->SetNumberOfThreads(atoi(argv[argc - 11]));
+ multiFilter->SetNumberOfWorkUnits(atoi(argv[argc - 11]));
writer->SetInput(multiFilter->GetOutput());
@@ -227,7 +227,7 @@ int otbMulti3DMapToDEMFilterManual(int argc, char* argv[])
WriterType::Pointer writer = WriterType::New();
- multiFilter->SetNumberOfThreads(atoi(argv[argc - 10]));
+ multiFilter->SetNumberOfWorkUnits(atoi(argv[argc - 10]));
writer->SetInput(multiFilter->GetOutput());
@@ -303,7 +303,7 @@ int otbMulti3DMapToDEMFilter(int argc, char* argv[])
WriterType::Pointer writer = WriterType::New();
- multiFilter->SetNumberOfThreads(atoi(argv[argc - 2]));
+ multiFilter->SetNumberOfWorkUnits(atoi(argv[argc - 2]));
writer->SetInput(multiFilter->GetOutput());
diff --git a/Modules/ThirdParty/6S/src/CMakeLists.txt b/Modules/ThirdParty/6S/src/CMakeLists.txt
index 2e1b3784cc4c798b03e228b7702ccf65deddd503..df4cc4e14ae550b43655075fa5ad97c547980364 100644
--- a/Modules/ThirdParty/6S/src/CMakeLists.txt
+++ b/Modules/ThirdParty/6S/src/CMakeLists.txt
@@ -107,6 +107,10 @@ if(OTB_LIBRARY_PROPERTIES)
set_target_properties(otb6S PROPERTIES ${OTB_LIBRARY_PROPERTIES})
endif()
+if(MSVC)
+ set_target_properties(otb6S PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+endif()
+
# Below "extra" compile flags are needed for proper functioning of 6S
# library. Without these flags especially /Oy- OpticalCalibration tests
# are failing. the flags are automatially added by VS generator.
diff --git a/Modules/ThirdParty/Boost/otb-module-init.cmake b/Modules/ThirdParty/Boost/otb-module-init.cmake
index c9a05b0f4329a8f0b15ef3ed2631e1eb625ef625..3530d52af5a7533a291d1b34ad1295a8fc07bc36 100644
--- a/Modules/ThirdParty/Boost/otb-module-init.cmake
+++ b/Modules/ThirdParty/Boost/otb-module-init.cmake
@@ -34,12 +34,12 @@ else()
endif()
if(OTBGroup_Core AND NOT OTBGroup_Learning)
- find_package (Boost 1.35.0 REQUIRED COMPONENTS filesystem)
+ find_package (Boost 1.73.0 REQUIRED COMPONENTS filesystem)
else()
- find_package (Boost 1.35.0 REQUIRED COMPONENTS filesystem serialization)
+ find_package (Boost 1.73.0 REQUIRED COMPONENTS filesystem serialization)
endif()
if (BUILD_TESTING)
- find_package (Boost 1.35.0 QUIET COMPONENTS filesystem serialization unit_test_framework)
+ find_package (Boost 1.73.0 QUIET COMPONENTS filesystem serialization unit_test_framework)
if (NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
message(STATUS "Boost unit_test_framework not found. Hence test depending on this framework will be skipped")
else()
diff --git a/Modules/ThirdParty/ITK/CMakeLists.txt b/Modules/ThirdParty/ITK/CMakeLists.txt
index 0b6d4f348cf57ac4844ddb09b22cc4cc7dc95444..1efa7de0b4cba0490103d499fcf3d0e018dcae83 100644
--- a/Modules/ThirdParty/ITK/CMakeLists.txt
+++ b/Modules/ThirdParty/ITK/CMakeLists.txt
@@ -21,7 +21,9 @@
project(OTBITK)
set(OTBITK_SYSTEM_INCLUDE_DIRS ${ITK_INCLUDE_DIRS})
-set(OTBITK_LIBRARIES "${ITK_LIBRARIES}")
+set(OTBITK_SYSTEM_LIBRARY_DIRS ${ITK_LIBRARY_DIRS})
+list(REMOVE_DUPLICATES OTBITK_SYSTEM_LIBRARY_DIRS)
+set(OTBITK_LIBRARIES "${ITK_LIBRARIES}" ${FFTWD_BASE_LIB} ${FFTWD_THREADS_LIB} ${FFTWF_BASE_LIB} ${FFTWF_THREADS_LIB})
set(OTBITK_EXPORT_CODE_BUILD "find_package(ITK REQUIRED COMPONENTS ${OTBITK_ITK_REQUIRED_MODULE_LIST} HINTS ${ITK_DIR})")
set(OTBITK_EXPORT_CODE_INSTALL ${OTBITK_EXPORT_CODE_BUILD})
diff --git a/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h b/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h
index 8b0b7632d47e6f36736917995367dafb70660fb1..6c84c5856171277ae6eba3e79dff84e8980e4f7b 100644
--- a/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h
+++ b/Modules/ThirdParty/ITK/include/itkImageRegionSplitter.h
@@ -71,7 +71,7 @@ namespace itk
*/
template< unsigned int VImageDimension >
-class ITK_EXPORT ImageRegionSplitter:public ImageRegionSplitterBase
+class ITK_ABI_EXPORT ImageRegionSplitter : public ImageRegionSplitterBase
{
public:
/** Standard class typedefs. */
diff --git a/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.hxx b/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.hxx
index c8db8c9d6fe02cc109b0b25b1c87eb117a9c2919..e9eefba1d3ebd4dd3b37b29febe0dcf0fbf09a0a 100644
--- a/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.hxx
+++ b/Modules/ThirdParty/ITK/include/itkTransformToDisplacementFieldSource.hxx
@@ -34,6 +34,7 @@ template< class TOutputImage, class TTransformPrecisionType >
TransformToDisplacementFieldSource< TOutputImage, TTransformPrecisionType >
::TransformToDisplacementFieldSource()
{
+ this->DynamicMultiThreadingOff();
this->m_OutputSpacing.Fill(1.0);
this->m_OutputOrigin.Fill(0.0);
this->m_OutputDirection.SetIdentity();
diff --git a/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h
index 023b294287f022ff1ec625bb073f7a923a9a93be..ab7f2346a56298de6282c4092f8714dfc9f531e9 100644
--- a/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h
+++ b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.h
@@ -50,7 +50,7 @@ namespace itk
* \ingroup OTBITK
*/
template< class TInputImage, class TOutputImage, class TFunction >
-class ITK_EXPORT UnaryFunctorImageFilter:public InPlaceImageFilter< TInputImage, TOutputImage >
+class ITK_TEMPLATE_EXPORT UnaryFunctorImageFilter:public InPlaceImageFilter< TInputImage, TOutputImage >
{
public:
/** Standard class typedefs. */
@@ -122,10 +122,9 @@ protected:
* portion of the output image specified by the parameter
* "outputRegionForThread"
*
- * \sa ImageToImageFilter::ThreadedGenerateData(),
+ * \sa ImageToImageFilter::DynamicThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread,
- ThreadIdType threadId) override;
+ void DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread) override;
private:
UnaryFunctorImageFilter(const Self &) = delete;
diff --git a/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.hxx b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.hxx
index c56c4992804e82f9cc4c6e4c2389f517126274dd..67aa7f8aebbcff4e3a4c1876c0c4034753a3ad8e 100644
--- a/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.hxx
+++ b/Modules/ThirdParty/ITK/include/itkUnaryFunctorImageFilter.hxx
@@ -20,7 +20,6 @@
#include "itkUnaryFunctorImageFilter.h"
#include "itkImageScanlineIterator.h"
-#include "itkProgressReporter.h"
namespace itk
{
@@ -31,6 +30,8 @@ template< class TInputImage, class TOutputImage, class TFunction >
UnaryFunctorImageFilter< TInputImage, TOutputImage, TFunction >
::UnaryFunctorImageFilter()
{
+ //TODO: Verify
+ this->DynamicMultiThreadingOn();
this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
}
@@ -154,8 +155,7 @@ UnaryFunctorImageFilter< TInputImage, TOutputImage, TFunction >
template< class TInputImage, class TOutputImage, class TFunction >
void
UnaryFunctorImageFilter< TInputImage, TOutputImage, TFunction >
-::ThreadedGenerateData(const OutputImageRegionType & outputRegionForThread,
- ThreadIdType threadId)
+::DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread)
{
const TInputImage *inputPtr = this->GetInput();
TOutputImage *outputPtr = this->GetOutput(0);
@@ -174,10 +174,6 @@ UnaryFunctorImageFilter< TInputImage, TOutputImage, TFunction >
inputIt.GoToBegin();
outputIt.GoToBegin();
- const size_t numberOfLinesToProcess = outputRegionForThread.GetNumberOfPixels() / outputRegionForThread.GetSize(0);
- ProgressReporter progress( this, threadId, numberOfLinesToProcess );
-
-
while ( !inputIt.IsAtEnd() )
{
while ( !inputIt.IsAtEndOfLine() )
@@ -188,7 +184,6 @@ UnaryFunctorImageFilter< TInputImage, TOutputImage, TFunction >
}
inputIt.NextLine();
outputIt.NextLine();
- progress.CompletedPixel(); // potential exception thrown here
}
}
} // end namespace itk
diff --git a/Modules/ThirdParty/ITK/otb-module-init.cmake b/Modules/ThirdParty/ITK/otb-module-init.cmake
index 0d9876e579d882d780321cac5bd5afef3ee4e5f4..f685616c58a27ad4719cc5a8126bb2ade44cdf4a 100644
--- a/Modules/ThirdParty/ITK/otb-module-init.cmake
+++ b/Modules/ThirdParty/ITK/otb-module-init.cmake
@@ -71,7 +71,6 @@ set(OTBITK_ITK_REQUIRED_MODULE_LIST
ITKEigen
#ITKFEM
ITKNarrowBand
- ITKNeuralNetworks
ITKOptimizers
ITKOptimizersv4
ITKPolynomials
@@ -102,9 +101,7 @@ set(OTBITK_ITK_REQUIRED_MODULE_LIST
find_package(ITK COMPONENTS ${OTBITK_ITK_REQUIRED_MODULE_LIST})
mark_as_advanced(ITK_DIR)
-
-# set ( ITK_NO_IO_FACTORY_REGISTER_MANAGER TRUE )
-# include (${ITK_USE_FILE})
+#include (${ITK_USE_FILE})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ITK_REQUIRED_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ITK_REQUIRED_CXX_FLAGS}")
diff --git a/Modules/ThirdParty/SiftFast/src/CMakeLists.txt b/Modules/ThirdParty/SiftFast/src/CMakeLists.txt
index a7485886ae73a3d328a705a9dc80c613c1e91584..e41ce2f85b87354a4aa5b5db9f5d2e7802d7826a 100644
--- a/Modules/ThirdParty/SiftFast/src/CMakeLists.txt
+++ b/Modules/ThirdParty/SiftFast/src/CMakeLists.txt
@@ -106,6 +106,9 @@ if(OTB_LIBRARY_PROPERTIES)
set_target_properties(otbsiftfast PROPERTIES ${OTB_LIBRARY_PROPERTIES})
endif()
+if(MSVC)
+ set_target_properties(otbsiftfast PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+endif()
install(TARGETS otbsiftfast
EXPORT ${OTB3P_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${OTB3P_INSTALL_RUNTIME_DIR} COMPONENT Dependencies
diff --git a/Packaging/Files/build_gdal_bindings.sh b/Packaging/Files/build_gdal_bindings.sh
new file mode 100644
index 0000000000000000000000000000000000000000..d8fd70d8a3f937ea2a3925a0ca4c264f88ce302c
--- /dev/null
+++ b/Packaging/Files/build_gdal_bindings.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# Copyright (C) 2005-2024 Centre National d'Etudes Spatiales (CNES)
+#
+# This file is part of Orfeo Toolbox
+#
+# https://www.orfeo-toolbox.org/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This script permits to build gdal bindings with python > 3.10 which is the default version in OTB 10
+
+if [ "$#" -ne 3 ]; then
+ echo "Usage : build_gdal_bindings.sh path_to_sources path_to_workdir otb_version"
+ exit
+fi
+
+SOURCEDIR=$1
+WORKDIR=$2
+INSTALLDIR=$WORKDIR/gdal_bindings_otb-$3-py312
+
+echo "*** Checking out branch release-$3 ***"
+cd $SOURCEDIR
+git checkout origin/release-$3
+
+pyversion="$(python3 -V 2>&1)"
+echo "*** Building GDAL bindings with $pyversion for otb $3 ***"
+mkdir $WORKDIR/gdal_build_otb-$3 && cd $WORKDIR/gdal_build_otb-$3
+cmake $SOURCEDIR/SuperBuild -DCMAKE_INSTALL_PREFIX=$INSTALLDIR -DDOWNLOAD_LOCATION=$WORKDIR/superbuild-archives
+make -j16 GDAL
+echo "*** Creating a tar gz of the gdal bindings in the directory $INSTALLDIR ***"
+find $INSTALLDIR/lib/python3/dist-packages/osgeo/ -type f -name "*.so" -printf "%P\n" | tar -czf $INSTALLDIR/OTB-$3-GDAL-bindings-py312.tar.gz --no-recursion -C $INSTALLDIR/lib/python3/dist-packages/osgeo -T -
diff --git a/Packaging/Files/otbenv.bat b/Packaging/Files/otbenv.bat
index b4f059dfc59fdb3e19e205a0d89f7ad85353d0ca..fa576bf7badec65a628b8ff9db6946f89d9cd7f6 100644
--- a/Packaging/Files/otbenv.bat
+++ b/Packaging/Files/otbenv.bat
@@ -23,7 +23,7 @@ set CURRENT_SCRIPT_DIR=%~dp0
call :prefix_path PATH "%CURRENT_SCRIPT_DIR%bin"
call :prefix_path PATH "%CURRENT_SCRIPT_DIR%lib"
-call :prefix_path PYTHONPATH "%CURRENT_SCRIPT_DIR%lib\otb\python"
+call :prefix_path PYTHONPATH "%CURRENT_SCRIPT_DIR%lib\otb\python;%CURRENT_SCRIPT_DIR%lib\site-packages"
call :prefix_path OTB_APPLICATION_PATH "%CURRENT_SCRIPT_DIR%lib\otb\applications"
set GDAL_DATA=%CURRENT_SCRIPT_DIR%share\data
diff --git a/Packaging/Files/post_install.sh.in b/Packaging/Files/post_install.sh.in
index e1a294b897ebcd931eb71a25d0e9d4135489d7e6..e14909d8fcd2197ffcc1535db38a4f91de606cce 100644
--- a/Packaging/Files/post_install.sh.in
+++ b/Packaging/Files/post_install.sh.in
@@ -25,24 +25,35 @@ OTB_SHORT_VERSION=@OTB_VERSION_MAJOR@.@OTB_VERSION_MINOR@
echo "***** First time launching OTB after installation, doing some post installation steps before use *****"
# Apply necessary patches for a modular install because cmake generates these file at configure time, not at packaging time
CMAKE_DIRS="$OTB_INSTALL_DIR/lib/cmake"
-sed -i "s/FATAL_ERROR/WARNING/g" "$CMAKE_DIRS/OTB-$OTB_SHORT_VERSION/OTBTargets.cmake"
-sed -i "s/FATAL_ERROR/WARNING/g" "$CMAKE_DIRS/OTB-$OTB_SHORT_VERSION/OTBModuleAPI.cmake"
sed -i "s/\/builds\/otb\/xdk/\${OTB_INSTALL_PREFIX}/g" "$CMAKE_DIRS"/OTB-"$OTB_SHORT_VERSION"/*.cmake
sed -i "s/\/builds\/otb\/xdk/\${OTB_INSTALL_PREFIX}/g" "$CMAKE_DIRS"/OTB-"$OTB_SHORT_VERSION"/Modules/*.cmake
-sed -i "s/\/builds\/otb\/xdk/\${OTB_INSTALL_PREFIX}/g" "$CMAKE_DIRS"/ITK-4.13/*.cmake
-sed -i "s/\/builds\/otb\/xdk/\${OTB_INSTALL_PREFIX}/g" "$CMAKE_DIRS"/ITK-4.13/Modules/*.cmake
+sed -i "s/\/builds\/otb\/xdk/\${OTB_INSTALL_PREFIX}/g" "$CMAKE_DIRS"/ITK-5.3/*.cmake
+sed -i "s/\/builds\/otb\/xdk/\${OTB_INSTALL_PREFIX}/g" "$CMAKE_DIRS"/ITK-5.3/Modules/*.cmake
sed -i "s/\/builds\/otb\/xdk/\$OTB_INSTALL_DIR/g" "$OTB_INSTALL_DIR"/bin/gdal-config
sed -i "s/\/builds\/otb\/xdk/\$OTB_INSTALL_DIR/g" "$OTB_INSTALL_DIR"/bin/curl-config
sh "$OTB_INSTALL_DIR"/tools/sanitize_rpath.sh
-# Check python version, if python 3.10 (ubuntu 22 and debian 12) download and extract the gdal bindings for python 3.10
pyversion="$(python3 -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]*\).*/\1\2/')"
-if [ "$pyversion" = "312" ]; then
- echo "*** Python 3.12 detected, downloading gdal bindings compiled for python 3.12 ***"
- PACKAGE_OTB_VERSION="$OTB_SHORT_VERSION.@OTB_VERSION_PATCH@"
- curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$PACKAGE_OTB_VERSION-GDAL-bindings-py312.tar.gz -o "$OTB_INSTALL_DIR"/tools/gdal-py312.tar.gz
- tar -xf "$OTB_INSTALL_DIR"/tools/gdal-py312.tar.gz -C "$OTB_INSTALL_DIR"/lib/python3/dist-packages/osgeo/
- rm "$OTB_INSTALL_DIR"/tools/gdal-py312.tar.gz
- echo "*** GDAL bindings for python 3.12 successfully installed ***"
+ostype="$(lsb_release -is)"
+# Recompile OTB Python bindings
+if [ "$pyversion" -ne "310" ] && [ $ostype != "RedHatEnterprise" ] ; then
+ sh "$OTB_INSTALL_DIR"/recompile_bindings.sh
fi
-echo "OK" > "$OTB_INSTALL_DIR"/tools/install_done.txt
+# Check python version, if python 3.12 (ubuntu 24 and debian > 12) download and extract the gdal bindings for python 3.12
+# In case your install is from compiled code, the gdal bindings will be already there in the installation
+python_distpackage_path="$OTB_INSTALL_DIR/lib/python3/dist-packages/osgeo/"
+gdal_python_found="$(find $python_distpackage_path -name "*$pyversion-x86_64-linux*")"
+if [ -z "$gdal_python_found" ]; then
+ echo "***** Python $pyversion detected, downloading gdal bindings compiled for this Python version *****"
+ HTTP_STATUS=$(curl -s -o "$OTB_INSTALL_DIR"/tools/gdal-py$pyversion.tar.gz -w "%{response_code}\n" https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_SHORT_VERSION-GDAL-bindings-py$pyversion.tar.gz)
+ if [ $HTTP_STATUS -eq 200 ]; then
+ tar -xf "$OTB_INSTALL_DIR"/tools/gdal-py$pyversion.tar.gz -C $python_distpackage_path
+ rm "$OTB_INSTALL_DIR"/tools/gdal-py$pyversion.tar.gz
+ echo "***** GDAL bindings for python $pyversion successfully installed *****"
+ else
+ echo "Can not find GDAL bindings at https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_SHORT_VERSION-GDAL-bindings-py$pyversion.tar.gz"
+ return -1
+ fi
+fi
+echo "***** OTB Environment and Python bindings setup complete *****"
+echo "OK" > "$OTB_INSTALL_DIR"/tools/install_done.txt
\ No newline at end of file
diff --git a/Packaging/Files/recompile_bindings.sh b/Packaging/Files/recompile_bindings.sh
index d9f6f67634063b0510603f036f67353494cc39b0..7fb98db435ae78f2bffffe3d36452f1c192e8919 100644
--- a/Packaging/Files/recompile_bindings.sh
+++ b/Packaging/Files/recompile_bindings.sh
@@ -18,6 +18,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-echo "************ Recompiling OTB python bindings with your version of Python ************"
+detected_pyversion="$(python3 -V 2>&1)"
+echo "***** Recompiling OTB python bindings with $detected_pyversion *****"
ctest -S "$OTB_INSTALL_DIR/share/otb/swig/build_wrapping.cmake" -VV
diff --git a/Packaging/Files/sanitize_rpath.sh b/Packaging/Files/sanitize_rpath.sh
index aee79e31b21554f231f901d0cce25b45531aca4b..19e32e53de2d18dbd696e317a7af49168c9d909e 100644
--- a/Packaging/Files/sanitize_rpath.sh
+++ b/Packaging/Files/sanitize_rpath.sh
@@ -26,4 +26,3 @@ for bin_file in $BINARY_FILES; do
$OTB_INSTALL_DIR/bin/patchelf "--set-rpath" "$OTB_INSTALL_DIR/lib" $bin_file
fi
done
-echo "***** OTB installation is complete *****"
diff --git a/README.md b/README.md
index 49a87c121b903ac2e0ea304a7002eb72fbe42cab..e9562d609739b0875a020804095d2186f8eddb79 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,6 @@ not a black box!
* [GitHub mirror](https://github.com/orfeotoolbox/)
* [Build status](http://cdash.orfeo-toolbox.org/index.php?project=OTB)
* [Bug tracker](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues?label_name%5B%5D=bug)
-* [Wiki](http://wiki.orfeo-toolbox.org/index.php/Main_Page)
* [Task tracking](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues)
### Installation
diff --git a/SuperBuild/CMake/External_boost.cmake b/SuperBuild/CMake/External_boost.cmake
index c2a0dbaa47cafdeb7b41bccef0861730b295eca6..8731c9bb9bbe30d67517dc57bd12c7242549ef94 100644
--- a/SuperBuild/CMake/External_boost.cmake
+++ b/SuperBuild/CMake/External_boost.cmake
@@ -86,8 +86,8 @@ set(BOOST_BUILD_COMMAND ${CMAKE_COMMAND}
#NOTE: update _SB_Boost_INCLUDE_DIR below when you change version number
ExternalProject_Add(BOOST
PREFIX BOOST
- URL "https://downloads.sourceforge.net/project/boost/boost/1.82.0/boost_1_82_0.tar.bz2"
- URL_MD5 b45dac8b54b58c087bfbed260dbfc03a
+ URL "https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2"
+ URL_MD5 2d098ba2e1457708a02de996857c2b10
BINARY_DIR ${BOOST_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
@@ -103,7 +103,7 @@ ExternalProject_Add(BOOST
#HINT: avoid all uses of _SB_* in External_<project>.cmake
# and depend on much saner CMAKE_PREFIX_PATH for cmake projects.
if(WIN32)
- set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include/boost-1_82)
+ set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include/boost-1_86)
else()
set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
endif()
diff --git a/SuperBuild/CMake/External_expat.cmake b/SuperBuild/CMake/External_expat.cmake
index 0ebd60126593581dfaa8780a3767229fd181c858..e0f86c934f9b980a8c94c018438c8d08e79dfd26 100644
--- a/SuperBuild/CMake/External_expat.cmake
+++ b/SuperBuild/CMake/External_expat.cmake
@@ -24,8 +24,8 @@ SETUP_SUPERBUILD(EXPAT)
ExternalProject_Add(EXPAT
PREFIX EXPAT
- URL "https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.gz"
- URL_MD5 686e9d986f85966c7924dfc041cdc15e
+ URL "https://github.com/libexpat/libexpat/releases/download/R_2_6_3/expat-2.6.3.tar.gz"
+ URL_MD5 8b0344e35dc7d40a42b80317076ee8c2
BINARY_DIR ${EXPAT_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
diff --git a/SuperBuild/CMake/External_hdf5.cmake b/SuperBuild/CMake/External_hdf5.cmake
index 9fdc483c81b5dd067a47aa746bedd235e4369124..c23cac85ddfea1e2c4c4c92b9fc299f20c7a55ee 100644
--- a/SuperBuild/CMake/External_hdf5.cmake
+++ b/SuperBuild/CMake/External_hdf5.cmake
@@ -29,8 +29,8 @@ set(HDF5_SB_CONFIG)
ExternalProject_Add(HDF5
PREFIX HDF5
- URL "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.3/src/hdf5-1.12.3.tar.gz"
- URL_MD5 4da24fcd281b9eeb05dae9b258f72a72
+ URL "https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.5/hdf5-1.14.5.tar.gz"
+ URL_MD5 600d29af6ccb7f1e3401560e1422ba5e
SOURCE_DIR ${HDF5_SB_SRC}
BINARY_DIR ${HDF5_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
diff --git a/SuperBuild/CMake/External_itk.cmake b/SuperBuild/CMake/External_itk.cmake
index b7cbf0c0748a37220c138eb1cd189c2b5f0155ea..8357ad767e70e167bee71f21f8ad6c98856d2d7b 100644
--- a/SuperBuild/CMake/External_itk.cmake
+++ b/SuperBuild/CMake/External_itk.cmake
@@ -22,11 +22,6 @@ INCLUDE_ONCE_MACRO(ITK)
SETUP_SUPERBUILD(ITK)
-# if(MSVC)
-# set(ITK_SB_SRC "C:/Temp/ITK")
-# set(ITK_SB_BUILD_DIR ${ITK_SB_SRC}/build)
-# endif()
-
set(ITK_ENABLED_MODULES
Common
FiniteDifference
@@ -84,7 +79,6 @@ set(ITK_ENABLED_MODULES
Eigen
#FEM
NarrowBand
- NeuralNetworks
Optimizers
Optimizersv4
Polynomials
@@ -131,6 +125,8 @@ list(APPEND ITK_SB_CONFIG
-DUSE_SYSTEM_FFTW:BOOL=ON
)
ADD_SUPERBUILD_CMAKE_VAR(ITK FFTW_INCLUDE_PATH)
+ADD_SUPERBUILD_CMAKE_VAR(ITK FFTW_LIBRARIES)
+ADD_SUPERBUILD_CMAKE_VAR(ITK FFTWD_LIBRARIES)
if (WIN32)
list(APPEND ITK_SB_CONFIG
@@ -139,15 +135,15 @@ if (WIN32)
endif()
#variables are later used in packaging
-set(SB_ITK_VERSION_MAJOR "4")
-set(SB_ITK_VERSION_MINOR "13")
+set(SB_ITK_VERSION_MAJOR "5")
+set(SB_ITK_VERSION_MINOR "3")
set(_SB_ITK_DIR ${SB_INSTALL_PREFIX}/lib/cmake/ITK-${SB_ITK_VERSION_MAJOR}.${SB_ITK_VERSION_MINOR})
ExternalProject_Add(ITK
PREFIX ITK
- URL "https://github.com/InsightSoftwareConsortium/ITK/archive/v4.13.3.tar.gz"
- URL_MD5 cc0e2d9b243f28db84b8b4a45a23f9d7
+ URL "https://github.com/InsightSoftwareConsortium/ITK/archive/v5.3.0.tar.gz"
+ URL_MD5 0eea824a392f7676c23bb24f4d8e3ceb
SOURCE_DIR ${ITK_SB_SRC}
BINARY_DIR ${ITK_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
@@ -173,5 +169,4 @@ ExternalProject_Add(ITK
LOG_INSTALL 1
)
-SUPERBUILD_PATCH_SOURCE(ITK)
-
+SUPERBUILD_PATCH_SOURCE(ITK)
\ No newline at end of file
diff --git a/SuperBuild/CMake/External_muparser.cmake b/SuperBuild/CMake/External_muparser.cmake
index cf891d282a8b51899ff72bfc06a35ed379b9e5cb..7ebf35c96ac1d69fc05f46df7bfda06c942729bc 100644
--- a/SuperBuild/CMake/External_muparser.cmake
+++ b/SuperBuild/CMake/External_muparser.cmake
@@ -24,8 +24,8 @@ SETUP_SUPERBUILD(MUPARSER)
ExternalProject_Add(MUPARSER
PREFIX MUPARSER
- URL "https://github.com/beltoforion/muparser/archive/v2.3.2.tar.gz"
- URL_MD5 cbc1b284e03abc7081b3c30997959893
+ URL "https://github.com/beltoforion/muparser/archive/v2.3.4.tar.gz"
+ URL_MD5 b92180a648be88238008ea01a597ccb9
BINARY_DIR ${MUPARSER_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
diff --git a/SuperBuild/CMake/External_muparserx.cmake b/SuperBuild/CMake/External_muparserx.cmake
index e4b64b532743b4c408c243e08ffaa34ecb469ff2..1f9d510c35e0fe0c23c79cb45c4dfe94a2e27ce4 100644
--- a/SuperBuild/CMake/External_muparserx.cmake
+++ b/SuperBuild/CMake/External_muparserx.cmake
@@ -31,8 +31,8 @@ endif()
ExternalProject_Add(MUPARSERX
PREFIX MUPARSERX
- URL "https://github.com/beltoforion/muparserx/archive/v4.0.8.zip"
- URL_MD5 b4cbf819a7a8a3d74fd1dcc1890a3670
+ URL "https://github.com/beltoforion/muparserx/archive/v4.0.12.zip"
+ URL_MD5 dca30d184b15447751c321ce85b400a1
BINARY_DIR ${MUPARSERX_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
@@ -48,7 +48,4 @@ ExternalProject_Add(MUPARSERX
LOG_INSTALL 1
)
-#Patch mpParserMessageProvider.cpp. This patch is integrated upstream but not yet released (last release is 4.0.7)
-SUPERBUILD_PATCH_SOURCE(MUPARSERX)
-
SUPERBUILD_UPDATE_CMAKE_VARIABLES(MUPARSERX FALSE muparserx muparserx)
diff --git a/SuperBuild/CMake/External_opencv.cmake b/SuperBuild/CMake/External_opencv.cmake
index 38c859dcb6f3107fbb99bd44114f8fa6beaf7580..5953521a3890c4529e495fb0c553f4c2ab7164d5 100644
--- a/SuperBuild/CMake/External_opencv.cmake
+++ b/SuperBuild/CMake/External_opencv.cmake
@@ -34,8 +34,8 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENCV PNG_LIBRARY)
ExternalProject_Add(OPENCV
PREFIX OPENCV
- URL "https://github.com/opencv/opencv/archive/4.6.0.tar.gz"
- URL_MD5 2f52df67b255fcc2c36632a9e9f723f6
+ URL "https://github.com/opencv/opencv/archive/4.10.0.tar.gz"
+ URL_MD5 adaf23e87339e6df6d50d68001138ccc
BINARY_DIR ${OPENCV_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
diff --git a/SuperBuild/CMake/External_openjpeg.cmake b/SuperBuild/CMake/External_openjpeg.cmake
index 7340a2c98dbf71500742daf1e5a87c938a4ee53f..8959daa2151e7fed73fe87979292e0f31d93d4fb 100644
--- a/SuperBuild/CMake/External_openjpeg.cmake
+++ b/SuperBuild/CMake/External_openjpeg.cmake
@@ -29,18 +29,15 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG TIFF_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG TIFF_LIBRARY)
ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG ZLIB_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG ZLIB_LIBRARY)
-ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG PNG_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG PNG_PNG_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG PNG_LIBRARY)
#GIT_REPOSITORY "https://github.com/uclouvain/openjpeg.git"
#GIT_TAG 081de4b15f54cb4482035b7bf5e3fb443e4bc84b
ExternalProject_Add(OPENJPEG
PREFIX OPENJPEG
- URL "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz"
- URL_MD5 3b9941dc7a52f0376694adb15a72903f
- DOWNLOAD_NAME openjpeg_v2.3.1.tar.gz
+ URL "https://github.com/uclouvain/openjpeg/archive/v2.5.2.tar.gz"
+ URL_MD5 f9ee64845881a15109ed0aa73a12202f
+ DOWNLOAD_NAME openjpeg_v2.5.2.tar.gz
BINARY_DIR ${OPENJPEG_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
@@ -54,6 +51,7 @@ ExternalProject_Add(OPENJPEG
-DBUILD_PKGCONFIG_FILES:BOOL=ON
-DBUILD_THIRDPARTY:BOOL=OFF
-DBUILD_THIRDPARTY_LCMS:BOOL=ON
+ -DCMAKE_INSTALL_LIBDIR:PATH=lib
${OPENJPEG_SB_CONFIG}
DEPENDS ${OPENJPEG_DEPENDENCIES}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
diff --git a/SuperBuild/CMake/External_png.cmake b/SuperBuild/CMake/External_png.cmake
index 355bb83d608da0db5780818c6d6c443f07541cd9..e501907d06ecd2b7f9470f5c5d73c40c3c47210f 100644
--- a/SuperBuild/CMake/External_png.cmake
+++ b/SuperBuild/CMake/External_png.cmake
@@ -30,19 +30,18 @@ ADD_SUPERBUILD_CMAKE_VAR(PNG ZLIB_LIBRARY)
ExternalProject_Add(PNG
PREFIX PNG
- URL "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz"
- URL_MD5 6c7519f6c75939efa0ed3053197abd54
+ URL "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.44/libpng-1.6.44.tar.gz"
+ URL_MD5 a780d4929c0bb47aaaf53d2e080b2a79
BINARY_DIR ${PNG_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
DEPENDS ${PNG_DEPENDENCIES}
CMAKE_CACHE_ARGS
${SB_CMAKE_CACHE_ARGS}
- -DPNG_BUILD_ZLIB:BOOL=ON
+ -DZLIB_ROOT:PATH=${SB_INSTALL_PREFIX}
-DPNG_STATIC:BOOL=OFF
-DPNG_SHARED:BOOL=ON
-DPNG_TESTS:BOOL=OFF
- -DVERSIONED_OUTPUT_LIB:BOOL=OFF
-DSKIP_INSTALL_FILES:BOOL=ON
-DSKIP_INSTALL_EXPORT:BOOL=ON
-DSKIP_INSTALL_EXECUTABLES:BOOL=OFF
@@ -54,8 +53,5 @@ ExternalProject_Add(PNG
LOG_BUILD 1
LOG_INSTALL 1
)
-set(_SB_PNG_PNG_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
-
-SUPERBUILD_PATCH_SOURCE(PNG)
SUPERBUILD_UPDATE_CMAKE_VARIABLES(PNG TRUE)
diff --git a/SuperBuild/CMake/External_proj.cmake b/SuperBuild/CMake/External_proj.cmake
index ce3b95a96758b1177dc216c1a9c1f85247cd08ec..5a2847cb0567d320f20e6c038eabe54650a6730b 100644
--- a/SuperBuild/CMake/External_proj.cmake
+++ b/SuperBuild/CMake/External_proj.cmake
@@ -25,8 +25,8 @@ SETUP_SUPERBUILD(PROJ)
# declare dependencies
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(PROJ SQLITE TIFF CURL)
-set(PROJ_URL "https://download.osgeo.org/proj/proj-9.3.1.tar.gz")
-set(PROJ_MD5 b5c3f36fdca3bc425aca09d77c4ec25a)
+set(PROJ_URL "https://download.osgeo.org/proj/proj-9.5.0.tar.gz")
+set(PROJ_MD5 ac46b4e31562890d012ea6b31e579cf6)
set(PROJ_FLAGS -DBUILD_SHARED_LIBS:BOOL=TRUE -DBUILD_TESTING:BOOL=OFF -DENABLE_TIFF:BOOL=ON -DENABLE_CURL:BOOL=ON)
ExternalProject_Add(PROJ
@@ -51,8 +51,6 @@ ExternalProject_Add(PROJ
LOG_INSTALL 1
)
-SUPERBUILD_PATCH_SOURCE(PROJ)
-
set(_SB_PROJ_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
set(_SB_PROJ_LIBRARY ${SB_INSTALL_PREFIX}/lib/proj.lib)
diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index b26ec370bd7ddd597513a17ab99d84b38e19bc3f..f1bcd99adb4be7a09150538b48556bd231230e22 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -25,9 +25,6 @@ project(OTB-SuperBuild)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Path to additional CMake modules
-#MESSAGE(INFO "${CMAKE_SOURCE_DIR}")
set(CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/CMake
${CMAKE_SOURCE_DIR}/../CMake
@@ -83,6 +80,10 @@ find_path(DOWNLOAD_LOCATION
HINTS $ENV{DOWNLOAD_LOCATION} "${CMAKE_CURRENT_BINARY_DIR}/Downloads"
)
+if(NOT DOWNLOAD_LOCATION)
+ set(DOWNLOAD_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/Downloads")
+endif()
+
# General options
option(OTB_DATA_USE_LARGEINPUT "Use Large inputs images test." OFF)
mark_as_advanced(OTB_DATA_USE_LARGEINPUT)
@@ -329,15 +330,8 @@ if(FROM_SUPERBUILD_LIST)
endforeach()
endif()
-message(STATUS "OTB_TARGET_SYSTEM_ARCH=${OTB_TARGET_SYSTEM_ARCH}")
-message(STATUS "OTB_TARGET_SYSTEM_ARCH_IS_X64=${OTB_TARGET_SYSTEM_ARCH_IS_X64}")
-
-if(DOWNLOAD_LOCATION)
- message(STATUS "DOWNLOAD_LOCATION=${DOWNLOAD_LOCATION}")
- message(STATUS "Source archives for dependencies will be taken from '${DOWNLOAD_LOCATION}'")
-else()
- message(STATUS "DOWNLOAD_LOCATION is not set. We will download all source archives during build!")
-endif()
-
-message(STATUS "SuperBuild will be installed to ${CMAKE_INSTALL_PREFIX}")
-message(STATUS "To install to a different directory, re-run cmake -DCMAKE_INSTALL_PREFIX=/your/preferred/path")
+message(STATUS "OTB_TARGET_SYSTEM_ARCH_IS_X64 = ${OTB_TARGET_SYSTEM_ARCH_IS_X64}")
+message(STATUS "DOWNLOAD_LOCATION = ${DOWNLOAD_LOCATION}")
+message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "SUPERBUILD_OTB_VERSION = ${SUPERBUILD_OTB_VERSION}")
+message("\nCMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator\n")
diff --git a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
index 838e554810d8c50cb319feda9a6dbae0b31e129a..c591bf1bde612cddf10e82e732136db76ceff319 100644
--- a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
+++ b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
@@ -20,7 +20,7 @@ JPEG_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\jpeg.lib
#if using an external png library uncomment the follwing lines
PNG_EXTERNAL_LIB = 1
PNGDIR = @SB_INSTALL_PREFIX_NATIVE@\include
-PNG_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\libpng.lib
+PNG_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\libpng16.lib
# if using an external libtiff library
TIFF_INC = -I@SB_INSTALL_PREFIX_NATIVE@\include
diff --git a/SuperBuild/patches/ITK/itk-1-fftw-all.diff b/SuperBuild/patches/ITK/itk-1-fftw-all.diff
index 8b7769bfb6b18cbf27e48130ad452927d394a8f2..58b31759c4b0a14be4d7b26988d13e98a8c58132 100644
--- a/SuperBuild/patches/ITK/itk-1-fftw-all.diff
+++ b/SuperBuild/patches/ITK/itk-1-fftw-all.diff
@@ -1,31 +1,32 @@
-diff -burN InsightToolkit-4.10.0.orig/CMake/FindFFTW.cmake InsightToolkit-4.10.0/CMake/FindFFTW.cmake
---- InsightToolkit-4.10.0.orig/CMake/FindFFTW.cmake 2016-06-16 14:21:15.226203872 +0200
-+++ InsightToolkit-4.10.0/CMake/FindFFTW.cmake 2016-06-16 14:23:48.966202670 +0200
-@@ -35,14 +35,12 @@
- set(FFTW_LIB_SEARCHPATH
- ${FFTW_INSTALL_BASE_PATH}/lib
- ${FFTW_INSTALL_BASE_PATH}/lib64
-- /usr/lib/fftw
-- /usr/local/lib/fftw
- )
+diff -burN ITK-5.0.0.orig/CMake/FindFFTW.cmake ITK-5.0.0/CMake/FindFFTW.cmake
+--- ITK-5.0.0.orig/CMake/FindFFTW.cmake 2019-05-22 17:54:36.000000000 +0200
++++ ITK-5.0.0/CMake/FindFFTW.cmake 2019-06-24 16:45:46.316235664 +0200
+@@ -59,7 +59,7 @@
+ if(ITK_USE_CUFFTW)
+ find_path(CUFFTW_INCLUDE_PATH cufftw.h ${FFTW_INC_SEARCHPATH})
+ else()
+- find_path(FFTW_INCLUDE_PATH fftw3.h ${FFTW_INC_SEARCHPATH})
++ find_path(FFTW_INCLUDE_PATH fftw3.h NO_DEFAULT_PATH)
+ endif()
- if(ITK_USE_FFTWD)
- mark_as_advanced(FFTWD_LIB)
-- find_library(FFTWD_LIB fftw3 ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib
-- find_library(FFTWD_THREADS_LIB fftw3_threads ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib only if compiled with threads support
-+ find_library(FFTWD_LIB fftw3 ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Double Precision Lib
-+ find_library(FFTWD_THREADS_LIB fftw3_threads ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Double Precision Lib only if compiled with threads support
+ if(FFTW_INCLUDE_PATH)
+@@ -183,7 +189,7 @@
+ if(ITK_USE_FFTWD)
+ mark_as_advanced(FFTWD_BASE_LIB FFTWD_THREADS_LIB FFTWD_LIBRARIES)
+- find_library(FFTWD_BASE_LIB fftw3 ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib
+- find_library(FFTWD_THREADS_LIB fftw3_threads ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib only if compiled with threads support
++ find_library(FFTWD_BASE_LIB fftw3 ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Double Precision Lib
++ find_library(FFTWD_THREADS_LIB fftw3_threads ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Double Precision Lib only if compiled with threads support
- if(FFTWD_LIB)
- set(FFTWD_FOUND 1)
-@@ -55,8 +53,8 @@
+ if(FFTWD_BASE_LIB)
+ set(FFTWD_FOUND 1)
+@@ -203,7 +209,7 @@
+ if(ITK_USE_FFTWF)
+ mark_as_advanced(FFTWF_BASE_LIB FFTWF_THREADS_LIB FFTWF_LIBRARIES)
+- find_library(FFTWF_BASE_LIB fftw3f ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib
+- find_library(FFTWF_THREADS_LIB fftw3f_threads ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib only if compiled with threads support
++ find_library(FFTWF_BASE_LIB fftw3f ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Single Precision Lib
++ find_library(FFTWF_THREADS_LIB fftw3f_threads ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Single Precision Lib only if compiled with threads support
- if(ITK_USE_FFTWF)
- mark_as_advanced(FFTWF_LIB)
-- find_library(FFTWF_LIB fftw3f ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib
-- find_library(FFTWF_THREADS_LIB fftw3f_threads ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib only if compiled with threads support
-+ find_library(FFTWF_LIB fftw3f ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Single Precision Lib
-+ find_library(FFTWF_THREADS_LIB fftw3f_threads ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Single Precision Lib only if compiled with threads support
-
- if(FFTWF_LIB)
- set(FFTWF_FOUND 1)
+ if(FFTWF_BASE_LIB)
+ set(FFTWF_FOUND 1)
diff --git a/SuperBuild/patches/ITK/itk-2-itktestlib-all.diff b/SuperBuild/patches/ITK/itk-2-itktestlib-all.diff
deleted file mode 100644
index dc0b0cbdbb7e18c55a0490150cf92d938cb3ab59..0000000000000000000000000000000000000000
--- a/SuperBuild/patches/ITK/itk-2-itktestlib-all.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -burN InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/CMakeLists.txt InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/CMakeLists.txt
---- InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/CMakeLists.txt 2017-08-22 11:53:55.960938649 +0200
-+++ InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/CMakeLists.txt 2017-08-22 11:56:07.289820954 +0200
-@@ -18,10 +18,14 @@
- # Retrive the variable type to CACHE.
- set(BUILD_EXAMPLES ${BUILD_EXAMPLES} CACHE BOOL "Build the examples from the ITK Software Guide." FORCE)
-
--foreach(lib itkvcl itkv3p_netlib itktestlib itkvnl itkvnl_algo itknetlib)
-+foreach(lib itkvcl itkv3p_netlib itkvnl itkvnl_algo itknetlib)
- itk_module_target(${lib} NO_INSTALL)
- endforeach()
-
-+if(BUILD_TESTING)
-+ itk_module_target(itktestlib NO_INSTALL)
-+endif()
-+
- foreach(exe
- netlib_integral_test
- netlib_lbfgs_example
-diff -burN InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt
---- InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt 2017-08-22 11:53:55.960938649 +0200
-+++ InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt 2017-08-22 11:56:56.410150930 +0200
-@@ -131,8 +131,10 @@
- set(CORE_VIDEO_FOUND OFF CACHE INTERNAL "VXL core video libraries built")
- endif ()
-
--# common test executable
--add_subdirectory(testlib)
-+# common test executable if testing enabled
-+if(BUILD_TESTING)
-+ add_subdirectory(testlib)
-+endif()
-
- # Tests that check and output the vxl configuration
- # NOTE: some external projects remove the tests directory (aka ITK)
diff --git a/SuperBuild/patches/ITK/itk-2-totalprogress-all.diff b/SuperBuild/patches/ITK/itk-2-totalprogress-all.diff
new file mode 100644
index 0000000000000000000000000000000000000000..65ae77e6559cfeb6a68427c1ffc13ce8da6245bb
--- /dev/null
+++ b/SuperBuild/patches/ITK/itk-2-totalprogress-all.diff
@@ -0,0 +1,9 @@
+diff -burN ITK-5.3.0.orig/Modules/Filtering/MathematicalMorphology/include/itkVanHerkGilWermanErodeDilateImageFilter.hxx ITK-5.3.0/Modules/Filtering/MathematicalMorphology/include/itkVanHerkGilWermanErodeDilateImageFilter.hxx
+--- ITK-5.3.0.orig/Modules/Filtering/MathematicalMorphology/include/itkVanHerkGilWermanErodeDilateImageFilter.hxx 2024-08-23 17:54:36.000000000 +0200
++++ ITK-5.3.0/Modules/Filtering/MathematicalMorphology/include/itkVanHerkGilWermanErodeDilateImageFilter.hxx 2024-08-23 16:45:46.316235664 +0200
+@@ -21,4 +21,4 @@
+#include "itkImageRegionIterator.h"
+
+#include "itkVanHerkGilWermanUtilities.h"
+-
++#include "itkTotalProgressReporter.h"
diff --git a/SuperBuild/patches/ITK/itk-3-gcc13-fix-all.diff b/SuperBuild/patches/ITK/itk-3-gcc13-fix-all.diff
new file mode 100644
index 0000000000000000000000000000000000000000..d91a1efa12b5b66e75e4b3083cc4d52e7446d139
--- /dev/null
+++ b/SuperBuild/patches/ITK/itk-3-gcc13-fix-all.diff
@@ -0,0 +1,13 @@
+diff -burN ITK-5.3.0.orig/Modules/Filtering/MathematicalMorphology/include/itkMathematicalMorphologyEnums.h ITK-5.3.0/Modules/Filtering/MathematicalMorphology/include/itkMathematicalMorphologyEnums.h
+--- ITK-5.3.0.orig/Modules/Filtering/MathematicalMorphology/include/itkMathematicalMorphologyEnums.h 2024-10-09 09:54:36.000000000 +0200
++++ ITK-5.3.0/Modules/Filtering/MathematicalMorphology/include/itkMathematicalMorphologyEnums.h 2024-10-09 09:54:46.316235664 +0200
+@@ -20,7 +20,7 @@
+
+ #include <iostream>
+ #include "ITKMathematicalMorphologyExport.h"
+-
++#include <cstdint>
+
+ namespace itk
+ {
+
diff --git a/SuperBuild/patches/ITK/itk-3-remove-gcc-version-debian-medteam-all.diff b/SuperBuild/patches/ITK/itk-3-remove-gcc-version-debian-medteam-all.diffOLD
similarity index 100%
rename from SuperBuild/patches/ITK/itk-3-remove-gcc-version-debian-medteam-all.diff
rename to SuperBuild/patches/ITK/itk-3-remove-gcc-version-debian-medteam-all.diffOLD
diff --git a/SuperBuild/patches/PNG/png-1-fixes-all.diff b/SuperBuild/patches/PNG/png-1-fixes-all.diff
deleted file mode 100644
index 8807cb0a047be49c274b6b38a6bc391626a2f219..0000000000000000000000000000000000000000
--- a/SuperBuild/patches/PNG/png-1-fixes-all.diff
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -burN libpng-1.6.37.orig/CMakeLists.txt libpng-1.6.37/CMakeLists.txt
---- libpng-1.6.37.orig/CMakeLists.txt 2019-04-14 20:10:32.000000000 +0200
-+++ libpng-1.6.37/CMakeLists.txt 2021-04-23 10:10:21.560899662 +0200
-@@ -27,7 +27,16 @@
- set(PNGLIB_MAJOR 1)
- set(PNGLIB_MINOR 6)
- set(PNGLIB_RELEASE 37)
--set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-+
-+option(VERSIONED_OUTPUT_LIB "create output library with major.minor suffix" OFF)
-+
-+set(PNGLIB_NAME libpng)
-+set(PNG_LIB_NAME png)
-+if(VERSIONED_OUTPUT_LIB)
-+ set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-+ set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-+endif()
-+
- set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
-
- include(GNUInstallDirs)
-@@ -196,11 +205,9 @@
-
- endif(PNG_HARDWARE_OPTIMIZATIONS)
-
--# SET LIBNAME
--set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-
- # to distinguish between debug and release lib
--set(CMAKE_DEBUG_POSTFIX "d")
-+#set(CMAKE_DEBUG_POSTFIX "d")
-
- include(CheckCSourceCompiles)
- option(ld-version-script "Enable linker version script" ON)
-@@ -525,7 +532,6 @@
- include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
-
- unset(PNG_LIB_TARGETS)
--
- if(PNG_SHARED)
- add_library(png SHARED ${libpng_sources})
- set(PNG_LIB_TARGETS png)
-@@ -838,9 +844,8 @@
- # SET UP LINKS
- if(PNG_SHARED)
- set_target_properties(png PROPERTIES
--# VERSION 16.${PNGLIB_RELEASE}.1.6.37
-- VERSION 16.${PNGLIB_RELEASE}.0
-- SOVERSION 16
-+ VERSION ${PNGLIB_VERSION}
-+ SOVERSION ${PNGLIB_MAJOR}
- CLEAN_DIRECT_OUTPUT 1)
- endif()
-
-@@ -852,29 +857,30 @@
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ if(VERSIONED_OUTPUT_LIB)
-+ if(PNG_SHARED)
-+ # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-+ if(CYGWIN OR MINGW)
-+ create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-+ install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ endif()
-
-- if(PNG_SHARED)
-- # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-- if(CYGWIN OR MINGW)
-- create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-- install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- endif()
--
-- if(NOT WIN32)
-- create_symlink(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png)
-- install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- endif()
-- endif()
-+ if(NOT WIN32)
-+ create_symlink(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png)
-+ install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ endif()
-+ endif(PNG_SHARED)
-
-- if(PNG_STATIC)
-- if(NOT WIN32 OR CYGWIN OR MINGW)
-- create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-- install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- endif()
-- endif()
-+ if(PNG_STATIC)
-+ if(NOT WIN32 OR CYGWIN OR MINGW)
-+ create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-+ install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ endif()
-+ endif(PNG_STATIC)
-+ endif(VERSIONED_OUTPUT_LIB)
- endif()
-
- if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)