diff --git a/FindOpenThreads.cmake b/CMake/FindOpenThreads.cmake
similarity index 100%
rename from FindOpenThreads.cmake
rename to CMake/FindOpenThreads.cmake
diff --git a/CMake/GenerateConfigProperties.cpp b/CMake/GenerateConfigProperties.cpp
index b18a5859bcbc62bced6f2a5754cb4e9aa9d2aa72..45678fed13837b01d5fdd4f524d738661b81a2c7 100644
--- a/CMake/GenerateConfigProperties.cpp
+++ b/CMake/GenerateConfigProperties.cpp
@@ -64,17 +64,21 @@ int main(int argc, char* argv[])
std::string language = "en_EN.UTF-8";
/** Write parameters to the configuration file*/
- os << "#Auto generated by config-properties \n"
+ os << "# Auto generated by config-properties \n\n"
+ << "# Language for the GUI application based on otb\n"
+ << "# for example OTB_LANG=en_EN.UTF-8\n"
<< "OTB_LANG="
<< language
- << "\n"
+ << "\n\n"
+ << "# Image size (in byte) to activate the streaming\n"
<< "OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING="
<< paramVector[0]
- << "\n"
+ << "\n\n"
+ << "# Buffer size when the streaming is activated\n"
<< "OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING="
<< paramVector[1]
- << "\n"
- << "#End of config file properties generation"
+ << "\n\n"
+ << "#End of config file properties generation\n"
<< std::endl;
os.close();
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8a12b6d9465ff2c927d55f5a0511d8154c70c50..470e9e9443f5725473af02632a7df3a3bc1d0eec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,21 @@
# This is the root OTB CMakeLists file.
# $Id$
#
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
PROJECT(OTB)
+# Path to additional CMake modules
+SET(CMAKE_MODULE_PATH
+ ${CMAKE_SOURCE_DIR}/CMake
+ ${CMAKE_MODULE_PATH})
+
INCLUDE_REGULAR_EXPRESSION("^(otb|itk|vtk|vnl|vcl|vxl|f2c|netlib|ce|itpack|DICOM|meta|png|dbh|tif|jpeg|zlib).*$")
SOURCE_GROUP("XML Files" REGULAR_EXPRESSION "[.]xml$")
+INCLUDE(CMakeDependentOption)
# On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
# warnings
@@ -100,19 +106,19 @@ IF(WIN32)
IF (MSVC)
IF(OTB_BUILD_PEDANTIC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
- ENDIF()
+ ENDIF(OTB_BUILD_PEDANTIC)
IF (MSVC80)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNING)
- ENDIF()
- ENDIF()
-ELSE()
+ ENDIF(MSVC80)
+ ENDIF(MSVC)
+ELSE(WIN32)
IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
IF(OTB_BUILD_PEDANTIC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
- ENDIF()
- ENDIF()
+ ENDIF(OTB_BUILD_PEDANTIC)
+ ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
ENDIF(WIN32)
#-----------------------------------------------------------------------------
@@ -225,7 +231,7 @@ ENDIF(OTB_COMPILE_JPEG2000)
IF(EXISTS "${CMAKE_ROOT}/Modules/FindOpenThreads.cmake")
FIND_PACKAGE(OpenThreads)
ELSE(EXISTS "${CMAKE_ROOT}/Modules/FindOpenThreads.cmake")
- INCLUDE(${OTB_SOURCE_DIR}/FindOpenThreads.cmake)
+ INCLUDE(${OTB_SOURCE_DIR}/CMake/FindOpenThreads.cmake)
ENDIF(EXISTS "${CMAKE_ROOT}/Modules/FindOpenThreads.cmake")
SET(OTB_USE_EXTERNAL_OPENTHREADS 1 CACHE INTERNAL "")
@@ -281,50 +287,49 @@ IF(OTB_USE_VISU_GUI)
#-------------------------------
# FLTK Library
#-------------------------------
+
+ #OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF)
+
FIND_PACKAGE(FLTK)
- IF(FLTK_FOUND)
- OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON)
- ELSE(FLTK_FOUND)
- OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." OFF)
- ENDIF(FLTK_FOUND)
+ CMAKE_DEPENDENT_OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON
+ "FLTK_FOUND" OFF)
+
+# IF(FLTK_FOUND)
+# SET(OTB_USE_EXTERNAL_FLTK ON)
+# ELSE(FLTK_FOUND)
+# SET(OTB_USE_EXTERNAL_FLTK OFF)
+# ENDIF(FLTK_FOUND)
+
# Option for internal/external FLTK
MARK_AS_ADVANCED(OTB_USE_EXTERNAL_FLTK)
- # Add an option to use or not use FLTK (http://www.fltk.org)
+
IF(OTB_USE_EXTERNAL_FLTK)
-# FIND_PACKAGE(FLTK)
# Mingw Option doesn't exist in the FindFLTK.cmake default configuration file in CMake installationj directory.
# Copy FLTK_PLATFORM_DEPENDENT_LIBS from FLTK CmakeList.txt
IF(MINGW)
ADD_DEFINITIONS(-DWIN32)
SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid wsock32 gdi32 comdlg32)
ENDIF(MINGW)
- IF (NOT FLTK_INCLUDE_DIR)
- SET( FLTK_INCLUDE_DIR /usr/include )
- FIND_PACKAGE(FLTK)
- ENDIF(NOT FLTK_INCLUDE_DIR)
IF(FLTK_FOUND)
- INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIRS})
- LINK_DIRECTORIES(${FLTK_LIBRARY_DIRS})
+ INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR})
ELSE(FLTK_FOUND)
- MESSAGE(FATAL_ERROR
+ MESSAGE(FATAL_ERROR
"Cannot build OTB project without FLTK. Please set FLTK_DIR or set OTB_USE_VISU to OFF or set OTB_USE_EXTERNAL_FLTK OFF to use INTERNAL FLTK set on OTB/Utilities repository.")
ENDIF(FLTK_FOUND)
ELSE(OTB_USE_EXTERNAL_FLTK)
-
+ SET(FLTK_INCLUDE_DIR "")
+ SET(FLTK_LIBRARIES "")
+
SET( FLTK_PLATFORM_DEPENDENT_LIBS "")
- IF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
- INCLUDE(${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake)
- ENDIF(EXISTS "${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake")
- #----------------------------------------------------------------
- # RESUME Alls VISU GUI libraries use by OTB in a single VARIABLE
- SET(OTB_VISU_GUI_LIBRARIES "${FLTK_LIBRARIES};${OPENGL_LIBRARIES} ")
- SET(FLTK_FLUID_EXECUTABLE ${FLUID_COMMAND})
+ INCLUDE(${OTB_BINARY_DIR}/Utilities/FLTK/FLTKConfig.cmake)
ENDIF(OTB_USE_EXTERNAL_FLTK)
+ SET(OTB_VISU_GUI_LIBRARIES "${FLTK_LIBRARIES};${OPENGL_LIBRARIES} ")
+ SET(FLTK_FLUID_EXECUTABLE ${FLUID_COMMAND})
ENDIF(OTB_USE_VISU_GUI)
#-------------------------------
@@ -587,7 +592,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
ENDIF (NOT JPEG_LIBRARY)
ENDIF(GDAL_HAS_JPEG)
- # Check if ${GDAL_LIBRARY} has jpeg library
+ # Check if ${GDAL_LIBRARY} has ogr library
TRY_COMPILE(GDAL_HAS_OGR
${CMAKE_CURRENT_BINARY_DIR}/CMake
${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasOGR.cxx
@@ -611,10 +616,26 @@ ENDIF(OTB_USE_EXTERNAL_GDAL)
#Experimental
FIND_PACKAGE(Gettext)
IF(GETTEXT_FOUND)
- SET(OTB_I18N 1)
- SET(OTB_LANG $ENV{LANG} CACHE STRING "OTB internationalization (Experimental)")#might want to get the Locale from the system here
- SET(OTB_LANG_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/I18n)
- SUBDIRS(I18n)
+ FIND_LIBRARY(GETTEXT_LIBRARY gettextlib DOC "GetText library")
+ IF(APPLE OR WIN32)
+ FIND_LIBRARY(GETTEXT_INTL_LIBRARY intl DOC "GetText intl library")
+ ENDIF(APPLE OR WIN32)
+
+ IF(GETTEXT_LIBRARY)
+ SET(OTB_I18N 1)
+ SET(OTB_LANG $ENV{LANG} CACHE STRING "OTB internationalization (Experimental)")#might want to get the Locale from the system here
+ SET(OTB_LANG_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/I18n)
+ ADD_SUBDIRECTORY(I18n)
+ FIND_PATH(GETTEXT_INCLUDE_DIR
+ libintl.h
+ DOC "Path to gettext include directory (where libintl.h can be found)")
+ MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR)
+
+ IF(GETTEXT_INCLUDE_DIR)
+ INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR})
+ ENDIF(GETTEXT_INCLUDE_DIR)
+ ENDIF(GETTEXT_LIBRARY)
+
ELSE(GETTEXT_FOUND)
SET(OTB_I18N 0)
MESSAGE(STATUS
@@ -727,7 +748,7 @@ ENDMACRO(OTB_DISABLE_FLTK_GENERATED_WARNINGS)
#
IF(APPLE AND NOT FLTK_USE_X)
FIND_PROGRAM(ITK_APPLE_RESOURCE Rez /Developer/Tools)
- FIND_FILE(ITK_FLTK_RESOURCE mac.r /usr/local/include/FL)
+ FIND_FILE(ITK_FLTK_RESOURCE mac.r ${FLTK_DIR}/include/FL)
IF(NOT ITK_FLTK_RESOURCE)
MESSAGE("Fltk resources not found, GUI application will not respond to mouse events")
ENDIF(NOT ITK_FLTK_RESOURCE)
@@ -873,23 +894,14 @@ ENDIF(OTB_DISABLE_UTILITIES_COMPILATION)
#-----------------------------------------------------------------------------
# Option to define streaming activation in applications
# Use by otbConfigure.h.in
-SET(OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING 8*4000*4000 CACHE STRING "Image size to activate using streaming for applications.")
+# Note: 8*4000*4000 = 128000000 (double 4000x4000 image)
+SET(OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING 128000000 CACHE STRING "Image size to activate using streaming for applications.")
MARK_AS_ADVANCED(OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING)
-SET(OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING 8*4000*4000 CACHE STRING "Max size buffer for streaming.")
+SET(OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING 128000000 CACHE STRING "Max size buffer for streaming.")
MARK_AS_ADVANCED(OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING)
-#-----------------------------------------------------------------------------
-# Perform a setup of OTB Wrapping. This will provide CMake options for
-# individual wrapping as well as determine if CableSwig is required. If it is,
-# OTB_NEED_CableSwig will be set. This file also tries to locate CableSwig by
-# searching first in the source tree of OTB, and if that fails, it searches
-# for a binary built of CableSwig.
-#
-INCLUDE(${OTB_SOURCE_DIR}/Wrapping/otbWrapSetup.cmake)
-
-
#-----------------------------------------------------------------------------
# Option for generate Patented examples !!!
OPTION(OTB_USE_PATENTED "Build patented examples. ITK must be genereted whith patented option (ITK_USE_PATENTED = ON)." OFF)
@@ -943,18 +955,34 @@ OPTION(BUILD_EXAMPLES "Build the Examples directory." OFF)
#-----------------------------------------------------------------------------
-# Dispatch the build into the proper subdirectories.
+# The entire OTB tree should use the same include path
-SUBDIRS(Utilities Code)
+# Create the list of include directories needed for OTB header files.
+INCLUDE(${OTB_SOURCE_DIR}/otbIncludeDirectories.cmake)
-SUBDIRS(Wrapping)
+# This should be the only INCLUDE_DIRECTORIES command in the entire
+# tree, except for the Utilities and Wrapping directories. We need to
+# do this in one place to make sure the order is correct.
+INCLUDE_DIRECTORIES(
+ ${OTB_INCLUDE_DIRS_BUILD_TREE}
+ ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
+ ${OTB_INCLUDE_DIRS_SYSTEM}
+)
+
+#-----------------------------------------------------------------------------
+# Dispatch the build into the proper subdirectories.
+
+#Note: SUBDIRS is deprecated and is replaced by ADD_SUBDIRECTORY
+#SUBDIRS(Utilities Code)
+ADD_SUBDIRECTORY(Utilities)
+ADD_SUBDIRECTORY(Code)
IF (BUILD_EXAMPLES)
- SUBDIRS(Examples)
+ ADD_SUBDIRECTORY(Examples)
ENDIF (BUILD_EXAMPLES)
IF (BUILD_TESTING)
- SUBDIRS(Testing)
+ ADD_SUBDIRECTORY(Testing)
ENDIF (BUILD_TESTING)
#-----------------------------------------------------------------------------
@@ -997,7 +1025,7 @@ CHECK_TYPE_SIZE("short int" OTB_SIZEOF_SHORT_INT)
#-----------------------------------------------------------------------------
# Configure the default OTB_DATA_ROOT for the location of OTB Data.
-FIND_PATH(OTB_DATA_ROOT OTBData.readme $ENV{OTB_DATA_ROOT})
+FIND_PATH(OTB_DATA_ROOT README-OTB-Data PATHS $ENV{OTB_DATA_ROOT} ${OTB_SOURCE_DIR}/../OTB-Data)
MARK_AS_ADVANCED(OTB_DATA_ROOT)
OPTION(OTB_DATA_USE_LARGEINPUT "Use Large inputs images test." OFF)
@@ -1014,20 +1042,19 @@ CONFIGURE_FILE(${OTB_SOURCE_DIR}/otbConfigure.h.in
${OTB_BINARY_DIR}/otbConfigure.h)
#-----------------------------------------------------------------------------
-# The entire OTB tree should use the same include path, except for the
-# Wrapping directory.
+# The entire OTB tree should use the same include path
# Create the list of include directories needed for OTB header files.
-INCLUDE(${OTB_SOURCE_DIR}/otbIncludeDirectories.cmake)
+#INCLUDE(${OTB_SOURCE_DIR}/otbIncludeDirectories.cmake)
# This should be the only INCLUDE_DIRECTORIES command in the entire
# tree, except for the Utilities and Wrapping directories. We need to
# do this in one place to make sure the order is correct.
-INCLUDE_DIRECTORIES(
- ${OTB_INCLUDE_DIRS_BUILD_TREE}
- ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
- ${OTB_INCLUDE_DIRS_SYSTEM}
-)
+#INCLUDE_DIRECTORIES(
+# ${OTB_INCLUDE_DIRS_BUILD_TREE}
+# ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
+# ${OTB_INCLUDE_DIRS_SYSTEM}
+#)
#-----------------------------------------------------------------------------
# Uninstall cmake use to uninstall OTB.
@@ -1057,7 +1084,7 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
${OTB_BINARY_DIR}/OTBBuildSettings.cmake
${OTB_BINARY_DIR}/OTBLibraryDepends.cmake
${OTB_BINARY_DIR}/UseOTB.cmake
- ${OTB_SOURCE_DIR}/FindOpenThreads.cmake
+ ${OTB_SOURCE_DIR}/CMake/FindOpenThreads.cmake
DESTINATION ${OTB_INSTALL_PACKAGE_DIR_CM24}
COMPONENT Development
)
@@ -1099,50 +1126,50 @@ MARK_AS_ADVANCED(OTB_USE_CPACK)
IF(OTB_USE_CPACK)
-INCLUDE(InstallRequiredSystemLibraries)
-
-SET(CPACK_PACKAGE_NAME "OTB" CACHE STRING "Package name")
-MARK_AS_ADVANCED(CPACK_PACKAGE_NAME)
-
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orfeo Toolbox")
-MARK_AS_ADVANCED(CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-
-SET(CPACK_PACKAGE_VERSION "${OTB_VERSION_STRING}")
-SET(CPACK_PACKAGE_VERSION_MAJOR "${OTB_VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${OTB_VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${OTB_VERSION_PATCH}")
-
-SET(CPACK_PACKAGE_CONTACT "contact@orfeo-toolbox.org" CACHE STRING "Orfeo toolbox contact email")
-
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Description.txt")
-
-#Debian specific
-SET(DEBIAN_PACKAGE_MAINTAINER "debian@orfeo-toolbox.org" CACHE STRING "Debian package maintainer email")
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libgdal1-1.5.0 (>= 1.5.1-0), libfltk1.1 (>= 1.1.7-3), libcurl3 (>=7.15.5-1etch1), libfftw3-3 (>=3.1.2-3.1)" CACHE STRING "Debian package dependance" )
-SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64" CACHE STRING "arch")
-MARK_AS_ADVANCED(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
-SET(CPACK_DEBIAN_PACKAGE_NAME "libotb" CACHE STRING "Debian package name")
-
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "OrfeoToolbox-${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}")
-
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright/OTBCopyright.txt")
-
-FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_RPM_PACKAGE_DESCRIPTION)
-FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_DEBIAN_PACKAGE_DESCRIPTION)
-
-IF(WIN32 AND NOT UNIX AND NOT CYGWIN)
-#Find gdal dll files, localized in the GDAL_LIBRARY directory
-GET_FILENAME_COMPONENT(GDAL_LIB_DIR "${GDAL_LIBRARY}" PATH )
-SET(GDAL_LIB_DIR "${GDAL_LIB_DIR}/" )
-INSTALL(DIRECTORY ${GDAL_LIB_DIR}
- DESTINATION bin
- FILES_MATCHING PATTERN "*.dll" )
-INSTALL(DIRECTORY ${GDAL_LIB_DIR}
- DESTINATION lib
- FILES_MATCHING PATTERN "*.lib" )
-ENDIF(WIN32 AND NOT UNIX AND NOT CYGWIN)
-
-INCLUDE(CPack)
+ INCLUDE(InstallRequiredSystemLibraries)
+
+ SET(CPACK_PACKAGE_NAME "OTB" CACHE STRING "Package name")
+ MARK_AS_ADVANCED(CPACK_PACKAGE_NAME)
+
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orfeo Toolbox")
+ MARK_AS_ADVANCED(CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+
+ SET(CPACK_PACKAGE_VERSION "${OTB_VERSION_STRING}")
+ SET(CPACK_PACKAGE_VERSION_MAJOR "${OTB_VERSION_MAJOR}")
+ SET(CPACK_PACKAGE_VERSION_MINOR "${OTB_VERSION_MINOR}")
+ SET(CPACK_PACKAGE_VERSION_PATCH "${OTB_VERSION_PATCH}")
+
+ SET(CPACK_PACKAGE_CONTACT "contact@orfeo-toolbox.org" CACHE STRING "Orfeo toolbox contact email")
+
+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Description.txt")
+
+ #Debian specific
+ SET(DEBIAN_PACKAGE_MAINTAINER "debian@orfeo-toolbox.org" CACHE STRING "Debian package maintainer email")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libgdal1-1.5.0 (>= 1.5.1-0), libfltk1.1 (>= 1.1.7-3), libcurl3 (>=7.15.5-1etch1), libfftw3-3 (>=3.1.2-3.1)" CACHE STRING "Debian package dependance" )
+ SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64" CACHE STRING "arch")
+ MARK_AS_ADVANCED(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ SET(CPACK_DEBIAN_PACKAGE_NAME "libotb" CACHE STRING "Debian package name")
+
+ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "OrfeoToolbox-${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}")
+
+ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright/OTBCopyright.txt")
+
+ FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_RPM_PACKAGE_DESCRIPTION)
+ FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_DEBIAN_PACKAGE_DESCRIPTION)
+
+ IF(WIN32 AND NOT UNIX AND NOT CYGWIN)
+ #Find gdal dll files, localized in the GDAL_LIBRARY directory
+ GET_FILENAME_COMPONENT(GDAL_LIB_DIR "${GDAL_LIBRARY}" PATH )
+ SET(GDAL_LIB_DIR "${GDAL_LIB_DIR}/" )
+ INSTALL(DIRECTORY ${GDAL_LIB_DIR}
+ DESTINATION bin
+ FILES_MATCHING PATTERN "*.dll" )
+ INSTALL(DIRECTORY ${GDAL_LIB_DIR}
+ DESTINATION lib
+ FILES_MATCHING PATTERN "*.lib" )
+ ENDIF(WIN32 AND NOT UNIX AND NOT CYGWIN)
+
+ INCLUDE(CPack)
ENDIF(OTB_USE_CPACK)
@@ -1156,4 +1183,4 @@ ADD_CUSTOM_COMMAND(
POST_BUILD
COMMAND GenerateConfigProperties
ARGS "${otbconfigfile_DEFAULT}" "${OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING}" "${OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING}"
- COMMENT "Generating ${otbconfigfile_DEFAULT}" )
\ No newline at end of file
+ COMMENT "Generating ${otbconfigfile_DEFAULT}" )
diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.h b/Code/BasicFilters/otbBinaryImageDensityFunction.h
index f6792b3494730a691320ec8c39a70d29ec19088d..2416e1cd4876de78b1b9a0e966fdbb0fe3189165 100644
--- a/Code/BasicFilters/otbBinaryImageDensityFunction.h
+++ b/Code/BasicFilters/otbBinaryImageDensityFunction.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBinaryImageDensityFunction_h
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
index 4ad31d21445f99442f97e37d53ad713f110b7f73..365b1584257a933ed6be0c8d78a8d719634f1a4e 100644
--- a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
+++ b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBoxAndWhiskerImageFilter__h
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
index 06a894e34cfe363859fe3713e39d2996183027df..16b3306b4020924feadca3970f087332384b1c0f 100644
--- a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
+++ b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBoxAndWhiskerImageFilter__txx
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.h b/Code/BasicFilters/otbChangeLabelImageFilter.h
index 70782cb11614ea376341815224107aa0f12c8a7d..bb83502e66c69f8878fa1a47906aef7c2f26dafc 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.h
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbChangeLabelImageFilter_h
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.txx b/Code/BasicFilters/otbChangeLabelImageFilter.txx
index 2fe64c967969846e70366d74c073024bb9b4b0fe..0c4ee60ab91e2c939fbe4878e4390bb94befe291 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.txx
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbChangeLabelImageFilter_txx
diff --git a/Code/BasicFilters/otbClosePathFunctor.h b/Code/BasicFilters/otbClosePathFunctor.h
index 95b530b5e4cfb652ba119ad3eeef068770ff5e73..142192da8f8593938c58a0e9cef7d116d05d3f85 100644
--- a/Code/BasicFilters/otbClosePathFunctor.h
+++ b/Code/BasicFilters/otbClosePathFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbClosePathFunctor_h
diff --git a/Code/BasicFilters/otbCorrectPolygonFunctor.h b/Code/BasicFilters/otbCorrectPolygonFunctor.h
index 745627365dcc90c573f790c68b43059036fe363d..002fe20fcd043895f6ae76dce9b4a77698df9c9c 100644
--- a/Code/BasicFilters/otbCorrectPolygonFunctor.h
+++ b/Code/BasicFilters/otbCorrectPolygonFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbCorrectPolygonFunctor_h
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.h b/Code/BasicFilters/otbEdgeDensityImageFilter.h
index b12406121fb57117ffd75a6a1819d1efe5a771c1..19ad03ad6dda22c6b20681044b3a991ffc2c1dd7 100644
--- a/Code/BasicFilters/otbEdgeDensityImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDensityImageFilter.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbEdgeDensityImageFilter_h
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.txx b/Code/BasicFilters/otbEdgeDensityImageFilter.txx
index 703857cdf6c931059937a226394ea0580ce6601c..06953ac649d40ca99660d815e9c6410b97b11449 100644
--- a/Code/BasicFilters/otbEdgeDensityImageFilter.txx
+++ b/Code/BasicFilters/otbEdgeDensityImageFilter.txx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.h b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
index 8a76b88a35c6e1b0cfa99ef22953932f0251b631..0cc0c262e9618c09c233a4171d4011c9ac90ebb6 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbEdgeDetectorImageFilter_h
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.txx b/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
index fda05ac775a7c646aeb72ad8c6b9d96e804c6d98..81402de0a742b4c21a7517811e5484dfdf97fcb5 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.h b/Code/BasicFilters/otbImageListToImageListApplyFilter.h
index 2c5f3abc858326e65cc363b64f13d17bbf2417f1..7ca9834eb9da1094b6651b54d8b6a1c8b3e1f215 100644
--- a/Code/BasicFilters/otbImageListToImageListApplyFilter.h
+++ b/Code/BasicFilters/otbImageListToImageListApplyFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListApplyFilter_h
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.txx b/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
index 834fb0bd969073de78283fb22a819c2c6680f22a..5d60408514d4c8a2a6e0d70fa50a16d65fbd0217 100644
--- a/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
+++ b/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListApplyFilter_txx
diff --git a/Code/BasicFilters/otbImageListToVectorImageFilter.h b/Code/BasicFilters/otbImageListToVectorImageFilter.h
index 1f4c38f4c6b03356bad83221adae7055feb6160a..ecefae3eff92b2e49404fdfecb8ef6b261d95802 100644
--- a/Code/BasicFilters/otbImageListToVectorImageFilter.h
+++ b/Code/BasicFilters/otbImageListToVectorImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToVectorImageFilter_h
diff --git a/Code/BasicFilters/otbImageListToVectorImageFilter.txx b/Code/BasicFilters/otbImageListToVectorImageFilter.txx
index 4e28c827a0ca42745265d2c9c3b2a749082cc58e..df4fc8af26bdac101d11c7b2b652d5254c414ac3 100644
--- a/Code/BasicFilters/otbImageListToVectorImageFilter.txx
+++ b/Code/BasicFilters/otbImageListToVectorImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToVectorImageFilter_txx
@@ -56,10 +56,10 @@ ImageListToVectorImageFilter<TImageList,TVectorImage>
InputImageListPointerType inputPtr = this->GetInput();
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
while (inputListIt!=inputPtr->End())
- {
- inputListIt.Get()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
- ++inputListIt;
- }
+ {
+ inputListIt.Get()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
+ ++inputListIt;
+ }
}
/**
* Main computation method
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.h b/Code/BasicFilters/otbImageToPointSetFilter.h
index c6289e5e0b65721119564990c670bda81fea4208..cdfa8060f309cedeca99d2148657e69fcb1b3fa6 100644
--- a/Code/BasicFilters/otbImageToPointSetFilter.h
+++ b/Code/BasicFilters/otbImageToPointSetFilter.h
@@ -19,6 +19,8 @@
#define __otbImageToPointSetFilter_h
#include "otbPointSetSource.h"
+#include "itkImageRegionSplitter.h"
+#include "otbStreamingTraits.h"
namespace otb
{
@@ -51,12 +53,14 @@ public:
typedef typename InputImageType::ConstPointer InputImageConstPointer;
typedef typename InputImageType::RegionType InputImageRegionType;
typedef typename InputImageType::PixelType InputImagePixelType;
+ itkStaticConstMacro(InputImageDimension, unsigned int,
+ TInputImage::ImageDimension);
/** Some PointSet related typedefs. */
typedef typename Superclass::OutputPointSetType OutputPointSetType;
typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
-
- typedef itk::ProcessObject ProcessObjectType;
+ typedef typename Superclass::PointsContainerType PointsContainerType;
+ typedef itk::ProcessObject ProcessObjectType;
/** Set the input image of this process object. */
void SetInput(unsigned int idx, const InputImageType *input);
@@ -71,9 +75,44 @@ public:
protected:
ImageToPointSetFilter();
- ~ImageToPointSetFilter();
+ virtual ~ImageToPointSetFilter() {};
void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ virtual void GenerateData(void);
+
+ /** Multi-threading implementation */
+
+ typedef std::vector<typename OutputPointSetType::PointsContainer::Pointer> OutputPointsContainerForThreadType;
+
+ virtual void BeforeThreadedGenerateData();
+
+ virtual void AfterThreadedGenerateData();
+
+ virtual int SplitRequestedRegion(int i, int num, InputImageRegionType& splitRegion);
+
+ virtual void ThreadedGenerateData(const InputImageRegionType &inputRegionForThread, int threadId);
+
+ /** 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 );
+
+ /** Internal structure used for passing image data into the threading library */
+ struct ThreadStruct
+ {
+ Pointer Filter;
+ };
+
+ OutputPointsContainerForThreadType m_PointsContainerPerThread;
+
+ /** End Multi-threading implementation */
+
+ /** Setup for streaming */
+ typedef StreamingTraits<InputImageType> StreamingTraitsType;
+ typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
+ typedef typename SplitterType::Pointer RegionSplitterPointer;
+ RegionSplitterPointer m_RegionSplitter;
+
private:
ImageToPointSetFilter(const ImageToPointSetFilter&); //purposely not implemented
void operator=(const ImageToPointSetFilter&); //purposely not implemented
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.txx b/Code/BasicFilters/otbImageToPointSetFilter.txx
index c3339697490ee3fff3ff8d09e0587cb89ea2107e..9d2eb01b14c4acf6b1e9b3e2dac03205307dee79 100644
--- a/Code/BasicFilters/otbImageToPointSetFilter.txx
+++ b/Code/BasicFilters/otbImageToPointSetFilter.txx
@@ -20,7 +20,6 @@
#include "otbImageToPointSetFilter.h"
-
namespace otb
{
@@ -39,15 +38,10 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
ProcessObjectType::SetNumberOfRequiredOutputs(1);
ProcessObjectType::SetNthOutput(0, output.GetPointer());
-}
+ // create default region splitter
+ m_RegionSplitter = itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)>::New();
+
-/**
- *
- */
-template <class TInputImage, class TOutputPointSet>
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
-::~ImageToPointSetFilter()
-{
}
/**
@@ -63,6 +57,7 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
this->ProcessObjectType::SetNthInput(idx,
const_cast< InputImageType * >(input) );
}
+
/**
*
*/
@@ -77,8 +72,6 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
const_cast< InputImageType * >(input) );
}
-
-
/**
*
*/
@@ -118,8 +111,6 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
Superclass::PrintSelf(os,indent);
}
-
-
/**
* copy information from first input to all outputs
* This is a void implementation to prevent the
@@ -132,6 +123,218 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
{
}
+/**
+ * GenerateData
+ */
+template <class TInputImage, class TOutputPointSet>
+void
+ImageToPointSetFilter<TInputImage,TOutputPointSet>
+::GenerateData(void)
+{
+
+ PointsContainerType * outputPointsContainer = this->GetOutput()->GetPoints();
+ outputPointsContainer->Initialize();
+
+ typename TInputImage::RegionType inputRegion = this->GetInput()->GetLargestPossibleRegion();
+
+ unsigned int numDivisions;
+ numDivisions = StreamingTraitsType
+ ::CalculateNumberOfStreamDivisions(this->GetInput(),
+ this->GetInput()->GetLargestPossibleRegion(),
+ m_RegionSplitter,
+ SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS,
+ 0, 0, 0);
+
+ // Input is an image, cast away the constness so we can set
+ // the requested region.
+ InputImagePointer input = const_cast<TInputImage *> (this->GetInput());
+
+ /**
+ * Loop over the number of pieces, execute the upstream pipeline on each
+ * piece, and copy the results into the output image.
+ */
+ unsigned int piece;
+ InputImageRegionType streamRegion;
+ for (piece = 0;
+ piece < numDivisions && !this->GetAbortGenerateData();
+ piece++)
+ {
+ streamRegion = m_RegionSplitter->GetSplit(piece, numDivisions, inputRegion);
+ typedef itk::ImageToImageFilterDetail::ImageRegionCopier<itkGetStaticConstMacro(InputImageDimension),
+ itkGetStaticConstMacro(InputImageDimension)> OutputToInputRegionCopierType;
+ OutputToInputRegionCopierType regionCopier;
+ InputImageRegionType inputRegion;
+ regionCopier(inputRegion, streamRegion);
+ input->SetRequestedRegion( inputRegion );
+
+
+ // Call a method that can be overridden by a subclass to perform
+ // some calculations prior to splitting the main computations into
+ // separate threads
+ this->BeforeThreadedGenerateData();
+
+ // Set up the multithreaded processing
+ ThreadStruct str;
+ str.Filter = this;
+
+ // Initializing object per thread
+ typename PointsContainerType::Pointer defaultPointsContainer = PointsContainerType::New();
+ this->m_PointsContainerPerThread
+ = OutputPointsContainerForThreadType(this->GetNumberOfThreads(),defaultPointsContainer);
+
+
+ // Setting up multithreader
+ this->GetMultiThreader()->SetNumberOfThreads(this->GetNumberOfThreads());
+ this->GetMultiThreader()->SetSingleMethod(this->ThreaderCallback, &str);
+
+ // multithread the execution
+ this->GetMultiThreader()->SingleMethodExecute();
+
+ // Call a method that can be overridden by a subclass to perform
+ // some calculations after all the threads have completed
+ this->AfterThreadedGenerateData();
+ }
+
+}
+
+template <class TInputImage, class TOutputPointSet>
+void
+ImageToPointSetFilter<TInputImage,TOutputPointSet>
+::BeforeThreadedGenerateData(void)
+{
+
+}
+
+template <class TInputImage, class TOutputPointSet>
+void
+ImageToPointSetFilter<TInputImage,TOutputPointSet>
+::AfterThreadedGenerateData(void)
+{
+ // copy the lists to the output
+ PointsContainerType * outputPointsContainer = this->GetOutput()->GetPoints();
+
+ typedef typename PointsContainerType::ConstIterator OutputPointsContainerIterator;
+ for (unsigned int i=0; i< this->m_PointsContainerPerThread.size(); ++i)
+ {
+ if (this->m_PointsContainerPerThread[i].IsNotNull())
+ {
+ for (OutputPointsContainerIterator it = this->m_PointsContainerPerThread[i]->Begin();
+ it != this->m_PointsContainerPerThread[i]->End();
+ ++it)
+ {
+ outputPointsContainer->push_back(it.Value());
+ }
+ }
+ }
+
+}
+
+template <class TInputImage, class TOutputPointSet>
+void
+ImageToPointSetFilter<TInputImage,TOutputPointSet>
+::ThreadedGenerateData(const InputImageRegionType&, int)
+{
+ // The following code is equivalent to:
+ // itkExceptionMacro("subclass should override this method!!!");
+ // The ExceptionMacro is not used because gcc warns that a
+ // 'noreturn' function does return
+ itk::OStringStream message;
+ message << "itk::ERROR: " << this->GetNameOfClass()
+ << "(" << this << "): " << "Subclass should override this method!!!";
+ itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(),ITK_LOCATION);
+ throw e_;
+
+}
+
+template <class TInputImage, class TOutputPointSet>
+ITK_THREAD_RETURN_TYPE
+ImageToPointSetFilter<TInputImage,TOutputPointSet>
+::ThreaderCallback( void *arg )
+{
+ ThreadStruct *str;
+ int total, threadId, threadCount;
+
+ threadId = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->ThreadID;
+ threadCount = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->NumberOfThreads;
+ str = (ThreadStruct *)(((itk::MultiThreader::ThreadInfoStruct *)(arg))->UserData);
+
+ // execute the actual method with appropriate output region
+ // first find out how many pieces extent can be split into.
+ typename TInputImage::RegionType splitRegion;
+ total = str->Filter->SplitRequestedRegion(threadId, threadCount,
+ splitRegion);
+
+ if (threadId < total)
+ {
+ str->Filter->ThreadedGenerateData(splitRegion, threadId);
+ }
+ // else
+ // {
+ // otherwise don't use this thread. Sometimes the threads dont
+ // break up very well and it is just as efficient to leave a
+ // few threads idle.
+ // }
+
+ return ITK_THREAD_RETURN_VALUE;
+}
+
+template <class TInputImage, class TOutputPointSet>
+int
+ImageToPointSetFilter<TInputImage,TOutputPointSet>
+::SplitRequestedRegion(int i, int num, InputImageRegionType& splitRegion)
+{
+ // Get the output pointer
+ typename InputImageType::ConstPointer inputPtr = this->GetInput();
+ const typename TInputImage::SizeType& requestedRegionSize
+ = inputPtr->GetRequestedRegion().GetSize();
+
+ int splitAxis;
+ typename TInputImage::IndexType splitIndex;
+ typename TInputImage::SizeType splitSize;
+
+ // Initialize the splitRegion to the output requested region
+ splitRegion = inputPtr->GetRequestedRegion();
+ splitIndex = splitRegion.GetIndex();
+ splitSize = splitRegion.GetSize();
+
+ // split on the outermost dimension available
+ splitAxis = inputPtr->GetImageDimension() - 1;
+ while (requestedRegionSize[splitAxis] == 1)
+ {
+ --splitAxis;
+ if (splitAxis < 0)
+ { // cannot split
+ itkDebugMacro(" Cannot Split");
+ return 1;
+ }
+ }
+
+ // determine the actual number of pieces that will be generated
+ typename TInputImage::SizeType::SizeValueType range = requestedRegionSize[splitAxis];
+ int valuesPerThread = (int)::vcl_ceil(range/(double)num);
+ int maxThreadIdUsed = (int)::vcl_ceil(range/(double)valuesPerThread) - 1;
+
+ // Split the region
+ if (i < maxThreadIdUsed)
+ {
+ splitIndex[splitAxis] += i*valuesPerThread;
+ splitSize[splitAxis] = valuesPerThread;
+ }
+ if (i == maxThreadIdUsed)
+ {
+ splitIndex[splitAxis] += i*valuesPerThread;
+ // last thread needs to process the "rest" dimension being split
+ splitSize[splitAxis] = splitSize[splitAxis] - i*valuesPerThread;
+ }
+
+ // set the split region ivars
+ splitRegion.SetIndex( splitIndex );
+ splitRegion.SetSize( splitSize );
+
+ itkDebugMacro(" Split Piece: " << splitRegion );
+
+ return maxThreadIdUsed + 1;
+}
} // end namespace otb
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.h b/Code/BasicFilters/otbImportGeoInformationImageFilter.h
index 7b316eb1a263960e5d4622ad528f1550de150645..ada67bb7706a9d89a4109cb5d5e61d94bd63545c 100644
--- a/Code/BasicFilters/otbImportGeoInformationImageFilter.h
+++ b/Code/BasicFilters/otbImportGeoInformationImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImportGeoInformationImageFilter_h
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
index 3cb8a229248ccb9ea1b9360639acdb51b66bd60a..a36df89de75eca318c64e3c6ec66a4468f3793cf 100644
--- a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
+++ b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImportGeoInformationImageFilter_txx
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.h b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
index 278026fc7b0612af548df8802d6d8ed073a6e6d8..a4893adffc2739f783709c0cdb8748832844be91 100644
--- a/Code/BasicFilters/otbInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbInnerProductPCAImageFilter_h
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
index f5578174e31215cf31b2f4ddd057e160e741953a..d816d5fe18878451475e4d105f1f3fc4e055eca8 100644
--- a/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbInnerProductPCAImageFilter_txx
diff --git a/Code/BasicFilters/otbKeyPointDensityImageFilter.h b/Code/BasicFilters/otbKeyPointDensityImageFilter.h
index 4159a701e7dc3911233f01c43c9ecc5210859cf3..e752a2d9c66ccb835db90f945c62c67f56ec8e35 100644
--- a/Code/BasicFilters/otbKeyPointDensityImageFilter.h
+++ b/Code/BasicFilters/otbKeyPointDensityImageFilter.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbKeyPointDensityImageFilter_h
diff --git a/Code/BasicFilters/otbKeyPointDensityImageFilter.txx b/Code/BasicFilters/otbKeyPointDensityImageFilter.txx
index 13d127b6df4af1957682b450eabe01c7cf038624..4ca0bf4bdb99658433652e44883c9fe238e06802 100644
--- a/Code/BasicFilters/otbKeyPointDensityImageFilter.txx
+++ b/Code/BasicFilters/otbKeyPointDensityImageFilter.txx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx b/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx
index a0bf2896769578acf0b93b820bbbaa27f07fbed2..9f4bc6c2b5a36ab6f69422adaa2c50a4b5f5b8f1 100644
--- a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx
+++ b/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLabelizeConfidenceConnectedImageFilter_txx
diff --git a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx b/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx
index 8d4d439e210c7657a84730efea22ad5d9c256cae..6603139c88337fb2876d5d7f0530e0e6efd5584d 100644
--- a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx
+++ b/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLabelizeConnectedThresholdImageFilter_txx
diff --git a/Code/BasicFilters/otbLabelizeImageFilterBase.txx b/Code/BasicFilters/otbLabelizeImageFilterBase.txx
index 40bdb4ab35c74bd02b1d012f43f9d5f032e510e7..5c7251ee5afb5d2d16b404fc864588cfb2775d39 100644
--- a/Code/BasicFilters/otbLabelizeImageFilterBase.txx
+++ b/Code/BasicFilters/otbLabelizeImageFilterBase.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLabelizeImageFilterBase_txx
diff --git a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx b/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx
index 0ca64add91a8d185276fea93e0da7981864d4fe2..558b4cd2f06db91ed181a5d4e083415dcfa5bb32 100644
--- a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx
+++ b/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLabelizeNeighborhoodConnectedImageFilter_txx
diff --git a/Code/BasicFilters/otbLeeImageFilter.txx b/Code/BasicFilters/otbLeeImageFilter.txx
index 8d9f84e0c4b6f2b5779605237d2c128ac8443e1b..4d1132c0a2993abc617d5616db6f4e7e634feda0 100644
--- a/Code/BasicFilters/otbLeeImageFilter.txx
+++ b/Code/BasicFilters/otbLeeImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLeeImageFilter_txx
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.h b/Code/BasicFilters/otbMeanShiftImageFilter.h
index 67c38096281c948696951d60a1130985c26a095f..0dfdfeade478b3b93f4ba26d2b0227ca4a0c3c1e 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter.h
+++ b/Code/BasicFilters/otbMeanShiftImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMeanShiftImageFilter_h
@@ -166,8 +166,6 @@ public:
const LabeledOutputType * GetClusterBoundariesOutput() const;
/** Return the cluster boundaries image output */
LabeledOutputType * GetClusterBoundariesOutput();
- /** Return the const vectorized boundaries output */
- const PolygonListType * GetVectorizedClusterBoundariesOutput() const;
/** Return the mean-shift mode by label */
const ModeMapType& GetModes()
{
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.txx b/Code/BasicFilters/otbMeanShiftImageFilter.txx
index 5a58db8a62a00bbad020d4ced0c986fc4b65b208..2b12c42c87a047913e1a1f30e33d01e0fcc98e1b 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter.txx
+++ b/Code/BasicFilters/otbMeanShiftImageFilter.txx
@@ -395,8 +395,8 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
regionIndeces = regionList->GetRegionIndeces(static_cast<int>(label));
for (int i = 0; i<regionList->GetRegionCount(static_cast<int>(label)); ++i)
{
- boundIndex[0]= regionIndeces[i] % clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0];
- boundIndex[1]= regionIndeces[i] / clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0];
+ boundIndex[0]= (regionIndeces[i] % clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0])+clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[0];
+ boundIndex[1]= (regionIndeces[i] / clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0])+clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[1];
if (clusterBoudariesOutputPtr->GetBufferedRegion().IsInside(boundIndex))
{
clusterBoudariesOutputPtr->SetPixel(boundIndex,1);
diff --git a/Code/BasicFilters/otbMeanShiftVectorImageFilter.h b/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
index 0725f605f870a9ef53f1033899c085bf90fd0ca3..f717ac2a234befb2eb6c8e8431a942cfa657aa99 100644
--- a/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
+++ b/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMeanShiftVectorImageFilter_h
diff --git a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h
index dfbf1637edf2c739896fbbe5765a77435e293601..4712898ab64de545e9a6632b926af88056d19847 100644
--- a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h
+++ b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbOverlapSaveConvolutionImageFilter_h
diff --git a/Code/BasicFilters/otbPathLengthFunctor.h b/Code/BasicFilters/otbPathLengthFunctor.h
index e2286967e61f11937beb1be4e4e2b219555ace4d..69d133013e1e3474f2dd545c5e31d40d28c97164 100644
--- a/Code/BasicFilters/otbPathLengthFunctor.h
+++ b/Code/BasicFilters/otbPathLengthFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/BasicFilters/otbPathMeanDistanceFunctor.h b/Code/BasicFilters/otbPathMeanDistanceFunctor.h
index 183123f0dc7330e82aa86476ec31805a76c97ba9..24968b50d2a0ba06de2757c02f26274c155bd0d9 100644
--- a/Code/BasicFilters/otbPathMeanDistanceFunctor.h
+++ b/Code/BasicFilters/otbPathMeanDistanceFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPathMeanDistanceFunctor_h
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.h b/Code/BasicFilters/otbPerBandVectorImageFilter.h
index ec5e13136dc8702fb91de26e945387c98e6cd84c..6eaf30e08da958de82212428d305b9e75cda55a4 100644
--- a/Code/BasicFilters/otbPerBandVectorImageFilter.h
+++ b/Code/BasicFilters/otbPerBandVectorImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPerBandVectorImageFilter_h
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.txx b/Code/BasicFilters/otbPerBandVectorImageFilter.txx
index 4bacc2c6c893b85d54d6f1d22b884f3a522cd317..f6b729a0c39d07b566c40334f260a7986c2be951 100644
--- a/Code/BasicFilters/otbPerBandVectorImageFilter.txx
+++ b/Code/BasicFilters/otbPerBandVectorImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPerBandVectorImageFilter_txx
diff --git a/Code/BasicFilters/otbPointSetToDensityImageFilter.h b/Code/BasicFilters/otbPointSetToDensityImageFilter.h
index e7e6550c757e0619783ba62156b130f705d0dcc0..6f49eaeff731cb85d01b022fefb44455a1804bac 100644
--- a/Code/BasicFilters/otbPointSetToDensityImageFilter.h
+++ b/Code/BasicFilters/otbPointSetToDensityImageFilter.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPointSetToDensityImageFilter_h
diff --git a/Code/BasicFilters/otbPointSetToDensityImageFilter.txx b/Code/BasicFilters/otbPointSetToDensityImageFilter.txx
index a2a7e4ff30dec282a244ee9d7745529973ee6726..189c484f47f788b805ec70eb3cc5a8001fd21deb 100644
--- a/Code/BasicFilters/otbPointSetToDensityImageFilter.txx
+++ b/Code/BasicFilters/otbPointSetToDensityImageFilter.txx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/BasicFilters/otbPolygonCompacityFunctor.h b/Code/BasicFilters/otbPolygonCompacityFunctor.h
index cee85f1377e655ff5a19e69d56503ec10825c603..18a7aa20ae0fd6581cea43f4120617a4cc18254a 100644
--- a/Code/BasicFilters/otbPolygonCompacityFunctor.h
+++ b/Code/BasicFilters/otbPolygonCompacityFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolygonCompacityFunctor_h
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.h b/Code/BasicFilters/otbProlateInterpolateImageFunction.h
index fcbeaeee21363d0fa01002a0c95a21a342236904..712d5b573fb82e7b388f4ec98ec038b461e4e214 100644
--- a/Code/BasicFilters/otbProlateInterpolateImageFunction.h
+++ b/Code/BasicFilters/otbProlateInterpolateImageFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbProlateInterpolateImageFunction_h
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.txx b/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
index 5e9428eb11311e04a2ff3a7eaebdc8fa3beff880..e261ccfe84ad7e898fa7f949bffe3d9796ae116e 100644
--- a/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
+++ b/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbProlateInterpolateImageFunction_txx
diff --git a/Code/BasicFilters/otbScalarImageTextureFunctor.h b/Code/BasicFilters/otbScalarImageTextureFunctor.h
index d8bd4c5842e997f2d4191d842d0228059a9af11c..bcc051df33d6cb35f94598b8eb1f263ca6784ef8 100644
--- a/Code/BasicFilters/otbScalarImageTextureFunctor.h
+++ b/Code/BasicFilters/otbScalarImageTextureFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbScalarImageTextureFunctor_h
diff --git a/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h b/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h
index 71816d33c0c714b43c2cacbd7a0057a5e36fa84c..0552a6b446ed52dbc3b6ad6f88944bcb43e0a34e 100644
--- a/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h
+++ b/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbScalarVectorImageTextureFunctor_h
diff --git a/Code/BasicFilters/otbSimplifyPathFunctor.h b/Code/BasicFilters/otbSimplifyPathFunctor.h
index c17cdbc5dcf977abc3d9ac8dcb87c91e65228fe7..41b508608d239ec51e8ef35c43116169564c0fcc 100644
--- a/Code/BasicFilters/otbSimplifyPathFunctor.h
+++ b/Code/BasicFilters/otbSimplifyPathFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSimplifyPathFunctor_h
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
index 5fe9c174109b0970c421029fcbd31bf2ffa4925b..97d60e2003d84d2abffb7e6e623efbd927bbb36d 100644
--- a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
+++ b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSpectralAngleDistanceImageFilter_h
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
index 79f1878f30e2ed067e5fa0bae5d52df763fd83bc..fc3a85dd285a492027128574f687dd70341d90fc 100644
--- a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
+++ b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSpectralAngleDistanceImageFilter_txx
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
index 308897f6770b520333a549073fe5adcedbd5e289..e6d4cb655fb1a7e8e2cad63db3f3a876d1944f78 100644
--- a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Some parts of this code are derived from ITK. See ITKCopyright.txt
for details.
@@ -15,7 +15,7 @@ for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbStreamingInnerProductVectorImageFilter_txx
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
index 16416f20fbf7972d5e9f4062154dc320c702dbdc..d9d7468f4fc1fb9f5a44629e1fe72fd1ede358d0 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Some parts of this code are derived from ITK. See ITKCopyright.txt
for details.
@@ -15,7 +15,7 @@ for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbStreamingStatisticsImageFilter_h
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
index ef3f5b4a69327676cf2a1333ef9c766649be7aeb..d5145d8655c448a79cea98bef2eb591861d4b389 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Some parts of this code are derived from ITK. See ITKCopyright.txt
for details.
@@ -15,7 +15,7 @@ for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbStreamingStatisticsImageFilter_txx
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
index bcb98ea49709f72ddc424c4cfbb81e6bb4a51026..163cfec3b066265a7c448adbb1e9162fd1ada227 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Some parts of this code are derived from ITK. See ITKCopyright.txt
for details.
@@ -15,7 +15,7 @@ for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbStreamingStatisticsVectorImageFilter_txx
diff --git a/Code/BasicFilters/otbUnaryFunctorImageFilter.h b/Code/BasicFilters/otbUnaryFunctorImageFilter.h
new file mode 100644
index 0000000000000000000000000000000000000000..c212e467a6a4b38c68d8d34b59fb8f9f7b45059d
--- /dev/null
+++ b/Code/BasicFilters/otbUnaryFunctorImageFilter.h
@@ -0,0 +1,83 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbUnaryFunctorImageFilter_h
+#define __otbUnaryFunctorImageFilter_h
+
+#include "itkUnaryFunctorImageFilter.h"
+
+namespace otb
+{
+/**
+ * \class UnaryFunctorImage
+ * \brief Implements pixel-wise generic operation on one image.
+ *
+ * Add the capability to change the number of channel when operation on
+ * VectorImage compared to the itk::UnaryFunctorImageFilter
+ *
+ * The number of channel is provided by the functor: TFunction::OutputSize. If
+ * this number is lower or equal to zero, the behavior of the itk::UnaryFunctorImageFilter
+ * remains unchanged.
+ *
+ * \sa itk::UnaryFunctorImageFilter
+ */
+template <class TInputImage, class TOutputImage, class TFunction >
+class ITK_EXPORT UnaryFunctorImageFilter : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction>
+{
+public:
+ /** Standard class typedefs. */
+ typedef UnaryFunctorImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(UnaryFunctorImageFilter, itk::UnaryFunctorImageFilter);
+
+protected:
+ UnaryFunctorImageFilter() {};
+ virtual ~UnaryFunctorImageFilter() {};
+
+ /** UnaryFunctorImageFilter can produce an image which has a different number of bands
+ * than its input image. As such, UnaryFunctorImageFilter
+ * needs to provide an implementation for
+ * GenerateOutputInformation() in order to inform the pipeline
+ * execution model. The original documentation of this method is
+ * below.
+ *
+ * \sa ProcessObject::GenerateOutputInformaton() */
+ virtual void GenerateOutputInformation()
+ {
+ Superclass::GenerateOutputInformation();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ outputPtr->SetNumberOfComponentsPerPixel( // propagate vector length info
+ this->GetFunctor().GetOutputSize());
+ }
+
+
+private:
+ UnaryFunctorImageFilter(const Self&); //purposely not implemented
+ void operator=(const Self&); //purposely not implemented
+
+};
+
+} // end namespace otb
+
+#endif
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h b/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h
index 920700e877a5d11725c7767f86dc867d4eaab6e7..4d731f6fa1e35fb87a4f709b4c04d5ab27d308c7 100644
--- a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h
+++ b/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h
@@ -38,10 +38,10 @@ class ITK_EXPORT UnaryFunctorObjectListFilter :
{
public:
/** Standard class typedefs. */
- typedef UnaryFunctorObjectListFilter Self;
+ typedef UnaryFunctorObjectListFilter Self;
typedef otb::ObjectListToObjectListFilter<TInputList,TOutputList> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -50,12 +50,12 @@ public:
itkTypeMacro(UnaryFunctorObjectListFilter, ObjectListToObjectListFilter);
/** Some typedefs. */
- typedef TFunction FunctorType;
- typedef TInputList InputListType;
- typedef TOutputList OutputListType;
- typedef typename TInputList::ConstPointer InputListPointer;
- typedef typename TOutputList::Pointer OutputListPointer;
- typedef typename TInputList::ConstIterator InputListIterator;
+ typedef TFunction FunctorType;
+ typedef TInputList InputListType;
+ typedef TOutputList OutputListType;
+ typedef typename TInputList::ConstPointer InputListPointer;
+ typedef typename TOutputList::Pointer OutputListPointer;
+ typedef typename TInputList::ConstIterator InputListIterator;
typedef typename TOutputList::ConstIterator OutputListIterator;
@@ -66,11 +66,12 @@ public:
FunctorType& GetFunctor()
{
return m_Functor;
- };
+ }
+
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -102,12 +103,6 @@ protected:
virtual void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, int threadId);
- /** Internal structure used for passing image data into the threading library */
- struct ThreadStruct
- {
- Pointer Filter;
- };
-
/** End Multi-threading implementation */
private:
diff --git a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
index b8c97718c665bf67270197169f1167c7e9713d7f..008f30135d0b9afe024b461609831edb375ee91f 100644
--- a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -31,9 +31,9 @@
namespace otb
{
/** \class UnaryImageFunctorWithVectorImageFilter
- * \brief The aim of the class is to work with vector images but with a functor that uses as input a componant of the pixel.
+ * \brief The aim of the class is to work with vector images but with a functor that uses as input a component of the pixel.
*
- * For N components pixel, the fucntor will be called N times and completes the Nth component the corresponding output pixel.
+ * For N components pixel, the functor will be called N times and completes the Nth component the corresponding output pixel.
*
* \ingroup Functor
* \ingroup VectorImage
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
index bcc911277f74205255cc4b64f1ef4755cb12c80a..f48fabc63f8fb799f046dbec30ae2647eb42f37b 100644
--- a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageTo3DScalarImageFilter_h
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
index 86c3b8e47e839a7650ed789e06fb977f4f25dc17..5d25a5fbc4df6e13a5ae7fa4abfe7fd7bb86457b 100644
--- a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageTo3DScalarImageFilter_txx
diff --git a/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h b/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
index c27f5954e2a5cfdddf1ec4eff3b3774c633c7b81..e336c1889195d6f48ba4f5d40b2a99cb397a47ea 100644
--- a/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageToAmplitudeImageFilter_h
@@ -20,6 +20,7 @@ See OTBCopyright.txt for details.
#include "itkUnaryFunctorImageFilter.h"
#include "otbMath.h"
+#include "itkConceptChecking.h"
namespace otb
{
@@ -36,6 +37,11 @@ public:
{
return static_cast<TOutput>(vcl_sqrt(A.GetSquaredNorm()));
}
+
+ itkConceptMacro(OutputShouldNotBeVectorImageCheck,
+ (itk::Concept::Convertible<TOutput, double>));
+
+
}; // end namespace Functor
}
@@ -46,18 +52,24 @@ public:
* \ingroup Streamed
* \ingroup Threaded
*/
+
template <class TInputImage, class TOutputImage>
class ITK_EXPORT VectorImageToAmplitudeImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,Functor::VectorToAmplitudeFunctor<
- typename TInputImage::PixelType, typename TOutputImage::PixelType> >
+ : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
+ Functor::VectorToAmplitudeFunctor<
+ typename TInputImage::PixelType, typename TOutputImage::PixelType> >
{
public:
/** Standard typedefs */
- typedef VectorImageToAmplitudeImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,Functor::VectorToAmplitudeFunctor<
- typename TInputImage::PixelType, typename TOutputImage::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorImageToAmplitudeImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<
+ TInputImage,
+ TOutputImage,
+ Functor::VectorToAmplitudeFunctor<
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -74,11 +86,12 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os,indent);
- };
+ }
private:
VectorImageToAmplitudeImageFilter(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
};
+
}// End namespace otb
#endif
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.h b/Code/BasicFilters/otbVectorImageToImageListFilter.h
index 06d29391fd97d22580a83a436ea6d051b613eca2..4cda50c967e091aa58a52e212856a56d97957f29 100644
--- a/Code/BasicFilters/otbVectorImageToImageListFilter.h
+++ b/Code/BasicFilters/otbVectorImageToImageListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageToImageListFilter_h
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.txx b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
index 7f17fec4d770687a7275d4fabc00297d057fc5dd..58379d5ef198b5c7c32bb0c49e1956e55fe66365 100644
--- a/Code/BasicFilters/otbVectorImageToImageListFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageToImageListFilter_txx
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
index b7e6f47a9bbd0d371b4401403a6c0c1f8b153b21..0888ad9da0ff4c3b280eea2aad8b73e05226a58e 100644
--- a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageToIntensityImageFilter_h
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
index e7ca8d0841b162c9a904f784a5a414e2c39b522f..60d249b3703e29ef12037333553e5efa5b28f872 100644
--- a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageToIntensityImageFilter_txx
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
index 36a5778e85a40843857bce2bc17150eb5b03f6e4..b0e9af84b6c7710669bb6c40a151520800c1b85a 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageBlackmanFunction_h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
index 25b3ab7a552b339813a56eb425419910416aeaa8..40dcbe1bdc4a554659acc8060a97629198953690 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageCosineFunction_h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
index b2537da6f9414fb120f43d0cb4fc8786ff6b306d..1219bd2b273eb851460e5916bcc7b504d4c7132f 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageFunctionBase_h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
index 607fac0e5902836fdbad750564f3929f86179b69..f823459c14ee9c3e2d3fa62ce43f98ef7d879c78 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageFunctionBase_txx
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
index 273aa7535ad31839a8976f5f386214c26ddb06a4..177126a4b4552bd351211b0ba6f94b7cfc6e9e2a 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageGaussianFunction_h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
index c7dc4afb62778acfd21b3845ad1610b29d61af4e..d11f77ac2660c7a992be7f556606ae4b52ba7f05 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageHammingFunction_h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
index df82f32af7e14cc3cd6a77f3cf464c4b1f75dec5..99d62a95d6333e5d7c39e30208537744da2177fb 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageLanczosFunction_h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
index 0a09170acf60edc404e55fd0b12155306aa83f63..0d82404328cd3ed2c350f27023c75aa4426ac9b9 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWindowedSincInterpolateImageWelchFunction_h
diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
index 0bd3e0d6816c74919a45b01190d003b13db63110..de9f5edf2fd1f8ac23c5bb85bfe59c7f93c10eec 100644
--- a/Code/CMakeLists.txt
+++ b/Code/CMakeLists.txt
@@ -1,27 +1,27 @@
-SUBDIRS(
-Common
-BasicFilters
-IO
-ChangeDetection
-FeatureExtraction
-Learning
-MultiScale
-DisparityMap
-SpatialReasoning
-Projections
-Radiometry
-Fusion
-Markov
-SARPolarimetry
-Testing
-)
+ADD_SUBDIRECTORY(Common)
+ADD_SUBDIRECTORY(BasicFilters)
+ADD_SUBDIRECTORY(IO)
+ADD_SUBDIRECTORY(ChangeDetection)
+ADD_SUBDIRECTORY(FeatureExtraction)
+ADD_SUBDIRECTORY(Learning)
+ADD_SUBDIRECTORY(MultiScale)
+ADD_SUBDIRECTORY(DisparityMap)
+ADD_SUBDIRECTORY(SpatialReasoning)
+ADD_SUBDIRECTORY(Projections)
+ADD_SUBDIRECTORY(Radiometry)
+ADD_SUBDIRECTORY(Fusion)
+ADD_SUBDIRECTORY(Markov)
+ADD_SUBDIRECTORY(SARPolarimetry)
+ADD_SUBDIRECTORY(Testing)
IF(OTB_USE_VISU_GUI)
- SUBDIRS(Visu Gui Visualization)
+ ADD_SUBDIRECTORY(Visu)
+ ADD_SUBDIRECTORY(Gui)
+ ADD_SUBDIRECTORY(Visualization)
ENDIF(OTB_USE_VISU_GUI)
IF(OTB_USE_PQXX)
- SUBDIRS(GeospatialAnalysis)
+ ADD_SUBDIRECTORY(GeospatialAnalysis)
ENDIF(OTB_USE_PQXX)
IF(OTB_COMPILE_WITH_FULL_WARNING)
diff --git a/Code/ChangeDetection/otbCBAMI.h b/Code/ChangeDetection/otbCBAMI.h
new file mode 100644
index 0000000000000000000000000000000000000000..f35a93b7fc22177781bb63d6991878a8750fe154
--- /dev/null
+++ b/Code/ChangeDetection/otbCBAMI.h
@@ -0,0 +1,281 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbCBAMI_h
+#define __otbCBAMI_h
+
+#include <vector>
+#include <stdlib.h>
+#include <math.h>
+
+
+namespace otb
+{
+
+// #define EPSILON_VALUE_CBAMI 0.01
+#define epsilon 0.01
+
+namespace Functor
+{
+
+template< class TInput1, class TInput2, class TOutput>
+class CBAMI
+{
+public:
+
+ typedef typename std::vector<TOutput> VectorType;
+ typedef typename VectorType::iterator IteratorType;
+ typedef typename std::vector<VectorType> VectorOfVectorType;
+ typedef typename VectorOfVectorType::iterator VecOfVecIteratorType;
+
+ CBAMI() {};
+ virtual ~CBAMI() {};
+ inline TOutput operator()( const TInput1 & itA,
+ const TInput2 & itB)
+ {
+ //const double epsilon = 0.01;
+ VectorType vecA;
+ VectorType vecB;
+
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ vecA.push_back(static_cast<double>(itA.GetPixel(pos)));
+ vecB.push_back(static_cast<double>(itB.GetPixel(pos)));
+
+ }
+
+ normalizeInPlace(vecA);
+ normalizeInPlace(vecB);
+
+ return static_cast<TOutput>( - vcl_log( static_cast<double>(PhiMI(vecA, vecB)+epsilon) ));
+ }
+
+protected:
+
+ inline void normalizeInPlace(VectorType vx)
+ {
+
+ TOutput Ex = 0.0;
+
+ IteratorType itx;
+
+ for ( itx = vx.begin(); itx < vx.end(); ++itx)
+ {
+ Ex += static_cast<TOutput>(*itx);
+ }
+
+ Ex /= (vx.size());
+
+ TOutput Vx = 0.0;
+
+ for ( itx = vx.begin(); itx < vx.end(); ++itx)
+ {
+ Vx += static_cast<TOutput>(vcl_pow(static_cast<double>((*itx)-Ex),2));
+ }
+
+ Vx /= (vx.size());
+
+ for ( itx = vx.begin(); itx < vx.end(); ++itx)
+ {
+ (*itx) = ((*itx)-Ex)/static_cast<TOutput>(vcl_sqrt(static_cast<double>(Vx)));
+ }
+
+
+ }
+ inline TOutput Exyc(VectorType vx, VectorType vy)
+ {
+
+ TOutput Exy = 0.0;
+ TOutput Ex = 0.0;
+ TOutput Ey = 0.0;
+
+ IteratorType itx;
+ IteratorType ity;
+
+ for ( itx = vx.begin(), ity = vy.begin(); itx < vx.end(); ++itx, ++ity)
+ {
+ //Ex += (*itx);
+ //Ey += (*ity);
+ Exy += (*itx)*(*ity);
+
+ }
+
+ //Ex /= (vx.size());
+ //Ey /= (vy.size());
+ Exy /= (vx.size());
+
+ return Exy-Ex*Ey;
+ }
+
+ inline TOutput Exyztc(VectorType vx, VectorType vy, VectorType vz, VectorType vt)
+ {
+
+ TOutput Exyzt = 0.0;
+
+ TOutput Exyz = 0.0;
+ TOutput Exyt = 0.0;
+ TOutput Exzt = 0.0;
+ TOutput Eyzt = 0.0;
+
+ TOutput Exy = 0.0;
+ TOutput Exz = 0.0;
+ TOutput Ext = 0.0;
+ TOutput Eyz = 0.0;
+ TOutput Eyt = 0.0;
+ TOutput Ezt = 0.0;
+
+ TOutput Ex = 0.0;
+ TOutput Ey = 0.0;
+ TOutput Ez = 0.0;
+ TOutput Et = 0.0;
+
+
+ IteratorType itx;
+ IteratorType ity;
+ IteratorType itz;
+ IteratorType itt;
+
+ for ( itx = vx.begin(),
+ ity = vy.begin(),
+ itz = vz.begin(),
+ itt = vt.begin();
+ itx < vx.end();
+ ++itx,
+ ++ity,
+ itz++,
+ itt++)
+ {
+ //Ex += (*itx);
+ //Ey += (*ity);
+ //Ez += (*itz);
+ //Et += (*itt);
+
+ Exy += (*itx)*(*ity);
+ Exz += (*itx)*(*itz);
+ Ext += (*itx)*(*itt);
+ Eyz += (*ity)*(*itz);
+ Eyt += (*ity)*(*itt);
+ Ezt += (*itz)*(*itt);
+
+ Exyz += (*itx)*(*ity)*(*itz);
+ Exyt += (*itx)*(*ity)*(*itt);
+ Exzt += (*itx)*(*itz)*(*itt);
+ Eyzt += (*ity)*(*itz)*(*itt);
+
+ Exyzt += (*itx)*(*ity)*(*itz)*(*itt);
+
+ }
+
+ /*Ex /= (vx.size());
+ Ey /= (vx.size());
+ Ez /= (vx.size());
+ Et /= (vx.size()); */
+
+ Exy /= (vx.size());
+ Exz /= (vx.size());
+ Ext /= (vx.size());
+ Eyz /= (vx.size());
+ Eyt /= (vx.size());
+ Ezt /= (vx.size());
+
+ Exyz /= (vx.size());
+ Exyt /= (vx.size());
+ Exzt /= (vx.size());
+ Eyzt /= (vx.size());
+
+
+ TOutput result = Exyzt - Exyz*Et- Exyt*Ez- Exzt*Ey- Eyzt*Ex +
+ Exy*Ez*Et + Exz*Et*Ey + Ext*Ey*Ez + Eyz*Et*Ex + Eyt*Ex*Ez + Ezt*Ex*Ey -
+ 3*Ex*Ey*Ez*Et;
+
+ return result;
+ }
+
+ inline TOutput Rxy(VectorType va, VectorType vb)
+ {
+
+ return Exyc(va, vb);
+
+ }
+
+ inline TOutput Qxijkl(VectorType va, VectorType vb, VectorType vc, VectorType vd)
+ {
+// IteratorType ita;
+// IteratorType itb;
+// IteratorType itc;
+// IteratorType itd;
+
+
+ TOutput Eabcd_c = Exyztc(va, vb, vc, vd);
+
+
+ TOutput Eab_c = Exyc(va, vb);
+ TOutput Eac_c = Exyc(va, vc);
+ TOutput Ead_c = Exyc(va, vd);
+ TOutput Ecd_c = Exyc(vc, vd);
+ TOutput Ebd_c = Exyc(vb, vd);
+ TOutput Ebc_c = Exyc(vb, vc);
+
+ return Eabcd_c - Eab_c*Ecd_c - Eac_c*Ebd_c - Ead_c*Ebc_c;
+
+
+
+
+ }
+
+ inline TOutput PhiMI(VectorType v1, VectorType v2)
+ {
+
+
+ VectorOfVectorType donnees;
+ donnees.push_back(v1);
+ donnees.push_back(v2);
+
+ VecOfVecIteratorType iti;
+ VecOfVecIteratorType itj;
+ VecOfVecIteratorType itk;
+ VecOfVecIteratorType itl;
+
+ TOutput termeR = 0.0;
+ TOutput termeQ = 0.0;
+
+ for ( iti = donnees.begin(); iti < donnees.end(); ++iti )
+ for ( itj = donnees.begin(); itj < donnees.end(); ++itj )
+ {
+ if (iti != itj)
+ termeR += static_cast<TOutput>(vcl_pow(static_cast<double>(Rxy((*iti),(*itj))),2));
+
+ for ( itk = donnees.begin(); itk < donnees.end(); ++itk )
+ for ( itl = donnees.begin(); itl < donnees.end(); itl++ )
+ {
+ if ((iti != itj) || (iti != itk) || (iti != itl))
+ termeQ += static_cast<TOutput>(vcl_pow( static_cast<double>(Qxijkl((*iti),(*itj),(*itk),(*itl))),2));
+ }
+ }
+
+
+ return 1.0/4.0*termeR + 1.0/48.0*termeQ;
+
+ }
+
+};
+}
+
+}
+
+#endif
diff --git a/Code/ChangeDetection/otbCBAMIChangeDetector.h b/Code/ChangeDetection/otbCBAMIChangeDetector.h
index 339f1b79529ef3a7a76fd5878c2d23772e4c3bdf..e077237c092c8d901b25abc844dd37a4dc96894c 100644
--- a/Code/ChangeDetection/otbCBAMIChangeDetector.h
+++ b/Code/ChangeDetection/otbCBAMIChangeDetector.h
@@ -20,9 +20,7 @@
#include "otbBinaryFunctorNeighborhoodImageFilter.h"
-#include <vector>
-#include <stdlib.h>
-#include <math.h>
+#include "otbCBAMI.h"
namespace otb
@@ -53,255 +51,6 @@ namespace otb
* \ingroup IntensityImageFilters Multithreaded
*/
-// #define EPSILON_VALUE_CBAMI 0.01
-
-namespace Functor
-{
-
-template< class TInput1, class TInput2, class TOutput>
-class CBAMI
-{
-public:
-
- typedef typename std::vector<TOutput> VectorType;
- typedef typename VectorType::iterator IteratorType;
- typedef typename std::vector<VectorType> VectorOfVectorType;
- typedef typename VectorOfVectorType::iterator VecOfVecIteratorType;
-
- CBAMI() {};
- virtual ~CBAMI() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
- {
- const double epsilon = 0.01;
- VectorType vecA;
- VectorType vecB;
-
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- vecA.push_back(static_cast<TOutput>(itA.GetPixel(pos)));
- vecB.push_back(static_cast<TOutput>(itB.GetPixel(pos)));
-
- }
-
- normalizeInPlace(vecA);
- normalizeInPlace(vecB);
-
- return static_cast<TOutput>( - vcl_log(PhiMI(vecA, vecB)+epsilon) );
- }
-
-protected:
-
- inline void normalizeInPlace(VectorType vx)
- {
-
- TOutput Ex = 0.0;
-
- IteratorType itx;
-
- for ( itx = vx.begin(); itx < vx.end(); ++itx)
- {
- Ex += (*itx);
- }
-
- Ex /= (vx.size());
-
- TOutput Vx = 0.0;
-
- for ( itx = vx.begin(); itx < vx.end(); ++itx)
- {
- Vx += vcl_pow((*itx)-Ex,2);
- }
-
- Vx /= (vx.size());
-
- for ( itx = vx.begin(); itx < vx.end(); ++itx)
- {
- (*itx) = ((*itx)-Ex)/vcl_sqrt(Vx);
- }
-
-
- }
- inline TOutput Exyc(VectorType vx, VectorType vy)
- {
-
- TOutput Exy = 0.0;
- TOutput Ex = 0.0;
- TOutput Ey = 0.0;
-
- IteratorType itx;
- IteratorType ity;
-
- for ( itx = vx.begin(), ity = vy.begin(); itx < vx.end(); ++itx, ++ity)
- {
- //Ex += (*itx);
- //Ey += (*ity);
- Exy += (*itx)*(*ity);
-
- }
-
- //Ex /= (vx.size());
- //Ey /= (vy.size());
- Exy /= (vx.size());
-
- return Exy-Ex*Ey;
- }
-
- inline TOutput Exyztc(VectorType vx, VectorType vy, VectorType vz, VectorType vt)
- {
-
- TOutput Exyzt = 0.0;
-
- TOutput Exyz = 0.0;
- TOutput Exyt = 0.0;
- TOutput Exzt = 0.0;
- TOutput Eyzt = 0.0;
-
- TOutput Exy = 0.0;
- TOutput Exz = 0.0;
- TOutput Ext = 0.0;
- TOutput Eyz = 0.0;
- TOutput Eyt = 0.0;
- TOutput Ezt = 0.0;
-
- TOutput Ex = 0.0;
- TOutput Ey = 0.0;
- TOutput Ez = 0.0;
- TOutput Et = 0.0;
-
-
- IteratorType itx;
- IteratorType ity;
- IteratorType itz;
- IteratorType itt;
-
- for ( itx = vx.begin(),
- ity = vy.begin(),
- itz = vz.begin(),
- itt = vt.begin();
- itx < vx.end();
- ++itx,
- ++ity,
- itz++,
- itt++)
- {
- //Ex += (*itx);
- //Ey += (*ity);
- //Ez += (*itz);
- //Et += (*itt);
-
- Exy += (*itx)*(*ity);
- Exz += (*itx)*(*itz);
- Ext += (*itx)*(*itt);
- Eyz += (*ity)*(*itz);
- Eyt += (*ity)*(*itt);
- Ezt += (*itz)*(*itt);
-
- Exyz += (*itx)*(*ity)*(*itz);
- Exyt += (*itx)*(*ity)*(*itt);
- Exzt += (*itx)*(*itz)*(*itt);
- Eyzt += (*ity)*(*itz)*(*itt);
-
- Exyzt += (*itx)*(*ity)*(*itz)*(*itt);
-
- }
-
- /*Ex /= (vx.size());
- Ey /= (vx.size());
- Ez /= (vx.size());
- Et /= (vx.size()); */
-
- Exy /= (vx.size());
- Exz /= (vx.size());
- Ext /= (vx.size());
- Eyz /= (vx.size());
- Eyt /= (vx.size());
- Ezt /= (vx.size());
-
- Exyz /= (vx.size());
- Exyt /= (vx.size());
- Exzt /= (vx.size());
- Eyzt /= (vx.size());
-
-
- TOutput result = Exyzt - Exyz*Et- Exyt*Ez- Exzt*Ey- Eyzt*Ex +
- Exy*Ez*Et + Exz*Et*Ey + Ext*Ey*Ez + Eyz*Et*Ex + Eyt*Ex*Ez + Ezt*Ex*Ey -
- 3*Ex*Ey*Ez*Et;
-
- return result;
- }
-
- inline TOutput Rxy(VectorType va, VectorType vb)
- {
-
- return Exyc(va, vb);
-
- }
-
- inline TOutput Qxijkl(VectorType va, VectorType vb, VectorType vc, VectorType vd)
- {
-// IteratorType ita;
-// IteratorType itb;
-// IteratorType itc;
-// IteratorType itd;
-
-
- TOutput Eabcd_c = Exyztc(va, vb, vc, vd);
-
-
- TOutput Eab_c = Exyc(va, vb);
- TOutput Eac_c = Exyc(va, vc);
- TOutput Ead_c = Exyc(va, vd);
- TOutput Ecd_c = Exyc(vc, vd);
- TOutput Ebd_c = Exyc(vb, vd);
- TOutput Ebc_c = Exyc(vb, vc);
-
- return Eabcd_c - Eab_c*Ecd_c - Eac_c*Ebd_c - Ead_c*Ebc_c;
-
-
-
-
- }
-
- inline TOutput PhiMI(VectorType v1, VectorType v2)
- {
-
-
- VectorOfVectorType donnees;
- donnees.push_back(v1);
- donnees.push_back(v2);
-
- VecOfVecIteratorType iti;
- VecOfVecIteratorType itj;
- VecOfVecIteratorType itk;
- VecOfVecIteratorType itl;
-
- TOutput termeR = 0.0;
- TOutput termeQ = 0.0;
-
- for ( iti = donnees.begin(); iti < donnees.end(); ++iti )
- for ( itj = donnees.begin(); itj < donnees.end(); ++itj )
- {
- if (iti != itj)
- termeR += vcl_pow(Rxy((*iti),(*itj)),2);
-
- for ( itk = donnees.begin(); itk < donnees.end(); ++itk )
- for ( itl = donnees.begin(); itl < donnees.end(); itl++ )
- {
- if ((iti != itj) || (iti != itk) || (iti != itl))
- termeQ += vcl_pow( Qxijkl((*iti),(*itj),(*itk),(*itl)),2);
- }
- }
-
-
- return 1.0/4.0*termeR + 1.0/48.0*termeQ;
-
- }
-
-};
-}
-
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT CBAMIChangeDetector :
public BinaryFunctorNeighborhoodImageFilter<
diff --git a/Code/ChangeDetection/otbCorrelationChangeDetector.h b/Code/ChangeDetection/otbCorrelationChangeDetector.h
index b2b252938ba637fbd6a99fde329035d24e5b518e..147e51849e931c22a67487bcdd0bc07b9c120c14 100644
--- a/Code/ChangeDetection/otbCorrelationChangeDetector.h
+++ b/Code/ChangeDetection/otbCorrelationChangeDetector.h
@@ -19,6 +19,7 @@
#define __otbCorrelationChangeDetector_h
#include "otbBinaryFunctorNeighborhoodImageFilter.h"
+#include "otbCrossCorrelation.h"
namespace otb
{
@@ -46,65 +47,6 @@ namespace otb
*
* \ingroup IntensityImageFilters Multithreaded
*/
-namespace Functor
-{
-
-template< class TInput1, class TInput2, class TOutput>
-class CrossCorrelation
-{
-public:
- CrossCorrelation() {};
- virtual ~CrossCorrelation() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
- {
-
- TOutput meanA = itk::NumericTraits<TOutput>::Zero;
- TOutput meanB = itk::NumericTraits<TOutput>::Zero;
-
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- meanA += static_cast<TOutput>(itA.GetPixel(pos));
- meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
-
- }
-
- meanA /= itA.Size();
- meanB /= itB.Size();
-
- TOutput varA = itk::NumericTraits<TOutput>::Zero;
- TOutput varB = itk::NumericTraits<TOutput>::Zero;
-
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- varA += static_cast<TOutput>( vcl_pow( static_cast<double>(itA.GetPixel(pos))-static_cast<double>(meanA),static_cast<double>(2.0)));
- varB += static_cast<TOutput>( vcl_pow( static_cast<double>(itB.GetPixel(pos))-static_cast<double>(meanB),static_cast<double>(2.0)));
-
- }
-
- varA /= itA.Size();
- varB /= itB.Size();
-
- TOutput crossCorrel = itk::NumericTraits<TOutput>::Zero;
-
- if (varA!= itk::NumericTraits<TOutput>::Zero && varB!= itk::NumericTraits<TOutput>::Zero)
- {
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
- crossCorrel += (static_cast<TOutput>(itA.GetPixel(pos))-meanA)*(static_cast<TOutput>(itB.GetPixel(pos))-meanB)/(itA.Size()*vcl_sqrt(varA*varB));
- }
- }
- else if (varA==itk::NumericTraits<TOutput>::Zero && varB==itk::NumericTraits<TOutput>::Zero)
- {
- crossCorrel = itk::NumericTraits<TOutput>::One;
- }
- return static_cast<TOutput>( itk::NumericTraits<TOutput>::One - crossCorrel );
- }
-};
-}
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT CorrelationChangeDetector :
diff --git a/Code/ChangeDetection/otbCrossCorrelation.h b/Code/ChangeDetection/otbCrossCorrelation.h
new file mode 100644
index 0000000000000000000000000000000000000000..87fb6ef0873d306ffd341bd6508c1421fe11b0ff
--- /dev/null
+++ b/Code/ChangeDetection/otbCrossCorrelation.h
@@ -0,0 +1,101 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbCrossCorrelation_h
+#define __otbCrossCorrelation_h
+
+
+namespace otb
+{
+
+
+namespace Functor
+{
+
+/** \class Functor::CrossCorrelation
+ *
+ * - cast the input 1 pixel value to \c double
+ * - cast the input 2 pixel value to \c double
+ * - compute the difference of the two pixel values
+ * - compute the value of the cross-correlation
+ * - cast the \c double value resulting to the pixel type of the output image
+ * - store the casted value into the output image.
+ *
+ */
+
+
+template< class TInput1, class TInput2, class TOutput>
+class CrossCorrelation
+{
+public:
+ CrossCorrelation() {};
+ virtual ~CrossCorrelation() {};
+ inline TOutput operator()( const TInput1 & itA,
+ const TInput2 & itB)
+ {
+
+ TOutput meanA = itk::NumericTraits<TOutput>::Zero;
+ TOutput meanB = itk::NumericTraits<TOutput>::Zero;
+
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ meanA += static_cast<TOutput>(itA.GetPixel(pos));
+ meanB += static_cast<TOutput>(itB.GetPixel(pos));
+
+
+ }
+
+ meanA /= itA.Size();
+ meanB /= itB.Size();
+
+ TOutput varA = itk::NumericTraits<TOutput>::Zero;
+ TOutput varB = itk::NumericTraits<TOutput>::Zero;
+
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ varA += static_cast<TOutput>( vcl_pow( static_cast<double>(itA.GetPixel(pos))-static_cast<double>(meanA),static_cast<double>(2.0)));
+ varB += static_cast<TOutput>( vcl_pow( static_cast<double>(itB.GetPixel(pos))-static_cast<double>(meanB),static_cast<double>(2.0)));
+
+ }
+
+ varA /= itA.Size();
+ varB /= itB.Size();
+
+ TOutput crossCorrel = itk::NumericTraits<TOutput>::Zero;
+
+ if (varA!= itk::NumericTraits<TOutput>::Zero && varB!= itk::NumericTraits<TOutput>::Zero)
+ {
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+ crossCorrel += (static_cast<TOutput>(itA.GetPixel(pos))-meanA)*(static_cast<TOutput>(itB.GetPixel(pos))-meanB)/(itA.Size()*vcl_sqrt(static_cast<double>(varA*varB)));
+ }
+ }
+ else if (varA==itk::NumericTraits<TOutput>::Zero && varB==itk::NumericTraits<TOutput>::Zero)
+ {
+ crossCorrel = itk::NumericTraits<TOutput>::One;
+ }
+ return static_cast<TOutput>( itk::NumericTraits<TOutput>::One - crossCorrel );
+ }
+};
+}
+
+} // end namespace otb
+
+
+#endif
diff --git a/Code/ChangeDetection/otbJoinHistogramMI.h b/Code/ChangeDetection/otbJoinHistogramMI.h
new file mode 100644
index 0000000000000000000000000000000000000000..35eeef25f1ef98a4c0f39cadca2d3a45d97b8e1e
--- /dev/null
+++ b/Code/ChangeDetection/otbJoinHistogramMI.h
@@ -0,0 +1,136 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbJoinHistogramMI_h
+#define __otbJoinHistogramMI_h
+
+#include "itkHistogram.h"
+
+namespace otb
+{
+
+namespace Functor
+{
+
+template< class TInput1, class TInput2, class TOutput>
+class JoinHistogramMI
+{
+public:
+ typedef double HistogramFrequencyType;
+ typedef typename itk::Statistics::Histogram<HistogramFrequencyType, 2> HistogramType;
+ JoinHistogramMI() {};
+ virtual ~JoinHistogramMI() {};
+ inline TOutput operator()( const TInput1 & itA,
+ const TInput2 & itB, const HistogramType* histogram)
+ {
+ TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
+ HistogramFrequencyType totalFreq = histogram->GetTotalFrequency();
+
+ /* for(unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+ double value = static_cast<double>(itA.GetPixel(pos));
+
+ unsigned int bin =
+ HistogramFrequencyType freq = histogram.GetFrequency(, 0);
+ if (freq > 0)
+ {
+ entropyX += freq*vcl_log(freq);
+ }
+ }
+
+ entropyX = -entropyX/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
+
+ for (unsigned int i = 0; i < this->GetHistogramSize()[1]; ++i)
+ {
+ HistogramFrequencyType freq = histogram.GetFrequency(i, 1);
+ if (freq > 0)
+ {
+ entropyY += freq*vcl_log(freq);
+ }
+ }
+
+ entropyY = -entropyY/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
+
+ HistogramIteratorType it = histogram.Begin();
+ HistogramIteratorType end = histogram.End();
+ while (it != end)
+ {
+ HistogramFrequencyType freq = it.GetFrequency();
+ if (freq > 0)
+ {
+ jointEntropy += freq*vcl_log(freq);
+ }
+ ++it;
+ }
+
+ jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
+ vcl_log(totalFreq);
+
+ return entropyX + entropyY - jointEntropy;*/
+
+
+ typename HistogramType::MeasurementVectorType sample;
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+ double valueA = static_cast<double>(itA.GetPixel(pos));
+ double valueB = static_cast<double>(itB.GetPixel(pos));
+
+ sample[0] = valueA;
+ sample[1] = valueB;
+
+
+ HistogramFrequencyType freq = histogram->GetFrequency(
+ histogram->GetIndex(sample));
+ if (freq > 0)
+ {
+ jointEntropy += freq*vcl_log(freq);
+ }
+
+ }
+
+ jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
+ vcl_log(totalFreq);
+
+ return jointEntropy;
+
+ /* TOutput meanA = 0.0;
+ TOutput meanB = 0.0;
+
+ for(unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ meanA += static_cast<TOutput>(itA.GetPixel(pos));
+ meanB += static_cast<TOutput>(itB.GetPixel(pos));
+
+
+ }*/
+ return static_cast<TOutput>( 0 );
+ }
+
+ /* void SetHistogram(HistogramType* histo)
+ {
+ m_Histogram = histo;
+ }
+
+ protected:
+ HistogramType::Pointer m_Histogram;*/
+};
+}
+} // end namespace otb
+
+
+#endif
diff --git a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
index 65e59e853836f85d84adcc86d076055562feff99..3117a2bba829983312f52e7d0acd65a5fb252312 100644
--- a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
+++ b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
@@ -20,6 +20,7 @@
#include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
#include "itkHistogram.h"
+#include "otbJoinHistogramMI.h"
namespace otb
{
@@ -48,113 +49,7 @@ namespace otb
*
* \ingroup IntensityImageFilters Multithreaded
*/
-namespace Functor
-{
-template< class TInput1, class TInput2, class TOutput>
-class JoinHistogramMI
-{
-public:
- typedef double HistogramFrequencyType;
- typedef typename itk::Statistics::Histogram<HistogramFrequencyType, 2> HistogramType;
- JoinHistogramMI() {};
- virtual ~JoinHistogramMI() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB, const HistogramType* histogram)
- {
- TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
- HistogramFrequencyType totalFreq = histogram->GetTotalFrequency();
-
- /* for(unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
- double value = static_cast<double>(itA.GetPixel(pos));
-
- unsigned int bin =
- HistogramFrequencyType freq = histogram.GetFrequency(, 0);
- if (freq > 0)
- {
- entropyX += freq*vcl_log(freq);
- }
- }
-
- entropyX = -entropyX/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
-
- for (unsigned int i = 0; i < this->GetHistogramSize()[1]; ++i)
- {
- HistogramFrequencyType freq = histogram.GetFrequency(i, 1);
- if (freq > 0)
- {
- entropyY += freq*vcl_log(freq);
- }
- }
-
- entropyY = -entropyY/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
-
- HistogramIteratorType it = histogram.Begin();
- HistogramIteratorType end = histogram.End();
- while (it != end)
- {
- HistogramFrequencyType freq = it.GetFrequency();
- if (freq > 0)
- {
- jointEntropy += freq*vcl_log(freq);
- }
- ++it;
- }
-
- jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
- vcl_log(totalFreq);
-
- return entropyX + entropyY - jointEntropy;*/
-
-
- typename HistogramType::MeasurementVectorType sample;
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
- double valueA = static_cast<double>(itA.GetPixel(pos));
- double valueB = static_cast<double>(itB.GetPixel(pos));
-
- sample[0] = valueA;
- sample[1] = valueB;
-
-
- HistogramFrequencyType freq = histogram->GetFrequency(
- histogram->GetIndex(sample));
- if (freq > 0)
- {
- jointEntropy += freq*vcl_log(freq);
- }
-
- }
-
- jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
- vcl_log(totalFreq);
-
- return jointEntropy;
-
- /* TOutput meanA = 0.0;
- TOutput meanB = 0.0;
-
- for(unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- meanA += static_cast<TOutput>(itA.GetPixel(pos));
- meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
-
- }*/
- return static_cast<TOutput>( 0 );
- }
-
- /* void SetHistogram(HistogramType* histo)
- {
- m_Histogram = histo;
- }
-
- protected:
- HistogramType::Pointer m_Histogram;*/
-};
-}
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT JoinHistogramMIImageFilter :
diff --git a/Code/ChangeDetection/otbLHMI.h b/Code/ChangeDetection/otbLHMI.h
new file mode 100644
index 0000000000000000000000000000000000000000..528aeedcd34774df7082a43ae6127a1d0d7acb06
--- /dev/null
+++ b/Code/ChangeDetection/otbLHMI.h
@@ -0,0 +1,189 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef __otbLHMI_h
+#define __otbLHMI_h
+
+#include <vector>
+#include <stdlib.h>
+#include <math.h>
+#include "itkHistogram.h"
+
+
+namespace otb
+{
+
+
+#define epsilon 0.01
+
+namespace Functor
+{
+
+/** \class Functor::LHMI
+ *
+ * - cast the input 1 pixel value to \c double
+ * - cast the input 2 pixel value to \c double
+ * - compute the difference of the two pixel values
+ * - compute the value of the LHMI
+ * - cast the \c double value resulting to the pixel type of the output image
+ *
+ */
+
+template< class TInput1, class TInput2, class TOutput>
+class LHMI
+{
+
+public:
+
+ typedef typename std::vector<TOutput> VectorType;
+ typedef typename VectorType::iterator IteratorType;
+ typedef typename std::vector<VectorType> VectorOfVectorType;
+ typedef typename VectorOfVectorType::iterator VecOfVecIteratorType;
+ typedef double HistogramFrequencyType;
+ typedef typename itk::Statistics::Histogram<HistogramFrequencyType, 2> HistogramType;
+ typedef typename HistogramType::MeasurementVectorType
+ MeasurementVectorType;
+ typedef typename HistogramType::SizeType HistogramSizeType;
+ typedef typename HistogramType::Iterator HistogramIteratorType;
+
+
+ LHMI() {};
+ virtual ~LHMI() {};
+ inline TOutput operator()( const TInput1 & itA,
+ const TInput2 & itB)
+ {
+
+
+ HistogramType::Pointer histogram;
+
+ /** The histogram size. */
+ HistogramSizeType histogramSize;
+ /** The lower bound for samples in the histogram. */
+ MeasurementVectorType lowerBound;
+ /** The upper bound for samples in the histogram. */
+ MeasurementVectorType upperBound;
+
+ double upperBoundIncreaseFactor = 0.001;
+
+ histogramSize.Fill(256);
+
+ TOutput maxA = itA.GetPixel(0);
+ TOutput minA = itA.GetPixel(0);
+ TOutput maxB = itB.GetPixel(0);
+ TOutput minB = itB.GetPixel(0);
+
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ TOutput value = static_cast<TOutput>(itA.GetPixel(pos));
+
+ if (value > maxA)
+ maxA = value;
+ else if (value < minA)
+ minA = value;
+
+ value = static_cast<TOutput>(itB.GetPixel(pos));
+
+ if (value > maxB)
+ maxB = value;
+ else if (value < minB)
+ minB = value;
+
+
+ }
+
+
+ // Initialize the upper and lower bounds of the histogram.
+ lowerBound[0] = minA;
+ lowerBound[1] = minB;
+ upperBound[0] =
+ maxA + (maxA - minA ) * upperBoundIncreaseFactor;
+ upperBound[1] =
+ maxB + (maxB - minB ) * upperBoundIncreaseFactor;
+
+
+ histogram = HistogramType::New();
+
+ histogram->Initialize(histogramSize, lowerBound, upperBound);
+
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ typename HistogramType::MeasurementVectorType sample;
+ sample[0] = itA.GetPixel(pos);
+ sample[1] = itB.GetPixel(pos);
+ /*if(sample[0]!=NumericTraits<TOutput>::Zero &&
+ sample[1]!=NumericTraits<TOutput>::Zero)*/
+ histogram->IncreaseFrequency(sample, 1);
+
+ }
+
+
+
+ TOutput entropyX = itk::NumericTraits<TOutput>::Zero;
+ TOutput entropyY = itk::NumericTraits<TOutput>::Zero;
+ TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
+ HistogramFrequencyType totalFreq = histogram->GetTotalFrequency();
+
+ for (unsigned int i = 0; i < histogram->GetSize()[0]; ++i)
+ {
+ HistogramFrequencyType freq = histogram->GetFrequency(i, 0);
+ if (freq > 0)
+ {
+ entropyX += freq*vcl_log(freq);
+ }
+ }
+
+ entropyX = -entropyX/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
+
+ for (unsigned int i = 0; i < histogram->GetSize()[1]; ++i)
+ {
+ HistogramFrequencyType freq = histogram->GetFrequency(i, 1);
+ if (freq > 0)
+ {
+ entropyY += freq*vcl_log(freq);
+ }
+ }
+
+ entropyY = -entropyY/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
+
+ HistogramIteratorType it = histogram->Begin();
+ HistogramIteratorType end = histogram->End();
+ while (it != end)
+ {
+ HistogramFrequencyType freq = it.GetFrequency();
+ if (freq > 0)
+ {
+ jointEntropy += freq*vcl_log(freq);
+ }
+ ++it;
+ }
+
+ jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
+ vcl_log(totalFreq);
+
+ return static_cast<TOutput>( jointEntropy/(entropyX + entropyY) );
+ }
+
+
+
+};
+}
+
+}
+#endif
diff --git a/Code/ChangeDetection/otbLHMIChangeDetector.h b/Code/ChangeDetection/otbLHMIChangeDetector.h
index 9383c213de62536f80c274ef9c70663532dae198..621618edb9bea87cfc754f21af93d52240a24cd8 100644
--- a/Code/ChangeDetection/otbLHMIChangeDetector.h
+++ b/Code/ChangeDetection/otbLHMIChangeDetector.h
@@ -19,11 +19,7 @@
#define __otbLHMIChangeDetector_h
#include "otbBinaryFunctorNeighborhoodImageFilter.h"
-#include <vector>
-#include <stdlib.h>
-#include <math.h>
-#include "itkHistogram.h"
-
+#include "otbLHMI.h"
namespace otb
{
@@ -53,152 +49,6 @@ namespace otb
* \ingroup IntensityImageFilters Multithreaded
*/
-#define epsilon 0.01
-
-namespace Functor
-{
-
-template< class TInput1, class TInput2, class TOutput>
-class LHMI
-{
-
-public:
-
- typedef typename std::vector<TOutput> VectorType;
- typedef typename VectorType::iterator IteratorType;
- typedef typename std::vector<VectorType> VectorOfVectorType;
- typedef typename VectorOfVectorType::iterator VecOfVecIteratorType;
- typedef double HistogramFrequencyType;
- typedef typename itk::Statistics::Histogram<HistogramFrequencyType, 2> HistogramType;
- typedef typename HistogramType::MeasurementVectorType
- MeasurementVectorType;
- typedef typename HistogramType::SizeType HistogramSizeType;
- typedef typename HistogramType::Iterator HistogramIteratorType;
-
-
- LHMI() {};
- virtual ~LHMI() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
- {
-
-
- HistogramType::Pointer histogram;
-
- /** The histogram size. */
- HistogramSizeType histogramSize;
- /** The lower bound for samples in the histogram. */
- MeasurementVectorType lowerBound;
- /** The upper bound for samples in the histogram. */
- MeasurementVectorType upperBound;
-
- double upperBoundIncreaseFactor = 0.001;
-
- histogramSize.Fill(256);
-
- TOutput maxA = itA.GetPixel(0);
- TOutput minA = itA.GetPixel(0);
- TOutput maxB = itB.GetPixel(0);
- TOutput minB = itB.GetPixel(0);
-
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- TOutput value = static_cast<TOutput>(itA.GetPixel(pos));
-
- if (value > maxA)
- maxA = value;
- else if (value < minA)
- minA = value;
-
- value = static_cast<TOutput>(itB.GetPixel(pos));
-
- if (value > maxB)
- maxB = value;
- else if (value < minB)
- minB = value;
-
-
- }
-
-
- // Initialize the upper and lower bounds of the histogram.
- lowerBound[0] = minA;
- lowerBound[1] = minB;
- upperBound[0] =
- maxA + (maxA - minA ) * upperBoundIncreaseFactor;
- upperBound[1] =
- maxB + (maxB - minB ) * upperBoundIncreaseFactor;
-
-
- histogram = HistogramType::New();
-
- histogram->Initialize(histogramSize, lowerBound, upperBound);
-
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- typename HistogramType::MeasurementVectorType sample;
- sample[0] = itA.GetPixel(pos);
- sample[1] = itB.GetPixel(pos);
- /*if(sample[0]!=NumericTraits<TOutput>::Zero &&
- sample[1]!=NumericTraits<TOutput>::Zero)*/
- histogram->IncreaseFrequency(sample, 1);
-
- }
-
-
-
- TOutput entropyX = itk::NumericTraits<TOutput>::Zero;
- TOutput entropyY = itk::NumericTraits<TOutput>::Zero;
- TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
- HistogramFrequencyType totalFreq = histogram->GetTotalFrequency();
-
- for (unsigned int i = 0; i < histogram->GetSize()[0]; ++i)
- {
- HistogramFrequencyType freq = histogram->GetFrequency(i, 0);
- if (freq > 0)
- {
- entropyX += freq*vcl_log(freq);
- }
- }
-
- entropyX = -entropyX/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
-
- for (unsigned int i = 0; i < histogram->GetSize()[1]; ++i)
- {
- HistogramFrequencyType freq = histogram->GetFrequency(i, 1);
- if (freq > 0)
- {
- entropyY += freq*vcl_log(freq);
- }
- }
-
- entropyY = -entropyY/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
-
- HistogramIteratorType it = histogram->Begin();
- HistogramIteratorType end = histogram->End();
- while (it != end)
- {
- HistogramFrequencyType freq = it.GetFrequency();
- if (freq > 0)
- {
- jointEntropy += freq*vcl_log(freq);
- }
- ++it;
- }
-
- jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
- vcl_log(totalFreq);
-
- return static_cast<TOutput>( jointEntropy/(entropyX + entropyY) );
- }
-
-
-
-};
-}
-
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT LHMIChangeDetector :
public BinaryFunctorNeighborhoodImageFilter<
diff --git a/Code/ChangeDetection/otbMeanDifference.h b/Code/ChangeDetection/otbMeanDifference.h
new file mode 100644
index 0000000000000000000000000000000000000000..aac79bd64f7e2787ad473fed65f6c9f88a3b726f
--- /dev/null
+++ b/Code/ChangeDetection/otbMeanDifference.h
@@ -0,0 +1,56 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbMeanDifference_h
+#define __otbMeanDifference_h
+
+
+namespace otb
+{
+
+
+namespace Functor
+{
+
+template< class TInput1, class TInput2, class TOutput>
+class MeanDifference
+{
+public:
+ MeanDifference() {};
+ virtual ~MeanDifference() {};
+ inline TOutput operator()( const TInput1 & itA,
+ const TInput2 & itB)
+ {
+
+ TOutput meanA = 0.0;
+ TOutput meanB = 0.0;
+
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ meanA += static_cast<TOutput>(itA.GetPixel(pos));
+ meanB += static_cast<TOutput>(itB.GetPixel(pos));
+
+
+ }
+ return static_cast<TOutput>( (meanA-meanB)/itA.Size() );
+ }
+};
+}
+}
+
+#endif
diff --git a/Code/ChangeDetection/otbMeanDifferenceImageFilter.h b/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
index c009eeb5893e9b50586ed208b3d3fdfec999e27e..371fd87a869fb23cfcbaf09aa6aee3f1013dc327 100644
--- a/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
+++ b/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
@@ -19,10 +19,10 @@
#define __otbMeanDifferenceImageFilter_h
#include "otbBinaryFunctorNeighborhoodImageFilter.h"
+#include "otbMeanDifference.h"
namespace otb
{
-
/** \class MeanDifferenceImageFilter
* \brief Implements neighborhood-wise the computation of mean difference.
*
@@ -46,34 +46,6 @@ namespace otb
*
* \ingroup IntensityImageFilters Multithreaded
*/
-namespace Functor
-{
-
-template< class TInput1, class TInput2, class TOutput>
-class MeanDifference
-{
-public:
- MeanDifference() {};
- virtual ~MeanDifference() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
- {
-
- TOutput meanA = 0.0;
- TOutput meanB = 0.0;
-
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- meanA += static_cast<TOutput>(itA.GetPixel(pos));
- meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
-
- }
- return static_cast<TOutput>( (meanA-meanB)/itA.Size() );
- }
-};
-}
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT MeanDifferenceImageFilter :
diff --git a/Code/ChangeDetection/otbMeanRatio.h b/Code/ChangeDetection/otbMeanRatio.h
new file mode 100644
index 0000000000000000000000000000000000000000..dbe0ba5a91be1e0892d57bd56d5f4871b996be6b
--- /dev/null
+++ b/Code/ChangeDetection/otbMeanRatio.h
@@ -0,0 +1,81 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbMeanRatio_h
+#define __otbMeanRatio_h
+
+#include "otbBinaryFunctorNeighborhoodImageFilter.h"
+
+namespace otb
+{
+
+/** \class Functor::MeanRatio
+ *
+ * - compute the ratio of the two pixel values
+ * - compute the value of the ratio of means
+ * - cast the \c double value resulting to the pixel type of the output image
+ * - store the casted value into the output image.
+ *
+
+ * \ingroup Functor
+ */
+namespace Functor
+{
+
+template< class TInput1, class TInput2, class TOutput>
+class MeanRatio
+{
+public:
+ MeanRatio() {};
+ virtual ~MeanRatio() {};
+ inline TOutput operator()( const TInput1 & itA,
+ const TInput2 & itB)
+ {
+
+ TOutput meanA = 0.0;
+ TOutput meanB = 0.0;
+
+ for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ {
+
+ meanA += static_cast<TOutput>(itA.GetPixel(pos));
+ meanB += static_cast<TOutput>(itB.GetPixel(pos));
+
+
+ }
+
+ meanA /= itA.Size();
+ meanB /= itB.Size();
+
+ //std::cout<<"meanA= "<<meanA<<", meanB= "<<meanB<<std::endl;
+
+ TOutput ratio;
+
+ if(meanA == meanB)
+ ratio = 0.;
+ else if (meanA>meanB)
+ ratio = static_cast<TOutput>(1.0 - meanB/meanA);
+ else ratio = static_cast<TOutput>(1.0 - meanA/meanB);
+
+ return ratio;
+ }
+};
+}
+} // end namespace otb
+
+
+#endif
diff --git a/Code/ChangeDetection/otbMeanRatioImageFilter.h b/Code/ChangeDetection/otbMeanRatioImageFilter.h
index 209aa3c400bca249fb2ddba8111f48d32e66d32a..9e77191fcbb302620fd3cacee2f96696ec909b0a 100644
--- a/Code/ChangeDetection/otbMeanRatioImageFilter.h
+++ b/Code/ChangeDetection/otbMeanRatioImageFilter.h
@@ -19,6 +19,7 @@
#define __otbMeanRatioImageFilter_h
#include "otbBinaryFunctorNeighborhoodImageFilter.h"
+#include "otbMeanRatio.h"
namespace otb
{
@@ -44,48 +45,6 @@ namespace otb
*
* \ingroup IntensityImageFilters Multithreaded
*/
-namespace Functor
-{
-
-template< class TInput1, class TInput2, class TOutput>
-class MeanRatio
-{
-public:
- MeanRatio() {};
- virtual ~MeanRatio() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
- {
-
- TOutput meanA = 0.0;
- TOutput meanB = 0.0;
-
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
-
- meanA += static_cast<TOutput>(itA.GetPixel(pos));
- meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
-
- }
-
- meanA /= itA.Size();
- meanB /= itB.Size();
-
- //std::cout<<"meanA= "<<meanA<<", meanB= "<<meanB<<std::endl;
-
- TOutput ratio;
-
- if(meanA == meanB)
- ratio = 0.;
- else if (meanA>meanB)
- ratio = static_cast<TOutput>(1.0 - meanB/meanA);
- else ratio = static_cast<TOutput>(1.0 - meanA/meanB);
-
- return ratio;
- }
-};
-}
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT MeanRatioImageFilter :
diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt
index 56010dbaa84bd003ec71b0e81b022c0e04bdccbf..576c3bd5365f86bdf63bc7d83ad7471ed44429d9 100644
--- a/Code/Common/CMakeLists.txt
+++ b/Code/Common/CMakeLists.txt
@@ -12,15 +12,25 @@ ENDIF( NOT OTB_USE_PQXX )
ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
+SET_TARGET_PROPERTIES(OTBCommon
+ PROPERTIES
+ LINK_INTERFACE_LIBRARIES ""
+)
TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon otbconfigfile)
-IF (OTB_USE_MAPNIK)
+IF(OTB_USE_MAPNIK)
TARGET_LINK_LIBRARIES(OTBCommon ${MAPNIK_LIBRARY})
ENDIF(OTB_USE_MAPNIK)
-IF (OTB_USE_PQXX)
-#TODO this line should be refined when we will like to have this capability with windows
- TARGET_LINK_LIBRARIES(OTBCommon pq pqxx)
+
+IF(OTB_USE_PQXX)
+ TARGET_LINK_LIBRARIES(OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX)
+IF(OTB_I18N)
+ TARGET_LINK_LIBRARIES(OTBCommon ${GETTEXT_LIBRARY})
+ IF(APPLE OR WIN32)
+ TARGET_LINK_LIBRARIES(OTBCommon ${GETTEXT_INTL_LIBRARY})
+ ENDIF(APPLE OR WIN32)
+ENDIF(OTB_I18N)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBCommon PROPERTIES ${OTB_LIBRARY_PROPERTIES})
diff --git a/Code/Common/otbArcSpatialObject.h b/Code/Common/otbArcSpatialObject.h
index 3eb90ba8168e39d3e4642fc937d12fbb88e3c1b0..e7032a408fb3a86f10131e87ec2d7ac32c829a2c 100644
--- a/Code/Common/otbArcSpatialObject.h
+++ b/Code/Common/otbArcSpatialObject.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbArcSpatialObject_h
diff --git a/Code/Common/otbArcSpatialObject.txx b/Code/Common/otbArcSpatialObject.txx
index 79700d2a7d34d20a49abfc7862c1cf06313ee37d..e54b8358ab960cac50d071c9521d7781fdaec2c1 100644
--- a/Code/Common/otbArcSpatialObject.txx
+++ b/Code/Common/otbArcSpatialObject.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbArcSpatialObject_txx
diff --git a/Code/Common/otbAttributesMapLabelObject.h b/Code/Common/otbAttributesMapLabelObject.h
index 16794330cfde5f52fa8bb33c27be32f9f0a74233..5312c2bc8fd515d454bcedec434d7cfd19bb82ee 100644
--- a/Code/Common/otbAttributesMapLabelObject.h
+++ b/Code/Common/otbAttributesMapLabelObject.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbAttributesMapLabelObject_h
diff --git a/Code/Common/otbAttributesMapOpeningLabelMapFilter.h b/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
index 396c222e139c10bd80322c2934beb1f7c19b1fab..de7307e81792593c41fc0d2867661a4fcccbc42a 100644
--- a/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbAttributesMapOpeningLabelMapFilter_h
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h
index ca24eba5206ae53e00127c0c434a17bacbb2228f..2801fe572a1285871a6038407bf8be95596f90c6 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -118,7 +118,7 @@ public:
typedef typename NeighborhoodIteratorType2::RadiusType RadiusType2;
- typedef typename itk::Size<> RadiusSizeType;
+ typedef typename itk::Size<Input1ImageType::ImageDimension> RadiusSizeType;
itkSetMacro(Radius, RadiusSizeType);
diff --git a/Code/Common/otbConcatenateVectorImageFilter.txx b/Code/Common/otbConcatenateVectorImageFilter.txx
index 68af49c69bbbca90df2b4670ad55d15a3770ff7c..6d8c5eb394ed7a5fff4743a86e2ae4303e1a63d1 100644
--- a/Code/Common/otbConcatenateVectorImageFilter.txx
+++ b/Code/Common/otbConcatenateVectorImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbConcatenateVectorImageFilter_txx
diff --git a/Code/Common/otbConfigurationFile.cxx b/Code/Common/otbConfigurationFile.cxx
index e814179f972360441cede87daf499a481291b267..e71e17d9784510b1984dbbd835d8826eac8e3f3b 100644
--- a/Code/Common/otbConfigurationFile.cxx
+++ b/Code/Common/otbConfigurationFile.cxx
@@ -16,6 +16,7 @@
=========================================================================*/
#include "otbConfigurationFile.h"
+#include "otbMacro.h"
namespace otb
{
@@ -25,6 +26,8 @@ ConfigurationFile::Pointer ConfigurationFile::Instance = NULL;
ConfigurationFile
::ConfigurationFile()
{
+ m_OTBConfig = NULL;
+
std::string OTBBinDir(OTB_CONFIG);
try
{
@@ -32,9 +35,9 @@ ConfigurationFile
}
catch (ConfigFile::file_not_found& e)
{
- itkExceptionMacro(<< "Error - File '" << e.filename << "' not found.");
+ otbMsgDebugMacro(<< "Error - File '" << e.filename << "' not found.");
}
-}
+}
ConfigurationFile
::~ConfigurationFile()
@@ -53,12 +56,12 @@ ConfigurationFile
};
-void
+void
ConfigurationFile
-::PrintSelf(std::ostream& os, itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os << indent;
+ os << indent;
os << (*m_OTBConfig);
}
diff --git a/Code/Common/otbConfigurationFile.h b/Code/Common/otbConfigurationFile.h
index 7572a2b0ff5fda45ea74b593df5ebc58a54b669d..616b747a81bfb6433f6cbe4bf6069a345466c41b 100644
--- a/Code/Common/otbConfigurationFile.h
+++ b/Code/Common/otbConfigurationFile.h
@@ -57,7 +57,13 @@ namespace otb
/** Get parameter*/
template<typename T> T GetParameter(const std::string & key) const {
- try
+
+ if(m_OTBConfig == NULL)
+ {
+ itkExceptionMacro(<<"Configuration file not found.");
+ }
+
+ try
{
return m_OTBConfig->read<T>( key );
}
diff --git a/Code/Common/otbDrawPathListFilter.h b/Code/Common/otbDrawPathListFilter.h
index bf56ce8d31b37d341fd6a6322f5a56ffd5dcb497..b9c4ed284115bbf23b76eae43ef0aa4b81b09bc4 100644
--- a/Code/Common/otbDrawPathListFilter.h
+++ b/Code/Common/otbDrawPathListFilter.h
@@ -31,9 +31,9 @@ namespace otb
* It then uses the otb::PolyLineImageIterator to draw each polyline. This iterator uses
* the general Bresenham algorithm known to be efficient in segment drawing.
*
- * If the UsePathInternalValue is toggled, the filter check if the metadata dictionnary of the input path has a "Value" key.
- * If it is the case, it will use this value to draw the Path instead of the default value. If not, it will use the default
- * value.
+ * If the UsePathInternalValue is toggled, the filter check if the metadata dictionnary of
+ * the input path has a "Value" key. If it is the case, it will use this value to draw the
+ * Path instead of the default value. If not, it will use the default value.
*
* \sa PolyLineParametricPathWithValue
* \sa MetaDataDictionary
@@ -47,10 +47,10 @@ class ITK_EXPORT DrawPathListFilter : public itk::ImageToImageFilter<TInputImage
{
public:
/** Standard class typedefs. */
- typedef DrawPathListFilter Self;
+ typedef DrawPathListFilter Self;
typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -59,19 +59,19 @@ public:
itkTypeMacro(DrawPathListFilter,ImageToImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType InputImageSizeType;
- typedef typename InputImageType::ValueType InputImageValueType;
-
- typedef TInputPath InputPathType;
- typedef typename InputPathType::Pointer InputPathPointerType;
- typedef otb::ObjectList<InputPathType> InputPathListType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::ConstPointer InputImageConstPointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::ValueType InputImageValueType;
+
+ typedef TInputPath InputPathType;
+ typedef typename InputPathType::Pointer InputPathPointerType;
+ typedef otb::ObjectList<InputPathType> InputPathListType;
typedef typename InputPathListType::ConstPointer InputPathListConstPointerType;
- typedef typename InputPathListType::Pointer InputPathListPointerType;
+ typedef typename InputPathListType::Pointer InputPathListPointerType;
typedef TOutputImage OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
@@ -116,9 +116,11 @@ protected:
private:
DrawPathListFilter(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
+
/** Default value to draw */
OutputImagePixelType m_PathValue;
- /** If set to true, the algorithm try to use path internal metadatadictionnary value */
+
+ /** If set to true, the algorithm try to use path internal metadata dictionnary value */
bool m_UseInternalPathValue;
bool m_AddValue;
@@ -131,4 +133,3 @@ private:
#endif
#endif
-
diff --git a/Code/Common/otbDrawPathListFilter.txx b/Code/Common/otbDrawPathListFilter.txx
index bde5aabde73b3f0125263d370b2bec13393993ed..63d92e6502b4a4fc74ae974aeee4a729094c4a4b 100644
--- a/Code/Common/otbDrawPathListFilter.txx
+++ b/Code/Common/otbDrawPathListFilter.txx
@@ -42,7 +42,6 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
m_AddValue = false;
}
-
template <class TInputImage, class TInputPath,class TOutputImage>
void
DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
@@ -62,6 +61,7 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
}
return static_cast<const InputPathListType *>(this->ProcessObjectType::GetInput(1));
}
+
/**
* Main computation method
*/
@@ -78,9 +78,9 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
outputPtr->FillBuffer(itk::NumericTraits<OutputImagePixelType>::Zero);
// First, we copy input to output
- typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
- typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
- typedef typename InputPathListType::ConstIterator PathListIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
+ typedef typename InputPathListType::ConstIterator PathListIteratorType;
typedef PolyLineImageIterator<OutputImageType,InputPathType> PolyLineIteratorType;
OutputIteratorType outIt(outputPtr,outputPtr->GetLargestPossibleRegion());
@@ -94,7 +94,7 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
}
// Then we use otb::PolyLineImageIterator to draw polylines
- for (PathListIteratorType plIt = pathListPtr->Begin(); plIt!=pathListPtr->End();++plIt)
+ for (PathListIteratorType plIt = pathListPtr->Begin(); plIt != pathListPtr->End(); ++plIt)
{
OutputImagePixelType value = itk::NumericTraits<OutputImagePixelType>::Zero;
if (m_UseInternalPathValue && plIt.Get()->GetMetaDataDictionary().HasKey("Value"))
@@ -119,6 +119,7 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
}
}
}
+
/**
* Printself method
*/
@@ -129,7 +130,7 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
{
Superclass::PrintSelf(os, indent);
}
+
} // end namespace otb
#endif
-
diff --git a/Code/Common/otbGISTableSource.txx b/Code/Common/otbGISTableSource.txx
index 1c7fc00298d7b81b6248e5ab8c3e493a522944b6..965f4d7cc344dc223652f2231c03adc41d3c1db3 100644
--- a/Code/Common/otbGISTableSource.txx
+++ b/Code/Common/otbGISTableSource.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Common/otbGenericInterpolateImageFunction.h b/Code/Common/otbGenericInterpolateImageFunction.h
index 9374af4d3905159c39f8bbe4c2fa44391810e720..0358c524d10614ad46a66d10095dfcc3ba853ddc 100644
--- a/Code/Common/otbGenericInterpolateImageFunction.h
+++ b/Code/Common/otbGenericInterpolateImageFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGenericInterpolateImageFunction_h
diff --git a/Code/Common/otbGenericInterpolateImageFunction.txx b/Code/Common/otbGenericInterpolateImageFunction.txx
index e39aed207ef193395e01219818098539b619bd9b..2dc8a516a17a237196c1af0a696700241b08a212 100644
--- a/Code/Common/otbGenericInterpolateImageFunction.txx
+++ b/Code/Common/otbGenericInterpolateImageFunction.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGenericInterpolateImageFunction_txx
diff --git a/Code/Common/otbImageList.h b/Code/Common/otbImageList.h
index c28bd5cf1c710f603a3dd81cb563e7572094fc0d..287eb4e75efa60a9c6fc3c54fa653e8d2bf26f23 100644
--- a/Code/Common/otbImageList.h
+++ b/Code/Common/otbImageList.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageList_h
@@ -59,7 +59,6 @@ public:
* Update images in the list.
*/
virtual void UpdateOutputInformation(void);
- virtual void PropagateRequestedRegion(void) throw (itk::InvalidRequestedRegionError);
virtual void UpdateOutputData(void);
diff --git a/Code/Common/otbImageList.txx b/Code/Common/otbImageList.txx
index 2ea07fab0e4d1cd56627d1d43db9122c6b0ac1fc..6beb48ec474e6ea7a9d94557c6ef25ca836e3cf6 100644
--- a/Code/Common/otbImageList.txx
+++ b/Code/Common/otbImageList.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageList_txx
@@ -29,6 +29,7 @@ ImageList<TImage>
::UpdateOutputData()
{
Superclass::UpdateOutputData();
+
for (ConstIterator it = this->Begin(); it!=this->End();++it)
{
if (it.Get()->GetUpdateMTime() < it.Get()->GetPipelineMTime()
@@ -43,37 +44,6 @@ ImageList<TImage>
}
}
-template <class TImage>
-void
-ImageList<TImage>
-::PropagateRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
- Superclass::PropagateRequestedRegion();
- for (ConstIterator it = this->Begin(); it!=this->End();++it)
- {
- if (it.Get()->GetUpdateMTime() < it.Get()->GetPipelineMTime()
- || it.Get()->GetDataReleased()
- || it.Get()->RequestedRegionIsOutsideOfTheBufferedRegion())
- {
- if (it.Get()->GetSource())
- {
- it.Get()->GetSource()->PropagateRequestedRegion(it.Get());
- }
- }
-
- // Check that the requested region lies within the largest possible region
- if ( ! it.Get()->VerifyRequestedRegion() )
- {
- // invalid requested region, throw an exception
- itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
- e.SetLocation(ITK_LOCATION);
- e.SetDataObject(it.Get());
- e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
-
- throw e;
- }
- }
-}
template <class TImage>
void
diff --git a/Code/Common/otbImageListSource.h b/Code/Common/otbImageListSource.h
index e0b7e524924a31362a318ca0e710a9bcc63d64c3..69bb971c2829c9a89e2c9d3b4ad44bdd0f31fc98 100644
--- a/Code/Common/otbImageListSource.h
+++ b/Code/Common/otbImageListSource.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListSource_h
diff --git a/Code/Common/otbImageListSource.txx b/Code/Common/otbImageListSource.txx
index c6784688fd27bd4706f842a87c9028bffe3f7dca..3b2e7af56e4262a0c5d99ca5a825b8a8d5a438ad 100644
--- a/Code/Common/otbImageListSource.txx
+++ b/Code/Common/otbImageListSource.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListSource_txx
diff --git a/Code/Common/otbImageListToImageFilter.h b/Code/Common/otbImageListToImageFilter.h
index 38d493cb6ff54761596d034174f10191f68282d4..aa7f1b6543d3cec99be27f07140c7cd1a23c6cb1 100644
--- a/Code/Common/otbImageListToImageFilter.h
+++ b/Code/Common/otbImageListToImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageFilter_h
diff --git a/Code/Common/otbImageListToImageFilter.txx b/Code/Common/otbImageListToImageFilter.txx
index 894615131106d4f260588231a58ee8f328566748..56b0d8b9b17c3586dae73168a84db84286b8f3cd 100644
--- a/Code/Common/otbImageListToImageFilter.txx
+++ b/Code/Common/otbImageListToImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageFilter_txx
diff --git a/Code/Common/otbImageListToImageListFilter.h b/Code/Common/otbImageListToImageListFilter.h
index 4989a7eaa13048286eb33197a0959778a2a04a64..89c173cb36be66f5afe19e99aebe391eb9ea0749 100644
--- a/Code/Common/otbImageListToImageListFilter.h
+++ b/Code/Common/otbImageListToImageListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListFilter_h
diff --git a/Code/Common/otbImageListToImageListFilter.txx b/Code/Common/otbImageListToImageListFilter.txx
index ed92995482ec91eba1fdbb851eb3b9446ec0c721..f042c854bece7cde3c48faf36110c3d5cba6beb0 100644
--- a/Code/Common/otbImageListToImageListFilter.txx
+++ b/Code/Common/otbImageListToImageListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListFilter_txx
diff --git a/Code/Common/otbImageRegionTileMapSplitter.h b/Code/Common/otbImageRegionTileMapSplitter.h
index 6290adaeb2b05250f267f3ddc046652ea4c211b9..537421fe27c114b0384d2e8707fde7572ab95fd1 100644
--- a/Code/Common/otbImageRegionTileMapSplitter.h
+++ b/Code/Common/otbImageRegionTileMapSplitter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Common/otbImageRegionTileMapSplitter.txx b/Code/Common/otbImageRegionTileMapSplitter.txx
index 2a1dc227b410e76e50028774dd0a105aa2faf0f4..6529baad31c97ebb30b01fa7a88e7eb18eceadd0 100644
--- a/Code/Common/otbImageRegionTileMapSplitter.txx
+++ b/Code/Common/otbImageRegionTileMapSplitter.txx
@@ -8,12 +8,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageRegionTileMapSplitter_txx
diff --git a/Code/Common/otbImageToImageListFilter.h b/Code/Common/otbImageToImageListFilter.h
index 7c522e5a1141a017720ba2343fff709f3056817c..0f924a32161ba9181c1f7d28dad6f3b5c32cf6b0 100644
--- a/Code/Common/otbImageToImageListFilter.h
+++ b/Code/Common/otbImageToImageListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToImageListFilter_h
diff --git a/Code/Common/otbImageToImageListFilter.txx b/Code/Common/otbImageToImageListFilter.txx
index ee50976eb44f57e1fb225f9e19676a28ff800a38..4596cbfc24210c287c425057007adbe698d2ace9 100644
--- a/Code/Common/otbImageToImageListFilter.txx
+++ b/Code/Common/otbImageToImageListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToImageListFilter_txx
diff --git a/Code/Common/otbImageToPathFilter.h b/Code/Common/otbImageToPathFilter.h
index 4b7677bec32e7da56078acc0f4268d90d5878d8e..fdb9911bdf0c66709a96fb9d2ff65b8b21681370 100644
--- a/Code/Common/otbImageToPathFilter.h
+++ b/Code/Common/otbImageToPathFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToPathFilter_h
diff --git a/Code/Common/otbImageToPathFilter.txx b/Code/Common/otbImageToPathFilter.txx
index 15cd700ddd4e9cb26dbf87e2dc416dfdb6b63d24..979110ed3fc1e99ad2e086f6276e49dd4f8a71fd 100644
--- a/Code/Common/otbImageToPathFilter.txx
+++ b/Code/Common/otbImageToPathFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToPathFilter_txx
diff --git a/Code/Common/otbLabelMapSource.txx b/Code/Common/otbLabelMapSource.txx
index ac9ef84d0f574c3f199357265d84b709919d0f1b..2ad82016545361324f0c3af476ea4f865af34eec 100644
--- a/Code/Common/otbLabelMapSource.txx
+++ b/Code/Common/otbLabelMapSource.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Common/otbLabelObjectToPolygonFunctor.h b/Code/Common/otbLabelObjectToPolygonFunctor.h
index 1cbcf57c7d9b9d42dc135abfdaf383166086bc99..166ee1d1627a6a8b33ae2eac223a22c1a7bb67f2 100644
--- a/Code/Common/otbLabelObjectToPolygonFunctor.h
+++ b/Code/Common/otbLabelObjectToPolygonFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLabelObjectToPolygonFunctor_h
diff --git a/Code/Common/otbLabelObjectToPolygonFunctor.txx b/Code/Common/otbLabelObjectToPolygonFunctor.txx
index 8b735998dcece8cfaab1096bc1ace3b8f9d369a0..87c0e712ec522cb314316ae13d3c549e8693b8ef 100644
--- a/Code/Common/otbLabelObjectToPolygonFunctor.txx
+++ b/Code/Common/otbLabelObjectToPolygonFunctor.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLabelObjectToPolygonFunctor_txx
diff --git a/Code/Common/otbLineSpatialObject.h b/Code/Common/otbLineSpatialObject.h
index 5c6838eca493260076a529430bd4d93b9deba432..c1c7e6c84b5237b0a3aef20b77819a8920477410 100644
--- a/Code/Common/otbLineSpatialObject.h
+++ b/Code/Common/otbLineSpatialObject.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLineSpatialObject_h
diff --git a/Code/Common/otbLineSpatialObject.txx b/Code/Common/otbLineSpatialObject.txx
index 2844e58ecbd210beb1d9eb836246a4d5878075ac..cfd1003f9b2ff2a9c72fce7c3f13276c429e8e21 100644
--- a/Code/Common/otbLineSpatialObject.txx
+++ b/Code/Common/otbLineSpatialObject.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLineSpatialObject_txx
diff --git a/Code/Common/otbList.h b/Code/Common/otbList.h
index 248ae35b951e2f066e3b1b2c6fa6e43879d956be..8826fd4d912045ecfef0b9eb541f2760cef1f865 100644
--- a/Code/Common/otbList.h
+++ b/Code/Common/otbList.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbList_h
diff --git a/Code/Common/otbObjectList.h b/Code/Common/otbObjectList.h
index 67b079f7d652bdc0d1bb59bcac4eb3d7a5ad9337..02ad0195fab294e33639b32b9faa34ee6c8ecec1 100644
--- a/Code/Common/otbObjectList.h
+++ b/Code/Common/otbObjectList.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbObjectList_h
diff --git a/Code/Common/otbObjectList.txx b/Code/Common/otbObjectList.txx
index e25f0b5308ad9ee922817e6857576d7c34d4c32d..020fa7e1960cb0b4e263442b9c45a7a7e5ea701c 100644
--- a/Code/Common/otbObjectList.txx
+++ b/Code/Common/otbObjectList.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbObjectList_txx
diff --git a/Code/Common/otbObjectListToObjectListFilter.h b/Code/Common/otbObjectListToObjectListFilter.h
index 35cfe3ffef30cf767583151f782f5440304bab89..0064ec93dadde5fb562e2c7ce51a9ebfc956f2f9 100644
--- a/Code/Common/otbObjectListToObjectListFilter.h
+++ b/Code/Common/otbObjectListToObjectListFilter.h
@@ -42,10 +42,10 @@ class ITK_EXPORT ObjectListToObjectListFilter : public otb::ObjectListSource<TOu
{
public:
/** Standard class typedefs. */
- typedef ObjectListToObjectListFilter Self;
+ typedef ObjectListToObjectListFilter Self;
typedef otb::ObjectListSource<TOutputList> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -54,22 +54,19 @@ public:
itkTypeMacro(ObjectListToObjectListFilter, ObjectListSource);
/** Some typedefs. */
- typedef TInputList InputListType;
- typedef TOutputList OutputListType;
- typedef typename TInputList::ConstPointer InputListPointer;
- typedef typename TOutputList::Pointer OutputListPointer;
- typedef typename TInputList::ConstIterator InputListIterator;
- typedef typename InputListType::ObjectType InputObjectType;
+ typedef TInputList InputListType;
+ typedef TOutputList OutputListType;
+ typedef typename TInputList::ConstPointer InputListPointer;
+ typedef typename TOutputList::Pointer OutputListPointer;
+ typedef typename TInputList::ConstIterator InputListIterator;
+ typedef typename InputListType::ObjectType InputObjectType;
typedef typename OutputListType::ObjectType OutputObjectType;
- typedef itk::DataObject::Pointer DataObjectPointer;
-
- typedef std::vector<OutputListPointer> OutputListForThreadType;
+ typedef itk::DataObject::Pointer DataObjectPointer;
virtual void SetInput( const InputListType *input);
const InputListType * GetInput(void);
-
protected:
/** Constructor */
ObjectListToObjectListFilter();
@@ -82,11 +79,14 @@ protected:
/** Multi-threading implementation */
+ typedef std::vector<OutputListPointer> OutputListForThreadType;
+
virtual void BeforeThreadedGenerateData();
virtual void AfterThreadedGenerateData() {};
- virtual int SplitRequestedRegion(int threadId, int threadCount, unsigned int requestedElements, unsigned int& startIndex, unsigned int& stopIndex);
+ virtual int SplitRequestedRegion(int threadId, int threadCount, unsigned int requestedElements,
+ unsigned int& startIndex, unsigned int& stopIndex);
/** startIndex and stopIndex represent the indices of the Objects
* to examine in thread threadId */
@@ -103,9 +103,10 @@ protected:
Pointer Filter;
};
+ OutputListForThreadType m_ObjectListPerThread;
+
/** End Multi-threading implementation */
- OutputListForThreadType m_ObjectListPerThread;
private:
ObjectListToObjectListFilter(const Self&); //purposely not implemented
diff --git a/Code/Common/otbPathListToPathListFilter.h b/Code/Common/otbPathListToPathListFilter.h
index 572e45f7a26d05603455e1817999abb025b915e4..ceacb63c83f8be15c9b02948aa60bfe7915dc63a 100644
--- a/Code/Common/otbPathListToPathListFilter.h
+++ b/Code/Common/otbPathListToPathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPathListToPathListFilter_h
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.h b/Code/Common/otbPersistentFilterStreamingDecorator.h
index 1f61350e45fc45cc28deaad26089f5724d6d30c6..141c33dc358ab883dfeade94f17178cf403f65a2 100644
--- a/Code/Common/otbPersistentFilterStreamingDecorator.h
+++ b/Code/Common/otbPersistentFilterStreamingDecorator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPersistentFilterStreamingDecorator_h
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.txx b/Code/Common/otbPersistentFilterStreamingDecorator.txx
index f24ef7c1aa9781a545ea45c32ed46d44b8f500bf..da4d5b2de23107f8e5618c54ce035aaa6392071e 100644
--- a/Code/Common/otbPersistentFilterStreamingDecorator.txx
+++ b/Code/Common/otbPersistentFilterStreamingDecorator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPersistentFilterStreamingDecorator_txx
diff --git a/Code/Common/otbPersistentImageFilter.h b/Code/Common/otbPersistentImageFilter.h
index dd98c213d4f126d0c6f61caade50d63ad7e024ff..c27cf8a47875d1b8e63c89772a01df07a439c092 100644
--- a/Code/Common/otbPersistentImageFilter.h
+++ b/Code/Common/otbPersistentImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPersistentImageFilter_h
diff --git a/Code/Common/otbPointSetAndValuesFunction.h b/Code/Common/otbPointSetAndValuesFunction.h
index c88d95ae8a87d5a434de6b3de5e674bdcebd366e..6a17d5444d8105d3726e01cce85544098ed269d9 100644
--- a/Code/Common/otbPointSetAndValuesFunction.h
+++ b/Code/Common/otbPointSetAndValuesFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPointSetAndValuesFunction_h
diff --git a/Code/Common/otbPointSetSource.h b/Code/Common/otbPointSetSource.h
index 6aceeb25655b857ef2656c14e262b6f14f84356a..24a60e75b2634e2d056ca73465ae0168291b92ed 100644
--- a/Code/Common/otbPointSetSource.h
+++ b/Code/Common/otbPointSetSource.h
@@ -55,9 +55,10 @@ public:
itkTypeMacro(PointSetSource,itk::ProcessObject);
/** Some convenient typedefs. */
- typedef itk::DataObject::Pointer DataObjectPointer;
- typedef TOutputPointSet OutputPointSetType;
- typedef typename OutputPointSetType::Pointer OutputPointSetPointer;
+ typedef itk::DataObject::Pointer DataObjectPointer;
+ typedef TOutputPointSet OutputPointSetType;
+ typedef typename OutputPointSetType::Pointer OutputPointSetPointer;
+ typedef typename OutputPointSetType::PointsContainer PointsContainerType;
/** Get the point set output of this process object. */
OutputPointSetType * GetOutput(void);
diff --git a/Code/Common/otbPolyLineImageConstIterator.h b/Code/Common/otbPolyLineImageConstIterator.h
index d7d41585c6d51dcdb18ad3cdb828468e3933fa3a..ed5c5f95937bc4925e4e65fa6a78aba0c26b6587 100644
--- a/Code/Common/otbPolyLineImageConstIterator.h
+++ b/Code/Common/otbPolyLineImageConstIterator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolyLineImageConstIterator_h
@@ -105,13 +105,16 @@ public:
virtual ~PolyLineImageConstIterator() {};
protected: //made protected so other iterators can access
+
/** Smart pointer to the source image. */
typename ImageType::ConstWeakPointer m_Image;
+
/** Smart pointer to the path */
typename PathType::ConstPointer m_Path;
- InternalImageIteratorType m_InternalImageIterator;
- VertexIteratorType m_InternalVertexIterator;
+ InternalImageIteratorType m_InternalImageIterator;
+ VertexIteratorType m_InternalVertexIterator;
};
+
}// End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPolyLineImageConstIterator.txx"
diff --git a/Code/Common/otbPolyLineImageConstIterator.txx b/Code/Common/otbPolyLineImageConstIterator.txx
index ce929f350d4d54cc67de1eb2b04c98bbb04f4b04..8891ad00b1a4ab3689e67444a1f95d3cd73b14e7 100644
--- a/Code/Common/otbPolyLineImageConstIterator.txx
+++ b/Code/Common/otbPolyLineImageConstIterator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolyLineImageConstIterator_txx
@@ -36,29 +36,27 @@ PolyLineImageConstIterator<TImage, TPath>
m_Image = imagePtr;
m_Path = pathPtr;
m_InternalVertexIterator = m_Path->GetVertexList()->Begin();
- IndexType source,target;
- for (unsigned int i = 0;i<ImageType::ImageDimension;++i)
+ IndexType source, target;
+ for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
{
- source[i] = static_cast<unsigned int>(m_InternalVertexIterator.Value()[i]);
+ source[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
}
++m_InternalVertexIterator;
- if (m_InternalVertexIterator!=m_Path->GetVertexList()->End())
+ if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
{
- for (unsigned int i = 0;i<ImageType::ImageDimension;++i)
+ for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
{
- target[i] = static_cast<unsigned int>(m_InternalVertexIterator.Value()[i]);
+ target[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
}
}
else
{
target = source;
}
- m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *>(m_Image.GetPointer()),source,target);
+ m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *> (m_Image.GetPointer()), source, target);
}
-/**
- * Constructor
- */
+
template <class TImage, class TPath>
typename PolyLineImageConstIterator<TImage,TPath>
::Self&
@@ -77,25 +75,25 @@ PolyLineImageConstIterator<TImage, TPath>
::GoToBegin(void)
{
m_InternalVertexIterator = m_Path->GetVertexList()->Begin();
- IndexType source,target;
- for (unsigned int i = 0;i<ImageType::ImageDimension;++i)
+ IndexType source, target;
+ for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
{
- source[i] = static_cast<unsigned int>(m_InternalVertexIterator.Value()[i]);
+ source[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
}
++m_InternalVertexIterator;
- if (m_InternalVertexIterator!=m_Path->GetVertexList()->End())
+ if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
{
- for (unsigned int i = 0;i<ImageType::ImageDimension;++i)
+ for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
{
- target[i] = static_cast<unsigned int>(m_InternalVertexIterator.Value()[i]);
+ target[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
}
}
else
{
target = source;
}
- m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *>(m_Image.GetPointer()),source,target);
+ m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *> (m_Image.GetPointer()), source, target);
}
template <class TImage, class TPath>
@@ -103,32 +101,34 @@ void
PolyLineImageConstIterator<TImage,TPath>
::operator++()
{
-// otbMsgDebugMacro(<<this->GetIndex());
+ // otbMsgDebugMacro(<<this->GetIndex());
++m_InternalImageIterator;
if (m_InternalImageIterator.IsAtEnd())
{
- if (m_InternalVertexIterator!=m_Path->GetVertexList()->End())
+ if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
{
IndexType source;
- for (unsigned int i = 0;i<ImageType::ImageDimension;++i)
+ for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
{
- source[i] = static_cast<unsigned int>(m_InternalVertexIterator.Value()[i]);
+ source[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
}
// otbMsgDebugMacro(<<"Source: "<<source);
++m_InternalVertexIterator;
- if (m_InternalVertexIterator!=m_Path->GetVertexList()->End())
+ if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
{
IndexType target;
- for (unsigned int i = 0;i<ImageType::ImageDimension;++i)
+ for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
{
- target[i] = static_cast<unsigned int>(m_InternalVertexIterator.Value()[i]);
+ target[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
}
// otbMsgDebugMacro(<<"Target: "<<target);
- m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *>(m_Image.GetPointer()),source,target);
+ m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *> (m_Image.GetPointer()), source,
+ target);
++m_InternalImageIterator;
}
}
}
}
+
} // End namespace otb
#endif
diff --git a/Code/Common/otbPolyLineImageIterator.h b/Code/Common/otbPolyLineImageIterator.h
index 4d509f0f2d2b3688dd73065efbeaa54f54eaa44b..71109e46a557136078a808eca3b94f7e45f037c6 100644
--- a/Code/Common/otbPolyLineImageIterator.h
+++ b/Code/Common/otbPolyLineImageIterator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolyLineImageIterator_h
@@ -43,7 +43,7 @@ class ITK_EXPORT PolyLineImageIterator
{
public:
/** Standard typedefs */
- typedef PolyLineImageIterator Self;
+ typedef PolyLineImageIterator Self;
typedef PolyLineImageConstIterator<TImage,TPath> Superclass;
itkStaticConstMacro(ImageIteratorDimension, unsigned int,
@@ -89,7 +89,8 @@ public:
{
this->Superclass::operator=(it);
return *this;
- };
+ }
+
/** Constructor establishes an iterator to walk along a line */
PolyLineImageIterator(ImageType *imagePtr,PathType * pathPtr)
: Superclass(imagePtr,pathPtr) {};
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.h b/Code/Common/otbPolyLineParametricPathWithValue.h
index cb2cbbb9d2528a2b4f38c8f7656e317f7dc03a99..e1d6e9c41ceb76a291a4c836a2b649e73fc5127f 100644
--- a/Code/Common/otbPolyLineParametricPathWithValue.h
+++ b/Code/Common/otbPolyLineParametricPathWithValue.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolyLineParametricPathWithValue_h
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.txx b/Code/Common/otbPolyLineParametricPathWithValue.txx
index dabf1c18bbc2ae1ea8537e212034b00f29a96aa0..6062c0e74f2068d7d1ff715785d1600f37cdfcad 100644
--- a/Code/Common/otbPolyLineParametricPathWithValue.txx
+++ b/Code/Common/otbPolyLineParametricPathWithValue.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolyLineParametricPathWithValue_txx
diff --git a/Code/Common/otbPolygon.h b/Code/Common/otbPolygon.h
index b5407926bef28ebfe993bed63222abeaa98812b0..ae59eff79eabecd33d0b0a272d28a8ca4b0cf90b 100644
--- a/Code/Common/otbPolygon.h
+++ b/Code/Common/otbPolygon.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolygon_h
diff --git a/Code/Common/otbPolygon.txx b/Code/Common/otbPolygon.txx
index eb7387e725564027b19d92cce3e1eaac0bb5997f..6e0f86075f76546146da66f9b35dbbe0a800d98b 100644
--- a/Code/Common/otbPolygon.txx
+++ b/Code/Common/otbPolygon.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPolygon_txx
diff --git a/Code/Common/otbQuickLookImageGenerator.h b/Code/Common/otbQuickLookImageGenerator.h
index 477cebe6cc0df4c2d68748a5de6527712ef84671..5af0ea483b5b10bc738d2f69ad4a2b130bb01143 100755
--- a/Code/Common/otbQuickLookImageGenerator.h
+++ b/Code/Common/otbQuickLookImageGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Common/otbQuickLookImageGenerator.txx b/Code/Common/otbQuickLookImageGenerator.txx
index 4c31bd43985dbbbd59fb01e94fc58c43ec7b4b81..c5b8c92597bdb64827cc7c91f1078140b2bd5907 100755
--- a/Code/Common/otbQuickLookImageGenerator.txx
+++ b/Code/Common/otbQuickLookImageGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbQuickLookImageGenerator.h"
diff --git a/Code/Common/otbRadiometricAttributesLabelMapFilter.h b/Code/Common/otbRadiometricAttributesLabelMapFilter.h
index 20c5a1c699398df657f90526e76c3375da6309de..071b2e524adfac7bb24f3afc4abdca940469e573 100644
--- a/Code/Common/otbRadiometricAttributesLabelMapFilter.h
+++ b/Code/Common/otbRadiometricAttributesLabelMapFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __itkRadiometricAttributesLabelMapFilter_h
diff --git a/Code/Common/otbRadiometricAttributesLabelMapFilter.txx b/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
index 61e4a41e89921db7fdc6709870b130faf72e715c..2e224b12c47da5c52e34a387f3b858137361237c 100644
--- a/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
+++ b/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRadiometricAttributesLabelMapFilter_txx
diff --git a/Code/Common/otbRectangle.h b/Code/Common/otbRectangle.h
index c9f21427e7a0913edb3fecea9f84e28719b6a093..3226fa90ed5381d6f2c9580a4727317c2a0039b1 100644
--- a/Code/Common/otbRectangle.h
+++ b/Code/Common/otbRectangle.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRectangle_h
diff --git a/Code/Common/otbRectangle.txx b/Code/Common/otbRectangle.txx
index 409a68e3aa6f12a54b7d108d1e4819b6b34413a0..8c1e56671c5d5240c0ad6cfd31542d48fcdf9933 100644
--- a/Code/Common/otbRectangle.txx
+++ b/Code/Common/otbRectangle.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRectangle_txx
diff --git a/Code/Common/otbSpatialObjectSource.h b/Code/Common/otbSpatialObjectSource.h
index f304f4252124dba1a227e8ec8b69e839ae7358f4..468b818c6efa003772ee97de1ddbd03a41984204 100644
--- a/Code/Common/otbSpatialObjectSource.h
+++ b/Code/Common/otbSpatialObjectSource.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSpatialObjectSource_h
diff --git a/Code/Common/otbSpatialObjectSource.txx b/Code/Common/otbSpatialObjectSource.txx
index ac2c7cb58fad921ce54b4c18f9644a54f4694b8e..4a4016f6af9a8f5a3ea073b37c2b327005473193 100644
--- a/Code/Common/otbSpatialObjectSource.txx
+++ b/Code/Common/otbSpatialObjectSource.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSpatialObjectSource_txx
diff --git a/Code/Common/otbStreamingTraits.h b/Code/Common/otbStreamingTraits.h
index ab1e315daa3428fb1f1c00e2019d3f889989b44a..69ffb0fd17f8cb9a7c9995d9648f503c129affb5 100644
--- a/Code/Common/otbStreamingTraits.h
+++ b/Code/Common/otbStreamingTraits.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbStreamingTraits_h
diff --git a/Code/Common/otbStreamingTraits.txx b/Code/Common/otbStreamingTraits.txx
index 5153e505150dbb1d3cf89a3428422342f1d01c80..f0dff8a8c6ff52b8a36be9524a7b0ec5b3cc087b 100644
--- a/Code/Common/otbStreamingTraits.txx
+++ b/Code/Common/otbStreamingTraits.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbStreamingTraits_txx
@@ -21,6 +21,7 @@ See OTBCopyright.txt for details.
#include "otbStreamingTraits.h"
#include "otbMacro.h"
#include "otbConfigure.h"
+#include "otbConfigurationFile.h"
#include "itkInterpolateImageFunction.h"
#include "itkBSplineInterpolateImageFunction.h"
@@ -111,8 +112,24 @@ unsigned long StreamingTraits<TImage>
case SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS : // Just like SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
case SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS :
{
- const std::streamoff streamMaxSizeBufferForStreamingBytes = OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING;
- const std::streamoff streamImageSizeToActivateStreamingBytes = OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING;
+ typedef otb::ConfigurationFile ConfigurationType;
+ ConfigurationType::Pointer conf = ConfigurationType::GetInstance();
+ std::streamoff streamMaxSizeBufferForStreamingBytes;
+ std::streamoff streamImageSizeToActivateStreamingBytes;
+ try
+ {
+ streamMaxSizeBufferForStreamingBytes = conf->GetParameter<std::streamoff>("OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING");
+ streamImageSizeToActivateStreamingBytes = conf->GetParameter<std::streamoff>("OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING");
+ }
+ catch(...)
+ {
+ // We should never have to go here if the configuration file is
+ // correct and found. In case it is not fallback on the cmake
+ // defined constants.
+ streamMaxSizeBufferForStreamingBytes = OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING;
+ streamImageSizeToActivateStreamingBytes = OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING;
+ }
+
//Convert in octet unit
std::streamoff streamMaxSizeBufferForStreaming = streamMaxSizeBufferForStreamingBytes/8;
const std::streamoff streamImageSizeToActivateStreaming = streamImageSizeToActivateStreamingBytes/8;
diff --git a/Code/Common/otbVectorDataExtractROI.txx b/Code/Common/otbVectorDataExtractROI.txx
index f81dbf8cf59e12239cedf40376255207cb96d1be..69a62573e68d1ee1b1fa5a655a73a8d3bce6efad 100644
--- a/Code/Common/otbVectorDataExtractROI.txx
+++ b/Code/Common/otbVectorDataExtractROI.txx
@@ -117,7 +117,7 @@ VectorDataExtractROI<TVectorData>
chrono.Start();
ProcessNode(inputRoot,outputRoot);
chrono.Stop();
- std::cout<<"VectorDataExtractROI: "<<m_Kept<<" Features processed in "<<chrono.GetMeanTime()<<" seconds."<<std::endl;
+ otbMsgDevMacro(<<"VectorDataExtractROI: "<<m_Kept<<" Features processed in "<<chrono.GetMeanTime()<<" seconds.");
}/*End GenerateData()*/
diff --git a/Code/Common/otbVectorDataProperties.txx b/Code/Common/otbVectorDataProperties.txx
index 4f1374e37d00ba560adb71bda1780c1fab645bdf..6253ccdad0f99e95c1895c382ee3c2abe64cd8ca 100644
--- a/Code/Common/otbVectorDataProperties.txx
+++ b/Code/Common/otbVectorDataProperties.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Common/otbVectorDataSource.txx b/Code/Common/otbVectorDataSource.txx
index 859c11c7164ab6cd75b31beba5f025f4c3960153..74bffc5733ac97a2d03fbfe8573103e860b6bd12 100644
--- a/Code/Common/otbVectorDataSource.txx
+++ b/Code/Common/otbVectorDataSource.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
index 1c4ab3318e33eeba33e5073fba1ef7d963f9eb3f..bd97df8b8a89cec3174fe674e712f0c85ec7ec5b 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBSplinesInterpolateDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
index 52b5a457c5e9f3260137a7a78a30666f4992f881..232058a2240d83ff44811a5bb74a90086e671fbd 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBSplinesInterpolateDeformationFieldGenerator_txx
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
index 1ea07a2dd40edce30cd00df6b6735fcce94f5df0..b26255c8991c83433d89f5a4e2542fe64125b073 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBSplinesInterpolateTransformDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
index 30397b34dc78bd832fbf6970c7c4c8c961f4e0c1..e822075a344c8487b6ea12d2ecc31b974d1e7c18 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBSplinesInterpolateTransformDeformationFieldGenerator_txx
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
index c1373461973d00946f7b22db3c8234a767f87b06..4d8af4391c99a5b60f76eb97bcc250e6a33f7127 100644
--- a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNNearestPointsLinearInterpolateDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
index 53bbcdb78a3eb156ce6a50cced18331a122ae1fb..4ab5a71354456ac7197a32a52cc7b070d7110fbb 100644
--- a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNNearestPointsLinearInterpolateDeformationFieldGenerator_txx
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
index dc4a683376613e4ccc3da421c55be264c26e04e2..7d37b7f6bd28595d04df6ef7ff3a6a0463add86c 100644
--- a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
index 34969b4371dba68cc5be1bc904e508bb8ef994ad..b5e2093c832ab85f682ba82d1e27d4686f9c8e5f 100644
--- a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_txx
diff --git a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
index cb72246878cfd286ea44e028b7b728ca4e94ae31..7e4874eec3b0267e931f53168b9689e9e1752682 100644
--- a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNearestPointDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
index 933bd5c6a9b0e58a9939de0bdb32167c7c3ffd0a..e86700c82843d5e8ea6b84196f45aa6c1805ef0b 100644
--- a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNearestPointDeformationFieldGenerator_txx
diff --git a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
index 801fd5d163b97a7dbb26dd0d9013465da7cf829b..e3e67f71186cd4cf6e77caf45d049346fa3e89e5 100644
--- a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNearestTransformDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
index 3a67d9cc62b5efb4bf33a0b38526e134c422af80..ed40305a896a5790a4f9e4445808bc8380d6e2cc 100644
--- a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNearestTransformDeformationFieldGenerator_txx
diff --git a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
index 7a6064eefdf28865485c3237d9309c7c9fe2b87c..c450838cd042e818b4b31305133a151ed654d9c5 100644
--- a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPointSetToDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
index 1c4ea562b5ac607b26dcf8d663c72a2231d80b48..2ae41f31ce40dcb6d1b98ab6c0d94ff38dfec866 100644
--- a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPointSetToDeformationFieldGenerator_txx
diff --git a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
index 386bb1f304e2f94fe0ea61266d937386f2a97aee..50695e8f72472a128d5ae7579f7ce2c57ff9e331 100644
--- a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPointSetWithTransformToDeformationFieldGenerator_h
diff --git a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx
index 2e59811541dcd82326ff34a7f7959a38359aeaa6..d4e0e7e16387898c10e8b0cb46a372e665caefe9 100644
--- a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPointSetWithTransformToDeformationFieldGenerator_txx
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.h b/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
index 79efbb3a7c22a196642bad77f7cd82342b748dff..ffcfdf0f2e6eb91fc3f27160af5153fa0a412ef4 100644
--- a/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
+++ b/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBreakAngularPathListFilter_h
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx b/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
index f0d931286cc91e4923876592453ac1e44942182d..cdc2c56aaff156240d86764e9a3edfb6c6a2a386 100644
--- a/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBreakAngularPathListFilter_txx
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
index 1a84ca63bc54903ef314d4ff4eb883565875001d..738bfa6435520f19db0956442a3d385846a59151 100644
--- a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
+++ b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbForwardFourierMellinTransformImageFilter_txx
diff --git a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
index 7f573967f72fb23565fcd7cf1e232a0c37eb9df3..fdb2908f40e734366da77d8863e21de950334196 100644
--- a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGenericRoadExtractionFilter_h
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
index ff53df19d5d8f5018db2b96ba9e4a25f57f5cb4e..8d46e09442a3a348298d9e2d2d5ac38842f77b7d 100644
--- a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
+++ b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageFittingPolygonListFilter_h
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
index d006f1acf1d1ecd950c03c7e63b0718085df84a5..d7558ab31c5c8b7d9a73d1eb809500ccd01c85b7 100644
--- a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
+++ b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageFittingPolygonListFilter_txx
diff --git a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h
index 66f18a999c9e09e3f4259b61d0567ed93746aec9..b406a7652d59eaf621fe48084faa062bb3daa1c6 100644
--- a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h
+++ b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToHessianDeterminantImageFilter_h
diff --git a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx
index 4007257c28dcfe5a5ab71b59575d788bb2359967..feba8081891e16d1918d8df961cd287bdd1fd947 100644
--- a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx
+++ b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
index 140af734e4d2e1d58a9a7a813d28133da395b451..142fc3014d46e43f0fb672e4220b61f8554a5f6d 100644
--- a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
+++ b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
@@ -275,7 +275,7 @@ ImageToLineSegmentVectorData<TInputImage, TPrecision>
}
// no point to fuse
else
- go = true;
+ go = true;
}// else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
else
{
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
index f5785ac7eaf8fb431c085d47ce710415faf7b8f7..987cc93cdc442a0a178bdb88ed344b4896b580e6 100644
--- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
+++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToSIFTKeyPointSetFilter_h
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
index 2df2b3a1d2448b77c57f384cfca156f28517c4f3..35bd9011aed6f74a830e8dc8213db63a1c68cdac 100644
--- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToSIFTKeyPointSetFilter_txx
diff --git a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
index d7b57ed1c3066bb795315418fa2216f66d25da1a..9556e668d1148e8d465b2125c50c38419237e2d4 100644
--- a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
+++ b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToSURFKeyPointSetFilter_h
diff --git a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx
index 8aca4018f4735a975a96a0b638ec386139524319..b715a60ba83819557b5e917e54c120cca5a3435e 100644
--- a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
index 34117ae99f70b087de6f425339eb389623063cc5..df14d351e30a3148769d3d5a7493b28923920d60 100644
--- a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
+++ b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbKeyPointSetsMatchingFilter_h
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx
index 33941c1de0bd111685aaa10a98762dfade9f1136..9bd156fcca6e423c78444d3fdee5a633f69b0c03 100644
--- a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx
+++ b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbKeyPointSetsMatchingFilter_txx
diff --git a/Code/FeatureExtraction/otbLandmark.h b/Code/FeatureExtraction/otbLandmark.h
index 8355da875ea3021ffef7908398514a0d8af474b5..3ee1cfca04e5549da785d5cb95de34b08bbf07ab 100644
--- a/Code/FeatureExtraction/otbLandmark.h
+++ b/Code/FeatureExtraction/otbLandmark.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLandmark_h
diff --git a/Code/FeatureExtraction/otbLikelihoodPathListFilter.h b/Code/FeatureExtraction/otbLikelihoodPathListFilter.h
index 615de108ab0b739aad56acf52af142b487a51663..0898715ad57e462e1fc94f70b28a976a41271159 100644
--- a/Code/FeatureExtraction/otbLikelihoodPathListFilter.h
+++ b/Code/FeatureExtraction/otbLikelihoodPathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLikelihoodPathListFilter_h
diff --git a/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx b/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
index 0ad10d174b24e41726feaf353dfe3f2c1c700589..e2bc559ade6c2f9ad6a04bf5d60661f796e06d5c 100644
--- a/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
+++ b/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLikelihoodPathListFilter_txx
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index b6e270f2dbc0189980b9b7cb2aa022ab1fb62ad6..17fec791601b2305ddf950f93d68036c75567724 100644
--- a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLineSpatialObjectListToRightAnglePointSetFilter_h
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.h b/Code/FeatureExtraction/otbLinkPathListFilter.h
index b3aafb98f26d938d13c9753ab4e78e8044a0c56f..9fe47439e818f41467f178fb3b84d26052d38a49 100644
--- a/Code/FeatureExtraction/otbLinkPathListFilter.h
+++ b/Code/FeatureExtraction/otbLinkPathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLinkPathListFilter_h
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.txx b/Code/FeatureExtraction/otbLinkPathListFilter.txx
index 8500b6c1d354da423890675e79258d9251c77c90..f655386fa1c2e4fc9bb10eef7e4fc9a6fc96c960 100644
--- a/Code/FeatureExtraction/otbLinkPathListFilter.txx
+++ b/Code/FeatureExtraction/otbLinkPathListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLinkPathListFilter_txx
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
index 66f030325c8fefe051bae8b85151c6db74cbc691..2c8f8dfcb9c2417a4c89111efdc39ff0536a4f42 100644
--- a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
+++ b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNeighborhoodScalarProductFilter_h
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
index 0e7dd4957fe01cdbc2c0d947fb89993d5aa5950a..33ab5a20fec388b394f990b592d4f489f1e66cc8 100644
--- a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
+++ b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNeighborhoodScalarProductFilter_txx
diff --git a/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h b/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
index 515c83de3f123e2e8f505154bac7e7b3f8ef9f48..b89c15d01a0e80b528b6ce9bbb0b09c316d6d068 100644
--- a/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
+++ b/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbNonMaxRemovalByDirectionFilter_h
diff --git a/Code/FeatureExtraction/otbParallelLinePathListFilter.h b/Code/FeatureExtraction/otbParallelLinePathListFilter.h
index 30b09c3350c3076706caf0dce3f9322dbef321e9..b7971cc48b9896c80f2739ea38d143ba1fb5c6e5 100644
--- a/Code/FeatureExtraction/otbParallelLinePathListFilter.h
+++ b/Code/FeatureExtraction/otbParallelLinePathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbParallelLinePathListFilter_h
diff --git a/Code/FeatureExtraction/otbParallelLinePathListFilter.txx b/Code/FeatureExtraction/otbParallelLinePathListFilter.txx
index 45f704045800a88894c148a478b51f76da75b6ef..aa8d5c0105de322ec4212e989b175841d95fe4f1 100644
--- a/Code/FeatureExtraction/otbParallelLinePathListFilter.txx
+++ b/Code/FeatureExtraction/otbParallelLinePathListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbParallelLinePathListFilter_txx
diff --git a/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h b/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
index fc58f3962c27e8d0f95b49f53a3f8fc4d53f3d7d..659974e1fe922bfc8982a9610c09ca6aa2efff63 100644
--- a/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
+++ b/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRemoveIsolatedByDirectionFilter_h
diff --git a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
index 51a9806cae58680c283beab0a9094e374fbdcf56..3eb6680e841113097724be142cd02a4782ac64bd 100644
--- a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
+++ b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRemoveTortuousPathListFilter_h
diff --git a/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h b/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
index d19fdad50078ba958aefb7bb9a0c49054e973ccb..af178aca065984d9493a084255ce266ff982d57e 100644
--- a/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
+++ b/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRemoveWrongDirectionFilter_h
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.h b/Code/FeatureExtraction/otbRoadExtractionFilter.h
index d8f2a4cc775b1ff8e4cc128ed2c2dabe406df90e..ee983caa6920d1b89a03507dc10a93dc883dd4ed 100644
--- a/Code/FeatureExtraction/otbRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbRoadExtractionFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRoadExtractionFilter_h
diff --git a/Code/FeatureExtraction/otbSFSTexturesImageFilter.h b/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
index 0974b8fe2e324a625b24300630039c4fc45158ea..828d9e05a88308e1197e5fe877cb674119dca048 100644
--- a/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
+++ b/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSFSTexturesImageFilter_h
diff --git a/Code/FeatureExtraction/otbSiftFastImageFilter.h b/Code/FeatureExtraction/otbSiftFastImageFilter.h
index a059676861cea94753e0c8f8bf070024a4a8496f..0c28231169066efa46a539b4a1f390c09d3b4159 100644
--- a/Code/FeatureExtraction/otbSiftFastImageFilter.h
+++ b/Code/FeatureExtraction/otbSiftFastImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSiftFastImageFilter_h
diff --git a/Code/FeatureExtraction/otbSiftFastImageFilter.txx b/Code/FeatureExtraction/otbSiftFastImageFilter.txx
index 6fea52daa0dcb12435f69a56ff6e0f31500f1178..44a3319933e07e3486a9a64e2715a53fbbd34e59 100644
--- a/Code/FeatureExtraction/otbSiftFastImageFilter.txx
+++ b/Code/FeatureExtraction/otbSiftFastImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/FeatureExtraction/otbSimplifyPathListFilter.h b/Code/FeatureExtraction/otbSimplifyPathListFilter.h
index dfb8d3ebe2b85c428a4e31b440945c865e0f31d3..f907691885f9e641ff5061b5076a23fc333bc704 100644
--- a/Code/FeatureExtraction/otbSimplifyPathListFilter.h
+++ b/Code/FeatureExtraction/otbSimplifyPathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSimplifyPathListFilter_h
diff --git a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
index bbb5dbda962a9a2101eccffd91f0a92504ca33d7..74b59b5127ab91ad0fdecd021897275839577f99 100644
--- a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
+++ b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSqrtSpectralAngleFunctor_h
diff --git a/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h b/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h
index 0351bed520a0a453aa99f2e8afa44ac2375d05f5..bcbd3588db56fa7dc82a950d417610896cda5ddf 100755
--- a/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h
+++ b/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h
@@ -25,7 +25,7 @@ namespace otb
namespace Functor
{
/** \class SumVarianceextureFunctor
- * \brief This functor calculates the sum variance image texture according to Haralick descriptiors.
+ * \brief This functor calculates the sum variance image texture according to Haralick descriptors.
*
* Computes sum variance using joint histogram (neighborhood and offset neighborhood).
* The formula is:
@@ -71,11 +71,11 @@ public:
double sVal = (static_cast<double>(s)+0.5)*this->GetNeighBinLength();
if( vcl_abs(rVal + sVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
{
- Px_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
+ Px_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
}
if( vcl_abs(rVal + sVal - nCeil2) < vcl_abs(this->GetNeighBinLength()) )
{
- Px_y2 += static_cast<double>(this->GetHisto()[r][s])*areaInv;
+ Px_y2 += static_cast<double>(this->GetHisto()[r][s])*areaInv;
}
}
}
@@ -86,11 +86,7 @@ public:
}
};
-
-
-
- } // namespace Functor
+} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
index 4408dae2213cdc42e6076088301e9d1c3f95bb43..a14c1981f25e9d889f103f1d74530e49cd8fb7a9 100644
--- a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
+++ b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
@@ -25,11 +25,11 @@ namespace otb
{
/** \class ThresholdImageToPointSetFilter
+ * \brief Produce a PointSet according to filtering conditions
*
*/
template <class TInputImage,
-// class TOutputPointSet>
class TOutputPointSet = itk::PointSet<ITK_TYPENAME TInputImage::PixelType,2> >
class ITK_EXPORT ThresholdImageToPointSetFilter :
public ImageToPointSetFilter< TInputImage,TOutputPointSet >
@@ -43,8 +43,8 @@ public:
typedef TInputImage InputImageType;
typedef ThresholdImageToPointSetFilter Self;
- typedef ImageToPointSetFilter< InputImageType, TOutputPointSet> Superclass;
- typedef typename Superclass::OutputPointSetType OutputPointSetType;
+ typedef ImageToPointSetFilter< InputImageType, TOutputPointSet> Superclass;
+ typedef typename Superclass::OutputPointSetType OutputPointSetType;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -54,13 +54,14 @@ public:
typedef typename Superclass::InputImagePixelType InputPixelType;
typedef typename Superclass::InputImagePointer InputImagePointer;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
typedef typename Superclass::InputImageConstPointer InputImageConstPointer;
typedef typename Superclass::InputImageType::SizeType SizeType;
typedef typename Superclass::InputImageType::IndexType IndexType;
- //typedef typename Superclass::OutputPointSetType OutputPointSetType;
- typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
- typedef typename Superclass::OutputPointSetType::PixelType OutputPointSetPixelType;
+ typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
+ typedef typename Superclass::OutputPointSetType::PixelType OutputPointSetPixelType;
+ typedef typename Superclass::PointsContainerType PointsContainerType;
itkSetMacro(LowerThreshold,InputPixelType);
itkGetConstReferenceMacro(LowerThreshold, InputPixelType);
@@ -71,7 +72,7 @@ protected:
ThresholdImageToPointSetFilter();
virtual ~ThresholdImageToPointSetFilter() {};
- virtual void GenerateData();
+ virtual void ThreadedGenerateData(const InputImageRegionType &inputRegionForThread, int threadId);
void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
index b81ca6e85b96fa6f3d604175b7ed187c66f1159f..a04bbe9a5bef1cf7e89966089c4b62bb9f097957 100644
--- a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
@@ -21,6 +21,8 @@
#include "otbThresholdImageToPointSetFilter.h"
#include "itkImageRegionConstIterator.h"
+#include "itkProgressReporter.h"
+#include "otbMacro.h"
namespace otb
{
@@ -33,41 +35,38 @@ ThresholdImageToPointSetFilter<TInputImage, TOutputPointSet>
m_UpperThreshold = itk::NumericTraits<InputPixelType>::max();
}
-
template <class TInputImage, class TOutputPointSet>
void
ThresholdImageToPointSetFilter<TInputImage, TOutputPointSet>
-::GenerateData()
+::ThreadedGenerateData(const InputImageRegionType &inputRegionForThread, int threadId)
{
- InputImageConstPointer inputPtr = this->GetInput(0);
- OutputPointSetPointer outputPtr = this->GetOutput();
-
- unsigned int pointId = 0;
- typename OutputPointSetType::PointType position;
+ otbMsgDevMacro(<< "Processing thread: " << threadId);
+ this->m_PointsContainerPerThread[threadId] = PointsContainerType::New();
+ InputImageConstPointer inputPtr = this->GetInput();
- outputPtr->Initialize();
+ // Define the iterators
+ itk::ImageRegionConstIterator<TInputImage> inputIt(inputPtr, inputRegionForThread);
- typedef itk::ImageRegionConstIterator<TInputImage> InputIterator;
- InputIterator inIt(inputPtr, inputPtr->GetRequestedRegion() );
+ itk::ProgressReporter progress(this, threadId, inputRegionForThread.GetNumberOfPixels());
- // walk the regions, threshold each pixel
- while ( !inIt.IsAtEnd() )
- {
+ typename OutputPointSetType::PointType position;
- const InputPixelType value = inIt.Get();
- const IndexType index = inIt.GetIndex();
+ inputIt.GoToBegin();
+ while( !inputIt.IsAtEnd() )
+ {
+ const InputPixelType value = inputIt.Get();
if ((value >= m_LowerThreshold) && (value <= m_UpperThreshold))
{
+ //FIXME: non valid for image with dim > 2
+ const IndexType index = inputIt.GetIndex();
position[0] = index[0];
position[1] = index[1];
-
- outputPtr->SetPoint(pointId,position);
-
- pointId++;
+ this->m_PointsContainerPerThread[threadId]->push_back(position);
}
- ++inIt;
+ ++inputIt;
+ progress.CompletedPixel(); // potential exception thrown here
}
}
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
index ef7b5b39bb0d727958118a8eb636f7329c3b5652..7f1bcdfd3678d909fdf19ac2c2188e2699fea8ef 100644
--- a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
+++ b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
@@ -8,12 +8,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRadiometricNonWaterNonVegetationDetectionImageFilter_h
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx
index c7530fb992d865e5be685603c02c9941fa307b0e..249916a7bbd6efe9d4af0ce4aa95941e87719c63 100644
--- a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbUrbanAreaDetectionFilter_txx
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.h b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
index a48cd2f14695812d58c0a952c990d4413a707563..ebe8fa4e7f9118cf19acc0bebe40d1cb7729efbc 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.h
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorizationPathListFilter_h
@@ -59,18 +59,18 @@ public:
/** Template parameters typedefs */
typedef TInputModulus InputModulusType;
typedef typename InputModulusType::ConstPointer InputModulusConstPointerType;
- typedef typename InputModulusType::PixelType InputPixelType;
- typedef typename InputModulusType::PointType PointType;
- typedef typename InputModulusType::IndexType IndexType;
-
- typedef TInputDirection InputDirectionType;
- typedef typename InputDirectionType::ConstPointer InputDirectionConstPointerType;
- typedef TOutputPath OutputPathType;
- typedef typename OutputPathType::Pointer OutputPathPointerType;
+ typedef typename InputModulusType::PixelType InputPixelType;
+ typedef typename InputModulusType::PointType PointType;
+ typedef typename InputModulusType::IndexType IndexType;
+
+ typedef TInputDirection InputDirectionType;
+ typedef typename InputDirectionType::ConstPointer InputDirectionConstPointerType;
+ typedef TOutputPath OutputPathType;
+ typedef typename OutputPathType::Pointer OutputPathPointerType;
typedef typename OutputPathType::ContinuousIndexType VertexType;
/** Derived typedefs */
- typedef typename Superclass::OutputPathListType OutputPathListType;
+ typedef typename Superclass::OutputPathListType OutputPathListType;
typedef typename Superclass::OutputPathListPointerType OutputPathListPointerType;
/** Set/get the input modulus */
@@ -88,7 +88,7 @@ protected:
/** Other internal useful typedefs */
typedef otb::Image<bool,InputModulusType::ImageDimension> FlagImageType;
- typedef typename FlagImageType::Pointer FlagImagePointerType;
+ typedef typename FlagImageType::Pointer FlagImagePointerType;
typedef itk::ImageRegionConstIterator<InputModulusType> ModRegionIteratorType;
typedef itk::ImageRegionConstIterator<InputDirectionType> DirRegionIteratorType;
@@ -104,11 +104,11 @@ protected:
typedef typename ModNeighborhoodIteratorType::RadiusType RadiusType;
typedef typename ModNeighborhoodIteratorType::OffsetType OffsetType;
- typedef std::vector<OffsetType> OffsetVectorType;
+ typedef std::vector<OffsetType> OffsetVectorType;
typedef typename OutputPathType::VertexListType VertexListType;
- typedef typename VertexListType::ConstPointer VertexListPointerType;
- typedef typename VertexListType::ConstIterator VertexIteratorType;
+ typedef typename VertexListType::ConstPointer VertexListPointerType;
+ typedef typename VertexListType::ConstIterator VertexIteratorType;
/** Constructor */
VectorizationPathListFilter();
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
index 28800682e0ece0fb56af7940d0eb6df68e8065ea..04fddc47956e45d0838187c5f48d4685cae94789 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorizationPathListFilter_txx
@@ -35,6 +35,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
this->SetNumberOfInputs(2);
m_AmplitudeThreshold = 1.0;
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
void
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
@@ -42,6 +43,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
{
this->itk::ProcessObject::SetNthInput(0,const_cast<InputModulusType *>(inputModulus));
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
const typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::InputModulusType *
@@ -54,6 +56,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
}
return static_cast<const TInputModulus*>(this->itk::ProcessObject::GetInput(0));
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
void
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
@@ -61,6 +64,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
{
this->itk::ProcessObject::SetNthInput(1,const_cast<InputDirectionType *>(inputDirection));
}
+
template <class TInputModulus, class TInputDirection, class TOutputPath>
const typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::InputDirectionType *
@@ -73,6 +77,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
}
return static_cast<const TInputDirection *>(this->itk::ProcessObject::GetInput(1));
}
+
/**
* Main computation method
*/
@@ -102,13 +107,13 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
DirRegionIteratorType dirIt(dirPtr,dirPtr->GetLargestPossibleRegion());
FlagRegionIteratorType flagIt(flagImage,flagImage->GetLargestPossibleRegion());
- for (modIt.GoToBegin(),dirIt.GoToBegin(),flagIt.GoToBegin();
+ for (modIt.GoToBegin(), dirIt.GoToBegin(), flagIt.GoToBegin();
(!modIt.IsAtEnd()) && (!dirIt.IsAtEnd()) && (!flagIt.IsAtEnd());
- ++modIt,++dirIt,++flagIt)
+ ++modIt, ++dirIt, ++flagIt)
{
if ((modIt.Get() > m_AmplitudeThreshold) && (!flagIt.Get()))
{
- //this is a begining, to follow in two directions
+ //this is a beginning, to follow in two directions
OutputPathPointerType pathTempDirect = OutputPathType::New();
OutputPathPointerType pathTempReverse = OutputPathType::New();
OutputPathPointerType path = OutputPathType::New();
@@ -117,9 +122,9 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
int flagReverse = 0;
double totalAmplitude = 0;
- ModNeighborhoodIteratorType nModIt(radius,modPtr,modPtr->GetLargestPossibleRegion());
- DirNeighborhoodIteratorType nDirIt(radius,dirPtr,dirPtr->GetLargestPossibleRegion());
- FlagNeighborhoodIteratorType nFlagIt(radius,flagImage,flagImage->GetLargestPossibleRegion());
+ ModNeighborhoodIteratorType nModIt(radius, modPtr, modPtr->GetLargestPossibleRegion());
+ DirNeighborhoodIteratorType nDirIt(radius, dirPtr, dirPtr->GetLargestPossibleRegion());
+ FlagNeighborhoodIteratorType nFlagIt(radius, flagImage, flagImage->GetLargestPossibleRegion());
for (flagReverse=0; flagReverse < 2; ++flagReverse)
{
@@ -142,10 +147,10 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
flagFinish = false;
while (!flagFinish)
{
- offsetVector =GetThreeNeighborOffsetFromDirection(nDirIt.GetCenterPixel(),flagReverse);
+ offsetVector = GetThreeNeighborOffsetFromDirection(nDirIt.GetCenterPixel(),flagReverse);
OffsetIteratorType vecIt = offsetVector.begin();
bool flagFound=false;
- while (vecIt!=offsetVector.end()&&!flagFound)
+ while (vecIt != offsetVector.end() && !flagFound)
{
flagFound = nModIt.GetPixel(*vecIt) > 0
&& !nFlagIt.GetPixel(*vecIt);
@@ -156,26 +161,27 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
point.Fill(0);
PointType tmpPoint;
totalAmplitude = 0;
- for (vecIt = offsetVector.begin();vecIt!=offsetVector.end();++vecIt)
+ for (vecIt = offsetVector.begin(); vecIt != offsetVector.end(); ++vecIt)
{
- totalAmplitude += nModIt.GetPixel(*vecIt);
+ double currentAmplitude = nModIt.GetPixel(*vecIt);
modPtr->TransformIndexToPhysicalPoint(nModIt.GetIndex(*vecIt),tmpPoint);
- point[0] += nModIt.GetPixel(*vecIt) * tmpPoint[0];
- point[1] += nModIt.GetPixel(*vecIt) * tmpPoint[1];
+ point[0] += currentAmplitude * tmpPoint[0];
+ point[1] += currentAmplitude * tmpPoint[1];
+ totalAmplitude += currentAmplitude;
}
- point[0] = point[0] / totalAmplitude + modPtr->GetSpacing()[0]/2;
- point[1] = point[1] / totalAmplitude + modPtr->GetSpacing()[1]/2;
+ point[0] = point[0] / totalAmplitude;
+ point[1] = point[1] / totalAmplitude;
modPtr->TransformPhysicalPointToContinuousIndex(point,vertex);
if (flagReverse == 0)
{
- // otbMsgDebugMacro(<<"Adding new vertex: "<<vertex);
+// otbMsgDevMacro(<<"Adding new vertex (direct): "<<vertex);
pathTempDirect->AddVertex(vertex);
}
else
{
- // otbMsgDebugMacro(<<"Adding new vertex: "<<vertex);
+// otbMsgDevMacro(<<"Adding new vertex (reverse): "<<vertex);
pathTempReverse->AddVertex(vertex);
}
@@ -185,11 +191,12 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
IndexType newIndex;
if (modPtr->TransformPhysicalPointToIndex(point,newIndex))
{
+// otbMsgDevMacro(<<"Moving to new center: " << newIndex);
nModIt.SetLocation(newIndex);
nDirIt.SetLocation(newIndex);
nFlagIt.SetLocation(newIndex);
- if (nModIt.GetCenterPixel()==0)
+ if (nModIt.GetCenterPixel() == 0)
{
//we need to check that in case the barycenter is out...
flagFinish=true;
@@ -248,6 +255,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
}
}
}
+
/**
* Compute the 8 neighbors to explore from the direction and the type of search (forward or backward).
* \param direction The direction
@@ -283,237 +291,239 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
switch ( neighborhoodNumber )
{
case 0:
- tmpOffset[0]=1;
- tmpOffset[1]=0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=0;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
break;
case 1:
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
break;
case 2:
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=0;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 3:
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=0;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
break;
case 4:
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=0;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
break;
case 5:
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 0;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]=2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
break;
case 6:
- tmpOffset[0]= 0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 0;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 7:
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -2;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 1;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 2;
- tmpOffset[1]= 2;
+ tmpOffset[0] = 2;
+ tmpOffset[1] = 2;
offset.push_back(tmpOffset);
break;
}
return offset;
-}/**
- * Compute the 3 neighbors to explore from the direction and the type of search (forward or backward).
- * \param direction The direction
- * \param flagReverse The type of search
- * \return The neighborhood
- */
+}
+
+/**
+ * Compute the 3 neighbors to explore from the direction and the type of search (forward or backward).
+ * \param direction The direction
+ * \param flagReverse The type of search
+ * \return The neighborhood
+ */
template <class TInputModulus, class TInputDirection, class TOutputPath>
typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::OffsetVectorType
@@ -540,108 +550,109 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
neighborhoodNumber = (neighborhoodNumber + 4) % 8;
}
OffsetType tmpOffset;
+// otbMsgDevMacro(<<"Direction: " << neighborhoodNumber)
switch ( neighborhoodNumber )
{
case 0:
- tmpOffset[0]=1;
- tmpOffset[1]=0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
break;
case 1:
- tmpOffset[0]=1;
- tmpOffset[1]=1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
break;
case 2:
- tmpOffset[0]=0;
- tmpOffset[1]=1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 3:
- tmpOffset[0]=-1;
- tmpOffset[1]=1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
break;
case 4:
- tmpOffset[0]=-1;
- tmpOffset[1]=0;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
break;
case 5:
- tmpOffset[0]=-1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = -1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]=1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
break;
case 6:
- tmpOffset[0]= 0;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 0;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
break;
case 7:
- tmpOffset[0]= 1;
- tmpOffset[1]=-1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = -1;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 0;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 0;
offset.push_back(tmpOffset);
- tmpOffset[0]= 1;
- tmpOffset[1]= 1;
+ tmpOffset[0] = 1;
+ tmpOffset[1] = 1;
offset.push_back(tmpOffset);
break;
@@ -659,5 +670,6 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
{
Superclass::PrintSelf(os, indent);
}
+
} // End namespace otb
#endif
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 3156f8472b81acae0133c66476fa36c723438004..9eecf13cbcf90037f6117590b32b107e1f8bba1c 100644
--- a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -57,8 +57,11 @@ public:
<TXsImageType, TOutputImageType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef otb::Image<double,2> InternalImageType;
- typedef otb::VectorImage<double> InternalVectorImageType;
+
+ //typedef otb::Image<double,2> InternalImageType;
+ //typedef otb::VectorImage<double> InternalVectorImageType;
+ typedef otb::Image<double,TPanImageType::ImageDimension> InternalImageType;
+ typedef otb::VectorImage<double,TPanImageType::ImageDimension> InternalVectorImageType;
typedef typename InternalImageType::PixelType InternalPixelType;
typedef typename itk::NumericTraits<InternalPixelType>::RealType InternalRealType;
diff --git a/Code/GeospatialAnalysis/CMakeLists.txt b/Code/GeospatialAnalysis/CMakeLists.txt
index 039e2ca221c4a4458c3c32e73c7e6b67e9a260d9..8df46d5af27ca86e0d6f1f95f15e25acb26d2443 100644
--- a/Code/GeospatialAnalysis/CMakeLists.txt
+++ b/Code/GeospatialAnalysis/CMakeLists.txt
@@ -4,7 +4,7 @@ FILE(GLOB OTBGeospatialAnalysis_SRCS "*.cxx" )
ADD_LIBRARY(OTBGeospatialAnalysis ${OTBGeospatialAnalysis_SRCS})
-TARGET_LINK_LIBRARIES (OTBGeospatialAnalysis OTBCommon pq pqxx)
+TARGET_LINK_LIBRARIES (OTBGeospatialAnalysis OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBGeospatialAnalysis PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Gui/CMakeLists.txt b/Code/Gui/CMakeLists.txt
index 852d1cc3afb24c7c363f2caa79f52f4e712019e6..d4121a4fbde15fbd41a8bff9f3266933b30d244f 100644
--- a/Code/Gui/CMakeLists.txt
+++ b/Code/Gui/CMakeLists.txt
@@ -2,15 +2,6 @@
FILE(GLOB OTBGui_SRCS "*.cxx" )
-
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
-IF(APPLE AND BUILD_SHARED_LIBS)
- FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
- SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}};-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
- ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
-
ADD_LIBRARY(OTBGui ${OTBGui_SRCS})
TARGET_LINK_LIBRARIES (OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
IF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index 62c477e20be8d1eb7b4c822562e8781edc2e347c..3d1f1208ee5452970df8897c7d2850781c21a0ae 100644
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -2,6 +2,9 @@
FILE(GLOB OTBIO_SRCS "*.cxx" )
+# Remove the otbTestDriver cause only an executable is nedded
+ LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbTestDriver.cxx" )
+
IF(NOT OTB_COMPILE_JPEG2000)
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIO.cxx" )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIOFactory.cxx" )
@@ -27,7 +30,13 @@ ENDIF(OTB_COMPILE_JPEG2000)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
-TARGET_LINK_LIBRARIES (OTBIO OTBCommon ${GDAL_LIBRARY} ${OGR_LIBRARY} otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
+ SET_TARGET_PROPERTIES(OTBIO
+ PROPERTIES
+ LINK_INTERFACE_LIBRARIES ""
+ )
+TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} OTBCommon)
+TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
+
IF (OTB_USE_LIBLAS)
TARGET_LINK_LIBRARIES(OTBIO otbliblas)
ENDIF(OTB_USE_LIBLAS)
@@ -36,7 +45,7 @@ IF( OTB_COMPILE_JPEG2000 )
ENDIF( OTB_COMPILE_JPEG2000 )
IF( OTB_USE_CURL )
- TARGET_LINK_LIBRARIES (OTBIO ${CURL_LIBRARY})
+ TARGET_LINK_LIBRARIES (OTBIO ${CURL_LIBRARY} tinyXML)
ENDIF( OTB_USE_CURL )
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBIO PROPERTIES ${OTB_LIBRARY_PROPERTIES})
@@ -64,6 +73,17 @@ IF(NOT OTB_COMPILE_JPEG2000)
LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIO.h" )
ENDIF(NOT OTB_COMPILE_JPEG2000)
+# Compile otbTestDriver
+# Needed in the OTB-Wrapping project.
+# Has to be compiled even if the BUILD_TEST are set to OFF
+IF(CMAKE_COMPILER_IS_GNUCXX)
+ SET_SOURCE_FILES_PROPERTIES(otbTestDriver.cxx PROPERTIES COMPILE_FLAGS -w)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ADD_EXECUTABLE(otbTestDriver otbTestDriver.cxx)
+TARGET_LINK_LIBRARIES(otbTestDriver OTBIO)
+SET(ITK_TEST_DRIVER "${EXECUTABLE_OUTPUT_PATH}/otbTestDriver"
+ CACHE INTERNAL "otbTestDriver path to be used by subprojects")
IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -71,5 +91,9 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
INSTALL(FILES ${__files1} ${__files2}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/IO
COMPONENT Development)
+ INSTALL(TARGETS otbTestDriver RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT Development)
ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
+
+
diff --git a/Code/Projections/otbCoordinateToName.cxx b/Code/IO/otbCoordinateToName.cxx
similarity index 58%
rename from Code/Projections/otbCoordinateToName.cxx
rename to Code/IO/otbCoordinateToName.cxx
index 480bf2a0b0f3c1a3c83f77dfbaf13a70bfe55661..a079e3b965115b3399b6ef6ee91be5f8ff13e8cb 100644
--- a/Code/Projections/otbCoordinateToName.cxx
+++ b/Code/IO/otbCoordinateToName.cxx
@@ -17,29 +17,36 @@
=========================================================================*/
#include "otbCoordinateToName.h"
+#include "otbMacro.h"
+
+#ifdef OTB_USE_CURL
#include "tinyxml.h"
#include <curl/curl.h>
-#include "otbMacro.h"
+#endif
namespace otb
{
/**
- * Constructor
- */
+ * Constructor
+ */
-CoordinateToName::CoordinateToName()
+CoordinateToName::CoordinateToName():
+ m_Lon(-1000.0), m_Lat(-1000.0), m_Multithread(false), m_IsValid(false)
{
- m_Lon = -1000.0;
- m_Lat = -1000.0;
m_PlaceName = "";
m_CountryName = "";
+ m_TempFileName = "out-SignayriUt1.xml";
+
+ m_Threader = itk::MultiThreader::New();
+
+ m_UpdateDistance = 0.01;//about 1km at equator
+
}
/**
- *
- */
-
+ * PrintSelf
+ */
void
CoordinateToName
::PrintSelf(std::ostream& os, itk::Indent indent) const
@@ -53,7 +60,29 @@ CoordinateToName
bool CoordinateToName::Evaluate()
{
+ if (m_Multithread)
+ {
+ m_Threader->SpawnThread(ThreadFunction, this);
+ }
+ else
+ {
+ DoEvaluate();
+ }
+ return true;
+}
+ITK_THREAD_RETURN_TYPE
+CoordinateToName::ThreadFunction( void *arg )
+{
+ struct itk::MultiThreader::ThreadInfoStruct * pInfo = (itk::MultiThreader::ThreadInfoStruct *)(arg);
+ CoordinateToName::Pointer lThis = (CoordinateToName*)(pInfo->UserData);
+ lThis->DoEvaluate();
+ return 0;
+}
+
+
+void CoordinateToName::DoEvaluate()
+{
std::ostringstream urlStream;
urlStream << "http://ws.geonames.org/findNearbyPlaceName?lat=";
urlStream << m_Lat;
@@ -61,41 +90,24 @@ bool CoordinateToName::Evaluate()
urlStream << m_Lon;
otbMsgDevMacro("CoordinateToName: retrieve url " << urlStream.str());
RetrieveXML(urlStream);
- ParseXMLGeonames();
-
- return true;
+ std::string placeName = "";
+ std::string countryName = "";
+ ParseXMLGeonames(placeName, countryName);
+ m_PlaceName = placeName;
+ m_CountryName = countryName;
+ m_IsValid = true;
}
-/*
-//This method will be necessary to process the file directly in memory
-//without writing it to the disk. Waiting for the xml lib to handle that
-//also
-static size_t
-curlHandlerWriteMemoryCallback(void *ptr, size_t size, size_t nmemb,
- void *data)
-{
- register int realsize = (int)(size * nmemb);
-
- std::vector<char> *vec
- = static_cast<std::vector<char>*>(data);
- const char* chPtr = static_cast<char*>(ptr);
- vec->insert(vec->end(), chPtr, chPtr + realsize);
- return realsize;
-}
-*/
-
-void CoordinateToName::RetrieveXML(std::ostringstream& urlStream)
+void CoordinateToName::RetrieveXML(std::ostringstream& urlStream) const
{
-
+#ifdef OTB_USE_CURL
CURL *curl;
CURLcode res;
- FILE* output_file = fopen("out.xml","w");
+ FILE* output_file = fopen(m_TempFileName.c_str(),"w");
curl = curl_easy_init();
-// std::cout << "URL data " << urlStream.str().data() << std::endl;
-
char url[256];
strcpy(url,urlStream.str().data());
@@ -105,11 +117,7 @@ void CoordinateToName::RetrieveXML(std::ostringstream& urlStream)
{
std::vector<char> chunk;
curl_easy_setopt(curl, CURLOPT_URL, url);
- /*
- //Step needed to handle curl without temporary file
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,this->curlHandlerWriteMemoryCallback);
- curl_easy_setopt(curl, CURLOPT_FILE, (void *)&chunk);
- */
+
curl_easy_setopt(curl, CURLOPT_WRITEDATA, output_file);
res = curl_easy_perform(curl);
@@ -117,27 +125,32 @@ void CoordinateToName::RetrieveXML(std::ostringstream& urlStream)
/* always cleanup */
curl_easy_cleanup(curl);
}
-
+#endif
}
-void CoordinateToName::ParseXMLGeonames()
+void CoordinateToName::ParseXMLGeonames(std::string& placeName, std::string& countryName) const
{
- TiXmlDocument doc( "out.xml" );
+#ifdef OTB_USE_CURL
+ TiXmlDocument doc( m_TempFileName.c_str() );
doc.LoadFile();
TiXmlHandle docHandle( &doc );
- TiXmlElement* childName = docHandle.FirstChild( "geonames" ).FirstChild( "geoname" ).FirstChild( "name" ).Element();
+ TiXmlElement* childName = docHandle.FirstChild( "geonames" ).FirstChild( "geoname" ).
+ FirstChild( "name" ).Element();
if ( childName )
{
- m_PlaceName=childName->GetText();
+ placeName=childName->GetText();
}
- TiXmlElement* childCountryName = docHandle.FirstChild( "geonames" ).FirstChild( "geoname" ).FirstChild( "countryName" ).Element();
+ TiXmlElement* childCountryName = docHandle.FirstChild( "geonames" ).FirstChild( "geoname" ).
+ FirstChild( "countryName" ).Element();
if ( childCountryName )
{
- m_CountryName=childCountryName->GetText();
+ countryName=childCountryName->GetText();
}
+ otbMsgDevMacro(<<"Near " << placeName << " in " << countryName);
+ remove(m_TempFileName.c_str());
+#endif
}
} // namespace otb
-
diff --git a/Code/IO/otbCoordinateToName.h b/Code/IO/otbCoordinateToName.h
new file mode 100644
index 0000000000000000000000000000000000000000..428867e60b270afb9c4258343cf31338d9c58f64
--- /dev/null
+++ b/Code/IO/otbCoordinateToName.h
@@ -0,0 +1,147 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbCoordinateToName_h
+#define __otbCoordinateToName_h
+
+#include "itkObject.h"
+#include "itkObjectFactory.h"
+#include "itkPoint.h"
+#include "itkMultiThreader.h"
+
+namespace otb
+{
+
+/**
+ * \class CoordinateToName
+ * \brief Retrieve geographical information for longitude and latitude coordinates
+ *
+ * This class can work in asynchronous mode using \code MultithreadOn() \endcode. In this
+ * case, the web request does not block the rest of the program.
+ *
+ */
+
+class ITK_EXPORT CoordinateToName : public itk::Object
+{
+public:
+ /** Standard class typedefs. */
+ typedef CoordinateToName Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+
+ typedef itk::Object Superclass;
+
+ itkTypeMacro(CoordinateToName, itk::Object);
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ typedef itk::Point<double,2> PointType;
+
+ itkGetMacro( Lon, double );
+ itkGetMacro( Lat, double );
+
+ itkSetMacro( Lon, double );
+ itkSetMacro( Lat, double );
+
+ /**
+ * Set the lon/lat only if they are far enough from the current point to
+ * avoid triggering too many updates
+ */
+ bool SetLonLat(PointType point)
+ {
+ if ((vcl_abs(point[0] - m_Lon) > m_UpdateDistance) || (vcl_abs(point[1] - m_Lat) > m_UpdateDistance))
+ {
+// std::cout << "Update lon/lat " << m_Lon << ", " << m_Lat << " -> " << point << std::endl;
+ m_Lon = point[0];
+ m_Lat = point[1];
+ //TODO Check whether it is better to have something imprecise or nothing at all
+ m_IsValid = false;
+ return true;
+ }
+ else
+ {
+// std::cout << "Keeping lon/lat" << std::endl;
+ return false;
+ }
+ }
+
+ std::string GetPlaceName() const
+ {
+ if (m_IsValid)
+ {
+ return m_PlaceName;
+ }
+ else
+ {
+ return "";
+ }
+ }
+
+ std::string GetCountryName() const
+ {
+ if (m_IsValid)
+ {
+ return m_CountryName;
+ }
+ else
+ {
+ return "";
+ }
+ }
+
+ itkGetMacro(Multithread, bool);
+ itkSetMacro(Multithread, bool);
+ itkBooleanMacro(Multithread);
+
+ virtual bool Evaluate();
+
+protected:
+ CoordinateToName();
+ virtual ~CoordinateToName() {};
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+ void RetrieveXML(std::ostringstream& urlStream) const;
+ void ParseXMLGeonames(std::string& placeName, std::string& countryName) const;
+
+ virtual void DoEvaluate();
+
+ static ITK_THREAD_RETURN_TYPE ThreadFunction(void*);
+
+private:
+ CoordinateToName( const Self& ); //purposely not implemented
+ void operator=( const Self& ); //purposely not implemented
+
+ double m_Lon;
+ double m_Lat;
+
+ bool m_Multithread;
+ bool m_IsValid;
+
+ //Minimum distance to trigger an update of the coordinates
+ //specified in degrees
+ double m_UpdateDistance;
+
+ std::string m_PlaceName;
+ std::string m_CountryName;
+ std::string m_TempFileName;
+
+ itk::MultiThreader::Pointer m_Threader;
+};
+
+} // namespace otb
+
+#endif
diff --git a/Code/IO/otbDEMHandler.cxx b/Code/IO/otbDEMHandler.cxx
index 504b9bfee25d12ccc422a0ed7b7010e7dfbb5020..52b7a6217a8d9bcbf752e476a8bee174be45e834 100644
--- a/Code/IO/otbDEMHandler.cxx
+++ b/Code/IO/otbDEMHandler.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbDEMHandler.h"
diff --git a/Code/IO/otbDXFToSpatialObjectGroupFilter.h b/Code/IO/otbDXFToSpatialObjectGroupFilter.h
index eb5351af8f9ac32b0b3156370e31aa9c7802f0f5..2e004c8406bcccfddee164b6c37ad1eea74eef94 100644
--- a/Code/IO/otbDXFToSpatialObjectGroupFilter.h
+++ b/Code/IO/otbDXFToSpatialObjectGroupFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbDXFToSpatialObjectGroupFilter_h
diff --git a/Code/IO/otbDXFToSpatialObjectGroupFilter.txx b/Code/IO/otbDXFToSpatialObjectGroupFilter.txx
index 8c20f4544a68f7af379012df88a0f263c86a439e..205a39ff2bbba1ae361e865f08db89ad2103d33e 100644
--- a/Code/IO/otbDXFToSpatialObjectGroupFilter.txx
+++ b/Code/IO/otbDXFToSpatialObjectGroupFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbDXFToSpatialObjectGroupFilter_txx
diff --git a/Code/IO/otbFileName.cxx b/Code/IO/otbFileName.cxx
index 6211842071d8c5362a71d44a79a05ca394f4d792..b39243ea23387978cc569e25fbea4d4dcc33d127 100644
--- a/Code/IO/otbFileName.cxx
+++ b/Code/IO/otbFileName.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/IO/otbFileName.h b/Code/IO/otbFileName.h
index 47b7a9bfcd6ce9afdc1a9477fb4bf3f7d831e6b4..5e6f81d3d3d2025a96816b6e3172be358f58aeb7 100644
--- a/Code/IO/otbFileName.h
+++ b/Code/IO/otbFileName.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbFileName_h
diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx
index b2e25335e76940dd778b0db75495727c1b9f840f..917af9d0c46afb00c06d28627325ae683d2e0933 100644
--- a/Code/IO/otbGDALImageIO.cxx
+++ b/Code/IO/otbGDALImageIO.cxx
@@ -16,32 +16,25 @@
=========================================================================*/
-#include "itkExceptionObject.h"
-#include "itkMacro.h"
-#include "itkByteSwapper.h"
-#include "itkRGBPixel.h"
-#include "itkRGBAPixel.h"
-
-#include "gdal_priv.h"
-//#include <iostream.h>
+#include <iostream>
+#include <fstream>
#include <string.h>
#include <list>
#include <vector>
#include <math.h>
-//#include <zlib.h>
#include "otbGDALImageIO.h"
#include "otbMacro.h"
#include "otbSystem.h"
-// #include "otbImageMetadata.h"
#include "otbImage.h"
#include "itkMetaDataObject.h"
-#include "itkPNGImageIO.h"
-#include "itkJPEGImageIO.h"
-#include <iostream>
-#include <fstream>
+#include "itkExceptionObject.h"
+#include "itkMacro.h"
+#include "itkRGBPixel.h"
+#include "itkRGBAPixel.h"
+
namespace otb
{
diff --git a/Code/IO/otbImage.h b/Code/IO/otbImage.h
index 8641ca72dff8087c78a31c395936a1e32d102c8a..fefa51123c26c8fe4407b804900ca5a9f9ba1cd4 100644
--- a/Code/IO/otbImage.h
+++ b/Code/IO/otbImage.h
@@ -72,8 +72,8 @@ public:
/** Accessor type that convert data between internal and external
* representations. */
- typedef itk::DefaultPixelAccessor< PixelType > AccessorType;
- typedef itk::DefaultPixelAccessorFunctor< Self > AccessorFunctorType;
+ //typedef itk::DefaultPixelAccessor< PixelType > AccessorType;
+ //typedef itk::DefaultPixelAccessorFunctor< Self > AccessorFunctorType;
/** Tyepdef for the functor used to access a neighborhood of pixel pointers.*/
typedef itk::NeighborhoodAccessorFunctor< Self >
@@ -120,16 +120,16 @@ public:
typedef typename Superclass::OffsetValueType OffsetValueType;
/** Return the Pixel Accessor object */
- AccessorType GetPixelAccessor( void )
- {
- return AccessorType();
- }
-
- /** Return the Pixel Accesor object */
- const AccessorType GetPixelAccessor( void ) const
- {
- return AccessorType();
- }
+// AccessorType GetPixelAccessor( void )
+// {
+// return AccessorType();
+// }
+
+// /** Return the Pixel Accesor object */
+// const AccessorType GetPixelAccessor( void ) const
+// {
+// return AccessorType();
+// }
/** Return the NeighborhoodAccessor functor */
NeighborhoodAccessorFunctorType GetNeighborhoodAccessor()
diff --git a/Code/IO/otbImageFileReader.h b/Code/IO/otbImageFileReader.h
index 2190767b976b62f8427f35af7099bbf8e3e0dd74..3496bd58dea12023e046569229bc98768ba07bad 100644
--- a/Code/IO/otbImageFileReader.h
+++ b/Code/IO/otbImageFileReader.h
@@ -24,7 +24,7 @@ namespace otb
{
/** \class ImageFileReader
- * \brief Ressource to read an image from a file.
+ * \brief Resource to read an image from a file.
*
* \sa ImageSeriesReader
* \sa ImageIOBase
@@ -37,9 +37,9 @@ class ITK_EXPORT ImageFileReader : public itk::ImageFileReader<TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef ImageFileReader Self;
+ typedef ImageFileReader Self;
typedef itk::ImageFileReader<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -59,8 +59,7 @@ public:
/** The pixel type of the output image. */
//typedef typename TOutputImage::InternalPixelType OutputImagePixelType;
- /** Prepare l'allocation de l'image output lors du premier appel de traitement
- * pipeline. */
+ /** Prepare image allocation at the first call of the pipeline processing */
virtual void GenerateOutputInformation(void);
/** Does the real work. */
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index 9cbd13ed2f87accd140f5343c2ab20264abdc497..4522919442f1bba29f11af1e4562324ecee0aad6 100644
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -170,7 +170,8 @@ ImageFileReader<TOutputImage>
ImageRegionType region = output->GetBufferedRegion();
// Adapte the image size with the region
- std::streamoff nbBytes = (this->m_ImageIO->GetImageSizeInBytes() / this->m_ImageIO->GetImageSizeInPixels()) * static_cast<std::streamoff>(region.GetNumberOfPixels());
+ std::streamoff nbBytes = (this->m_ImageIO->GetImageSizeInBytes() / this->m_ImageIO->GetImageSizeInPixels())
+ * static_cast<std::streamoff>(region.GetNumberOfPixels());
char * loadBuffer = new char[nbBytes];
@@ -339,12 +340,10 @@ ImageFileReader<TOutputImage>
ossimKeywordlist geom_kwl, tmp_kwl, tmp_kwl2;// = new ossimKeywordlist();
-
// Add the radar factory
ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance());
-
ossimImageHandler* handler = ossimImageHandlerRegistry::instance()
->open(ossimFilename(lFileNameOssimKeywordlist.c_str()));
@@ -357,7 +356,11 @@ ImageFileReader<TOutputImage>
{
otbMsgDevMacro( <<"OSSIM Open Image SUCCESS ! ");
// hasMetaData = handler->getImageGeometry(geom_kwl);
- hasMetaData = handler->getImageGeometry()->getProjection()->saveState(geom_kwl);
+ ossimProjection* projection = handler->getImageGeometry()->getProjection();
+ if (projection)
+ {
+ hasMetaData = projection->saveState(geom_kwl);
+ }
}
// Free memory
delete handler;
@@ -367,14 +370,14 @@ ImageFileReader<TOutputImage>
// Add the plugins factory
ossimProjectionFactoryRegistry::instance()->registerFactory(ossimplugins::ossimPluginProjectionFactory::instance());
ossimProjection * projection = ossimProjectionFactoryRegistry::instance()
- ->createProjection(ossimFilename(lFileNameOssimKeywordlist.c_str()),0);
+ ->createProjection(ossimFilename(lFileNameOssimKeywordlist.c_str()), 0);
if (!projection)
{
- otbMsgDevMacro( <<"OSSIM Instanciate projection FAILED ! ");
+ otbMsgDevMacro( <<"OSSIM Instantiate projection FAILED ! ");
}
else
{
- otbMsgDevMacro( <<"OSSIM Instanciate projection SUCCESS ! ");
+ otbMsgDevMacro( <<"OSSIM Instantiate projection SUCCESS ! ");
hasMetaData = projection->saveState(geom_kwl);
// Free memory
delete projection;
@@ -395,7 +398,7 @@ ImageFileReader<TOutputImage>
ImageKeywordlist otb_kwl;
otb_kwl.SetKeywordlist( geom_kwl );
- // Update itk MetaData Dictionnary
+ // Update itk MetaData Dictionary
itk::MetaDataDictionary& dict = this->m_ImageIO->GetMetaDataDictionary();
@@ -449,7 +452,7 @@ ImageFileReader<TOutputImage>
}
// Test if the file can be open for reading access.
- //Only if m_FileName speciy a filname (not a dirname)
+ //Only if m_FileName specify a filename (not a dirname)
if ( System::IsAFileName( this->m_FileName ) == true )
{
std::ifstream readTester;
@@ -477,7 +480,7 @@ ImageFileReader<TOutputImage>
{
std::vector<std::string> listFileSearch;
listFileSearch.push_back("DAT_01.001");
- listFileSearch.push_back("dat_01.001");// RADARSAT ou SAR_ERS2
+ listFileSearch.push_back("dat_01.001");// RADARSAT or SAR_ERS2
listFileSearch.push_back("IMAGERY.TIF");
listFileSearch.push_back("imagery.tif");//For format SPOT5TIF
// Not recognised as a supported file format by GDAL.
diff --git a/Code/IO/otbImageMetadataInterfaceFactory.cxx b/Code/IO/otbImageMetadataInterfaceFactory.cxx
index f9b564bd8297eb6fe9f231d28e5f75193f762646..1291cca6d1f256896eac3f790410397de6ac1810 100644
--- a/Code/IO/otbImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbImageMetadataInterfaceFactory.cxx
@@ -28,6 +28,8 @@
#include "otbSpotImageMetadataInterfaceFactory.h"
#include "otbQuickBirdImageMetadataInterfaceFactory.h"
// SAR Sensors
+//#include "otbTerraSarImageMetadataInterfaceFactory.h"
+
#include "itkObjectFactoryBase.h"
#include "itkMutexLock.h"
#include "itkMutexLockHolder.h"
@@ -87,7 +89,7 @@ ImageMetadataInterfaceFactory
itk::ObjectFactoryBase::RegisterFactory( IkonosImageMetadataInterfaceFactory::New() );
itk::ObjectFactoryBase::RegisterFactory( SpotImageMetadataInterfaceFactory::New() );
itk::ObjectFactoryBase::RegisterFactory( QuickBirdImageMetadataInterfaceFactory::New() );
- //itk::ObjectFactoryBase::RegisterFactory( QuickBirdImageMetadataInterfaceFactory::New() );
+ //itk::ObjectFactoryBase::RegisterFactory( TerraSarImageMetadataInterfaceFactory::New() );
firstTime = false;
}
}
diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Code/IO/otbJPEG2000ImageIO.cxx
index 5e31ecdc4d73c38e82dcbe757420e3e3148e957b..ba9de487b5af7454d2c78c7e131c8312cdc2a80a 100644
--- a/Code/IO/otbJPEG2000ImageIO.cxx
+++ b/Code/IO/otbJPEG2000ImageIO.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbJPEG2000ImageIO.h"
diff --git a/Code/IO/otbMetaDataKey.h b/Code/IO/otbMetaDataKey.h
index e06ee2a6a3e07b3251028d1c08657cc7717a5eff..523f5ab9ca1009ae0f53fab96b89d48afe1c7c2c 100644
--- a/Code/IO/otbMetaDataKey.h
+++ b/Code/IO/otbMetaDataKey.h
@@ -124,7 +124,7 @@ private:
/** \class OTB_GCP
*
- * \brief This OTB_GCP class is used to manege the GCP parameters
+ * \brief This OTB_GCP class is used to manage the GCP parameters
* in OTB.
*
*/
diff --git a/Code/IO/otbSpatialObjectDXFReader.h b/Code/IO/otbSpatialObjectDXFReader.h
index 8f70bfe3b0d66afd25c1cb690bb2028147b2de9b..2e3171866143a69d427144d22932a1904f7f2c05 100644
--- a/Code/IO/otbSpatialObjectDXFReader.h
+++ b/Code/IO/otbSpatialObjectDXFReader.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSpatialObjectDXFReader_h
diff --git a/Code/IO/otbSpatialObjectDXFReader.txx b/Code/IO/otbSpatialObjectDXFReader.txx
index 20463d459cd556ecf8ffc70267eafeb1e3b36cb5..c3ff8c8c0b89e76fff4bdb7e47c41c87de51fc69 100644
--- a/Code/IO/otbSpatialObjectDXFReader.txx
+++ b/Code/IO/otbSpatialObjectDXFReader.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSpatialObjectDXFReader_txx
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.cxx b/Code/IO/otbTerraSarImageMetadataInterface.cxx
index b5e3f6c88c34af46ba2d033e3a3652dd67e5ec52..8a1519f61c280e1d6afe5df0f8556e905df30213 100644
--- a/Code/IO/otbTerraSarImageMetadataInterface.cxx
+++ b/Code/IO/otbTerraSarImageMetadataInterface.cxx
@@ -44,18 +44,17 @@ std::string
TerraSarImageMetadataInterface::GetSensorID( const MetaDataDictionaryType & dict ) const
{
ImageKeywordlistType ImageKeywordlist;
- std::cout<<"theSensorID"<<std::endl;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
{
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
}
ossimKeywordlist kwl;
ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::cout<<kwl<<std::endl;
+
std::string key= "sensor";
ossimString keywordString = kwl.find(key.c_str());
std::string output(keywordString.chars());
-
+
return output;
}
@@ -63,8 +62,7 @@ bool
TerraSarImageMetadataInterface::CanRead( const MetaDataDictionaryType & dict ) const
{
std::string sensorID = GetSensorID(dict);
- std::cout<<"sensorID : "<<sensorID<<std::endl;
- if (sensorID.find("TerraSar") != std::string::npos)
+ if (sensorID.find("TSX") != std::string::npos)
return true;
else
return false;
@@ -78,7 +76,7 @@ TerraSarImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) co
{
itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
- /*
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
@@ -91,7 +89,7 @@ TerraSarImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) co
std::string key;
ossimString separatorList;
- key = "support_data.image_date";
+ key = "azimuth_start_time";
separatorList = "-T";
ossimString keywordString = kwl.find(key.c_str());
@@ -103,8 +101,6 @@ TerraSarImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) co
ossimString day = keywordStrings[2];
return day.toInt();
- */
- return 1;
}
@@ -116,7 +112,7 @@ TerraSarImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
{
itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
- /*
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
@@ -129,7 +125,7 @@ TerraSarImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
std::string key;
ossimString separatorList;
- key = "support_data.image_date";
+ key = "azimuth_start_time";
separatorList = "-T";
@@ -142,8 +138,6 @@ TerraSarImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
ossimString month = keywordStrings[1];
return month.toInt();
- */
- return 1;
}
@@ -154,7 +148,7 @@ TerraSarImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) c
{
itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
- /*
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
@@ -167,7 +161,7 @@ TerraSarImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) c
std::string key;
ossimString separatorList;
- key = "support_data.image_date";
+ key = "azimuth_start_time";
separatorList = "-T";
ossimString keywordString = kwl.find(key.c_str());
@@ -179,8 +173,7 @@ TerraSarImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) c
ossimString year = keywordStrings[0];
return year.toInt();
- */
- return 1;
+
}
int
@@ -190,7 +183,7 @@ TerraSarImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) c
{
itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
- /*
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
@@ -203,20 +196,18 @@ TerraSarImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) c
std::string key;
ossimString separatorList;
- key = "support_data.image_date";
+ key = "azimuth_start_time";
separatorList = "-T:";
ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
+ if( keywordStrings.size() <= 4 )
itkExceptionMacro("Invalid Hour");
ossimString hour = keywordStrings[3];
return hour.toInt();
- */
- return 1;
}
int
@@ -226,7 +217,7 @@ TerraSarImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict )
{
itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
}
- /*
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
@@ -239,19 +230,17 @@ TerraSarImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict )
std::string key;
ossimString separatorList;
- key = "support_data.image_date";
+ key = "azimuth_start_time";
separatorList = "-T:";
ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
+ if( keywordStrings.size() <= 5 )
itkExceptionMacro("Invalid Minute");
ossimString minute = keywordStrings[4];
return minute.toInt();
- */
- return 1;
}
int
@@ -274,14 +263,14 @@ TerraSarImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType &
std::string key;
ossimString separatorList;
- key = "support_data.generation_time";
+ key = "generation_time";
separatorList = "-T:";
ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
+ itkExceptionMacro(<<"Invalid Production Day");
ossimString day = keywordStrings[2];
@@ -308,14 +297,14 @@ TerraSarImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType
std::string key;
ossimString separatorList;
- key = "support_data.generation_time";
+ key = "generation_time";
separatorList = "-T";
ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ itkExceptionMacro(<<"Invalid Production Month");
ossimString month = keywordStrings[1];
@@ -343,21 +332,43 @@ TerraSarImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType
std::string key;
ossimString separatorList;
- key = "support_data.generation_time";
+ key = "generation_time";
separatorList = "-T";
ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ itkExceptionMacro("Invalid Production Year");
ossimString year = keywordStrings[0];
return year.toInt();
}
+double
+TerraSarImageMetadataInterface::GetCalibrationFactor( const MetaDataDictionaryType & dict ) const
+{
+ if( !this->CanRead( dict ) )
+ {
+ itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ }
+
+ ImageKeywordlistType imageKeywordlist;
+ if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
+ {
+ itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
+ }
+
+ ossimKeywordlist kwl;
+ imageKeywordlist.convertToOSSIMKeywordlist(kwl);
+
+ std::string key = "calibration.calibrationConstant.calFactor";
+ ossimString calFac = kwl.find(key.c_str());
+
+ return calFac.toDouble();
+}
} // end namespace otb
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.h b/Code/IO/otbTerraSarImageMetadataInterface.h
index fa521aca79e6410328f7649dbc0eff5e8a198ca6..9ac96ad82fd8c42dccdbae1a6e8a413efb2eca32 100644
--- a/Code/IO/otbTerraSarImageMetadataInterface.h
+++ b/Code/IO/otbTerraSarImageMetadataInterface.h
@@ -66,30 +66,33 @@ public:
/** Get the sensor ID from the ossim metadata */
std::string GetSensorID(const MetaDataDictionaryType & dict ) const;
- /** Get the imaging acquisition day from the ossim metadata */
+ /** Get the imaging start acquisition day from the ossim metadata */
int GetDay( const MetaDataDictionaryType & ) const;
- /** Get the imaging acquisition month from the ossim metadata */
+ /** Get the imaging start acquisition month from the ossim metadata */
int GetMonth( const MetaDataDictionaryType & ) const;
- /** Get the imaging acquisition year from the ossim metadata */
+ /** Get the imaging start acquisition year from the ossim metadata */
int GetYear( const MetaDataDictionaryType & ) const;
- /** Get the imaging acquisition hour from the ossim metadata */
+ /** Get the imaging start acquisition hour from the ossim metadata */
int GetHour( const MetaDataDictionaryType & ) const;
- /** Get the imaging acquisition minute from the ossim metadata */
+ /** Get the imaging start acquisition minute from the ossim metadata */
int GetMinute( const MetaDataDictionaryType & ) const;
- /** Get the imaging production day from the ossim metadata */
+ /** Get the imaging production day from the ossim metadata : generationTime variable */
int GetProductionDay( const MetaDataDictionaryType & ) const;
- /** Get the imaging production month from the ossim metadata */
+ /** Get the imaging production month from the ossim metadata : generationTime variable */
int GetProductionMonth( const MetaDataDictionaryType & ) const;
- /** Get the imaging production year from the ossim metadata */
+ /** Get the imaging production year from the ossim metadata : generationTime variable */
int GetProductionYear( const MetaDataDictionaryType & ) const;
+ /** Get the calibration.calFactor : generationTime variable */
+ double GetCalibrationFactor( const MetaDataDictionaryType & ) const;
+
bool CanRead( const MetaDataDictionaryType & ) const;
protected:
diff --git a/Code/IO/otbTestDriver.cxx b/Code/IO/otbTestDriver.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..8309f34cf5cd6f953a4126ba8718ac252d064985
--- /dev/null
+++ b/Code/IO/otbTestDriver.cxx
@@ -0,0 +1,522 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+// define some itksys* things to make ShareForward.h happy
+#define itksys_SHARED_FORWARD_DIR_BUILD ""
+#define itksys_SHARED_FORWARD_PATH_BUILD ""
+#define itksys_SHARED_FORWARD_PATH_INSTALL ""
+#define itksys_SHARED_FORWARD_EXE_BUILD ""
+#define itksys_SHARED_FORWARD_EXE_INSTALL ""
+
+#include "itkWin32Header.h"
+#include <map>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include "itkNumericTraits.h"
+#include "itkMultiThreader.h"
+#include "otbImage.h"
+#include "otbImageFileReader.h"
+#include "otbImageFileWriter.h"
+#include "itkImageRegionConstIterator.h"
+#include "itkSubtractImageFilter.h"
+#include "itkRescaleIntensityImageFilter.h"
+#include "itkExtractImageFilter.h"
+#include "itkDifferenceImageFilter.h"
+#include "itkImageRegion.h"
+#include "itksys/SystemTools.hxx"
+// include SharedForward to avoid duplicating the code which find the library path variable
+// name and the path separator
+#include "itksys/SharedForward.h"
+#include "itksys/Process.h"
+
+#define ITK_TEST_DIMENSION_MAX 6
+
+void usage()
+{
+ std::cerr << "usage: otbTestDriver [options] prg [args]" << std::endl;
+ std::cerr << std::endl;
+ std::cerr << "otbTestDriver alter the environment, run a test program and compare the images" << std::endl;
+ std::cerr << "produced." << std::endl;
+ std::cerr << std::endl;
+ std::cerr << "Options:" << std::endl;
+ std::cerr << " --add-before-libpath PATH" << std::endl;
+ std::cerr << " Add a path to the library path environment. This option take care of" << std::endl;
+ std::cerr << " choosing the right environment variable for your system." << std::endl;
+ std::cerr << " This option can be used several times." << std::endl;
+ std::cerr << std::endl;
+ std::cerr << " --add-before-env NAME VALUE" << std::endl;
+ std::cerr << " Add a VALUE to the variable name in the environment." << std::endl;
+ std::cerr << " This option can be used several times." << std::endl;
+ std::cerr << std::endl;
+ std::cerr << " --compare TEST BASELINE" << std::endl;
+ std::cerr << " Compare the TEST image to the BASELINE one." << std::endl;
+ std::cerr << " This option can be used several times." << std::endl;
+ std::cerr << std::endl;
+ std::cerr << " --" << std::endl;
+ std::cerr << " The options after -- are not interpreted by this program and passed" << std::endl;
+ std::cerr << " directly to the test program." << std::endl;
+ std::cerr << std::endl;
+ std::cerr << " --help" << std::endl;
+ std::cerr << " Display this message and exit." << std::endl;
+ std::cerr << std::endl;
+
+}
+
+// Regression Testing Code
+
+int RegressionTestImage (const char *testImageFilename, const char *baselineImageFilename, int reportErrors)
+{
+ // Use the factory mechanism to read the test and baseline files and convert them to double
+ typedef otb::Image<double,ITK_TEST_DIMENSION_MAX> ImageType;
+ typedef otb::Image<unsigned char,ITK_TEST_DIMENSION_MAX> OutputType;
+ typedef otb::Image<unsigned char,2> DiffOutputType;
+ typedef otb::ImageFileReader<ImageType> ReaderType;
+
+ // Read the baseline file
+ ReaderType::Pointer baselineReader = ReaderType::New();
+ baselineReader->SetFileName(baselineImageFilename);
+ try
+ {
+ baselineReader->UpdateLargestPossibleRegion();
+ }
+ catch (itk::ExceptionObject& e)
+ {
+ std::cerr << "Exception detected while reading " << baselineImageFilename << " : " << e.GetDescription();
+ return 1000;
+ }
+
+ // Read the file generated by the test
+ ReaderType::Pointer testReader = ReaderType::New();
+ testReader->SetFileName(testImageFilename);
+ try
+ {
+ testReader->UpdateLargestPossibleRegion();
+ }
+ catch (itk::ExceptionObject& e)
+ {
+ std::cerr << "Exception detected while reading " << testImageFilename << " : " << e.GetDescription() << std::endl;
+ return 1000;
+ }
+
+ // The sizes of the baseline and test image must match
+ ImageType::SizeType baselineSize;
+ baselineSize = baselineReader->GetOutput()->GetLargestPossibleRegion().GetSize();
+ ImageType::SizeType testSize;
+ testSize = testReader->GetOutput()->GetLargestPossibleRegion().GetSize();
+
+ if (baselineSize != testSize)
+ {
+ std::cerr << "The size of the Baseline image and Test image do not match!" << std::endl;
+ std::cerr << "Baseline image: " << baselineImageFilename
+ << " has size " << baselineSize << std::endl;
+ std::cerr << "Test image: " << testImageFilename
+ << " has size " << testSize << std::endl;
+ return 1;
+ }
+
+ // Now compare the two images
+ typedef itk::DifferenceImageFilter<ImageType,ImageType> DiffType;
+ DiffType::Pointer diff = DiffType::New();
+ diff->SetValidInput(baselineReader->GetOutput());
+ diff->SetTestInput(testReader->GetOutput());
+ diff->SetDifferenceThreshold(2.0);
+ diff->UpdateLargestPossibleRegion();
+
+ double status = diff->GetTotalDifference();
+
+ // if there are discrepencies, create an diff image
+ if (status && reportErrors)
+ {
+ typedef itk::RescaleIntensityImageFilter<ImageType,OutputType> RescaleType;
+ typedef itk::ExtractImageFilter<OutputType,DiffOutputType> ExtractType;
+ typedef otb::ImageFileWriter<DiffOutputType> WriterType;
+ typedef itk::ImageRegion<ITK_TEST_DIMENSION_MAX> RegionType;
+
+ OutputType::IndexType index; index.Fill(0);
+ OutputType::SizeType size; size.Fill(0);
+
+ RescaleType::Pointer rescale = RescaleType::New();
+ rescale->SetOutputMinimum(itk::NumericTraits<unsigned char>::NonpositiveMin());
+ rescale->SetOutputMaximum(itk::NumericTraits<unsigned char>::max());
+ rescale->SetInput(diff->GetOutput());
+ rescale->UpdateLargestPossibleRegion();
+
+ RegionType region;
+ region.SetIndex(index);
+
+ size = rescale->GetOutput()->GetLargestPossibleRegion().GetSize();
+ for (unsigned int i = 2; i < ITK_TEST_DIMENSION_MAX; i++)
+ {
+ size[i] = 0;
+ }
+ region.SetSize(size);
+
+ ExtractType::Pointer extract = ExtractType::New();
+ extract->SetInput(rescale->GetOutput());
+ extract->SetExtractionRegion(region);
+
+ WriterType::Pointer writer = WriterType::New();
+ writer->SetInput(extract->GetOutput());
+
+ std::cout << "<DartMeasurement name=\"ImageError\" type=\"numeric/double\">";
+ std::cout << status;
+ std::cout << "</DartMeasurement>" << std::endl;
+
+ ::itk::OStringStream diffName;
+ diffName << testImageFilename << ".diff.png";
+ try
+ {
+ rescale->SetInput(diff->GetOutput());
+ rescale->Update();
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "Error during rescale of " << diffName.str() << std::endl;
+ std::cerr << e.what() << "\n";
+ }
+ catch (...)
+ {
+ std::cerr << "Error during rescale of " << diffName.str() << std::endl;
+ }
+ writer->SetFileName(diffName.str().c_str());
+ try
+ {
+ writer->Update();
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "Error during write of " << diffName.str() << std::endl;
+ std::cerr << e.what() << "\n";
+ }
+ catch (...)
+ {
+ std::cerr << "Error during write of " << diffName.str() << std::endl;
+ }
+
+ std::cout << "<DartMeasurementFile name=\"DifferenceImage\" type=\"image/png\">";
+ std::cout << diffName.str();
+ std::cout << "</DartMeasurementFile>" << std::endl;
+
+ ::itk::OStringStream baseName;
+ baseName << testImageFilename << ".base.png";
+ try
+ {
+ rescale->SetInput(baselineReader->GetOutput());
+ rescale->Update();
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "Error during rescale of " << baseName.str() << std::endl;
+ std::cerr << e.what() << "\n";
+ }
+ catch (...)
+ {
+ std::cerr << "Error during rescale of " << baseName.str() << std::endl;
+ }
+ try
+ {
+ writer->SetFileName(baseName.str().c_str());
+ writer->Update();
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "Error during write of " << baseName.str() << std::endl;
+ std::cerr << e.what() << "\n";
+ }
+ catch (...)
+ {
+ std::cerr << "Error during write of " << baseName.str() << std::endl;
+ }
+
+ std::cout << "<DartMeasurementFile name=\"BaselineImage\" type=\"image/png\">";
+ std::cout << baseName.str();
+ std::cout << "</DartMeasurementFile>" << std::endl;
+
+ ::itk::OStringStream testName;
+ testName << testImageFilename << ".test.png";
+ try
+ {
+ rescale->SetInput(testReader->GetOutput());
+ rescale->Update();
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "Error during rescale of " << testName.str() << std::endl;
+ std::cerr << e.what() << "\n";
+ }
+ catch (...)
+ {
+ std::cerr << "Error during rescale of " << testName.str() << std::endl;
+ }
+ try
+ {
+ writer->SetFileName(testName.str().c_str());
+ writer->Update();
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "Error during write of " << testName.str() << std::endl;
+ std::cerr << e.what() << "\n";
+ }
+ catch (...)
+ {
+ std::cerr << "Error during write of " << testName.str() << std::endl;
+ }
+
+ std::cout << "<DartMeasurementFile name=\"TestImage\" type=\"image/png\">";
+ std::cout << testName.str();
+ std::cout << "</DartMeasurementFile>" << std::endl;
+
+
+ }
+ return (status != 0) ? 1 : 0;
+}
+
+//
+// Generate all of the possible baselines
+// The possible baselines are generated fromn the baselineFilename using the following algorithm:
+// 1) strip the suffix
+// 2) append a digit .x
+// 3) append the original suffix.
+// It the file exists, increment x and continue
+//
+std::map<std::string,int> RegressionTestBaselines (char *baselineFilename)
+{
+ std::map<std::string,int> baselines;
+ baselines[std::string(baselineFilename)] = 0;
+
+ std::string originalBaseline(baselineFilename);
+
+ int x = 0;
+ std::string::size_type suffixPos = originalBaseline.rfind(".");
+ std::string suffix;
+ if (suffixPos != std::string::npos)
+ {
+ suffix = originalBaseline.substr(suffixPos,originalBaseline.length());
+ originalBaseline.erase(suffixPos,originalBaseline.length());
+ }
+ while (++x)
+ {
+ ::itk::OStringStream filename;
+ filename << originalBaseline << "." << x << suffix;
+ std::ifstream filestream(filename.str().c_str());
+ if (!filestream)
+ {
+ break;
+ }
+ baselines[filename.str()] = 0;
+ filestream.close();
+ }
+ return baselines;
+}
+
+int main(int ac, char* av[] )
+{
+ std::vector< char* > args;
+ typedef std::pair< char *, char *> ComparePairType;
+ std::vector< ComparePairType > compareList;
+
+ // parse the command line
+ int i = 1;
+ bool skip = false;
+ while( i < ac )
+ {
+ if( !skip && strcmp(av[i], "--add-before-libpath") == 0 )
+ {
+ if( i+1 >= ac )
+ {
+ usage();
+ return 1;
+ }
+ std::string libpath = KWSYS_SHARED_FORWARD_LDPATH;
+ libpath += "=";
+ libpath += av[i+1];
+ char * oldenv = getenv(KWSYS_SHARED_FORWARD_LDPATH);
+ if( oldenv )
+ {
+ libpath += KWSYS_SHARED_FORWARD_PATH_SEP;
+ libpath += oldenv;
+ }
+ itksys::SystemTools::PutEnv( libpath.c_str() );
+ // on some 64 bit systems, LD_LIBRARY_PATH_64 is used before
+ // LD_LIBRARY_PATH if it is set. It can lead the test to load
+ // the system library instead of the expected one, so this
+ // var must also be set
+ if( std::string(KWSYS_SHARED_FORWARD_LDPATH) == "LD_LIBRARY_PATH" )
+ {
+ std::string libpath = "LD_LIBRARY_PATH_64";
+ libpath += "=";
+ libpath += av[i+1];
+ char * oldenv = getenv("LD_LIBRARY_PATH_64");
+ if( oldenv )
+ {
+ libpath += KWSYS_SHARED_FORWARD_PATH_SEP;
+ libpath += oldenv;
+ }
+ itksys::SystemTools::PutEnv( libpath.c_str() );
+ }
+ i += 2;
+ }
+ else if( !skip && strcmp(av[i], "--add-before-env") == 0 )
+ {
+ if( i+2 >= ac )
+ {
+ usage();
+ return 1;
+ }
+ std::string env = av[i+1];
+ env += "=";
+ env += av[i+2];
+ char * oldenv = getenv(av[i+1]);
+ if( oldenv )
+ {
+ env += KWSYS_SHARED_FORWARD_PATH_SEP;
+ env += oldenv;
+ }
+ itksys::SystemTools::PutEnv( env.c_str() );
+ i += 3;
+ }
+ else if( !skip && strcmp(av[i], "--compare") == 0 )
+ {
+ if( i+2 >= ac )
+ {
+ usage();
+ return 1;
+ }
+ compareList.push_back( ComparePairType( av[i+1], av[i+2] ) );
+ i += 3;
+ }
+ else if( !skip && strcmp(av[i], "--") == 0 )
+ {
+ skip = true;
+ i += 1;
+ }
+ else if( !skip && strcmp(av[i], "--help") == 0 )
+ {
+ usage();
+ return 0;
+ }
+ else
+ {
+ args.push_back( av[i] );
+ i += 1;
+ }
+ }
+
+ if( args.empty() )
+ {
+ usage();
+ return 1;
+ }
+
+ // a NULL is required at the end of the table
+ char** argv = new char*[ args.size() + 1 ];
+ for( i=0; i<static_cast<int>(args.size()); i++ )
+ {
+ argv[ i ] = args[ i ];
+ }
+ argv[ args.size() ] = NULL;
+
+ itksysProcess * process = itksysProcess_New();
+ itksysProcess_SetCommand( process, argv );
+ itksysProcess_SetPipeShared( process, itksysProcess_Pipe_STDOUT, true);
+ itksysProcess_SetPipeShared( process, itksysProcess_Pipe_STDERR, true);
+ itksysProcess_Execute( process );
+ itksysProcess_WaitForExit( process, NULL );
+
+ delete []argv;
+
+ int retCode = itksysProcess_GetExitValue( process );
+ if( retCode != 0 )
+ {
+ // no need to compare the images: the test has failed
+ return retCode;
+ }
+
+ // now compare the images
+ try
+ {
+ for( i=0; i<static_cast<int>(compareList.size()); i++)
+ {
+ char * testFilename = compareList[i].first;
+ char * baselineFilename = compareList[i].second;
+ std::cout << "testFilename: " << testFilename << " baselineFilename: " << baselineFilename << std::endl;
+
+ // Make a list of possible baselines
+ std::map<std::string,int> baselines = RegressionTestBaselines(baselineFilename);
+ std::map<std::string,int>::iterator baseline = baselines.begin();
+ std::string bestBaseline;
+ int bestBaselineStatus = itk::NumericTraits<int>::max();
+ while (baseline != baselines.end())
+ {
+ baseline->second = RegressionTestImage(testFilename,
+ (baseline->first).c_str(),
+ 0);
+ if (baseline->second < bestBaselineStatus)
+ {
+ bestBaseline = baseline->first;
+ bestBaselineStatus = baseline->second;
+ }
+ if (baseline->second == 0)
+ {
+ break;
+ }
+ ++baseline;
+ }
+ // if the best we can do still has errors, generate the error images
+ if (bestBaselineStatus)
+ {
+ baseline->second = RegressionTestImage(testFilename,
+ bestBaseline.c_str(),
+ 1);
+ }
+
+ // output the matching baseline
+ std::cout << "<DartMeasurement name=\"BaselineImageName\" type=\"text/string\">";
+ std::cout << itksys::SystemTools::GetFilenameName(bestBaseline);
+ std::cout << "</DartMeasurement>" << std::endl;
+
+ if( bestBaselineStatus != 0 )
+ {
+ return bestBaselineStatus;
+ }
+ }
+
+ }
+ catch(const itk::ExceptionObject& e)
+ {
+ std::cerr << "ITK test driver caught an ITK exception:\n";
+ std::cerr << e.GetFile() << ":" << e.GetLine() << ":\n"
+ << e.GetDescription() << "\n";
+ return -1;
+ }
+ catch(const std::exception& e)
+ {
+ std::cerr << "ITK test driver caught an exception:\n";
+ std::cerr << e.what() << "\n";
+ return -1;
+ }
+ catch(...)
+ {
+ std::cerr << "ITK test driver caught an unknown exception!!!\n";
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/Code/IO/otbVectorDataBase.cxx b/Code/IO/otbVectorDataBase.cxx
index 2fe34118e05abf3d32c71d50e3a1d5b0249105f8..09bd71401b44f0cd9409a66cea48c3c56f23caab 100644
--- a/Code/IO/otbVectorDataBase.cxx
+++ b/Code/IO/otbVectorDataBase.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/IO/otbVectorDataFileReader.h b/Code/IO/otbVectorDataFileReader.h
index 5bc75e37b0ca5056f7a0430d08df09f58e7553ce..e515d50fb1192972defd9651c7ef472d7419886c 100644
--- a/Code/IO/otbVectorDataFileReader.h
+++ b/Code/IO/otbVectorDataFileReader.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorDataFileReader_h
diff --git a/Code/IO/otbVectorDataFileReader.txx b/Code/IO/otbVectorDataFileReader.txx
index e5b48a5b41bbf1dffb7a000b783fab74edd1d935..9c334bbf9e545bcff448c9c46089b4204aecd668 100644
--- a/Code/IO/otbVectorDataFileReader.txx
+++ b/Code/IO/otbVectorDataFileReader.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/IO/otbVectorDataFileWriter.h b/Code/IO/otbVectorDataFileWriter.h
index 567adb129d6df43db4ec2fdb6e162141fc23706f..fed73c4b4c60ef50e73bf469e0789e66e930acb7 100644
--- a/Code/IO/otbVectorDataFileWriter.h
+++ b/Code/IO/otbVectorDataFileWriter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorDataFileWriter_h
diff --git a/Code/IO/otbVectorDataFileWriter.txx b/Code/IO/otbVectorDataFileWriter.txx
index 1854c877d978837d6d7dd2148cb720a2627176bd..dd3a52b3708143cdffd600257235c6026fd2b77f 100644
--- a/Code/IO/otbVectorDataFileWriter.txx
+++ b/Code/IO/otbVectorDataFileWriter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/IO/otbVectorImage.h b/Code/IO/otbVectorImage.h
index 8e46ac6fcae9420a0b9700e940bffbe61d10af67..772c1cce286600468a6c2db55fa64b8d64fc237a 100644
--- a/Code/IO/otbVectorImage.h
+++ b/Code/IO/otbVectorImage.h
@@ -71,7 +71,7 @@ public:
/** Accessor type that convert data between internal and external
* representations. */
- typedef itk::DefaultVectorPixelAccessor< InternalPixelType > AccessorType;
+ //typedef itk::DefaultVectorPixelAccessor< InternalPixelType > AccessorType;
/** Functor to provide a common API between DefaultPixelAccessor and
* DefaultVectorPixelAccessor */
@@ -151,16 +151,16 @@ public:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Return the Pixel Accessor object */
- AccessorType GetPixelAccessor( void )
- {
- return AccessorType( this->GetNumberOfComponentsPerPixel() );
- }
-
- /** Return the Pixel Accesor object */
- const AccessorType GetPixelAccessor( void ) const
- {
- return AccessorType( this->GetNumberOfComponentsPerPixel() );
- }
+// AccessorType GetPixelAccessor( void )
+// {
+// return AccessorType( this->GetNumberOfComponentsPerPixel() );
+// }
+
+// /** Return the Pixel Accesor object */
+// const AccessorType GetPixelAccessor( void ) const
+// {
+// return AccessorType( this->GetNumberOfComponentsPerPixel() );
+// }
/** Return the NeighborhoodAccessor functor */
NeighborhoodAccessorFunctorType GetNeighborhoodAccessor()
diff --git a/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h b/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h
index 88c9d8bc59a698a7b53796d37f8755d98913db06..0a65dc6674b4a543ef62dae781bf074c0b5fff2f 100644
--- a/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h
+++ b/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h b/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h
index 4608850a81b9a75844ede657a237c5ddc538b980..bd6516d7ccd2ec78dfaa9e7c927240eaa65aeee7 100644
--- a/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h
+++ b/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.h b/Code/Learning/otbKMeansImageClassificationFilter.h
index 980887da1278ce58547c972aa0bb948f9099756f..a5ce5d68f99513d583be8592c701595de4dda9a1 100644
--- a/Code/Learning/otbKMeansImageClassificationFilter.h
+++ b/Code/Learning/otbKMeansImageClassificationFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbKMeansImageClassificationFilter_h
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.txx b/Code/Learning/otbKMeansImageClassificationFilter.txx
index fab3902237d79b8a8d97bd926d065320c26dc727..20bd3e79b67344398609d98e81b3058df1577e10 100644
--- a/Code/Learning/otbKMeansImageClassificationFilter.txx
+++ b/Code/Learning/otbKMeansImageClassificationFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbKMeansImageClassificationFilter_txx
diff --git a/Code/Learning/otbSOM.h b/Code/Learning/otbSOM.h
index aa656cc6343607bbfb68bf769f92074f3bce0062..cc148071baed68e86a5d745d606f1daef18f7db4 100644
--- a/Code/Learning/otbSOM.h
+++ b/Code/Learning/otbSOM.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOM_h
diff --git a/Code/Learning/otbSOM.txx b/Code/Learning/otbSOM.txx
index 95850f7cbe74ec01e0152c98f9f9ff4cea27f6e9..151d5016c11875c5ce2e55aaffdb8857567f25b7 100644
--- a/Code/Learning/otbSOM.txx
+++ b/Code/Learning/otbSOM.txx
@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOM_txx
diff --git a/Code/Learning/otbSOMActivationBuilder.h b/Code/Learning/otbSOMActivationBuilder.h
index 871365a67b78b8985f6693c5a3674a1fcd1cd42b..bf62edb377373285507742d598ef3c60f59d020a 100644
--- a/Code/Learning/otbSOMActivationBuilder.h
+++ b/Code/Learning/otbSOMActivationBuilder.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMActivationBuilder_h
diff --git a/Code/Learning/otbSOMActivationBuilder.txx b/Code/Learning/otbSOMActivationBuilder.txx
index 735743ac458f74f823274bd91f63229723cdbe5e..fdb1d7689b72395d78b722d87c90300a4e40b22c 100644
--- a/Code/Learning/otbSOMActivationBuilder.txx
+++ b/Code/Learning/otbSOMActivationBuilder.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMActivationBuilder_txx
diff --git a/Code/Learning/otbSOMImageClassificationFilter.h b/Code/Learning/otbSOMImageClassificationFilter.h
index b73176f518552e2a72dee123988bbb967c1e4ed9..9caaa444f1f8e963ea7db83c285f9bbc32424bd5 100644
--- a/Code/Learning/otbSOMImageClassificationFilter.h
+++ b/Code/Learning/otbSOMImageClassificationFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMImageClassificationFilter_h
diff --git a/Code/Learning/otbSOMImageClassificationFilter.txx b/Code/Learning/otbSOMImageClassificationFilter.txx
index d1b00916ca2d0ccd5707d9cf9c00d88582383247..8c547a7b47397564d95cc3654874e21ad2f613d7 100644
--- a/Code/Learning/otbSOMImageClassificationFilter.txx
+++ b/Code/Learning/otbSOMImageClassificationFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMImageClassificationFilter_txx
diff --git a/Code/Learning/otbSOMLearningBehaviorFunctor.h b/Code/Learning/otbSOMLearningBehaviorFunctor.h
index d4c28e2c547481c714c646b5040d96557d9f65c1..0ee4e9a2d8cc1172a46253ea3656313937e1e20f 100644
--- a/Code/Learning/otbSOMLearningBehaviorFunctor.h
+++ b/Code/Learning/otbSOMLearningBehaviorFunctor.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Learning/otbSOMMap.h b/Code/Learning/otbSOMMap.h
index ca679561c39e08aceaa5f8ccaa6c6cfab9353ca4..88479d850480e20e8ce9cc08436abf9f1e6e8124 100644
--- a/Code/Learning/otbSOMMap.h
+++ b/Code/Learning/otbSOMMap.h
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom Bretagne. All right reserved.
See GETCopyright.txt for details.
@@ -15,7 +15,7 @@ See GETCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMMap_h
diff --git a/Code/Learning/otbSOMMap.txx b/Code/Learning/otbSOMMap.txx
index 1feb9f91f09a6fd93f7acab9ea27b419d9f6bb2f..b973588d9c455c6988040cb90e80f2316bbf8a91 100644
--- a/Code/Learning/otbSOMMap.txx
+++ b/Code/Learning/otbSOMMap.txx
@@ -7,7 +7,7 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom Bretagne. All right reserved.
See GETCopyright.txt for details.
@@ -15,7 +15,7 @@ See GETCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMMap_txx
diff --git a/Code/Learning/otbSOMWithMissingValue.h b/Code/Learning/otbSOMWithMissingValue.h
index 9d5a23e1a57ded9bbed11ac3c5d8a14750e6eba4..2ec4b1fad8842582686ed362664590b2106e67ad 100644
--- a/Code/Learning/otbSOMWithMissingValue.h
+++ b/Code/Learning/otbSOMWithMissingValue.h
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef _otbSOMWithMissingValue_h
diff --git a/Code/Learning/otbSOMWithMissingValue.txx b/Code/Learning/otbSOMWithMissingValue.txx
index dc620810f93f0f2fcd00fdbbc3c840030873bd51..2d1a5943159887ec5d2e93af9cc1399f6802ca64 100644
--- a/Code/Learning/otbSOMWithMissingValue.txx
+++ b/Code/Learning/otbSOMWithMissingValue.txx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef _otbSOMWithMissingValue_txx
diff --git a/Code/Learning/otbSOMbasedImageFilter.h b/Code/Learning/otbSOMbasedImageFilter.h
index c847557467d1f8280b9a57b79ccaee5a8a02f070..2a2b5ce9b1b6e4863c8be283ae13b339fff6b6de 100644
--- a/Code/Learning/otbSOMbasedImageFilter.h
+++ b/Code/Learning/otbSOMbasedImageFilter.h
@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMbasedImageFilter__h
diff --git a/Code/Learning/otbSOMbasedImageFilter.txx b/Code/Learning/otbSOMbasedImageFilter.txx
index f42e14688eb084f275abe4aa808bc32f5e482637..de9f864213137304e40d5968f398c1c9c714c9f9 100644
--- a/Code/Learning/otbSOMbasedImageFilter.txx
+++ b/Code/Learning/otbSOMbasedImageFilter.txx
@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSOMbasedImageFilter__txx
diff --git a/Code/Learning/otbSVMClassifier.txx b/Code/Learning/otbSVMClassifier.txx
index cc00f61f9de1c5367e246ecdb31b304370dc7a91..85a44718f09a73c5e9e35b057a711b43a915e63c 100644
--- a/Code/Learning/otbSVMClassifier.txx
+++ b/Code/Learning/otbSVMClassifier.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSVMClassifier_txx
diff --git a/Code/Learning/otbSVMImageClassificationFilter.h b/Code/Learning/otbSVMImageClassificationFilter.h
index 0a91cd78438f649f6329110d5eeb5bbff96dd22f..dd644767cfd81bd2600f33421567ac614ecbe317 100644
--- a/Code/Learning/otbSVMImageClassificationFilter.h
+++ b/Code/Learning/otbSVMImageClassificationFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSVMImageClassificationFilter_h
diff --git a/Code/Learning/otbSVMImageClassificationFilter.txx b/Code/Learning/otbSVMImageClassificationFilter.txx
index 40c059cc6cfe3a95638c98e82307d626d160b249..d297b83e3dceef683fc6e22493c2393d2bb3c7c1 100644
--- a/Code/Learning/otbSVMImageClassificationFilter.txx
+++ b/Code/Learning/otbSVMImageClassificationFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSVMImageClassificationFilter_txx
diff --git a/Code/Learning/otbSVMModel.txx b/Code/Learning/otbSVMModel.txx
index da6475407f59d484143a8bde5454d1d9c0f58717..a93b30ecdd4902a699bf9c10be507159d01f7879 100644
--- a/Code/Learning/otbSVMModel.txx
+++ b/Code/Learning/otbSVMModel.txx
@@ -540,7 +540,6 @@ SVMModel<TValue,TLabel>::SetSupportVectors(svm_node ** sv, int nbOfSupportVector
delete[] (m_Model->SV);
m_Model->SV = NULL;
- this->SetNumberOfSupportVectors(nbOfSupportVector);
m_Model->SV = new struct svm_node*[m_Model->l];
// copy new SV values
@@ -606,8 +605,6 @@ SVMModel<TValue,TLabel>::SetAlpha( double ** alpha, int nbOfSupportVector )
}
delete [] m_Model->sv_coef;
- this->SetNumberOfSupportVectors(nbOfSupportVector);
-
// copy new sv_coef values
m_Model->sv_coef = new double*[m_Model->nr_class-1];
for (int i=0; i<m_Model->nr_class-1; ++i)
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.txx b/Code/Learning/otbSVMPointSetModelEstimator.txx
index 9ef4e5a8692e818f7798985607c18c2ae69e10bd..fffb151472da59700cdc1743045e6cd595704075 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.txx
+++ b/Code/Learning/otbSVMPointSetModelEstimator.txx
@@ -130,7 +130,7 @@ SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
unsigned int dataId = 0;
while (inIt!=inEnd && trIt!=trEnd)
{
- typename TTrainingPointSet::PixelType label;
+ typename TTrainingPointSet::PixelType label = itk::NumericTraits<typename TTrainingPointSet::PixelType>::Zero;
trainingPointSet->GetPointData( dataId, & label );
otbMsgDevMacro( << " Label " << label );
diff --git a/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h b/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
index 4b73ebef838d07f22848146f44e3c580530261a8..ed72df0a0201b8f06597858de4ed5760b9a82e28 100644
--- a/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
+++ b/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbConvexOrConcaveClassificationFilter_h
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
index 02ac5f6d211f2790fe392e445d9a8dc981c0586e..aa1aac99e0d4070603c815f70ec63af7792cb84e 100644
--- a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGeodesicMorphologyDecompositionImageFilter_h
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
index 24df3f9c94a383bf947abe539e4f49bbaf700d0f..95ea2b7970bad33e68b2c7facc049b602bea4d03 100644
--- a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
+++ b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGeodesicMorphologyDecompositionImageFilter_txx
diff --git a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
index 7c5a3a520f98403799f731c945126d75964e266f..59614cc8db38f562e3024e01782239f7b6384a57 100644
--- a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
+++ b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
diff --git a/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h b/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
index 849b0768847966d459ef8b9564a6ff87bc2e5fe1..93a7d922a147ebac53f1570fa0fcd6aa1cd5a2fe 100644
--- a/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGeodesicMorphologyLevelingFilter_h
diff --git a/Code/MultiScale/otbImageToProfileFilter.h b/Code/MultiScale/otbImageToProfileFilter.h
index 48c6d4c495b7f4ed646a452c0e469cfd37264af8..fad0c1d802d1d7441dd627d47955d613720fcaf7 100644
--- a/Code/MultiScale/otbImageToProfileFilter.h
+++ b/Code/MultiScale/otbImageToProfileFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToProfileFilter_h
diff --git a/Code/MultiScale/otbImageToProfileFilter.txx b/Code/MultiScale/otbImageToProfileFilter.txx
index 1a9c5d06e81c6aba438e75a31076b24d1ca0808a..72f38481e15a61c8d81a5ae8b4e50ba7b9dbb59b 100644
--- a/Code/MultiScale/otbImageToProfileFilter.txx
+++ b/Code/MultiScale/otbImageToProfileFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToProfileFilter_txx
diff --git a/Code/MultiScale/otbMorphologicalClosingProfileFilter.h b/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
index 5f8051099c31274d67fb91d13bc636bae752f1ab..3d047985ac9e7ec8616092402230b30b0b6fbc3a 100644
--- a/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
+++ b/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalClosingProfileFilter_h
diff --git a/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h b/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
index 26be04dc953c449db5253580c2f8ffd787d49d3d..4f81e6ad89a11c6441740606f0ffe098f54e45d6 100644
--- a/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
+++ b/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalOpeningProfileFilter_h
diff --git a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
index 3df9d9f5666d9896dddc992e2e900c7ba2279446..ec2270205a56a05265956403ae2cfa776964a758 100644
--- a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalPyramidAnalysisFilter_txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx
index 61a3258153f20e5575f8e3a3f75177a8253e98f1..6708992a0cf5634843c22d85d0eb22e57f66ad4f 100644
--- a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalPyramidMRToMSConverter_txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.h b/Code/MultiScale/otbMorphologicalPyramidResampler.h
index d650e6cfe2850e5e9ae8bec6898e039aa779082e..8ee13ff261f0dbe45dbe5f239dd26b7c434fa1f4 100644
--- a/Code/MultiScale/otbMorphologicalPyramidResampler.h
+++ b/Code/MultiScale/otbMorphologicalPyramidResampler.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalPyramidResampler_h
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
index 07367b9284629ac461b9b62e8f0ff0f2c78ea016..35e19e9eab5fd9c09d8bfc4c8de3b9cb828ced8d 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalPyramidSegmentationFilter_txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.h b/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
index c35bed70af72636aed201e6c3e6b602975c9e061..a491a8fbac8a8a568c27ae7bb570b92ede74e1b4 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalPyramidSegmenter_h
diff --git a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
index af254a4641531798245c8bc6b43b05ced538ffb1..fa60784486fa28d0ab62c73b6c6b2a5752d127eb 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMorphologicalPyramidSynthesisFilter_txx
diff --git a/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
index 0cefba160458cd214a1fccba7977c6ab3dd61742..c3d115b3738f14d184c6ec3c5fe05f47182140c4 100644
--- a/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
+++ b/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMultiScaleConvexOrConcaveClassificationFilter_h
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index 583ae27ef9c5f86c6fe1bf740fbc8e3b18b7e59d..39fde13a4d60e7879eeb67df8be3263234ef4e15 100644
--- a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbProfileDerivativeToMultiScaleCharacteristicsFilter_h
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
index 3bd69da036d936c09882d8a8a25ff3dd6c7c8b3b..15ef5743b4c792815ef83354a915260562efc86b 100644
--- a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
+++ b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.h b/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
index 8e9404185b092feca4d84c2101b67276b729f2e7..56d5512889ee3be83ce9f8026d69942301f211ba 100644
--- a/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
+++ b/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbProfileToProfileDerivativeFilter_h
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx b/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
index 58dfb50c653e98f0cecb767410029e9cf7fa2d91..88e00539ab69a7b0a4d893497b68d3fea8a4ca87 100644
--- a/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
+++ b/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbProfileToProfileDerivativeFilter_txx
diff --git a/Code/MultiScale/otbWaveletFilterBank.h b/Code/MultiScale/otbWaveletFilterBank.h
index 442b2187e662d7fb13dceafbd410fd193413b360..a82a5ea86f74debee2b938cd14240968cdb3efe8 100644
--- a/Code/MultiScale/otbWaveletFilterBank.h
+++ b/Code/MultiScale/otbWaveletFilterBank.h
@@ -41,7 +41,7 @@ namespace otb {
* (ie. convolution-like operation).
*
* the inner operator are supposed to be defined through 1D filters. Then, the
- * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
+ * forward transformation yields \f$ 2^{\text{Dim}} \f$ output images, while the inverse
* transformation requires \f$ 2^{\text{Dim}} \f$ input image for one output.
*
* In case of 1D, GetOutput(0) -> LowPass
@@ -87,10 +87,10 @@ class ITK_EXPORT WaveletFilterBank
{
public:
/** Standard typedefs */
- typedef WaveletFilterBank Self;
+ typedef WaveletFilterBank Self;
typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -115,7 +115,7 @@ private:
* (ie. convolution-like operation).
*
* The inner operator are supposed to be defined through 1D filters. Then, the
- * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
+ * forward transformation yields \f$ 2^{\text{Dim}} \f$ output images, while the inverse
* transformation requires \f$ 2^{\text{Dim}} \f$ input image for one output.
*
* In case of 1D, GetOutput(0) -> LowPass
@@ -154,10 +154,10 @@ class ITK_EXPORT WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator,
{
public:
/** Standard typedefs */
- typedef WaveletFilterBank Self;
+ typedef WaveletFilterBank Self;
typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -166,22 +166,22 @@ public:
itkTypeMacro(WaveletFilterBank,ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::SizeType InputSizeType;
- typedef typename InputImageType::IndexType InputIndexType;
- typedef typename InputImageType::PixelType InputPixelType;
-
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::SizeType InputSizeType;
+ typedef typename InputImageType::IndexType InputIndexType;
+ typedef typename InputImageType::PixelType InputPixelType;
+
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::SizeType OutputSizeType;
- typedef typename OutputImageType::IndexType OutputIndexType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::SizeType OutputSizeType;
+ typedef typename OutputImageType::IndexType OutputIndexType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
- typedef TWaveletOperator WaveletOperatorType;
- typedef typename WaveletOperatorType::LowPassOperator LowPassOperatorType;
+ typedef TWaveletOperator WaveletOperatorType;
+ typedef typename WaveletOperatorType::LowPassOperator LowPassOperatorType;
typedef typename WaveletOperatorType::HighPassOperator HighPassOperatorType;
typedef InverseOrForwardTransformationEnum DirectionOfTransformationEnumType;
@@ -252,7 +252,7 @@ protected:
virtual void CallCopyOutputRegionToInputRegion
( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
virtual void CallCopyInputRegionToOutputRegion
- ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
/** CallCopyOutputRegionToInputRegion
* This function is also redefined in order to adapt the shape of the regions with
@@ -283,7 +283,7 @@ private:
* size ImageDimension-1 and each InternalImagesTabular contains intermediate
* images.
*/
- typedef std::vector< OutputImagePointerType > InternalImagesTabular ;
+ typedef std::vector< OutputImagePointerType > InternalImagesTabular;
std::vector< InternalImagesTabular > m_InternalImages;
}; // end of class
@@ -296,7 +296,7 @@ private:
* (ie. convolution-like operation).
*
* The inner operator are supposed to be defined through 1D filters. Then, the
- * forward transformation yields \f$ 2^{\test{Dim}} \f$ output images, while the inverse
+ * forward transformation yields \f$ 2^{\text{Dim}} \f$ output images, while the inverse
* transformation requires \f$ 2^{\text{Dim}} \f$ input image for one output.
*
* In case of 1D, GetOutput(0) -> LowPass
@@ -335,10 +335,10 @@ class ITK_EXPORT WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator,
{
public:
/** Standard typedefs */
- typedef WaveletFilterBank Self;
+ typedef WaveletFilterBank Self;
typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -347,22 +347,22 @@ public:
itkTypeMacro(WaveletFilterBank,ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::SizeType InputSizeType;
- typedef typename InputImageType::IndexType InputIndexType;
- typedef typename InputImageType::PixelType InputPixelType;
-
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::SizeType InputSizeType;
+ typedef typename InputImageType::IndexType InputIndexType;
+ typedef typename InputImageType::PixelType InputPixelType;
+
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::SizeType OutputSizeType;
- typedef typename OutputImageType::IndexType OutputIndexType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::SizeType OutputSizeType;
+ typedef typename OutputImageType::IndexType OutputIndexType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
- typedef TWaveletOperator WaveletOperatorType;
- typedef typename WaveletOperatorType::LowPassOperator LowPassOperatorType;
+ typedef TWaveletOperator WaveletOperatorType;
+ typedef typename WaveletOperatorType::LowPassOperator LowPassOperatorType;
typedef typename WaveletOperatorType::HighPassOperator HighPassOperatorType;
typedef InverseOrForwardTransformationEnum DirectionOfTransformationEnumType;
@@ -435,7 +435,7 @@ protected:
virtual void CallCopyOutputRegionToInputRegion
( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
virtual void CallCopyInputRegionToOutputRegion
- ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
/** CallCopyOutputRegionToInputRegion
* This function is also redefined in order to adapt the shape of the regions with
@@ -469,7 +469,7 @@ private:
* size ImageDimension-1 and each InternalImagesTabular contains intermediate
* images. Internal images are used for multiresolution case only.
*/
- typedef std::vector< OutputImagePointerType > InternalImagesTabular ;
+ typedef std::vector< OutputImagePointerType > InternalImagesTabular;
std::vector< InternalImagesTabular > m_InternalImages;
}; // end of class
@@ -481,4 +481,3 @@ private:
#endif
#endif
-
diff --git a/Code/Projections/otbCompositeTransform.h b/Code/Projections/otbCompositeTransform.h
index baa79c8ccee7aac0df16a2cc44351fd321eaa7c2..ad9f4bcfd82fbd9831a19055ef7a5d5cae27672c 100644
--- a/Code/Projections/otbCompositeTransform.h
+++ b/Code/Projections/otbCompositeTransform.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbCompositeTransform_h
diff --git a/Code/Projections/otbCompositeTransform.txx b/Code/Projections/otbCompositeTransform.txx
index 4eb3dfe7cbb1348692e6a99dd3c7238abadef900..70dd69547341e225b2307eb2cd94fe85d6d92a50 100644
--- a/Code/Projections/otbCompositeTransform.txx
+++ b/Code/Projections/otbCompositeTransform.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbCompositeTransform_txx
diff --git a/Code/Projections/otbCoordinateToName.h b/Code/Projections/otbCoordinateToName.h
deleted file mode 100644
index 451594d8d12f367b0cc7685e2a7f2128972e266f..0000000000000000000000000000000000000000
--- a/Code/Projections/otbCoordinateToName.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*=========================================================================
-
- Program: ORFEO Toolbox
- Language: C++
- Date: $Date$
- Version: $Revision$
-
-
- Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
- See OTBCopyright.txt for details.
-
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef __otbCoordinateToName_h
-#define __otbCoordinateToName_h
-
-#include "itkObject.h"
-#include "itkObjectFactory.h"
-
-namespace otb
-{
-
-/**
- * \class CoordinateToName
- * \brief Retrieve Geographical information for Longitude and Latitude coordinates
- *
-
- */
-
-
-class ITK_EXPORT CoordinateToName : public itk::Object
-{
-public:
- /** Standard class typedefs. */
- typedef CoordinateToName Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
-
- typedef itk::Object Superclass;
-
- itkTypeMacro(CoordinateToName, Object);
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- itkGetMacro( Lon, double );
- itkGetMacro( Lat, double );
- itkGetMacro( PlaceName, std::string );
- itkGetMacro( CountryName, std::string );
-
- itkSetMacro( Lon, double );
- itkSetMacro( Lat, double );
-
- virtual bool Evaluate();
-
-protected:
- CoordinateToName();
- virtual ~CoordinateToName() {};
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
- void RetrieveXML(std::ostringstream& urlStream);
- void ParseXMLGeonames();
-
-private:
- CoordinateToName( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
-
- double m_Lon;
- double m_Lat;
- std::string m_PlaceName;
- std::string m_CountryName;
-};
-
-} // namespace otb
-
-
-#endif
diff --git a/Code/Projections/otbEckert4MapProjection.h b/Code/Projections/otbEckert4MapProjection.h
index b816a1b80cc3e6730e6457bc34452accd249d449..f1efc9e97dc33d4e92dbf1519c0dc657e4b232d5 100644
--- a/Code/Projections/otbEckert4MapProjection.h
+++ b/Code/Projections/otbEckert4MapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbEckert4MapProjection_h
diff --git a/Code/Projections/otbEckert4MapProjection.txx b/Code/Projections/otbEckert4MapProjection.txx
index 3e439fcd0480434e30ed18d5d95f7806bf994de3..16109170bbe07afa0ebc06fb2eaf9bd151cf2a57 100644
--- a/Code/Projections/otbEckert4MapProjection.txx
+++ b/Code/Projections/otbEckert4MapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbForwardSensorModel.h b/Code/Projections/otbForwardSensorModel.h
index d9d24f3b5af8b44eb15029a51d09aae33bf23afe..9a45413a19867f173211bc4edb08d68874fd69cf 100644
--- a/Code/Projections/otbForwardSensorModel.h
+++ b/Code/Projections/otbForwardSensorModel.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbForwardSensorModel.txx b/Code/Projections/otbForwardSensorModel.txx
index ae2ad8d5e0aa61f985cff6e72f6ff8f4d69b4829..d9ae0ad8ef4f994cd927d3c6133c8b67059ba3d7 100644
--- a/Code/Projections/otbForwardSensorModel.txx
+++ b/Code/Projections/otbForwardSensorModel.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbForwardSensorModel_txx
@@ -84,14 +84,9 @@ ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
currentPoint[1] = ossimGPointRef.lat;
// otbMsgDevMacro(<< "PointP Before iter : (" << point[1] << "," << point[0] <<")");
- if (this->m_UseDEM)
- {
- heightTmp = this->m_DEMHandler->GetHeightAboveMSL(currentPoint);
- }
- else
- {
- heightTmp = this->m_AverageElevation;
- }
+
+ heightTmp = this->m_DEMHandler->GetHeightAboveMSL(currentPoint);
+
// otbMsgDevMacro(<< "height : " << heightTmp);
this->m_Model->lineSampleHeightToWorld(ossimPoint, heightTmp, ossimGPointRef);
diff --git a/Code/Projections/otbGenericMapProjection.h b/Code/Projections/otbGenericMapProjection.h
index be07dff27f597b5868a50d90469118e9be42b3af..406a23ea3378a1af12435cf2fb908034cb21e106 100644
--- a/Code/Projections/otbGenericMapProjection.h
+++ b/Code/Projections/otbGenericMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGenericMapProjection_h
diff --git a/Code/Projections/otbGenericMapProjection.txx b/Code/Projections/otbGenericMapProjection.txx
index bd0b5bf3a47514b76075c421ba29dae4a8c14f9b..2b61a2a34e169b1dd25a4f984a78d594151f1a96 100644
--- a/Code/Projections/otbGenericMapProjection.txx
+++ b/Code/Projections/otbGenericMapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGenericMapProjection_txx
@@ -120,7 +120,7 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
if (!projectionInformationAvailable)
{
- std::cout << "WARNING: Impossible to create the projection from string: "<< m_ProjectionRefWkt << std::endl;
+ otbMsgDevMacro(<<"WARNING: Impossible to create the projection from string: "<< m_ProjectionRefWkt);
return false;
}
@@ -129,7 +129,7 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
//a better solution might be available...
if (std::string(kwl.find("type")) == "ossimEquDistCylProjection")
{
- std::cout << "WARNING: Not instanciating a ossimEquDistCylProjection"<< std::endl;
+ otbMsgDevMacro(<< "WARNING: Not instanciating a ossimEquDistCylProjection");
return false;
}
diff --git a/Code/Projections/otbGenericRSTransform.h b/Code/Projections/otbGenericRSTransform.h
index 568b7f1f852e425b0d602a5b5d304ad336eb081f..e2862e8ed2d8c22ec3744735d9e10805ce359c5d 100644
--- a/Code/Projections/otbGenericRSTransform.h
+++ b/Code/Projections/otbGenericRSTransform.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGenericRSTransform_h
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx
index 8abebd5ee916f96872bd5160faf02f086f1f8c66..febc948a009d70b870da721948a65f9f5f79a313 100644
--- a/Code/Projections/otbGenericRSTransform.txx
+++ b/Code/Projections/otbGenericRSTransform.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGenericRSTransform_txx
diff --git a/Code/Projections/otbGeocentricTransform.h b/Code/Projections/otbGeocentricTransform.h
index 32d68ad5f65320c5c6f21f0eb2b958d7a48dce9e..3b5c82eaf2aab7c423e174ddf1b10c25df37e4c2 100644
--- a/Code/Projections/otbGeocentricTransform.h
+++ b/Code/Projections/otbGeocentricTransform.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGeocentricTransform_h
diff --git a/Code/Projections/otbGeocentricTransform.txx b/Code/Projections/otbGeocentricTransform.txx
index 66f49831ebd4118fdd07de74a870d272efb821b1..66ff679bd88c80e5586331f1ebc2b68ef1a83f03 100644
--- a/Code/Projections/otbGeocentricTransform.txx
+++ b/Code/Projections/otbGeocentricTransform.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGeocentricTransform_txx
diff --git a/Code/Projections/otbInverseSensorModel.h b/Code/Projections/otbInverseSensorModel.h
index fc6858a7ac2f33656495a69d5399319528022998..c2dd35d0ffd90384336ef650096bde206f2c7528 100644
--- a/Code/Projections/otbInverseSensorModel.h
+++ b/Code/Projections/otbInverseSensorModel.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbInverseSensorModel_h
diff --git a/Code/Projections/otbLambert2EtenduProjection.h b/Code/Projections/otbLambert2EtenduProjection.h
index 214b10ad550f7b9dd8fdd46983a0d0d2fe81a9ac..f907ebc3663da7a20a60f6127ed57cbd4a9901e0 100644
--- a/Code/Projections/otbLambert2EtenduProjection.h
+++ b/Code/Projections/otbLambert2EtenduProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLambert2EtenduProjection_h
diff --git a/Code/Projections/otbLambert2EtenduProjection.txx b/Code/Projections/otbLambert2EtenduProjection.txx
index 013fb1dd52a9f19aea65bf829f7214187067d699..9cea8f80fe42e8059712722bc1317273670f4493 100644
--- a/Code/Projections/otbLambert2EtenduProjection.txx
+++ b/Code/Projections/otbLambert2EtenduProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbLambert3CartoSudProjection.h b/Code/Projections/otbLambert3CartoSudProjection.h
new file mode 100644
index 0000000000000000000000000000000000000000..7568e4501e4aaf883687d5125e15a5dc66b57735
--- /dev/null
+++ b/Code/Projections/otbLambert3CartoSudProjection.h
@@ -0,0 +1,69 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#ifndef __otbLambert3CartoSudProjection_h
+#define __otbLambert3CartoSudProjection_h
+
+
+#include "projection/ossimMapProjection.h"
+#include "projection/ossimLambertConformalConicProjection.h"
+#include "otbMapProjection.h"
+
+namespace otb
+{
+/** \class Lambert3CartoSudProjection
+* \brief This class implements the Lambert3CartoSud map projection (RGF93 french geodesic system).
+* It converts coordinates in longitude,latitude (WGS84) to Lambert 3 map coordinates.
+*
+ */
+template <InverseOrForwardTransformationEnum transform>
+class ITK_EXPORT Lambert3CartoSudProjection : public LambertConformalConicMapProjection<transform>
+{
+public :
+ /** Standard class typedefs. */
+ typedef Lambert3CartoSudProjection Self;
+ typedef LambertConformalConicMapProjection<transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType,2 > InputPointType;
+ typedef itk::Point<ScalarType,2 > OutputPointType;
+
+ /** Method for creation through the object factory. */
+ itkNewMacro( Self );
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro( Lambert3CartoSudProjection, LambertConformalConicMapProjection);
+
+
+protected:
+ Lambert3CartoSudProjection();
+ virtual ~Lambert3CartoSudProjection();
+
+private :
+ Lambert3CartoSudProjection(const Self&); //purposely not implemented
+ void operator=(const Self&); //purposely not implemented
+};
+
+} // namespace otb
+
+#ifndef OTB_MANUAL_INSTANTIATION
+#include "otbLambert3CartoSudProjection.txx"
+#endif
+
+#endif
diff --git a/Code/Projections/otbLambert3CartoSudProjection.txx b/Code/Projections/otbLambert3CartoSudProjection.txx
new file mode 100644
index 0000000000000000000000000000000000000000..333630b36aaabf5fddda6e633377214fc20de158
--- /dev/null
+++ b/Code/Projections/otbLambert3CartoSudProjection.txx
@@ -0,0 +1,59 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef __otbLambert3CartoSudProjection_txx
+#define __otbLambert3CartoSudProjection_txx
+
+#include "otbLambert3CartoSudProjection.h"
+
+namespace otb
+{
+
+template <InverseOrForwardTransformationEnum transform>
+Lambert3CartoSudProjection<transform>
+::Lambert3CartoSudProjection()
+{
+ itk::Point<double,2> origin;
+ origin[0]=3;
+ origin[1]=46.5;
+ std::string datum = "WE"; //WGS84 datum
+
+
+ double parall1=43.1992913888888888888888888889;
+ double parall2=44.9960938888888888888888888888;
+ double falseEasting=600000;
+ double falseNorthing=3200000;
+ std::string ellipsoid = "CE";
+
+ //TODO: 29-02-2008 Emmanuel: when ossim version > 1.7.2 only
+ // SetOrigin required (remove SetEllipsoid)
+ this->SetOrigin(origin, datum);
+ this->SetEllipsoid(ellipsoid);
+ this->SetParameters(parall1, parall2, falseEasting, falseNorthing);
+}
+
+template <InverseOrForwardTransformationEnum transform>
+Lambert3CartoSudProjection<transform>
+::~Lambert3CartoSudProjection()
+{
+}
+
+
+} // namespace otb
+
+#endif
diff --git a/Code/Projections/otbLambert93Projection.h b/Code/Projections/otbLambert93Projection.h
index 3f47021847efbabc03c1eb2aabed6108dba2be5f..6436bb435ce2160d31be2fdeb67ae8c73be95750 100644
--- a/Code/Projections/otbLambert93Projection.h
+++ b/Code/Projections/otbLambert93Projection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLambert93Projection_h
diff --git a/Code/Projections/otbLambert93Projection.txx b/Code/Projections/otbLambert93Projection.txx
index 4fef21eff1d722880ad01775397b1b77b79174bb..bd7777499e50aec65e752958870ce2bc135d892e 100644
--- a/Code/Projections/otbLambert93Projection.txx
+++ b/Code/Projections/otbLambert93Projection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbLambertConformalConicMapProjection.h b/Code/Projections/otbLambertConformalConicMapProjection.h
index 09d817aa624d3fc317d3648dfa3b382ca0e7332c..364fce1ee33570474c0f19ac210cdc4266f186de 100644
--- a/Code/Projections/otbLambertConformalConicMapProjection.h
+++ b/Code/Projections/otbLambertConformalConicMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbLambertConformalConicMapProjection_h
diff --git a/Code/Projections/otbLambertConformalConicMapProjection.txx b/Code/Projections/otbLambertConformalConicMapProjection.txx
index 0a512ef5d0e4ef74bd362f832e05b64fc83167ba..1129f3d7dbf625303e98ab6855e66f242b8ab8df 100644
--- a/Code/Projections/otbLambertConformalConicMapProjection.txx
+++ b/Code/Projections/otbLambertConformalConicMapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbMapProjection.h b/Code/Projections/otbMapProjection.h
index b1f0b35ad91c64b2f479e457aa0f4f008231df63..d01cf1a37515dfce14e7b0d47274823eb3e7e807 100644
--- a/Code/Projections/otbMapProjection.h
+++ b/Code/Projections/otbMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMapProjection_h
@@ -122,7 +122,10 @@ public :
virtual void ComputeMetersPerPixel(const InputPointType ¢er, double deltaDegreesPerPixelLat, double deltaDegreesPerPixelLon, OutputPointType &metersPerPixel);
virtual void ComputeMetersPerPixel(double deltaDegreesPerPixelLat, double deltaDegreesPerPixelLon, OutputPointType &metersPerPixel);
//virtual void SetMatrix(double rotation, const OutputPointType &scale, const OutputPointType &translation);
- void SetFalseEasting(double falseEasting);
+ virtual void SetFalseEasting(double falseEasting)
+ {
+ itkExceptionMacro(<<"Subclasses should override this method");
+ }
/** Return the Wkt representation of the projection*/
virtual std::string GetWkt() const;
diff --git a/Code/Projections/otbMapProjection.txx b/Code/Projections/otbMapProjection.txx
index 2ed7d49ad98e4f5f8a1009caacc2b89fd9cf5cfc..d211c675eb766d72d8c5c8330219e1bd4bb96e19 100644
--- a/Code/Projections/otbMapProjection.txx
+++ b/Code/Projections/otbMapProjection.txx
@@ -12,7 +12,7 @@
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMapProjection_txx
diff --git a/Code/Projections/otbMapProjections.h b/Code/Projections/otbMapProjections.h
index 8875a37bdaa821709381de7bf9601753e6700ad9..061660b231bdbf5790a95aa99a4ba289091c6bbb 100644
--- a/Code/Projections/otbMapProjections.h
+++ b/Code/Projections/otbMapProjections.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMapProjections_h
@@ -50,6 +50,7 @@ See OTBCopyright.txt for details.
#include "otbUtmMapProjection.h"
#include "otbLambertConformalConicMapProjection.h"
#include "otbLambert2EtenduProjection.h"
+#include "otbLambert3CartoSudProjection.h"
#include "otbLambert93Projection.h"
#include "otbEckert4MapProjection.h"
#include "otbTransMercatorMapProjection.h"
@@ -84,6 +85,8 @@ typedef LambertConformalConicMapProjection<INVERSE> LambertConfor
typedef LambertConformalConicMapProjection<FORWARD> LambertConformalConicForwardProjection;
typedef Lambert2EtenduProjection<INVERSE> Lambert2EtenduInverseProjection;
typedef Lambert2EtenduProjection<FORWARD> Lambert2EtenduForwardProjection;
+typedef Lambert3CartoSudProjection<INVERSE> Lambert3CartoSudInverseProjection;
+typedef Lambert3CartoSudProjection<FORWARD> Lambert3CartoSudForwardProjection;
typedef Lambert93Projection<INVERSE> Lambert93InverseProjection;
typedef Lambert93Projection<FORWARD> Lambert93ForwardProjection;
typedef SVY21MapProjection<INVERSE> SVY21InverseProjection;
diff --git a/Code/Projections/otbMapToMapProjection.h b/Code/Projections/otbMapToMapProjection.h
index cc1c9e0facf459dfb39b97fa44d07119c4acd23f..1be9742f3f286b31ffa7856f6f9ed5d560a3e5c1 100644
--- a/Code/Projections/otbMapToMapProjection.h
+++ b/Code/Projections/otbMapToMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMapToMapProjection_h
@@ -30,12 +30,17 @@ namespace otb
/** \class MapToMapProjection
-
-* \brief Class for switching from a Map Projection coordinates to other Map Projection coordinates.
+*
+* \brief <b>DEPRECATED</b>: Class for switching from a Map Projection coordinates to
+* other Map Projection coordinates.
+*
+* <b>DEPRECATED</b>: Use otb::GenericMapProjection instead
* It converts MapProjection1 coordinates to MapProjection2 coordinates by using MapProjection methods.
* It takes a point in input.
-* (X_1, Y_1) -> (lat, lon) -> (X_2, Y_2)
+* (X_1, Y_1) -> (lon, lat) -> (X_2, Y_2)
+*
* \ingroup Transform
+* \sa GenericMapProjection
*/
template <class TInputMapProjection,
class TOutputMapProjection,
diff --git a/Code/Projections/otbMapToMapProjection.txx b/Code/Projections/otbMapToMapProjection.txx
index 0c27f2b2a54f766d412a95e640ce63e517cf99ee..66c858802f5314340698c6e2fdfb54954eb9d60f 100644
--- a/Code/Projections/otbMapToMapProjection.txx
+++ b/Code/Projections/otbMapToMapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMapToMapProjection_txx
diff --git a/Code/Projections/otbMollweidMapProjection.h b/Code/Projections/otbMollweidMapProjection.h
index 30748a0501bcdb9d427ee0ba09c41cf8453de15e..96c1a38841a90145776419ef63e387519ad7ed16 100644
--- a/Code/Projections/otbMollweidMapProjection.h
+++ b/Code/Projections/otbMollweidMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMollweidMapProjection_h
diff --git a/Code/Projections/otbMollweidMapProjection.txx b/Code/Projections/otbMollweidMapProjection.txx
index ddeab43088700fabe837749d11a056a652afd9e9..4c632bcc1523d1ef9289310af5ef73fe0419e380 100644
--- a/Code/Projections/otbMollweidMapProjection.txx
+++ b/Code/Projections/otbMollweidMapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbOrthoRectificationFilter.h b/Code/Projections/otbOrthoRectificationFilter.h
index 16a84571ff3e91991412240a3953e3933ca121c1..63a18dc027aa745989ce893b82d91ffda0170d4f 100644
--- a/Code/Projections/otbOrthoRectificationFilter.h
+++ b/Code/Projections/otbOrthoRectificationFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbOrthoRectificationFilter_h
@@ -83,12 +83,12 @@ public :
itkTypeMacro( OrthoRectificationFilter, StreamingResampleImageFilter );
/** Accessors */
- virtual void SetMapProjection (MapProjectionType* _arg)
+ virtual void SetMapProjection (MapProjectionType* arg)
{
- if (this->m_MapProjection != _arg)
+ if (this->m_MapProjection != arg)
{
- this->m_MapProjection = _arg;
- m_CompositeTransform->SetFirstTransform(_arg);
+ this->m_MapProjection = arg;
+ m_CompositeTransform->SetFirstTransform(arg);
m_IsComputed = false;
this->Modified();
}
diff --git a/Code/Projections/otbOrthoRectificationFilter.txx b/Code/Projections/otbOrthoRectificationFilter.txx
index 0498ded78d5fe69f736a8a5e5fba13650f932eca..ee3ca3b81968280ff5eb51419089c12581a93665 100644
--- a/Code/Projections/otbOrthoRectificationFilter.txx
+++ b/Code/Projections/otbOrthoRectificationFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbOrthoRectificationFilter_txx
diff --git a/Code/Projections/otbPlaceNameToLonLat.h b/Code/Projections/otbPlaceNameToLonLat.h
index 5dc5b8bddaaedb04b8108d40672945903243ec2c..5d6b3b8c8bebb235c064d6fc1cfaa698a9eadc87 100644
--- a/Code/Projections/otbPlaceNameToLonLat.h
+++ b/Code/Projections/otbPlaceNameToLonLat.h
@@ -51,8 +51,6 @@ public:
itkGetMacro( Lat, double );
itkGetMacro( PlaceName, std::string );
- itkSetMacro( Lon, double );
- itkSetMacro( Lat, double );
itkSetMacro( PlaceName, std::string );
typedef enum {ALL, GEONAMES, GOOGLE, YAHOO} SearchMethodEnum;//Not implemented yet TODO
@@ -80,5 +78,4 @@ private:
} // namespace otb
-
#endif
diff --git a/Code/Projections/otbSVY21MapProjection.h b/Code/Projections/otbSVY21MapProjection.h
index 30f75229659fe60b15b44c047eb1cfaab2aff388..2e1f292ec477066645a02ef68e740cc8a728ec5c 100644
--- a/Code/Projections/otbSVY21MapProjection.h
+++ b/Code/Projections/otbSVY21MapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSVY21MapProjection_h
diff --git a/Code/Projections/otbSVY21MapProjection.txx b/Code/Projections/otbSVY21MapProjection.txx
index e3f222f2befbf59442bceacf7ac516225cffbfcc..67f0f5e10c1eef2cc89c0729f5d7298b3f6f156c 100644
--- a/Code/Projections/otbSVY21MapProjection.txx
+++ b/Code/Projections/otbSVY21MapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbSensorModelBase.h b/Code/Projections/otbSensorModelBase.h
index 67b4ff2d4014caf503a14c3cf370af1a58d7fcff..6af2fa1cc9d471711763f726ecbd73e188cd8337 100644
--- a/Code/Projections/otbSensorModelBase.h
+++ b/Code/Projections/otbSensorModelBase.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSensorModelBase_h
diff --git a/Code/Projections/otbSensorModelBase.txx b/Code/Projections/otbSensorModelBase.txx
index d3aaeebe3f273e088cc0dd848f4d293ca04d8a91..01fc87adafd5e4b587b0bb35b35f93b16eff1d79 100644
--- a/Code/Projections/otbSensorModelBase.txx
+++ b/Code/Projections/otbSensorModelBase.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSensorModelBase_txx
diff --git a/Code/Projections/otbSinusoidalMapProjection.h b/Code/Projections/otbSinusoidalMapProjection.h
index 569fa22fa2ce2e03c159bea378517be28692c405..2e7aadfc087e060fe68bb4bf74d76d81acc6318e 100644
--- a/Code/Projections/otbSinusoidalMapProjection.h
+++ b/Code/Projections/otbSinusoidalMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSinusoidalMapProjection_h
diff --git a/Code/Projections/otbSinusoidalMapProjection.txx b/Code/Projections/otbSinusoidalMapProjection.txx
index 51bf620a303cabf26c4daa75e0e311ee05166c4d..f998a3ae50a6f7a82d23ce3b829282b29067d5dc 100644
--- a/Code/Projections/otbSinusoidalMapProjection.txx
+++ b/Code/Projections/otbSinusoidalMapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Projections/otbTileMapTransform.h b/Code/Projections/otbTileMapTransform.h
index 9937e0c5828d2468a30bd9d51e3c64eeb77bb37c..17eba843b212c7809ae52d2e6930e776b5e5cfc7 100644
--- a/Code/Projections/otbTileMapTransform.h
+++ b/Code/Projections/otbTileMapTransform.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbTileMapTransform_h
diff --git a/Code/Projections/otbTileMapTransform.txx b/Code/Projections/otbTileMapTransform.txx
index 4eb0146cf750295cde8bc98d1fbb1a2cff49d0be..9aa377458b0074c77b0c41f8caada2abe24b1716 100644
--- a/Code/Projections/otbTileMapTransform.txx
+++ b/Code/Projections/otbTileMapTransform.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbTileMapTransform_txx
diff --git a/Code/Projections/otbTransMercatorMapProjection.h b/Code/Projections/otbTransMercatorMapProjection.h
index 890c8c2b7512671f35ac5b70deadcc49dfe623d4..a8c4f51bb515fcc049b9ea1b82f7977041e94250 100644
--- a/Code/Projections/otbTransMercatorMapProjection.h
+++ b/Code/Projections/otbTransMercatorMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbTransMercatorMapProjection_h
diff --git a/Code/Projections/otbTransMercatorMapProjection.txx b/Code/Projections/otbTransMercatorMapProjection.txx
index 7440d144d86ae8a5d3a1427f373e51fc0fb18e12..3f63051156eb394679a43bad71970e9ba2332a81 100644
--- a/Code/Projections/otbTransMercatorMapProjection.txx
+++ b/Code/Projections/otbTransMercatorMapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbTransMercatorMapProjection_txx
diff --git a/Code/Projections/otbUtmMapProjection.h b/Code/Projections/otbUtmMapProjection.h
index d70e1f5ced5efc39380884a1b9151edc7f8d11a4..ad2c9abb2bdf73098c6743f084ede8e0594c72af 100644
--- a/Code/Projections/otbUtmMapProjection.h
+++ b/Code/Projections/otbUtmMapProjection.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbUtmMapProjection_h
diff --git a/Code/Projections/otbUtmMapProjection.txx b/Code/Projections/otbUtmMapProjection.txx
index 88e478b4277ef3658a7d8cab17b7fb0a8608b36f..8daebac76c29f555e978ed2ee62595b814a19a1a 100644
--- a/Code/Projections/otbUtmMapProjection.txx
+++ b/Code/Projections/otbUtmMapProjection.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Radiometry/CMakeLists.txt b/Code/Radiometry/CMakeLists.txt
index db3ff67df4dac6b553f8c27fe8055af42cd921a2..f280fb3030d44de59074b62fb763b229271eccff 100644
--- a/Code/Radiometry/CMakeLists.txt
+++ b/Code/Radiometry/CMakeLists.txt
@@ -3,7 +3,9 @@
FILE(GLOB OTBRadiometry_SRCS "*.cxx" )
ADD_LIBRARY(OTBRadiometry ${OTBRadiometry_SRCS})
-TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S)
+
+#Note: depend on OTBIO instead of otbossim to keep the correct order between gdal and ossim
+TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S OTBIO)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBRadiometry PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
index 6de9a8b7fc2dd49e4b6000d3dc09549779daf84f..24c5b70e6b2ece1fd5ce78763c7521b379e59089 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index 96cf09898159975496a28bca08abc0b4d517c74b..23d4fa17d62123790b2fda9a0d54ee251a52d6eb 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbAtmosphericCorrectionParameters_h
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
index 501a7a24d157e9d4427df86440d9ac8554117a80..f3ada1673fee354f2bec9dd3815ce27b6efeadeb 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h"
@@ -138,6 +138,7 @@ void
AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
::GenerateData()
{
+
AtmosphericCorrectionParametersPointer input = this->GetInput();
AtmosphericRadiativeTermsPointer output = this->GetOutput();
@@ -158,7 +159,7 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
for (unsigned int i=0; i<NbBand; ++i)
{
- atmosphericReflectance = 0.;
+ atmosphericReflectance = 0.;
atmosphericSphericalAlbedo = 0.;
totalGaseousTransmission = 0.;
downwardTransmittance = 0.;
@@ -192,6 +193,7 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
upwardDiffuseTransmittanceForAerosol /** Upward diffuse transmittance for aerosols */
);
+
output->SetIntrinsicAtmosphericReflectance(i, atmosphericReflectance);
output->SetSphericalAlbedo(i, atmosphericSphericalAlbedo);
output->SetTotalGaseousTransmission(i, totalGaseousTransmission);
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
index 75c7259be2bc0b2c0845a24a247bb8e49606920f..997e29757120b72a8a61c0aac5c4b753d0303be8 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms_h
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx b/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
index fe2a58510a235dbdbe07b1fda9e49072a8419c54..3a2a0a0f8f3097376f3d837f00111f062b60470e 100644
--- a/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
+++ b/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.h b/Code/Radiometry/otbAtmosphericRadiativeTerms.h
index a6d29cac69fce64bc9b14a4e72b6df2dacf99385..bf39d9bc476ecf2cee1c26e860ea8395fc0988a4 100644
--- a/Code/Radiometry/otbAtmosphericRadiativeTerms.h
+++ b/Code/Radiometry/otbAtmosphericRadiativeTerms.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbAtmosphericRadiativeTerms_h
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
index c8c446071348e6acadeb1a71c71f1202e8bc663f..2b593a76e6cfb14970b3635e30e13023af3ec87d 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
@@ -94,7 +94,7 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
m_CorrectionParameters->LoadFilterFunctionValue( m_FilterFunctionValuesFileName );
}
// the user has set the filter function values
- else
+ else if( m_CorrectionParameters->GetWavelenghtSpectralBand().size() != this->GetInput()->GetNumberOfComponentsPerPixel())
{
bool ffvfOK = true;
if( m_FilterFunctionCoef.size() == 0 )
@@ -105,23 +105,22 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
for(unsigned int i=0; i<this->GetInput()->GetNumberOfComponentsPerPixel(); i++)
{
FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
- // if no ffvf set, set 1 as coef
+
if(ffvfOK)
functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
-
- functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
- functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
-
- // if no ffvf set, compute the step to be sure that the valueswavelength are between min and max
- if(!ffvfOK)
- functionValues->SetUserStep( functionValues->GetMaxSpectralValue()-functionValues->GetMinSpectralValue()/2. );
+ else // if no ffvf set, compute the step to be sure that the valueswavelength are between min and max and 1 as coef
+ {
+ functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
+ functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
+ functionValues->SetUserStep( functionValues->GetMaxSpectralValue()-functionValues->GetMinSpectralValue()/2. );
+ }
m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
}
+
}
-
+
Parameters2RadiativeTermsPointerType param2Terms = Parameters2RadiativeTermsType::New();
-
param2Terms->SetInput(m_CorrectionParameters);
param2Terms->Update();
m_AtmosphericRadiativeTerms = param2Terms->GetOutput();
diff --git a/Code/Radiometry/otbSIXSTraits.cxx b/Code/Radiometry/otbSIXSTraits.cxx
index 543cef59d0452e2156edc07fb2b52c946bf69ca5..3c139d10fc54d34e6ed59b6bc401dbe9f1303cdd 100644
--- a/Code/Radiometry/otbSIXSTraits.cxx
+++ b/Code/Radiometry/otbSIXSTraits.cxx
@@ -111,6 +111,7 @@ SIXSTraits::ComputeAtmosphericParameters(
s[cpt] = FilterFunctionValues6S[i];
cpt++;
}
+
// Call 6s main function
otbMsgDevMacro(<< "Start call 6S main function ...");
otb_6s_ssssss_otb_main_function( &asol, &phi0, &avis, &phiv, &month, &jday,
diff --git a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
index f58eecc9197e4387ebbcb8f38c1f9a8fd82f8f5d..7350f8ce4f2305f362e36c3d16ffd8b38c9ec26e 100644
--- a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
+++ b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbWaterSqrtSpectralAngleImageFilter_h
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
index 2beadd0de465ad0a02034a1f81087ecab9174c43..0db6823de8e21bf82616a32063e8706d125228ef 100644
--- a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
+++ b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToRCC8GraphFilter_h
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
index aef2576df233fbb12757f34e21456652d6140e00..3c0ece316d0f6f3e02211a997d0cf261335060a4 100644
--- a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
+++ b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToRCC8GraphFilter_txx
diff --git a/Code/SpatialReasoning/otbRCC8Graph.txx b/Code/SpatialReasoning/otbRCC8Graph.txx
index 23670c8eea0c03fa802333dfa65b64a976be14ba..29203ec7bd4141991ae80bcd3d35c3093842664c 100644
--- a/Code/SpatialReasoning/otbRCC8Graph.txx
+++ b/Code/SpatialReasoning/otbRCC8Graph.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRCC8Graph_txx
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.h b/Code/SpatialReasoning/otbRCC8GraphSource.h
index 47fc682925ab8aefdc0e4b1221b4fa1b9f4afcf3..89442cc74ec29af625ec46918a53f03f225a6df5 100644
--- a/Code/SpatialReasoning/otbRCC8GraphSource.h
+++ b/Code/SpatialReasoning/otbRCC8GraphSource.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRCC8GraphSource_h
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.txx b/Code/SpatialReasoning/otbRCC8GraphSource.txx
index 270b71aad8fd58fb9c52c17e25f538e3843f874f..dcb542b89c9989bc5b91940d800b153f07480684 100644
--- a/Code/SpatialReasoning/otbRCC8GraphSource.txx
+++ b/Code/SpatialReasoning/otbRCC8GraphSource.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRCC8GraphSource_txx
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
index 487a33229de5b977bb99c259e10a472c1ac600fa..0713e0e70e60109901494e4bb173165c0e1395f4 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRCC8VertexWithCompacity_h
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
index 798fda1bbf3f53dc427c1e088b3f3444390cca3b..40bbb5b8d37b460f79895b8432b62f18b86a1b08 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRCC8VertexWithRegionCenter_h
diff --git a/Code/Testing/CMakeLists.txt b/Code/Testing/CMakeLists.txt
index 091ed1945f72a6ec4c9334265e5bc550784887e2..29bf017a0ae02846dd94de4793e18e0e95ae4c6e 100644
--- a/Code/Testing/CMakeLists.txt
+++ b/Code/Testing/CMakeLists.txt
@@ -3,6 +3,10 @@
FILE(GLOB OTBTesting_SRCS "*.cxx" )
ADD_LIBRARY(OTBTesting ${OTBTesting_SRCS})
+SET_TARGET_PROPERTIES(OTBTesting
+ PROPERTIES
+ LINK_INTERFACE_LIBRARIES ""
+)
TARGET_LINK_LIBRARIES (OTBTesting OTBBasicFilters OTBIO OTBCommon ITKBasicFilters)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBTesting PROPERTIES ${OTB_LIBRARY_PROPERTIES})
diff --git a/Code/Visu/CMakeLists.txt b/Code/Visu/CMakeLists.txt
index d43a587b5da37275884581c32ef35052bb711183..b0fcfa82b72ea1bba40e24fff676e8c11db70a1f 100644
--- a/Code/Visu/CMakeLists.txt
+++ b/Code/Visu/CMakeLists.txt
@@ -2,13 +2,6 @@
FILE(GLOB OTBVisu_SRCS "*.cxx" )
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
-IF(APPLE AND BUILD_SHARED_LIBS)
- FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
- SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
- ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
ADD_LIBRARY(OTBVisu ${OTBVisu_SRCS})
TARGET_LINK_LIBRARIES (OTBVisu OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
IF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Visu/otbFixedSizeFullImageWidget.h b/Code/Visu/otbFixedSizeFullImageWidget.h
index db23eed84f20fe46f6fe39f8f28812537571013b..e02a87ecde9d85ace93805abbf97885a3f35f789 100644
--- a/Code/Visu/otbFixedSizeFullImageWidget.h
+++ b/Code/Visu/otbFixedSizeFullImageWidget.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbFixedSizeFullImageWidget_h
diff --git a/Code/Visu/otbGluPolygonDrawingHelper.cxx b/Code/Visu/otbGluPolygonDrawingHelper.cxx
index 0f4c673c93f0930ecce2b14d99aee5f73caf5bd3..54ecc2936465e654ef15899bb9856107cafcfd71 100644
--- a/Code/Visu/otbGluPolygonDrawingHelper.cxx
+++ b/Code/Visu/otbGluPolygonDrawingHelper.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include <iostream>
diff --git a/Code/Visu/otbGluPolygonDrawingHelper.h b/Code/Visu/otbGluPolygonDrawingHelper.h
index be696eb65c360b3a8f6836e72d6b5e30d0ee8b08..2eff10f65a3f41df091a371fe72518fc167b1293 100644
--- a/Code/Visu/otbGluPolygonDrawingHelper.h
+++ b/Code/Visu/otbGluPolygonDrawingHelper.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbGluPolygonDrawingHelper_h
diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.h b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
index 23bb07c32261145566a9a205a6c2b9e0f13639d7..33b965e2f7056a5b995e2c82db40d8d1345eee1f 100644
--- a/Code/Visu/otbHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbHistogramAndTransferFunctionWidget_h
diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.txx b/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
index 872ea8c43a94c90c4291d01b3b3a99e3e9032c8b..54c409a5188534b7698d08afd41818db0931beb4 100644
--- a/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
+++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbHistogramAndTransferFunctionWidget_txx
diff --git a/Code/Visu/otbImageAlternateViewer.h b/Code/Visu/otbImageAlternateViewer.h
index defceda8c6d38a9a1144ed05a00b535f9547e52f..d5306d1cdb54cfc4e6a497552600ba8aa08f34b7 100644
--- a/Code/Visu/otbImageAlternateViewer.h
+++ b/Code/Visu/otbImageAlternateViewer.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageAlternateViewer_h
diff --git a/Code/Visu/otbImageAlternateViewer.txx b/Code/Visu/otbImageAlternateViewer.txx
index 792114f6cf17e5731f0d85722d22016df6fca104..d988f77886acc0df662395687061d473799ae42e 100644
--- a/Code/Visu/otbImageAlternateViewer.txx
+++ b/Code/Visu/otbImageAlternateViewer.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageAlternateViewer_txx
diff --git a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
index cd0a1cea41d24f30f1c33a3450637f68b3a11ab8..ce3dc5b8b675703da7e945224a3b4154f817fbd6 100644
--- a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
+++ b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageToGrayscaleAnaglyphImageFilter_h
diff --git a/Code/Visu/otbImageViewer.h b/Code/Visu/otbImageViewer.h
index af207de501021151541faa24fe3551a9c5d32a74..bff205b2e8d4c1f3243eedd246528be61f66c91f 100644
--- a/Code/Visu/otbImageViewer.h
+++ b/Code/Visu/otbImageViewer.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewer_h
diff --git a/Code/Visu/otbImageViewer.txx b/Code/Visu/otbImageViewer.txx
index fe6154ac1c3c19ad7b044ab6f80c8393d535618b..7ca4b4f8ad38c4d1b176c5d2ff85e35b3d32cffb 100644
--- a/Code/Visu/otbImageViewer.txx
+++ b/Code/Visu/otbImageViewer.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewer_txx
diff --git a/Code/Visu/otbImageViewerBase.h b/Code/Visu/otbImageViewerBase.h
index a8fd54969e4e9fccdf3d0c8b0d93dd92d0b4bfd0..0b98c39ca31d8c671cc81b196bca6915fdb17486 100644
--- a/Code/Visu/otbImageViewerBase.h
+++ b/Code/Visu/otbImageViewerBase.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewerBase_h
diff --git a/Code/Visu/otbImageViewerBase.txx b/Code/Visu/otbImageViewerBase.txx
index f02406303bc122f538eb2435e0a319bf2defaf15..a3f1d7cd61a546034f2f4ba678cc0110e9e73f98 100644
--- a/Code/Visu/otbImageViewerBase.txx
+++ b/Code/Visu/otbImageViewerBase.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewerBase_txx
diff --git a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
index ce5f8083869fdd4103fecd632d6086d3a582ebf7..74db67fe1d9a846b741f1d19f20777861fb30595 100644
--- a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
+++ b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewerFullResolutionEventsInterface_h
diff --git a/Code/Visu/otbImageViewerFullWidget.h b/Code/Visu/otbImageViewerFullWidget.h
index 4268348cbe9869843275a05a41fba1fb8ba6e0aa..1967204abdd2df04f335ccd11c4991d6db020eb5 100644
--- a/Code/Visu/otbImageViewerFullWidget.h
+++ b/Code/Visu/otbImageViewerFullWidget.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewerFullWidget_h
diff --git a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
index 7f41bb1a3561d843580cff8ebd551a31a54241db..1ad3c531637312eead5cb105042fe941a1033832 100644
--- a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewerHistogramAndTransferFunctionWidget_h
diff --git a/Code/Visu/otbImageViewerScrollWidget.h b/Code/Visu/otbImageViewerScrollWidget.h
index af6895e00f8010cb7f486440b4663999c596b9f0..8105452d3a3f35cb0dcbfbeac4f5f3f0b833c995 100644
--- a/Code/Visu/otbImageViewerScrollWidget.h
+++ b/Code/Visu/otbImageViewerScrollWidget.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewerScrollWidget_h
diff --git a/Code/Visu/otbImageViewerZoomWidget.h b/Code/Visu/otbImageViewerZoomWidget.h
index 4b0ac2dfca12dedbd11e2083042e6eaf8b47320a..7aa99cb688fa24ecbc3f70880b07d5a02d1eb20e 100644
--- a/Code/Visu/otbImageViewerZoomWidget.h
+++ b/Code/Visu/otbImageViewerZoomWidget.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageViewerZoomWidget_h
diff --git a/Code/Visu/otbImageWidgetBase.txx b/Code/Visu/otbImageWidgetBase.txx
index d5c21a57ba1cc7d0816c958567d8a62f56720397..4d4efb53960b5c799d3a5ffa82c3dff0ef32bf5e 100644
--- a/Code/Visu/otbImageWidgetBase.txx
+++ b/Code/Visu/otbImageWidgetBase.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageWidgetBase_txx
diff --git a/Code/Visu/otbImageWidgetTransferFunction.h b/Code/Visu/otbImageWidgetTransferFunction.h
index c86aca293ca5145e18788577cbe58350a77962b4..59b14a500c0a3b64d651d012cc47e9c5c1a36d67 100644
--- a/Code/Visu/otbImageWidgetTransferFunction.h
+++ b/Code/Visu/otbImageWidgetTransferFunction.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageWidgetTransferFunction_h
diff --git a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
index 2aa3f88f2ec84201212a0e82501d620448a33d82..8b5381012bf5dbba14f9dc04e50cebb7a1b93fc1 100644
--- a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
+++ b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVectorImageToColorAnaglyphVectorImageFilter_h
diff --git a/Code/Visualization/CMakeLists.txt b/Code/Visualization/CMakeLists.txt
index 9bfc18f098c1e735144c859aea1ff3de4054606e..4f38b18bab4b68d2052b4a0bdb03dd4e112f6d7f 100644
--- a/Code/Visualization/CMakeLists.txt
+++ b/Code/Visualization/CMakeLists.txt
@@ -2,17 +2,10 @@
FILE(GLOB OTBVisualization_SRCS "*.cxx" )
-# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
-IF(APPLE AND BUILD_SHARED_LIBS)
- FOREACH(c "" "_DEBUG" "_RELEASE" "_MINSIZEREL" "_RELWITHDEBINFO")
- SET(CMAKE_SHARED_LINKER_FLAGS${c} "${CMAKE_SHARED_LINKER_FLAGS${c}} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
- ENDFOREACH(c)
-ENDIF(APPLE AND BUILD_SHARED_LIBS)
-
FLTK_WRAP_UI(OTBVisualization otbImageWidgetPackedManager.fl otbImageWidgetSplittedManager.fl)
ADD_LIBRARY(OTBVisualization ${OTBVisualization_SRCS} ${OTBVisualization_FLTK_UI_SRCS})
-TARGET_LINK_LIBRARIES (OTBVisualization OTBGui OTBCommon ${OTB_VISU_GUI_LIBRARIES})
+TARGET_LINK_LIBRARIES (OTBVisualization OTBGui OTBCommon OTBIO ${OTB_VISU_GUI_LIBRARIES})
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBVisualization PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/Visualization/otbAmplitudeFunctor.h b/Code/Visualization/otbAmplitudeFunctor.h
index b3605810ec46a90b9bc4bd62a200ffe099641c64..5a0734e4e7ab4ce284920e4daed5ac0f441ef1a8 100644
--- a/Code/Visualization/otbAmplitudeFunctor.h
+++ b/Code/Visualization/otbAmplitudeFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbAmplitudeFunctor_h
diff --git a/Code/Visualization/otbChannelSelectorFunctor.h b/Code/Visualization/otbChannelSelectorFunctor.h
index a09c242976580bf26ec06fb2e6c773f8a6c93574..4702c96683e183fa0def38dd24ee3ad3a4e525a3 100644
--- a/Code/Visualization/otbChannelSelectorFunctor.h
+++ b/Code/Visualization/otbChannelSelectorFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbChannelSelectorFunctor_h
diff --git a/Code/Visualization/otbCircleGlComponent.cxx b/Code/Visualization/otbCircleGlComponent.cxx
index 32deb34895eb398125964a5aee3ad4ca393d5aa2..c3bcee8c27b1f22884cc5c8de22efa8e96ac08f0 100644
--- a/Code/Visualization/otbCircleGlComponent.cxx
+++ b/Code/Visualization/otbCircleGlComponent.cxx
@@ -35,20 +35,20 @@ CircleGlComponent
m_Spacing.Fill(1.);
m_Radius = 10;
// Create the tesselator
- m_GluTesselator = gluNewTess();
+ m_GluTesselator = gluNewTess();
// Center representation
m_CenterRepresentation = CROSS;
}
CircleGlComponent
-::~CircleGlComponent()
+::~CircleGlComponent()
{
// Delete the tesselator
gluDeleteTess(m_GluTesselator);
}
-void
+void
CircleGlComponent
::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
{
@@ -89,7 +89,7 @@ CircleGlComponent
}
-void
+void
CircleGlComponent
::Render(unsigned int id, const RegionType & /*extent*/, const AffineTransformType * space2ScreenTransform)
{
@@ -109,7 +109,7 @@ CircleGlComponent
// Draw a disk
glEnable(GL_BLEND);
glPointSize(m_Radius);
- glBegin(GL_POINTS);
+ glBegin(GL_POINTS);
glVertex2d(screenPoint[0],screenPoint[1]);
glEnd();
@@ -120,7 +120,7 @@ CircleGlComponent
glColor4d(0, 0, 0, 1);
glEnable(GL_BLEND);
glPointSize(2);
- glBegin(GL_POINTS);
+ glBegin(GL_POINTS);
glVertex2d(screenPoint[0],screenPoint[1]);
glEnd();
}
diff --git a/Code/Visualization/otbCircleGlComponent.h b/Code/Visualization/otbCircleGlComponent.h
index 6a4352dfb949349586625885658cc016b0f18923..88c6700e80b517b4a90a92bd5adc5c6446d7bb51 100644
--- a/Code/Visualization/otbCircleGlComponent.h
+++ b/Code/Visualization/otbCircleGlComponent.h
@@ -41,9 +41,10 @@
namespace otb
{
/** \class CircleGlComponent
-* \brief This Gl Component to render a Circle.
-* No checking is done upon the adequation between the Circle
-* projection and the underlying image projection. Gie possibility to represnts the circle center (by a point or a cross)
+* \brief This Gl Component to render a circle.
+* No checking is done upon the adequation between the circle
+* projection and the underlying image projection. Gie possibility
+* to represnts the circle center (by a point or a cross)
*
* Origin and Spacing allows to fit to the image axis.
* \ingroup Visualization
@@ -53,7 +54,7 @@ class CircleGlComponent : public GlComponent
{
public:
/** Standard class typedefs */
- typedef CircleGlComponent Self;
+ typedef CircleGlComponent Self;
typedef GlComponent Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -65,7 +66,7 @@ public:
typedef AffineTransformType::InputVectorType VectorType;
typedef Superclass::ColorType ColorType;
- typedef itk::Index<> IndexType;
+ typedef itk::Index<> IndexType;
typedef std::vector<IndexType> IndexListType;
typedef std::vector<ColorType> ColorListType;
@@ -89,42 +90,42 @@ public:
itkGetConstReferenceMacro(Origin,PointType);
/** Set/Get the index to render */
- void SetIndexList(IndexListType idList) { m_IndexList = idList; };
- IndexListType GetIndexList() { return m_IndexList; };
- void AddIndex(IndexType id) { m_IndexList.push_back(id); m_ColorList.push_back(m_RedColor); };
+ void SetIndexList(IndexListType idList) { m_IndexList = idList; }
+ IndexListType GetIndexList() { return m_IndexList; }
+ void AddIndex(IndexType id) { m_IndexList.push_back(id); m_ColorList.push_back(m_RedColor); }
void RemoveIndex(unsigned int id)
{
if( id >= m_IndexList.size() )
itkExceptionMacro(<<"Index out of size ");
m_IndexList.erase(m_IndexList.begin()+id);
- };
+ }
/** Set/Get the color */
- void SetColorList(ColorListType colorList) { m_ColorList = colorList; };
- ColorListType GetColorList() { return m_ColorList; };
+ void SetColorList(ColorListType colorList) { m_ColorList = colorList; }
+ ColorListType GetColorList() { return m_ColorList; }
void ChangeColor(ColorType color, unsigned int id)
{
if( id >= m_ColorList.size() )
itkExceptionMacro(<<"Index out of size ");
m_ColorList[id] = color;
- };
+ }
void RemoveColor(unsigned int id)
{
if( id >= m_ColorList.size() )
itkExceptionMacro(<<"Index out of size ");
m_ColorList.erase(m_ColorList.begin()+id);
- };
+ }
/** Clear all*/
- void Clear() { m_IndexList.clear(); m_ColorList.clear(); };
+ void Clear() { m_IndexList.clear(); m_ColorList.clear(); }
void ClearIndex(unsigned int id)
- {
+ {
this->RemoveIndex(id);
this->RemoveColor(id);
- };
+ }
/** Set/Get the line width */
itkSetMacro(LineWidth,double);
@@ -181,13 +182,10 @@ private:
/** Default color : red*/
ColorType m_RedColor;
- /** Center representation */
+ /** Center representation */
CenterRepresentationEnumType m_CenterRepresentation;
}; // end class
} // end namespace otb
#endif
-
-
-
diff --git a/Code/Visualization/otbGlWidget.cxx b/Code/Visualization/otbGlWidget.cxx
index 1cfb1489765bb3e77180c4d8185341085fcf3730..555162aa58072dea2cbc008cf798580dcee9a2a2 100644
--- a/Code/Visualization/otbGlWidget.cxx
+++ b/Code/Visualization/otbGlWidget.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbGlWidget.h"
diff --git a/Code/Visualization/otbImageLayer.h b/Code/Visualization/otbImageLayer.h
index 5c87ff1f5b6dbf68a0617ffcd0091e32744ac254..88cfff086ab980748aafeab32a323eb25cd640db 100644
--- a/Code/Visualization/otbImageLayer.h
+++ b/Code/Visualization/otbImageLayer.h
@@ -29,6 +29,8 @@
#include "otbRenderingImageFilter.h"
#include "otbGenericRSTransform.h"
+#include "otbCoordinateToName.h"
+
namespace otb
{
/** \class ImageLayer
@@ -246,6 +248,7 @@ private:
/** Coordinate transform */
TransformType::Pointer m_Transform;
+ CoordinateToName::Pointer m_CoordinateToName;
/** General info about the image*/
std::string m_PlaceName;//FIXME the call should be done by a more general method outside of the layer
diff --git a/Code/Visualization/otbImageLayer.txx b/Code/Visualization/otbImageLayer.txx
index a75e08af3a8916487eac45eb3fe3b355bc75ed0d..dd48a7ad48a023b5f1e8aa3f0f71593e563d9fb8 100644
--- a/Code/Visualization/otbImageLayer.txx
+++ b/Code/Visualization/otbImageLayer.txx
@@ -20,6 +20,7 @@
#include "itkImageRegionConstIterator.h"
#include "otbMacro.h"
+#include "otbI18n.h"
#include "itkTimeProbe.h"
#include "otbStandardRenderingFunction.h"
@@ -59,6 +60,7 @@ ImageLayer<TImage,TOutputImage>
m_ScaledExtractRenderingFilter->SetInput(m_ScaledExtractFilter->GetOutput());
m_Transform = TransformType::New();
+ m_CoordinateToName = CoordinateToName::New();
m_PlaceName = "";
m_CountryName = "";
@@ -119,7 +121,8 @@ ImageLayer<TImage,TOutputImage>
m_QuicklookRenderingFilter->Update();
this->SetRenderedQuicklook(m_QuicklookRenderingFilter->GetOutput());
probe.Stop();
- otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"<< " quicklook regenerated ("<<probe.GetMeanTime()<<" s.)");
+ otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"
+ << " quicklook regenerated ("<<probe.GetMeanTime()<<" s.)");
}
// If there are pixels to render
if(this->GetExtractRegion().GetNumberOfPixels() > 0)
@@ -137,7 +140,8 @@ ImageLayer<TImage,TOutputImage>
m_ExtractRenderingFilter->Update();
this->SetRenderedExtract(m_ExtractRenderingFilter->GetOutput());
probe.Stop();
- otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"<< " extract regenerated ("<<probe.GetMeanTime()<<" s.)");
+ otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"
+ << " extract regenerated ("<<probe.GetMeanTime()<<" s.)");
this->SetHasExtract(true);
}
else
@@ -161,7 +165,8 @@ ImageLayer<TImage,TOutputImage>
this->SetRenderedScaledExtract(m_ScaledExtractRenderingFilter->GetOutput());
this->SetHasScaledExtract(true);
probe.Stop();
- otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"<< " scaled extract regenerated ("<<probe.GetMeanTime()<<" s.)");
+ otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"
+ << " scaled extract regenerated ("<<probe.GetMeanTime()<<" s.)");
}
else
{
@@ -199,7 +204,8 @@ ImageLayer<TImage,TOutputImage>
// Check if we need to generate the histogram again
if( m_ListSample.IsNull() || m_ListSample->Size() == 0 || (histogramSource->GetUpdateMTime() < histogramSource->GetPipelineMTime()) )
{
- otbMsgDevMacro(<<"ImageLayer::UpdateListSample():"<<" ("<<this->GetName()<<")"<< " Regenerating histogram due to pippeline update.");
+ otbMsgDevMacro(<<"ImageLayer::UpdateListSample():"<<" ("<<this->GetName()<<")"
+ << " Regenerating histogram due to pippeline update.");
// Update the histogram source
histogramSource->Update();
@@ -222,7 +228,8 @@ ImageLayer<TImage,TOutputImage>
m_ListSample->PushBack(sample);
++it;
}
- otbMsgDevMacro(<<"ImageLayer::UpdateListSample()"<<" ("<<this->GetName()<<")"<< " Sample list generated ("<<m_ListSample->Size()<<" samples, "<< sampleSize <<" bands)");
+ otbMsgDevMacro(<<"ImageLayer::UpdateListSample()"<<" ("<<this->GetName()<<")"
+ << " Sample list generated ("<<m_ListSample->Size()<<" samples, "<< sampleSize <<" bands)");
m_RenderingFunction->SetListSample(m_ListSample);
@@ -243,8 +250,8 @@ ImageLayer<TImage,TOutputImage>
m_RenderingFunction->Initialize(); //FIXME check, but the call must be done in the generator. To be moved to the layer?
// The ouptut stringstream
itk::OStringStream oss;
- oss<<"Layer: "<<this->GetName();
- oss<<std::endl<<"Image Size: "<<m_Image->GetLargestPossibleRegion().GetSize();
+ oss<< otbGetTextMacro("Layer") << ": "<<this->GetName();
+ oss<<std::endl<< otbGetTextMacro("Image size") << ": " <<m_Image->GetLargestPossibleRegion().GetSize();
// If we are inside the buffered region
if(m_Image->GetBufferedRegion().IsInside(index))
{
@@ -254,8 +261,8 @@ ImageLayer<TImage,TOutputImage>
// Else we extrapolate the value from the quicklook
{
IndexType ssindex = index;
- ssindex[0]/=this->GetQuicklookSubsamplingRate();
- ssindex[1]/=this->GetQuicklookSubsamplingRate();
+ ssindex[0] /= this->GetQuicklookSubsamplingRate();
+ ssindex[1] /= this->GetQuicklookSubsamplingRate();
if(m_Quicklook->GetBufferedRegion().IsInside(ssindex))
{
@@ -273,22 +280,24 @@ ImageLayer<TImage,TOutputImage>
if (m_Transform->GetTransformAccuracy() == Projection::PRECISE) oss<< "(precise location)" << std::endl;
if (m_Transform->GetTransformAccuracy() == Projection::ESTIMATE) oss<< "(estimated location)" << std::endl;
-// if ((m_PlaceName == "") && (m_CountryName == ""))
-// {
-// CoordinateToName::Pointer conv = CoordinateToName::New();
-// conv->SetLon(point[0]);
-// conv->SetLat(point[1]);
-// conv->Evaluate();
-//
-// m_PlaceName = conv->GetPlaceName();
-// m_CountryName = conv->GetCountryName();
-// }
-// if (m_PlaceName != "") oss << "Near " << m_PlaceName;
-// if (m_CountryName != "") oss << " in " << m_CountryName;
+ // We do not want to refresh the location if we are pointing in the scroll view
+ if (m_Image->GetBufferedRegion().IsInside(index))
+ {
+ if (m_CoordinateToName->SetLonLat(point))
+ {
+ m_CoordinateToName->Evaluate();
+ }
+ }
+
+ m_PlaceName = m_CoordinateToName->GetPlaceName();
+ m_CountryName = m_CoordinateToName->GetCountryName();
+
+ if (m_PlaceName != "") oss << otbGetTextMacro("Near") << " " << m_PlaceName;
+ if (m_CountryName != "") oss << " " << otbGetTextMacro("in") << " " << m_CountryName;
}
else
{
- oss << "Location unknown" << std::endl;
+ oss << otbGetTextMacro("Location unknown") << std::endl;
}
}
return oss.str();
diff --git a/Code/Visualization/otbImageLayerRenderingModelListener.h b/Code/Visualization/otbImageLayerRenderingModelListener.h
index d26c5f8295231b291085db0ca682d82c29be4847..41e5e5dee75d4673fad2d40474b86c5e0c0cadcf 100644
--- a/Code/Visualization/otbImageLayerRenderingModelListener.h
+++ b/Code/Visualization/otbImageLayerRenderingModelListener.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageLayerRenderingModelListener_h
diff --git a/Code/Visualization/otbImageView.txx b/Code/Visualization/otbImageView.txx
index 56e67e2821708658c3cca4f14eea2c883edfe973..36ae54be934cf2666de4ff7bf8b3afb0e71d5036 100644
--- a/Code/Visualization/otbImageView.txx
+++ b/Code/Visualization/otbImageView.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageView_txx
diff --git a/Code/Visualization/otbImageWidget.txx b/Code/Visualization/otbImageWidget.txx
index c362425446176eef8040d003506236ec6d590ab9..30291ef442898724bb8c7005fd8c84dccf32cf00 100644
--- a/Code/Visualization/otbImageWidget.txx
+++ b/Code/Visualization/otbImageWidget.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageWidget_txx
diff --git a/Code/Visualization/otbImageWidgetPackedManager.fl b/Code/Visualization/otbImageWidgetPackedManager.fl
index 5740335f253d7d931443391b541f28ae14b8d1ca..3fd21f115a9582f0bbd57756e75b3018a412ca13 100644
--- a/Code/Visualization/otbImageWidgetPackedManager.fl
+++ b/Code/Visualization/otbImageWidgetPackedManager.fl
@@ -1,17 +1,17 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0107
-i18n_type 1
-i18n_include "otbI18n.h"
-i18n_function otbGetTextMacro
-header_name {.h}
+version 1.0107
+i18n_type 1
+i18n_include "otbI18n.h"
+i18n_function otbGetTextMacro
+header_name {.h}
code_name {.cxx}
class ImageWidgetPackedManager {open
} {
Function {ImageWidgetPackedManager()} {open return_type void
} {
Fl_Window m_Window {
- label {Standard Image Viewer} open
- xywh {640 313 800 600} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
+ label {Standard image viewer} open
+ xywh {476 313 800 600} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
} {
Fl_Tile {} {open
xywh {0 0 800 600} resizable
@@ -20,31 +20,31 @@ class ImageWidgetPackedManager {open
xywh {0 0 200 600} box PLASTIC_THIN_DOWN_BOX color 23
} {
Fl_Group m_QuicklookGroup {
- label {Navigation View} open selected
+ label {Navigation view} open
xywh {10 18 180 150} box PLASTIC_DOWN_BOX color 23 labelfont 1 labelcolor 187
} {}
Fl_Group m_ZoomGroup {
- label {Zoom View} open
+ label {Zoom view} open
xywh {10 183 180 150} box PLASTIC_DOWN_BOX color 23 labelfont 1 labelcolor 187
} {}
Fl_Group m_HistogramsGroup {
label Histograms open
- xywh {10 348 180 109} box PLASTIC_DOWN_BOX color 23 labelfont 1 labelcolor 187
+ xywh {10 348 180 90} box PLASTIC_DOWN_BOX color 23 labelfont 1 labelcolor 187
} {}
Fl_Group m_PixelDescriptionGroup {
- label {Pixel Information} open
- xywh {10 473 180 121} box PLASTIC_DOWN_BOX color 23 labelfont 1 labelcolor 187
+ label {Pixel information} open selected
+ xywh {10 453 180 141} box PLASTIC_DOWN_BOX color 23 labelfont 1 labelcolor 187
} {}
}
Fl_Group m_MainGroup {open
xywh {200 0 600 600} box PLASTIC_THIN_DOWN_BOX color 23
} {
Fl_Group m_FullGroup {
- label {Full Resolution View} open
+ label {Full resolution view} open
xywh {207 17 585 577} box PLASTIC_DOWN_BOX color 23 labelfont 1 labelcolor 187
} {}
}
}
}
}
-}
+}
diff --git a/Code/Visualization/otbImageWidgetSplittedManager.fl b/Code/Visualization/otbImageWidgetSplittedManager.fl
index d336d50de8e59554c747a3f02002d308e8eec07b..ebf231cd3f98833f4e1c092e3640fbce6810e5fe 100644
--- a/Code/Visualization/otbImageWidgetSplittedManager.fl
+++ b/Code/Visualization/otbImageWidgetSplittedManager.fl
@@ -10,23 +10,23 @@ class ImageWidgetSplittedManager {open
Function {ImageWidgetSplittedManager()} {open selected return_type void
} {
Fl_Window m_FullGroup {
- label {Full Window}
+ label {Full window}
xywh {673 230 630 565} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
} {}
Fl_Window m_QuicklookGroup {
- label {Scroll Window}
+ label {Scroll window}
xywh {1309 229 215 180} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
} {}
Fl_Window m_ZoomGroup {
- label {Zoom Window}
+ label {Zoom window}
xywh {1309 436 215 170} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
} {}
Fl_Window m_HistogramsGroup {
- label {Histogram Window}
+ label {Histogram window}
xywh {387 234 280 160} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
} {}
Fl_Window m_PixelDescriptionGroup {
- label {Pixel Description Window}
+ label {Pixel description window}
xywh {1309 633 215 160} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
} {}
}
diff --git a/Code/Visualization/otbListenerBase.h b/Code/Visualization/otbListenerBase.h
index a4b3a0f02cc07a8cc999f891065bfec404e42e60..778a34a3f68dee12d22eee0c1d5bce3c0ba3b233 100644
--- a/Code/Visualization/otbListenerBase.h
+++ b/Code/Visualization/otbListenerBase.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbListenerBase_h
diff --git a/Code/Visualization/otbMVCModel.h b/Code/Visualization/otbMVCModel.h
index 8aa5cfd0209ff7e9ab142a221b8cf8ffc9e5c2a7..860cc4e8482ffcd42402bc73158510df33f71d58 100644
--- a/Code/Visualization/otbMVCModel.h
+++ b/Code/Visualization/otbMVCModel.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMVCModel_h
diff --git a/Code/Visualization/otbPhaseFunctor.h b/Code/Visualization/otbPhaseFunctor.h
index c0b237e9991c1d7bd565dc51c8ba0217c9e5d957..44c0cdd19426d74f536d73c61595a84af2b82789 100644
--- a/Code/Visualization/otbPhaseFunctor.h
+++ b/Code/Visualization/otbPhaseFunctor.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPhaseFunctor_h
diff --git a/Code/Visualization/otbPixelDescriptionModel.txx b/Code/Visualization/otbPixelDescriptionModel.txx
index 683dd95ad7b901b52829e737eeb2333be42e333e..f40d94c5da60f828afe5093b44077e097b4c5fd2 100644
--- a/Code/Visualization/otbPixelDescriptionModel.txx
+++ b/Code/Visualization/otbPixelDescriptionModel.txx
@@ -20,6 +20,7 @@
#include "otbPixelDescriptionModel.h"
#include "otbMacro.h"
+#include "otbI18n.h"
#include "itkTimeProbe.h"
namespace otb
@@ -50,7 +51,7 @@ PixelDescriptionModel<TOutputImage>
{
// The output stringstream
itk::OStringStream oss;
- oss<<"Index: "<<index<<std::endl;
+ oss<< otbGetTextMacro("Index") << ": "<<index<<std::endl;
// Report pixel info for each visible layer
for(typename Superclass::LayerIteratorType it = this->GetLayers()->Begin();
it != this->GetLayers()->End(); ++it)
diff --git a/Code/Visualization/otbPixelDescriptionModelListener.h b/Code/Visualization/otbPixelDescriptionModelListener.h
index 1077ee6283c3396908ea26ef5e17788ec3815090..138e0db1d6234464e8d0da8e568a8c6dd3f38722 100644
--- a/Code/Visualization/otbPixelDescriptionModelListener.h
+++ b/Code/Visualization/otbPixelDescriptionModelListener.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPixelDescriptionModelListener_h
diff --git a/Code/Visualization/otbPixelDescriptionView.txx b/Code/Visualization/otbPixelDescriptionView.txx
index 9b0055daeb9dfcc6bc3c4a7ef4a5c02c21516962..7e6a101bc72d39b42cb72ee5e903b8d6b3167c52 100644
--- a/Code/Visualization/otbPixelDescriptionView.txx
+++ b/Code/Visualization/otbPixelDescriptionView.txx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPixelDescriptionView_txx
diff --git a/Code/Visualization/otbStandardRenderingFunction.h b/Code/Visualization/otbStandardRenderingFunction.h
index 707369399b44c85c128597d83d830ed0d6e1dcd9..945be33ceec3553e8843600422578fd4bd1eaa72 100644
--- a/Code/Visualization/otbStandardRenderingFunction.h
+++ b/Code/Visualization/otbStandardRenderingFunction.h
@@ -13,7 +13,7 @@
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-//
+
=========================================================================*/
#ifndef __otbStandardRenderingFunction_h
#define __otbStandardRenderingFunction_h
@@ -23,6 +23,7 @@
#include <vector>
#include "otbMacro.h"
+#include "otbI18n.h"
#include "otbChannelSelectorFunctor.h"
#include "otbRenderingFunction.h"
@@ -100,9 +101,9 @@ public:
/** Extrema vector */
- typedef std::vector<RealScalarType> ExtremaVectorType;
- typedef TTransferFunction TransferFunctionType;
- typedef TPixelRepresentationFunction PixelRepresentationFunctionType;
+ typedef std::vector<RealScalarType> ExtremaVectorType;
+ typedef TTransferFunction TransferFunctionType;
+ typedef TPixelRepresentationFunction PixelRepresentationFunctionType;
typedef typename PixelRepresentationFunctionType::ChannelListType ChannelListType;
/** Convert the input pixel to a pixel representation that can be displayed on
@@ -182,7 +183,7 @@ public:
if (m_PixelRepresentationFunction.IsUsingDefaultParameters())
{
// Case of image with 4 bands or more : Display in the B,G,R ,NIR channel order
- if (this->GetListSample()->GetMeasurementVectorSize() >=4)
+ if (this->GetListSample()->GetMeasurementVectorSize() >= 4)
{
m_PixelRepresentationFunction.SetRedChannelIndex(2);
m_PixelRepresentationFunction.SetGreenChannelIndex(1);
@@ -190,7 +191,7 @@ public:
}
// Classic case
- if (this->GetListSample()->GetMeasurementVectorSize() ==3)
+ if (this->GetListSample()->GetMeasurementVectorSize() == 3)
{
m_PixelRepresentationFunction.SetRedChannelIndex(0);
m_PixelRepresentationFunction.SetGreenChannelIndex(1);
@@ -201,18 +202,18 @@ public:
}
if(m_AutoMinMax)
{
-
- unsigned int nbComps = m_PixelRepresentationFunction.GetOutputSize();//FIXME check what happen if the m_PixelRepresentationFunction is modified AFTER the Initialize.
+ //FIXME check what happen if the m_PixelRepresentationFunction is modified AFTER the Initialize.
+ unsigned int nbComps = m_PixelRepresentationFunction.GetOutputSize();
otbMsgDevMacro(<<"Initialize(): "<<nbComps<<" components, quantile= "<<100*m_AutoMinMaxQuantile<<" %");
// For each components, use the histogram to compute min and max
m_Minimum.clear();
m_Maximum.clear();
- // Comment the condition cause if we change the channel list order
+ // Comment the condition cause if we change the channel list order
// this condition doesn't allow us to recompute the histograms
- //if (this->GetHistogramList().IsNull())
- //{
+ //if (this->GetHistogramList().IsNull())
+ //{
this->RenderHistogram();
// itkExceptionMacro( << "To Compute min/max automatically, Histogram should be "
// <<"provided to the rendering function with SetHistogramList()" );
@@ -220,8 +221,10 @@ public:
for(unsigned int comp = 0; comp < nbComps;++comp)
{
// Compute quantiles
- m_Minimum.push_back(static_cast<ScalarType>(this->GetHistogramList()->GetNthElement(comp)->Quantile(0,m_AutoMinMaxQuantile)));
- m_Maximum.push_back(static_cast<ScalarType>(this->GetHistogramList()->GetNthElement(comp)->Quantile(0,1-m_AutoMinMaxQuantile)));
+ m_Minimum.push_back(static_cast<ScalarType>(
+ this->GetHistogramList()->GetNthElement(comp)->Quantile(0,m_AutoMinMaxQuantile)));
+ m_Maximum.push_back(static_cast<ScalarType>(
+ this->GetHistogramList()->GetNthElement(comp)->Quantile(0,1-m_AutoMinMaxQuantile)));
otbMsgDevMacro(<<"Initialize():"<< " component "<<comp
<<", min= "<< static_cast< typename itk::NumericTraits<ScalarType >::PrintType>(m_Minimum.back())
<<", max= "<<static_cast< typename itk::NumericTraits<ScalarType >::PrintType>(m_Maximum.back()));
@@ -278,18 +281,22 @@ public:
InternalPixelType spixelRepresentation = this->EvaluatePixelRepresentation(spixel);
OutputPixelType spixelDisplay = this->EvaluateTransferFunction(spixelRepresentation);
- oss << "Pixel value: "
+ oss << otbGetTextMacro("Pixel value") << ": "
<< static_cast<typename itk::NumericTraits<PixelType>::PrintType>(spixel) << std::endl;
- oss << "Value computed : "
+ oss << otbGetTextMacro("Value computed") << ": "
<< static_cast<typename itk::NumericTraits<InternalPixelType>::PrintType>(spixelRepresentation) << std::endl;
- oss << "Value displayed: " << std::endl;
- oss << "R " << std::setw(3)<< static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[0]) << ", ";
- oss << "G " << std::setw(3)<< static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[1]) << ", ";
- oss << "B " << std::setw(3)<< static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[2]);
+ oss << otbGetTextMacro("Value displayed") << ": " << std::endl;
+ oss << otbGetTextMacro("R") << " " << std::setw(3)
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[0]) << ", ";
+ oss << otbGetTextMacro("G") << " " << std::setw(3)
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[1]) << ", ";
+ oss << otbGetTextMacro("B") << " " << std::setw(3)
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[2]);
if (spixelDisplay.Size() == 4)
{
oss << ", ";
- oss << "A " << std::setw(3)<< static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[3]);
+ oss << otbGetTextMacro("A") << " " << std::setw(3)
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[3]);
}
oss << std::endl;
return oss.str();
@@ -331,7 +338,7 @@ public:
param.SetSize(2*nbBands);
// Edit the parameters as [minBand0, maxBand0, minBand1, maxBand1,...]
- for(unsigned int i = 0; i< nbBands ; i++)
+ for(unsigned int i = 0; i< nbBands; ++i)
{
// Min Band
param.SetElement(2*i,/*TransferedMinimum*/m_Minimum[i]);
@@ -468,5 +475,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbVisualizationPixelTraits.h b/Code/Visualization/otbVisualizationPixelTraits.h
index f4ed1e2d04ad8c34d21af29524c262cd03e64074..067caa5e687f73bcb336e94309f3b4d9a374750e 100644
--- a/Code/Visualization/otbVisualizationPixelTraits.h
+++ b/Code/Visualization/otbVisualizationPixelTraits.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbVisualizationPixelTraits_h
diff --git a/Documentation/Doxygen/Blox.dox b/Documentation/Doxygen/Blox.dox
deleted file mode 100644
index 910ff641a73c8b80fe8cc7fc0ab1dc30734f6b3b..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Blox.dox
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-
-\page BloxPage Blox Framework
-
-\section BloxIntroduction Introduction
-
-The itk::BloxImage object is a regular, rectilinear lattice of ``blocks''
-in n-dimensional space. The word ``blox'' was chosen to bring to mind a
-set of ``city blocks'' in 2D or ``building blocks'' in 3D. Being a
-regular lattice, itk::BloxImage logically derives from itkImage. In an
-itk::BloxImage, each pixel represents an isometric space-filling block of
-geometric space, called an itk::BloxPixel. Each itk::BloxPixel generally
-covers many pixels in the underlying image and is used to store a
-variable number of image primitives (such as boundary points) or
-features (such as medial nodes) gathered within that region of geometric
-space. To do this, each itk::BloxPixel contains a linked list.
-
-The itk::BloxImage object facilitates certain forms of analysis by
-providing geometric hashing. For example, if boundary points are stored
-in an itk::BloxImage, pairs of boundary points that face each other
-(called ``core atoms'') can be found by searching relatively small
-regions of geometric space that face each boundary point for appropriate
-mates. Because an itk::BloxImage is rectilinear in geometric space (even
-though the underlying image may not be) subsequent analysis can be
-invariant to rotation and translation.
-
-*/
diff --git a/Documentation/Doxygen/Doxyfile b/Documentation/Doxygen/Doxyfile
deleted file mode 100644
index ff2f81004ea832d35db07d2b8c336955aae23b21..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Doxyfile
+++ /dev/null
@@ -1,1537 +0,0 @@
-# Doxyfile 1.5.9
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = OTB
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER = "ORFEO ToolBox 3.0 "
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = ./
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
-
-LAYOUT_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text "
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = ../../Code \
- ../Doxygen \
- ../../Utilities/ITK/Code \
- ../../Utilities/otbsvm \
- ../../Examples
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS = *.cxx \
- *.h \
- *.txx \
- *.dox
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE = ../../OTB/Utilities/ITK/Code/Code/Common/itkPixelTraits.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraits.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsRGB.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsVectorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsTensorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsCovariantVectorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsVariableLengthVectorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/IO/itkPixelData.h \
- ../../OTB/Utilities/ITK/Code/Code/IO/itkAnalyzeDbh.h
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = */vxl_copyright.h \
- */vcl/* \
- */dll.h \
- */test* \
- */example* \
- *config* \
- */contrib/* \
- */Templates/* \
- *_mocced.cxx
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = YES
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 3
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER = DoxygenHeader.html
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER = DoxygenFooter.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET = DoxygenStyle.css
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = YES
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE =
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to FRAME, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature. Other possible values
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list;
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
-# disables this behavior completely. For backwards compatibility with previous
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
-# respectively.
-
-GENERATE_TREEVIEW = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = YES
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = YES
diff --git a/Documentation/Doxygen/DoxyfileLight b/Documentation/Doxygen/DoxyfileLight
deleted file mode 100644
index dba89a1cd875c5d8752af7254241508bf7a6cf17..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/DoxyfileLight
+++ /dev/null
@@ -1,255 +0,0 @@
-# Doxyfile 1.5.4
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = OTB
-PROJECT_NUMBER = "ORFEO ToolBox 2.0 "
-OUTPUT_DIRECTORY = ./
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = YES
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = YES
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = YES
-CPP_CLI_SUPPORT = NO
-SIP_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-TYPEDEF_HIDES_STRUCT = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = NO
-GENERATE_TESTLIST = NO
-GENERATE_BUGLIST = NO
-GENERATE_DEPRECATEDLIST= NO
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = YES
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text "
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = ../../OTB/Code \
- ../Doxygen \
- ../../OTB/Utilities/ITK/Code \
- ../../OTB/Utilities/otbsvm
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.cxx \
- *.h \
- *.txx \
- *.dox
-RECURSIVE = YES
-EXCLUDE = ../../OTB/Utilities/ITK/Code/Code/Common/itkPixelTraits.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraits.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsRGB.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsVectorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsTensorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsCovariantVectorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsVariableLengthVectorPixel.h \
- ../../OTB/Utilities/ITK/Code/Code/IO/itkPixelData.h \
- ../../OTB/Utilities/ITK/Code/Code/IO/itkAnalyzeDbh.h
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = */vxl_copyright.h \
- */vcl/* \
- */dll.h \
- */test* \
- */example* \
- *config* \
- */contrib/* \
- */Templates/* \
- *_mocced.cxx
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 3
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER = DoxygenHeader.html
-HTML_FOOTER = DoxygenFooter.html
-HTML_STYLESHEET = DoxygenStyle.css
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-HTML_DYNAMIC_SECTIONS = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 0
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
diff --git a/Documentation/Doxygen/DoxyfileWithoutITK b/Documentation/Doxygen/DoxyfileWithoutITK
deleted file mode 100644
index 3d6d1b4317fd3516c4b31b396e95c72a7a38ee16..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/DoxyfileWithoutITK
+++ /dev/null
@@ -1,1163 +0,0 @@
-# Doxyfile 1.3.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = OTB
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER = "ORFEO ToolBox 1.2"
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = ./
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of source
-# files, where putting all generated files in the same directory would otherwise
-# cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
-# Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE = English
-
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is used
-# as the annotated text. Otherwise, the brief description is used as-is. If left
-# blank, the following values are used ("$name" is automatically replaced with the
-# name of the entity): "The $name class" "The $name widget" "The $name file"
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = YES
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text.
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = "../../Code" "../Doxygen" #"../../Utilities/ITK/Code"
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS = *.cxx *.h *.txx *.dox
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE = "../../OTB/Utilities/ITK/Code/Code/Common/itkPixelTraits.h" \
- "../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraits.h" \
- "../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsRGB.h" \
- "../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsVectorPixel.h" \
- "../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsTensorPixel.h" \
- "../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsCovariantVectorPixel.h" \
- "../../OTB/Utilities/ITK/Code/Code/Common/itkNumericTraitsVariableLengthVectorPixel.h" \
- "../../OTB/Utilities/ITK/Code/Code/IO/itkPixelData.h" \
- "../../OTB/Utilities/ITK/Code/Code/IO/itkAnalyzeDbh.h"
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-
-EXCLUDE_PATTERNS = "*/vxl_copyright.h" "*/vcl/*" "*/dll.h" \
- "*/test*" "*/example*" "*config*" "*/contrib/*" \
- "*/Templates/*" "*_mocced.cxx" # "*impl*"
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = YES
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = YES
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 3
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER = DoxygenHeader.html
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER = DoxygenFooter.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET = DoxygenStyle.css
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse the
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off. Note that this
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_WIDTH = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes that
-# lay further from the root node will be omitted. Note that setting this option to
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that a graph may be further truncated if the graph's image dimensions are
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = NO
diff --git a/Documentation/Doxygen/DoxygenFooter.html b/Documentation/Doxygen/DoxygenFooter.html
deleted file mode 100644
index 10644070fdc5b9ef8510d4a198aaee3cfcdfcff3..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/DoxygenFooter.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<hr><address><small>
-Generated at $datetime for $projectname by <a href="http://www.stack.nl/~dimitri/doxygen/index.html"> <img
-src="http://www.stack.nl/~dimitri/doxygen/doxygen.png" alt="doxygen"
-align="middle" border=0 width=110 height=53>
-</a> $doxygenversion written by <a href="mailto:dimitri@stack.nl">Dimitri van Heesch</a>,
- © 1997-2000</small></address>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-1482698-1";
-urchinTracker();
-</script>
-</body>
-</html>
diff --git a/Documentation/Doxygen/DoxygenHeader.html b/Documentation/Doxygen/DoxygenHeader.html
deleted file mode 100644
index 966e74685cf5d1936e2eef088623400a7c71ae31..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/DoxygenHeader.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-<title>$title</title>
-<link href="DoxygenStyle.css" rel="stylesheet" type="text/css">
-<link rel="icon" href="favicon.ico" type="image/x-icon">
-<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-</head><body bgcolor="#ffffff">
-<a href="http://otb.cnes.fr"><img class="logo" src="logoVectoriel.png" height="80" border="0" alt="otb.cnes.fr"/></a>
diff --git a/Documentation/Doxygen/DoxygenStyle.css b/Documentation/Doxygen/DoxygenStyle.css
deleted file mode 100644
index 8ddd1ba5eb5d3e69c6b3aae5e92072c38247d561..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/DoxygenStyle.css
+++ /dev/null
@@ -1,382 +0,0 @@
-BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
- font-family: Geneva, Arial, Helvetica, sans-serif;
-}
-H1 {
- text-align: center;
-}
-IMG.logo { margin-bottom: 10px; margin-top: 3px; }
-CAPTION { font-weight: bold }
-DIV.qindex {
- width: 100%;
- background-color: #eeeeff;
- border: 1px solid #b0b0b0;
- text-align: center;
- margin: 2px;
- padding: 2px;
- line-height: 140%;
-}
-DIV.nav {
- width: 100%;
- background-color: #eeeeff;
- border: 1px solid #b0b0b0;
- text-align: center;
- margin: 2px;
- padding: 2px;
- line-height: 140%;
-}
-A.qindex {
- text-decoration: none;
- font-weight: bold;
- color: #1A419D;
-}
-A.qindex:visited {
- text-decoration: none;
- font-weight: bold;
- color: #1A419D
-}
-A.qindex:hover {
- text-decoration: none;
- background-color: #ddddff;
-}
-A.qindexHL {
- text-decoration: none;
- font-weight: bold;
- background-color: #6666cc;
- color: #ffffff;
- border: 1px double #9295C2;
-}
-A.qindexHL:hover {
- text-decoration: none;
- background-color: #6666cc;
- color: #ffffff;
-}
-A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
-A.el { text-decoration: none; font-weight: bold }
-A.elRef { font-weight: bold }
-A.code:link { text-decoration: none; font-weight: normal; color: #0000FF}
-A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF}
-A.codeRef:link { font-weight: normal; color: #0000FF}
-A.codeRef:visited { font-weight: normal; color: #0000FF}
-A:hover { text-decoration: none; background-color: #f2f2ff }
-DL.el { margin-left: -1cm }
-.fragment {
- font-family: monospace
-}
-PRE.fragment {
- border: 1px solid #CCCCCC;
- background-color: #f5f5f5;
- margin-top: 4px;
- margin-bottom: 4px;
- margin-left: 2px;
- margin-right: 8px;
- padding-left: 6px;
- padding-right: 6px;
- padding-top: 4px;
- padding-bottom: 4px;
-}
-DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
-TD.md { background-color: #F4F4FB; font-weight: bold; }
-TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
-TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; }
-DIV.groupHeader {
- margin-left: 16px;
- margin-top: 12px;
- margin-bottom: 6px;
- font-weight: bold;
-}
-DIV.groupText { margin-left: 16px; font-style: italic; font-size: 14px }
-BODY {
- background: white;
- color: black;
- margin-right: 20px;
- margin-left: 20px;
-}
-TD.indexkey {
- background-color: #eeeeff;
- font-weight: bold;
- padding-right : 10px;
- padding-top : 2px;
- padding-left : 10px;
- padding-bottom : 2px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 2px;
- margin-bottom : 2px;
- border: 1px solid #CCCCCC;
-}
-TD.indexvalue {
- background-color: #eeeeff;
- font-style: italic;
- padding-right : 10px;
- padding-top : 2px;
- padding-left : 10px;
- padding-bottom : 2px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 2px;
- margin-bottom : 2px;
- border: 1px solid #CCCCCC;
-}
-TR.memlist {
- background-color: #f0f0f0;
-}
-P.formulaDsp { text-align: center; }
-IMG.formulaDsp { }
-IMG.formulaInl { vertical-align: middle; }
-SPAN.keyword { color: #008000 }
-SPAN.keywordtype { color: #604020 }
-SPAN.keywordflow { color: #e08000 }
-SPAN.comment { color: #800000 }
-SPAN.preprocessor { color: #806020 }
-SPAN.stringliteral { color: #002080 }
-SPAN.charliteral { color: #008080 }
-.mdTable {
- border: 1px solid #868686;
- background-color: #F4F4FB;
-}
-.mdRow {
- padding: 8px 10px;
-}
-.mdescLeft {
- padding: 0px 8px 4px 8px;
- font-size: 12px;
- font-style: italic;
- background-color: #FAFAFA;
- border-top: 1px none #E0E0E0;
- border-right: 1px none #E0E0E0;
- border-bottom: 1px none #E0E0E0;
- border-left: 1px none #E0E0E0;
- margin: 0px;
-}
-.mdescRight {
- padding: 0px 8px 4px 8px;
- font-size: 12px;
- font-style: italic;
- background-color: #FAFAFA;
- border-top: 1px none #E0E0E0;
- border-right: 1px none #E0E0E0;
- border-bottom: 1px none #E0E0E0;
- border-left: 1px none #E0E0E0;
- margin: 0px;
-}
-.memItemLeft {
- padding: 1px 0px 0px 8px;
- margin: 4px;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-color: #E0E0E0;
- border-right-color: #E0E0E0;
- border-bottom-color: #E0E0E0;
- border-left-color: #E0E0E0;
- border-top-style: solid;
- border-right-style: none;
- border-bottom-style: none;
- border-left-style: none;
- background-color: #FAFAFA;
- font-size: 12px;
-}
-.memItemRight {
- padding: 1px 8px 0px 8px;
- margin: 4px;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-color: #E0E0E0;
- border-right-color: #E0E0E0;
- border-bottom-color: #E0E0E0;
- border-left-color: #E0E0E0;
- border-top-style: solid;
- border-right-style: none;
- border-bottom-style: none;
- border-left-style: none;
- background-color: #FAFAFA;
- font-size: 13px;
-}
-.memTemplItemLeft {
- padding: 1px 0px 0px 8px;
- margin: 4px;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-color: #E0E0E0;
- border-right-color: #E0E0E0;
- border-bottom-color: #E0E0E0;
- border-left-color: #E0E0E0;
- border-top-style: none;
- border-right-style: none;
- border-bottom-style: none;
- border-left-style: none;
- background-color: #FAFAFA;
- font-size: 12px;
-}
-.memTemplItemRight {
- padding: 1px 8px 0px 8px;
- margin: 4px;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-color: #E0E0E0;
- border-right-color: #E0E0E0;
- border-bottom-color: #E0E0E0;
- border-left-color: #E0E0E0;
- border-top-style: none;
- border-right-style: none;
- border-bottom-style: none;
- border-left-style: none;
- background-color: #FAFAFA;
- font-size: 13px;
-}
-.memTemplParams {
- padding: 1px 0px 0px 8px;
- margin: 4px;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- border-top-color: #E0E0E0;
- border-right-color: #E0E0E0;
- border-bottom-color: #E0E0E0;
- border-left-color: #E0E0E0;
- border-top-style: solid;
- border-right-style: none;
- border-bottom-style: none;
- border-left-style: none;
- color: #606060;
- background-color: #FAFAFA;
- font-size: 12px;
-}
-.search { color: #003399;
- font-weight: bold;
-}
-FORM.search {
- margin-bottom: 0px;
- margin-top: 0px;
-}
-INPUT.search { font-size: 75%;
- color: #000080;
- font-weight: normal;
- background-color: #eeeeff;
-}
-TD.tiny { font-size: 75%;
-}
-a {
- color: #252E78;
-}
-a:visited {
- color: #3D2185;
-}
-
-/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
-
-DIV.tabs
-{
- float : left;
- width : 100%;
- background : url("tab_b.gif") repeat-x bottom;
- margin-bottom : 4px;
-}
-
-DIV.tabs UL
-{
- margin : 0px;
- padding-left : 10px;
- list-style : none;
-}
-
-DIV.tabs LI, DIV.tabs FORM
-{
- display : inline;
- margin : 0px;
- padding : 0px;
-}
-
-DIV.tabs FORM
-{
- float : right;
-}
-
-DIV.tabs A
-{
- float : left;
- background : url("tab_r.gif") no-repeat right top;
- border-bottom : 1px solid #84B0C7;
- font-size : x-small;
- font-weight : bold;
- text-decoration : none;
-}
-
-DIV.tabs A:hover
-{
- background-position: 100% -150px;
-}
-
-DIV.tabs A:link, DIV.tabs A:visited,
-DIV.tabs A:active, DIV.tabs A:hover
-{
- color: #1A419D;
-}
-
-DIV.tabs SPAN
-{
- float : left;
- display : block;
- background : url("tab_l.gif") no-repeat left top;
- padding : 5px 9px;
- white-space : nowrap;
-}
-
-DIV.tabs INPUT
-{
- float : right;
- display : inline;
- font-size : 1em;
-}
-
-DIV.tabs TD
-{
- font-size : x-small;
- font-weight : bold;
- text-decoration : none;
-}
-
-
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-DIV.tabs SPAN {float : none;}
-/* End IE5-Mac hack */
-
-DIV.tabs A:hover SPAN
-{
- background-position: 0% -150px;
-}
-
-DIV.tabs LI#current A
-{
- background-position: 100% -150px;
- border-width : 0px;
-}
-
-DIV.tabs LI#current SPAN
-{
- background-position: 0% -150px;
- padding-bottom : 6px;
-}
-
-DIV.nav
-{
- background : none;
- border : none;
- border-bottom : 1px solid #84B0C7;
-}
-
-DIV.searchresults
-{
- float : left;
- width : 100%;
- margin-bottom : 4px;
-}
diff --git a/Documentation/Doxygen/Geometry.dox b/Documentation/Doxygen/Geometry.dox
deleted file mode 100644
index 6b62bde2c7e32f49e08754359beb31caa70275b8..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Geometry.dox
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- \page GeometryPage Geometry Concepts
-
- Insight provide basic classe to represent geometrical concepts, alghought
- the aim of the toolkit is not computational geometry, some of these elements
- are necessary for common procedures in image processing.
-
- This document present the different geometric concepts used in the toolkit,
- as well as their relationships and how they can effectively be used.
-
- At the beggining there was the Point
-
- */
diff --git a/Documentation/Doxygen/ImageSimilarityMetrics.dox b/Documentation/Doxygen/ImageSimilarityMetrics.dox
deleted file mode 100644
index 060d226f739a1c4ea0a051b9660f484262d46634..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/ImageSimilarityMetrics.dox
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
-
-\page ImageSimilarityMetricsPage Image Similarity Metrics
-
-\section MetricsIntroduction Introduction
-
-It is a common task in image analysis to require to compare how
-similar two image might be. This comparison may be limited to a
-particular region of each image. \em Image Similarity Metrics are
-methods that produce a quantitative evaluation of the similarity
-between two image or two image regions.
-
-This techniques are used as a base for registration methods because
-they provide the information that indicates when the registration
-process is going in the right direction.
-
-
-A large number of Image Similarity Metrics have been proposed in the
-medical image and computer vision community. There is no a \em right
-image similarity metric but a set of metrics that are appropiated for
-particular applications. Metrics fit very well the notions of tools
-in a toolkit. You need a set of them because none is able to perform
-the same job as the other.
-
-The following table presents a comparison between image similarity
-metrics. This is by no means an exhaustive comparison but will at
-least provide some guidance as to what metric can be appropiated for
-particular problems.
-
-
-
-\subsection RegistrationMetrics Similarity Metrics
-Metrics are probably the most critical element of a registration problem. The metric defines what the goal of the process is, they measure how well the Target object is matched by the Reference object after the transform has been applied to it. The Metric should be selected in function of the types of objects to be registered and the expected kind of missalignment. Some metrics has a rather large capture region, which means that the optimizer will be able to find his way to a maximum even if the missalignment is high. Typicaly large capture regions are associated with low precision for the maximum. Other metrics can provide high precision for the final registration, but usually require to be initialized quite close to the optimal value.
-
-Unfortunately there are no clear rules about how to select a metric, other that trying some of them in different conditions. In some cases could be and advantage to use a particular metric to get an initial approximation of the transformation, and then switch to another more sensitive metric to achieve better precision in the final result.
-
-Metrics are depend on the objects they compare. The toolkit currently offers <em> Image To Image </em> and <em> PointSet to Image </em> metrics as follows:
-
-\li <b> Mean Squares </b> Sum of squared differences between intensity values. It requires the two objects to have intensity values in the same range.
-\li <b> Normalized Correlation </b> Correlation between intensity values divided by the square rooted autocorrelation of both target and reference objects: \f$ \frac{\sum_i^n{a_i * b_i }}{\sum_i^n{a_i^2}\sum_i^n{b_i^2}} \f$. This metric allows to register objects whose intensity values are related by a linear transformation.
-\li <b> Pattern Intensity </b> Squared differences between intensity values transformed by a function of type \f$ \frac{1}{1+x} \f$ and summed them up. This metric has the advantage of increase simultaneously when more samples are available and when intensity values are close.
-\li <b> Mutual Information </b> Mutual information is based in an information theory concept. Mutual information between two sets measures how much can be known from one set if only the other set is known. Given a set of values \f$ A=\{a_i\} \f$. Its entropy \f$ H(A) \f$ is defined by \f$ H(A) = \sum_i^n{- p(a_i) \log({p(a_i)})} \f$ where \f$ p(a_i) \f$ are the probabilities of the values in the set. Entropy can be interpreted as a measure of the mean uncertainty reduction that is obtained when one of the particular values is found during sampling. Given two sets \f$ A=\{a_i\} \f$ and \f$ B=\{b_i\} \f$ its joint entropy is given by the joint probabilities \f$ p_(a_i,b_i) \f$ as \f$ H(A,B) = \sum_i^n{-p(a_i,b_i) * log( p(a_i, b_i) )} \f$. Mutual information is obtained by subtracting the entropy of both sets from the joint entropy, as : \f$ H(A,B)-H(A)-H(B) \f$, and indicates how much uncertainty about one set is reduced by the knowledge of the second set. Mutual information is the metric of choice when image from different modalities need to be registered.
-
- */
diff --git a/Documentation/Doxygen/Iterators.dox b/Documentation/Doxygen/Iterators.dox
deleted file mode 100644
index 130bba0289027d112f43d1a9a38398fd4e37e788..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Iterators.dox
+++ /dev/null
@@ -1,301 +0,0 @@
-/**
-
- \page ImageIteratorsPage Image Iterators
-
- \section ImageIteratorsIntroduction Introduction
-
- ImageIterators are the mechanism used in ITK for walking through the image
- data.
-
- You probably learned image processing with the classical access to the
- image data using <b>"for loops"</b> like:
-
-
- \code
-
- const int nx = 200;
- const int ny = 100;
-
- ImageType image(nx,ny);
-
- for(int x=0; x<nx; x++) // for all Columns
- {
- for(int y=0; y<ny; y++) // for all Rows
- {
- image(x,y) = 10;
- }
- }
-
- \endcode
-
-
- When what you \em really mean is:
-
- \code
-
- ForAllThePixels p in image Do p = 100
-
- \endcode
-
- ImageIterators gets you closer to this algorithmic abstraction.
- They abstract the low-level processing of images from the particular
- implementation of the image class.
-
- Here is how an image iterator is used in ITK:
-
- \code
-
- ImageType::Pointer im = GetAnImageSomeHow();
-
- ImageIterator it( im, im->GetRequestedRegion() );
-
- it.GoToBegin();
-
- while( !it.IsAtEnd() )
- {
- it.Set( 10 );
- ++it;
- }
-
- \endcode
-
- This code can also be written as:
-
- \code
- ImageType::Pointer im = GetAnImageSomeHow();
-
- ImageIterator it( im, im->GetRequestedRegion() );
-
- for (it = it.Begin(); !it.IsAtEnd(); ++it)
- {
- it.Set( 10 );
- }
-
- \endcode
-
- One important advantage of ImageIterators is that they provide support for
- the N-Dimensional images in ITK. Otherwise it would be impossible (or at
- least very hard) to write algorithms that work independent of the image
- dimension.
-
- Another advantage of ImageIterators is that they support walking a region
- of an image. In fact, one argument of an ImageIterator's constructor
- defines the region or portion of an image to traverse.
-
- Iterators know a lot about the internal composition of the image,
- relieving the user from these details. Your algorithm can go through
- all the pixels of an image without ever knowing the dimension of the image.
-
- \section IteratorTypes Types of Iterators
-
- The order in which the image pixels are visited can be quite important for
- some image processing algorithms and may be inconsequential to other
- algorithms as long as pixels are accessed as fast as possible.
-
- To address these diverse requirements, ITK implements a set
- of ImageIterators, always following the "C" philosophy of :
-
- "You only pay for what you use"
-
- Here is a list of some of the different ImageIterators implemented in ITK:
-
- - itk::ImageRegionIterator
- - itk::ImageRegionReverseIterator
-
- Region iterators don't define any specific order to walk over the pixels on
- the image. The user can be sure though, that all the pixels inside the region
- will be visited.
-
- The following iterators allow to walk the image in specific directions
-
- - itk::ImageLinearIteratorWithIndex Along lines
- - itk::ImageSliceIteratorWithIndex Along lines, then along planes
-
- Iterators in general can have <B>Read/Write</B> access to image pixels.
- A family of iterators provides <B>Read Only</B> access, in order to
- preserve the image content. These iterators are equivalent to "C"
- const pointers :
-
- \code
- const * PixelType iterator;
- \endcode
-
- or to STL const_iterators:
-
- \code
- vector<PixelType>::const_iterator it;
- \endcode
-
- The class name of the iterator makes clears if it provides const access
- or not. Some of the <TT>const</TT> iterators available are
-
- - itk::ImageConstIterator
- - itk::ImageConstIteratorWithIndex
- - itk::ImageLinearConstIteratorWithIndex
- - itk::ImageRegionConstIteratorWithIndex
- - itk::ImageSliceConstIteratorWithIndex
-
- \subsection NeighbohoodIteratorType Other Types of Iterators
-
- Another group of iterators support a moving neighborhood. Here the
- neighborhood can "iterate" over an image and a calculation can iterate
- over the neighborhood. This allows N-dimensional implementations of
- convolution and finite differences to be implemented succintly.
- This class of iterators is described in detail on the page
- \ref NeighborhoodIteratorsPage.
-
-
- \subsection STL ImageIterators vs. STL Iterators
-
- Given the breadth and complexity of ImageIterators, they are designed to
- operate slightly differently than STL iterators. In STL, you ask a
- container for an iterator that will traverse the container. Furthermore,
- in STL, you frequently compare an iterator against another iterator.
- Here is a loop to walk over an STL vector.
-
- \code
- for (it = vec.begin(); it != vec.end(); ++it)
- {}
- \endcode
-
- ImageIterators, unfortunately, are more complicated than STL iterators.
- ImageIterators need to store more state information than STL iterators.
- As one example, ImageIterators can walk a region of an image and an
- image can have multiple ImageIterators traversing different
- regions simultaneously. Thus, each ImageIterator must maintain which region
- it traverses. This results in a fairly heavyweight iterator, where
- comparing two ImageIterators and constructing iterators is an
- expensive operation. To address this issue, ImageIterators have a
- slightly different API than STL iterators.
-
- First, you do not ask the container (the image) for an iterator. Instead,
- you construct an iterator and tell it which image to traverse. Here
- is a snippet of code to construct an iterator that will walk a region
- of an image:
-
- \code
- ImageType::Pointer im = GetAnImageSomeHow();
-
- ImageIterator it( im, im->GetRequestedRegion() );
- \endcode
-
- Second, since constructing and comparing ImageIterators is expensive,
- ImageIterators know the beginning and end of the region. So you ask the
- iterator rather than the container whether the iterator is at the end of
- a region.
-
- \code
- for (it = it.Begin(); !it.IsAtEnd(); ++it)
- {
- it.Set( 10 );
- }
- \endcode
-
-
- \subsection IteratorsRegions Regions
- Iterators are typically defined to walk a region of an image. ImageRegions
- are defined to be rectangular prisms. (Insight also has a number of
- iterators that can walk a region defined by a spatial function.)
- The region for an iterator is defined at constructor time. Regions
- are not validated, so the programmer is responsible for assigning a
- region that is within the image. Iterator methods Begin() and End()
- are defined relative to the region. See below.
-
- \section IteratorAPI Iterator API
-
- \subsection IteratorsPositioning Position
-
- \subsection IteratorsIntervals Half Open Intervals - Begin/End
- Like most iterator implementations, ImageIterators walk a half-open
- interval. Begin is defined as the first pixel in the region. End is
- defined as one pixel past the last pixel in the region (one pixel
- past in the same row). So Begin points a valid pixel in the region
- and End points to a pixel that is outside the region.
-
- \subsection IteratorsDereferencing Dereferencing
-
- In order to get access to the image data pointed by the iterator,
- dereferencing is required. This is equivalent to the classical
- "C" dereferencing code :
-
- \code
- PixelType * p; // creation of the pointer
- *p = 100; // write access to a data
- PixelType a = *p; // read access to data
- \endcode
-
- Iterators dereference data using <TT>Set()</TT> and <TT>Get()</TT>
-
- \code
- imageIterator.Set( 100 );
- PixelType a = imageIterator.Get();
- \endcode
-
-
- \subsection IteratorsOperatorPlusPlus operator++
-
- The ++ operator will move the image iterator to the next pixel,
- according to the particular order in which this iterator walks
- the imaage.
-
- \subsection IteratorsOperatorMinusMinus operator--
-
- The -- operator will move the image iterator to the previous pixel,
- according to the particular order in which this iterator walks
- the imaage.
-
- \subsection IteratorsIteratorsBegin Begin()
- Begin() returns an iterator for the same image and region as the current
- iterator but positioned at the first pixel in the region. The current iterator
- is not modified.
-
- \subsection IteratorsIteratorsEnd End()
- End() returns an iterator for the same image and region as the current
- iterator but positioned one pixel past the last pixel in the region.
- The current iterator is not modified.
-
- \subsection IteratorsIteratorsGotoBegin GotoBegin()
- GotoBegin() repositions the iterator to the first pixel in the region.
-
- \subsection IteratorsGotoEnd GotoEnd()
- GotoEnd() repositions the iterator to one pixel past (in the same
- row) the last pixel in the region.
-
- \subsection IteratorsIsAtBegin IsAtBegin()
- IsAtBegin() returns true if the iterator is positioned at the first
- pixel in the region, returns false otherwise. IsAtBegin() is faster than
- comparing an iterator for equivalence to the iterator returned by Begion().
-
- \code
- if (it.IsAtBegin()) {} // Fast
-
- if (it == it.Begin()) {} // Slow
- \endcode
-
- \subsection IteratorsIsAtEnd IsAtEnd()
- IsAtEnd() returns true if the iterator is positioned one pixel past
- the last pixel in the region, returns false otherwise. IsAtEnd()
- is faster than comparing an iterator for equivalence to the iterator
- returned by End().
-
- \code
- if (it.IsAtEnd()) {} // Fast
-
- if (it == it.End()) {} // Slow
- \endcode
-
-
- \section IteratorFinalComment Final Comments
-
- In general, iterators are not the kind of objects that users of the
- toolkit would need to use. They are rather designed to be used by
- code developers that add new components to the toolkit, like writting
- a new Image filter, for example.
-
- Before starting to write code that use iterators, users should consider
- to verify if the particular operation they intend to apply to the image
- is not already defined in the form of an existing image filter.
-
-
-*/
-
diff --git a/Documentation/Doxygen/MainPage.dox b/Documentation/Doxygen/MainPage.dox
deleted file mode 100644
index 8b3e5fb41a10f280976981a8f19e37719794b0eb..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/MainPage.dox
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- *
- * \mainpage Orfeo Toolbox
- *
- * <div align="center"><img src="logoVectoriel.png" alt="logoVectoriel.png"></div>
- *
- * \section intro Introduction
- *
- * Welcome to CNES' ORFEO Toolbox (OTB). OTB is an open-source sofware
- * system developped in the framework of the ORFEO Accompaniment
- * Program.
- *
- * \section homepage Home Page
- *
- * The Home Page of the ORFEO Toolbox can be found at:
- *
- * http://smsc.cnes.fr/PLEIADES/lien3_vm.htm
- *
- * The OTB software guide can be downloaded here:
- *
- * http://orfeo-toolbox.sourceforge.net/Docs/OTBSoftwareGuide.pdf
- *
- * More information about the ORFEO Program is available here:
- *
- * http://smsc.cnes.fr/PLEIADES/A_prog_accomp.htm
- *
- * The OTB users mailing list is located here:
- *
- * http://groups.google.com/group/otb-users
- *
- * \section howto How to use this documentation
- *
- * This documentation describes the API of the toolbox. The Modules
- * link presents a hierarchy of classes organized according to their
- * functionality. The Related Pages link presents design details, in
- * particular the use of the data pipeline model and the philosophy of
- * iterators.
- *
- */
-
diff --git a/Documentation/Doxygen/Modules.dox b/Documentation/Doxygen/Modules.dox
deleted file mode 100644
index 52e21f72e19d81372cf07deab3e723d3e88eb026..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Modules.dox
+++ /dev/null
@@ -1,575 +0,0 @@
-/**
- \defgroup DataRepresentation Data Representation Objects
- The Insight Toolkit includes several data representation objects such as
- Image, Mesh, Pixel, Points, etc.
-*/
-
-/**
- \defgroup ImageObjects Image Representation Objects
- \ingroup DataRepresentation
- This category includes the objects required to represent images in ITK.
-*/
-
-/**
- \defgroup MeshObjects Mesh Representation Objects
- \ingroup DataRepresentation
- This category includes the objects required to represent meshes in ITK.
-*/
-
-/**
- \defgroup PathObjects Path Representation Objects
- \ingroup DataRepresentation
- This category includes the objects required to represent paths in ITK.
-*/
-
-/**
- \defgroup Geometry Geometry Representation Objects
- \ingroup DataRepresentation
-
- This category include the objects required to represent geometrical entities
- like positions, vectors and space mappings.
-
- A detailed description of the rationale for these classes can be found in
- \ref GeometryPage
-*/
-
-
-/**
- \defgroup DataAccess Data Access Objects
-
- The Insight Toolkit includes several ways to access data through the user of
- iterators, pointers, indexes, etc.
-*/
-
-/**
- \defgroup TensorObjects Objects Related to Tensor Images
-
- This category includes the objects required for representing diffusion tensor images in ITK.
-*/
-
-
-/**
-\defgroup ImageAccess Image Access Objects
-\ingroup DataAccess
-*/
-
-
-/**
-\defgroup MeshAccess Mesh Access Objects
-\ingroup DataAccess
-*/
-
-
-/**
-\defgroup Iterators Iterators
-\ingroup DataAccess
-Iterators are the mechanism used to walk over the content of a particular data object.
-They allow to define paths and directions along which the data should be walked through.
-*/
-
-/**
-\defgroup ImageIterators Image Iterators
-\ingroup Iterators
-Image Iterators allow to go through the content of an image in a predefined way.
-For a detailed description of iterators rationale see \ref ImageIteratorsPage
-*/
-
-
-
-
-/**
- \defgroup DataProcessing Data Processing Objects
-
- The Insight Toolkit includes several ways to process the data using objects such as adaptors, functions, filters, and
- transforms.
-*/
-
-
-/**
- \defgroup Filters Filters
- \ingroup DataProcessing
- Filters implement the operations on the pipeline architecture.
-*/
-
-/**
- \defgroup ImageFilters Image Filters
- \ingroup Filters
-
- Image filters process input images and produce output images. Inputs are
- unmodified. The pipeline architecture makes provisions for supporting
- streaming by using packets of data defined by regions
- \sa Image
- \sa PhysicalImage
- \sa ImageRegion
-*/
-
-/**
- \defgroup MeshFilters Mesh Filters
- \ingroup Filters
-
- Mesh filters process input meshes and produce output meshes. Inputs are
- unmodified.
- \sa Mesh
-*/
-
-/**
- \defgroup IntensityImageFilters Intensity Image Filters
- \ingroup ImageFilters
-
- Intensity Image filters only alter the values stored in image pixels.
- \sa Image
- \sa PhysicalImage
- \sa ImageRegion
-*/
-
-/**
- \defgroup MathematicalMorphologyImageFilters Mathematical Morphology Image Filters
- \ingroup IntensityImageFilters
-
- Mathematical morphology filters are a particular class of cellular automata.
- They modify the value of a pixel based on the values of a neighborhood.
- The neighborhood is now as the structured element.
-
- \sa Image
- \sa PhysicalImage
- \sa ImageRegion
- \sa BinaryMorphologicalFilterBase
-*/
-
-
-/**
- \defgroup ImageEnhancement Image Enhancement Filters
- \ingroup ImageFilters
- Image enhancement filters process an image to enhance the appearance
- of an image either for visualization purposes or for further processing.
- Examples of image enhancement filters available in ITK are: anisotropic diffusion,
- Gaussian filter, and histogram equalization.
-*/
-
-/**
- \defgroup ImageFeatureExtraction Image Feature Extraction Filters
- \ingroup ImageFilters
- Image feature extraction filters process an image to extract features of interest
- such as gradients, edges, distances, etc.
- Examples of image feature extraction algorithms available in ITK are: image gradients,
- first and second derivatives, and Danielson distance.
-*/
-
-/**
- \defgroup GradientFilters Image Gradient Filters
- \ingroup ImageFeatureExtraction
- These filters compute local gradients of images.
-*/
-
-
-/**
- \defgroup GeometricTransforms Geometric Transformation Filters
- \ingroup Filters
- Geometric transformation Filters transform the coordinates of an image in various ways.
- Examples of geometric transformation Filters available in ITK are: image shrinking, and
- affine transformation.
-*/
-
-/**
- \defgroup PyramidImageFilter Image Pyramid Filters
- \ingroup GeometricTransforms
- Image pyramid filters generate a set of downsampled versions of an image according
- to a user defined multi-resolution schedule.
-*/
-
-/**
- \defgroup ImageSegmentation Image Segmentation Filters
- \ingroup ImageFilters
- Image segmentation filters process an image to
- partition it into meaningful regions. Various types of image segmentation algorithms
- are available in ITK - some examples are, unsupervised pixel classification methods, region-growing methods,
- watershed-based methods, deformable-model based methods, and level-set based methods.
-*/
-
-/**
- \defgroup IntensityImageSegmentation Intensity-Based Image Segmentation Filters
- \ingroup ImageSegmentation
- Intensity based image segmentation filters use intensity values
- of image pixels to segment an image. Typically, spatial contiguity is not considered in
- intensity-based segmentation filters.
- Examples of intensity-based algorithms in ITK are supervised and unsupervised pixel classification algorithms.
-*/
-
-/**
- \defgroup ClassificationFilters Pixel Classification Filters
- \ingroup IntensityImageSegmentation
- Pixel classification filters use statistical classification algorithms to assign a label to
-a given image pixel. Classification algorithms can be supervised when training data is available
-or unsupervised when no training data is available.
-*/
-
-/**
- \defgroup SupervisedClassificationFilters Supervised Classification Filters
- \ingroup ClassificationFilters
- Supervised classification filters rely on the existence of training data to classify
- pixels into different types. An example of supervised classification algorithm in ITK is
- the Gaussian classifier that uses the training data to build Gaussian models of intensity distributions.
-*/
-
-/**
- \defgroup UnSupervisedClassificationFilters Unsupervised Classification Filters
- \ingroup ClassificationFilters
- Unsupervised classification filters typically cluster the image intensity data into different groups.
- An example of unsupervised classification algorithm in ITK is the K-Means clustering algorithm.
-*/
-
-
-/**
- \defgroup WatershedSegmentation Watershed-based Segmentation Filters
- \ingroup IntensityImageSegmentation
- These filters segment an image based on intensity values using the watershed algorithm.
-*/
-
-/**
- \defgroup RegionBasedSegmentation Region-Based Segmentation Filters
- \ingroup ImageSegmentation
- These filters segment an image based on similarity of intensity values between spatially adjacent
- pixels. Examples of region-based segmentation filters in ITK include fuzzy connectedness, region growing, and
- Markov Random Fields.
-*/
-
-/**
- \defgroup FuzzyConnectednessSegmentation Fuzzy Connectedness-based Segmentation Filters
- \ingroup RegionBasedSegmentation
- These filters segment an image based on fuzzy connectedness principles. Here you typically
-start with one or more seed points and grow regions around these seed points based on fuzzy affinity.
-*/
-
-/**
- \defgroup RegionGrowingSegmentation Region Growing Filters
- \ingroup RegionBasedSegmentation
-Typically region growing involves starting several small regions on an image and merging them iteratively based on some
-pixel intensity similarity criterion. ITK provides an intensity and edge-based region-growing algorithm for segmentation.
-*/
-
-/**
- \defgroup MRFFilters Markov Random Field-based Filters
- \ingroup RegionBasedSegmentation
-Markov Random Field (MRF)-based Filters assume that the segmented image is Markovian in nature, i.e., adjacent
-pixels are likely to be of the same class. These methods typically combine intensity-based Filters with MRF prior
-models also known as Gibbs prior models.
-*/
-
-
-/**
- \defgroup ModelImageSegmentation Model-Based Image Segmentation Filters
- \ingroup ImageSegmentation
- These filters segment an image by starting with a model and then updating the model based on
-image features and the updates are typically constrained by a-priori knowledge about the models.
-Examples of these types of algorithms in ITK include: deformable model (snakes)-based algorithms and level set-based algorithms.
-*/
-
-/**
- \defgroup MeshSegmentation Mesh Segmentation Filters
- \ingroup ModelImageSegmentation
-These algorithms represent models using a mesh and update the models based on image features.
-Examples of this type of filter in ITK include: balloon force filter and the deformable mesh filter.
-*/
-
-/**
- \defgroup LevelSetSegmentation Level Set-Based Segmentation Filters
- \ingroup ModelImageSegmentation
- These algorithms represent models implicitly using level-sets and update the models based on image features.
-Examples of these types of segmentation methods in ITK include: curvature flow-based filters,
- fast marching filters, and shape-detection filters.
-*/
-
-/**
- \defgroup HybridSegmentation Hybrid Segmentation Filters
- \ingroup ImageSegmentation
- These filters are hybrid between intensity-based, region-based, or model-based image
- segmentation filters.
-*/
-
-
-/**
- \defgroup RegistrationFilters Registration Filters
- \ingroup Filters
-*/
-
-/**
- \defgroup RegistrationComponents Components of Registration Methods
- Registration methods are implemented by combining basic components. This framework allows
- great flexibility in the construction of registration methods, and maximize code reuse.
- The basic components of a registration method are described in \ref RegistrationPage
- \ingroup RegistrationFilters
-*/
-
-/**
- \defgroup RegistrationMetrics Similarity Metrics of Registration Methods
- Similarity metrics are the objects that evaluate how similar two objects are. They are
- used in registration to quantify how well a transform is mapping the reference object
- on top of the target object.
- \ingroup RegistrationComponents
-
-*/
-
-
-/**
- \defgroup ImageRegistration Image Registration Methods
- \ingroup RegistrationFilters
-*/
-
-/**
- \defgroup RigidImageRegistration Rigid Registration Methods
- \ingroup ImageRegistration
-*/
-
-/**
- \defgroup AffineImageRegistration Affine Registration Methods
- \ingroup ImageRegistration
-*/
-
-
-/**
- \defgroup DeformableImageRegistration Deformable Registration Methods
- \ingroup ImageRegistration
-*/
-
-/**
- \defgroup ModelImageRegistration Model - Image Registration Methods
- \ingroup RegistrationFilters
-*/
-
-/**
- \defgroup PointSetToImageRegistration PointSet to Image Registration Methods
- \ingroup ModelImageRegistration
-*/
-
-
-/**
-\defgroup IOFilters Input and Output Filters
-\ingroup Filters
-*/
-
-
-
-/**
-\defgroup DataSources Data Sources
-\ingroup DataProcessing
-*/
-
-
-
-/**
-\defgroup Transforms Transforms
-\ingroup DataProcessing
-*/
-
-
-/**
-\defgroup ImageAdaptors Image Adaptors
-\ingroup DataProcessing
-
-Image Adaptors are an implementation of the <EM>Adaptor Design Pattern</EM>. They are
-designed to present an image of a particular type as being an image of a different type.
-Adaptors perform simple operations on pixel values for which is not easy to justify the
-use of an image filter.
-
-One of the principal tasks of ImageAdaptors is to perform casting.
-
-For example: you have an image whose pixels are of type <TT>unsigned char</TT> and you
-need to feed this image in a process that expects pixels of type <TT>double</TT>.
-You have the option of using and ImageFilter that convert the input <TT>unsigned char </TT> image into another of pixel type <TT>double</TT>.
-However this filter will allocate memory for this second image and will need to be executed.
-Image Adaptors allow to simulate that you have made the conversion but will avoid the overhead in memory.
-There is however a penalty in performance.
-
-The mechanism used by image adaptors is to provide a simple function that will be used by ImageIterator (see \ref ImageIteratorsPage) to convert the value of a pixel, in a pixel-by-pixel basis.
-*/
-
-
-/**
-\defgroup Functions Functions
-\ingroup DataProcessing
-Functions provide an efficient mechanism for computing values
-*/
-
-/**
-\defgroup ImageFunctions Image Functions
-\ingroup Functions
-Image functions compute single values using data from a previously
-specified Image. A value can be computed at an image index,
-continuous index or point.
-
-\sa Image
-\sa Index
-\sa ImageFunction
-*/
-
-/**
-\defgroup ImageInterpolators Image Interpolators
-\ingroup ImageFunctions
-Image interpolators compute pixel values in non-grid positions. A value can be computed at an image index, continuous index or point.
-
-\sa Image
-\sa ImageFunction
-*/
-
-
-/**
-\defgroup SpatialFunctions Spatial Functions
-\ingroup Functions
-*/
-
-/**
-\defgroup FiniteDifferenceFunctions Finite Difference Functions
-\ingroup Functions
-Finite difference functions are used in the finite difference solver (FDS)
-framework for solving partial differential equations on images using
-an iterative, finite difference update scheme.
-
-\sa FiniteDifferenceImageFilter
-\sa FiniteDifferenceFunction
-*/
-
-/**
-\defgroup Operators Operators
-\ingroup DataProcessing
-Operators implements the abstraction of performing an operation using data
-from a neighborhood of a pixel. ITK Operators work in conjunction with
-Neighborhood iterators in order to walk over an image.
-*/
-
-
-
-/**
- \defgroup Numerics Numerics
-
- Insight provides support for numerical operations at two levels. First,
- Insight uses an external library called VNL, which is one component of
- the VXL toolkit. This library provides linear algebra, optimization,
- and FFTs. Second, Insight provides numerical optimizers
- designed for the registration framework and statistical
- classes designed to be used for classification and segmentation.
- */
-
-
-/**
- \defgroup Optimizers Optimizers
- \ingroup Numerics RegistrationComponents
- \sa RegistrationComponents
-
- Set of Optimization methods. Some of these methods are adaptors for
- classes already defined in the VNL library. These methods have been
- particularly tailored to be used as modular components in the
- registration framework.
- */
-
-/**
-\defgroup SystemObjects System Objects
-*/
-
-/**
-\defgroup ITKSystemObjects ITK System Objects
-\ingroup SystemObjects
-These objects are the basic system objects used in building ITK.
-*/
-
-/**
-\defgroup OSSystemObjects OS System Objects
-\ingroup SystemObjects
- These objects are the basic operating system related system objects in ITK.
-*/
-
-
-
-/**
- \defgroup ThreadSafetyGroup Thread Safety
- This groups catalog classes according to its compliance with thread safety.
- ITK is designed to be thread-safe, but in some particular cases this
- capability cannot be supported and for this reason a classification is
- needed.
-*/
-
-/**
- \defgroup ThreadSafe Thread Safe classes
- \ingroup ThreadSafetyGroup
-*/
-
-/**
- \defgroup ThreadUnSafe Thread Unsafe classes
- \ingroup ThreadSafetyGroup
-*/
-
-/**
- \defgroup ThreadSafetyUnknown Thread Safety Unknown
- \ingroup ThreadSafetyGroup
-*/
-
-
-
-/**
- \defgroup MultithreadingGroup Support for Multithreading
- This category classifies filters according to their support
- for performing processing in multiple threadS
-*/
-
-
-/**
- \defgroup Multithreaded Multithreaded Filters
- \ingroup MultithreadingGroup
- Filters on this category divide processing across several threads.
-*/
-
-
-/**
- \defgroup Singlethreaded Singlethreaded Filters
- \ingroup MultithreadingGroup
- Filter on this category perform all its processing in a single thread
-*/
-
-
-/**
- \defgroup ShouldBeThreaded Filters that can potentialy be modified to be Threaded
- \ingroup MultithreadingGroup
- Filter on this category could be implemented to use several processing threads
-*/
-
-
-/**
- \defgroup StreamingGroup Processing images region by region
- This category classifies filters according to their capatity for supporting
- Streaming.
-*/
-
-/**
- \defgroup Streamed Filters supporting Streaming
- \ingroup StreamingGroup
- Filter can respond to a request for a portion of the output using
- only a portion of the input.
-*/
-
-
-/**
- \defgroup CannotBeStreamed Filters that cannot be streamed
- \ingroup StreamingGroup
- Filter requires either all the input or produces all the output.
-*/
-
-
-/**
- \defgroup ShouldBeStreamed Filters that could be implemented to be streamed
- \ingroup StreamingGroup
- Filters that can potentially be modified to support streaming but currently
- are not supporting it.
-*/
-
-
-
-
-/**
- \defgroup Deprecated Deprecated classes that are scheduled to be removed from the Toolkit
- The classes on this group will be removed soon. Their funcionality is now provided
- by other classes or changes in the toolkit have made them useless. Please report to
- their documentation and look in to their "Deprecated" section. This section should
- indicate what to do to replace this class in your code.
-*/
-
-
-
diff --git a/Documentation/Doxygen/NeighborhoodIterators.dox b/Documentation/Doxygen/NeighborhoodIterators.dox
deleted file mode 100644
index 1c054ffd481ad350437f42a89b1ffd9b008a6f04..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/NeighborhoodIterators.dox
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
-\page NeighborhoodIteratorsPage Neighborhood Iterators
-
-\section IntroductionSection Introduction
-This document provides a general overview of the intended use of the
-NeighborhoodIterator classes and their associated objects for low-level image
-processing in Itk. For a more detailed description of the API, please refer to
-the inline Itk documentation and manual.
-
-\par
-Neighborhood iterators are the abstraction of the concept of \em locality in
-image processing. They are designed to be used in algorithms that perform
-calculations on a neighborhood of pixel values around a point in an image. For
-example, a classic neighborhood-based operation is to compute the mean of a set
-of pixels in order to reduce noise in an image. This is typically done by
-taking a region of 3x3 pixels and computing the average of their values. A new
-image with fewer narrow high frequency spikes (noise) is produced using the
-resulting means.
-
-\par
-This code in classical \em texbook notation can look like:
-
-\code
-
- int nx = 512;
- int ny = 512;
- ImageType image(nx,ny);
- for(int x=1; x<nx-1; x++)
- {
- float sum = 0;
- for(int y=1; y<ny-1; y++)
- {
- sum += image(x-1,y-1) + image(x ,y-1) + image(x+1,y-1);
- sum += image(x-1,y ) + image(x ,y ) + image(x+1,y );
- sum += image(x-1,y+1) + image(x ,y+1) + image(x+1,y+1);
- }
- }
-\endcode
-
-\par
-The code above is readable and straightforward to implement. But its
-efficiency is limited to the speed of random access into the image. It also
-assumes a two dimensional image. We can eliminate the random access bottleneck
-by using iterators to dereference pixels, and for a two-dimensional image,
-code-readability may not suffer much. But what if we want code for three
-or more dimensions? Before long, the code size and complexity will increase to
-unmanageable levels. In Itk, we have encapsulated this functionality for
-efficiency, readability, and reusability.
-
-\section NeighborhoodIteratorsSection Neighborhood iterators
-itk::Image neighborhood iteration and dereferencing is encapsulated in the
-itk::NeighborhoodIterator classes. ITK NeighborhoodIterators allow for code
-that is closer to the algorithmic abstraction,
-
-\code
- ForAllTheIndicies i in Image
- GetTheNeighbors n in a 3x3 region around i
- Compute the mean of all pixels n
- Write the value to the output at i
-\endcode
-
-Here is how the pseudocode above can be rewritten in ITK using neighborhood
-iterators: ( In the code examples that follow, some template parameters may
-have been omitted for clarity. )
-
-
-\code
-1 typedef itk::Image<float, 2> ImageType;
-2 typedef itk::SmartNeighborhoodIterator<ImageType> NeighborhoodIterator;
-3 typedef itk::ImageRegionIterator<ImageType> ImageIterator;
-4
-5 ImageType::Pointer input_image = GetImageSomehow();
-6 ImageType::Pointer output_image = GetImageSomehow();
-7
-8 // A radius of 1 in all axial directions gives a 3x3x3x3x... neighborhood.
-9 NeighborhoodIterator::RadiusType radius;
-10 for (unsigned int i = 0; i < ImageType::ImageDimension; ++i) radius[i] = 1;
-11
-12 // Initializes the iterators on the input & output image regions
-13 NeighborhoodIterator it(radius, input_image,
-14 output_image->GetRequestedRegion());
-15 ImageIterator out(output_image, output_image->GetRequestedRegion());
-16
-17 // Iterates over the input and output
-18 for (it.SetToBegin(), out = out.Begin(); ! it.IsAtEnd(); ++it, ++out )
-19 {
-20 float accum = 0.0;
-21 for (unsigned int i = 0; i < it.Size(); ++i)
-22 {
-23 accum += it.GetPixel(i);
-24 }
-25 out.Set(accum/(float)(it.Size()));
-26 }
-\endcode
-
-\par
-Note that the computational work is confined to lines 18-26. The code is also
-completely generalized for multiple dimensions. For example, changing line 1
-to:
-\code
-1 typedef itk::Image<float, 5> ImageType;
-\endcode
-produces an averaging filter for five-dimensional images.
-
-\par
-The values in the neighborhood are dereferenced through the GetPixel(n) method
-of the iterator. Think of the iterator as a C array, storing neighborhood
-values in the same order that they are stored in the image, with the lowest
-dimension as the fastest increasing dimension.
-
-\section OperatorsOperationsSection Neighborhood operators and operations
-NeighborhoodOperators are container classes for generating and storing
-computational kernels such as LaPlacian, Gaussian, derivative, and
-morphological operators. They provide a generalized interface for creation and
-access of the operator coefficients.
-
-\par
-Applying a NeighborhoodOperator to a NeighborhoodIterator requires defining
-some sort of operation. One common case is that of convolution with a kernel
-of coefficients. In Itk, convolution filtering of an image can be done in just
-a few lines of code using an inner product operation between a neighborhood
-iterator and an operator. The following convolution with a LaPlacian kernel
-demonstrates this concept.
-
-\code
-1 LaPlacianOperator<double, 3> OP;
-2 ImageIterator out( outputImage, regionToProcess );
-3 NeighborhoodIterator it ( OP.GetRadius(), inputImage, regionToProcess );
-4 NeighborhoodInnerProduct IP;
-5
-6 out = out.Begin();
-7 for (it.SetToBegin(); it != it.End(); ++it, ++out)
-8 {
-9 out.Set( IP( it, OP) );
-10 }
-\endcode
-
-\par
-Sometimes it may be more appropriate and efficient to work outside of the
-operator/operation model. The mean calculation above is one example. A
-``half'' directional derivative, shown below, is another example.
-
-\code
-1 NeighborhoodIterator::RadiusType radius = {1, 0, 0};
-2 NeighborhoodIterator it(radius, inputImage, regionToProcess)
-3 ImageRegionIterator out( outputImage, regionToProcess );
-4 for (it.SetToBegin(); it != it.End(); ++it, ++out)
-5 {
-6 out.Set( it.GetPixel(3) - it.GetPixel(2) );
-7 }
-\endcode
-
-\par
-In this example the neighborhood is defined as a three pixel strip
-with width along only the first axis. Mapping
-the spatial orientation of neighborhood pixels to the array location is the
-responsibility of the code writer. Some methods such as GetStride(n), which
-returns the stride length in pixels along an axis n, have been provided to help
-in coding algorithms for arbitrary dimensionality. The index of the center
-pixel in a neighborhood is always Size()/2.
-
-\section ImageBoundariesSection Calculations at image boundaries
- For any neighborhood operation, conditions at data set boundaries become
-important. SmartNeighborhoodIterator defines a special class of neighborhood
-iterators that transparently handle boundary conditions. These iterators store
-a boundary condition object that is used to calculate a value of requested
-pixel indicies that lie outside the data set boundary. New boundary condition
-objects can be defined by a user and plugged into SmartNeighboroodIterators as
-is appropriate for their algorithm.
-
-\par
-A SmartNeighborhoodIterator can be used in place of NeighborhoodIterator to
-iterate over an entire image region, but it will incur a penalty on
-performance. For this reason, it is desirable to process the image differently
-over distinct boundary and non-boundary regions. Itk's definition of image regions
-makes this easy to manage. The process is as follows: first apply the
-algorithm over all neighborhoods not on the image boundary using the fast
-NeighborhoodIterator, then process each region on the boundary using the
-SmartNeighborhoodIterator. The size of the boundary regions are defined by the
-radius of the neighborhood that you are using.
-
-\par
-Rewriting the inner product code using this approach looks like the following.
-(Here we are using the default SmartNeighborhoodIterator boundary condition and
-omitting some template parameters for simplicity.)
-
-\code
-typedef NeighborhoodAlgorithm::ImageBoundaryFacesCalculator RegionFinderType;
-
-LaPlacianOperator<double, InputImageType::ImageDimension> OP;
-
-RegionFinderType regionCalculator;
-RegionFinderType::FaceListType regions;
-RegionFinderType::FaceListType::iterator regions_iterator;
-
-regions = regionCalculator( inputImage, regionToProcess, it.GetRadius() );
-regions_iterator = regions.begin();
-
-ImageIterator out;
-
-//
-// Process non-boundary regions normally.
-//
-out = ImageIterator(outputImage, *regions_iterator);
-NeighborhoodIterator it (OP.GetRadius(), inputImage, *regions_iterator);
-NeighborhoodInnerProduct IP;
-out = out.Begin();
-for (it.SetToBegin(); it != it.End(); ++it, ++out)
-{
- out.Set( IP( it, OP) );
-}
-
-//
-// Process each boundary region with boundary conditions.
-//
-SmartNeighborhoodInnerProduct SIP;
-SmartNeighborhoodIterator sit;
-for (regions_iterator++ ; regions_iterator != regions.end(); regions_iterator++)
-{
- out = ImageIterator(outputImage, *regions_iterator);
- sit = SmartNeighborhoodIterator(OP.GetRadius(), inputImage, *regions_iterator);
- for (sit.SetToBegin(); sit != sit.End(); ++sit, ++out)
- {
- out.Set( SIP( sit, OP) );
- }
-}
-\endcode
-
-\par
-The NeighborhoodAlgorithm::ImageBoundaryFacesCalculator is a special function
-object that returns a list of sub-regions, or faces, of an image region. The
-first region in the list corresponds to all the non-boundary pixels in the
-input image region. Subseqent regions in the list represent all of the boundary
-faces of the image (because an image region is defined only by a single index
-and size, no single composite boundary region is possible). The list is
-traversed with an iterator.
-
-\section FurtherInformationSection Further information
-Many filters in Itk use the neighborhood iterators and operators. Some
-canonical examples of their use include the class of
-AnisotropicDiffusionFunctions and the morphological image filters.
-itk::WatershedSegmenter also makes extensive use of the neighborhood
-iterators.
-
-\par
-The best documentation of the API for these objects is are the class
-definitions themselves, since the API is subject to change as the tookit
-matures and is refined.
-
-
-*/
diff --git a/Documentation/Doxygen/Registration.dox b/Documentation/Doxygen/Registration.dox
deleted file mode 100644
index 0adc872ed585824595db91c1c5b9e2930d6cb1e7..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Registration.dox
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
-
-\page RegistrationPage Registration Techniques
-
-\section RegistrationIntroduction Introduction
-
-\b Registration is a technique aimed to align two objects using a
-particular transformation.
-
-A typical example of registration is to have two medical images
-from the same patient taken at different dates. It is very likely
-that the patient assume a different position during each acquisition.
-A registration procedure would allow to take both images and find
-a spatial transformation to find the corresponding pixel from one
-image into the other.
-
-Another typical example of registration is to have a geometrical model
-of an organ, let's say a bone. This model can be used to find the
-corresponding structure in a medical image. In this case, a spatial
-transformation is needed to find the correct location of the structure
-in the image.
-
-
-\section RegistrationFramework ITK Registration Framework
-
-The Insight Toolkit takes full advantage of the power provided by
-generic programming. Thanks to that, it have been possible to create
-an abstraction of the particular problems that the toolkit is intended
-to solve.
-
-The registration problem have been decomposed in a set of basic
-elements. They are:
-
-\li \b Target: the object that is assumed to be static.
-\li \b Reference: the object that will be transformed in order to be superimpossed to the \e Target
-\li \b Transform: the mapping that will conver one point from the \e Reference object space to the \e Target object space.
-\li \b Metric: a measure that indicates how well the \e Target object matches the \e Reference object after transformation.
-\li \b Mapper: the particular technique used for interpolating values when objects are resampled through the \e Transform.
-\li \b Optimizer: the method used to find the \e Transform parameters that optimize the \e Metric.
-
-A particular registration method is defined by selecting specific implemementations of each one of these basic elements.
-In order to determine the registration method appropriated for a particular problem, is will be useful to answer the following questions:
-
-
-
-
-\subsection TargetReference Target and Reference Objects
-
-Currently the Target an Reference objects can be of type \b itkImage and \b itkPointSet. Methods have been instantiated for a variety of <em> Image to Image </em> and <em> PointSet to Image </em> registration cases.
-
-
-
-
-\subsection Transforms Transforms
-This is a rapid description of the transforms implemented in the toolkit
-
-\li \b Affine: The affine transform is N-Dimensional. It is composed of a NxN matrix and a translation vector. The affine transform is a linear transformation that can manage rotations, translations, shearing and scaling.
-
-\li \b Rigid3D: This transform is specific for 3D, it supports only rotations and translations. Rotations are represented using \e Quaternions.
-
-\li \b Rigid3DPerspective: A composition of a \e Rigid3D transform followed by a perpective projection. This transformation is intended to be used in applications like X-Rays projections.
-
-\li \b Translation: A N-Dimensional translation internally represented as a vector.
-
-\li \b Spline: A kernel based spline is used to interpolate a mapping from a pair of point sets.
-
-
-
-
-\subsection RegistrationMetrics Similarity Metrics
-Metrics are probably the most critical element of a registration problem. The metric defines what the goal of the process is, they measure how well the Target object is matched by the Reference object after the transform has been applied to it. The Metric should be selected in function of the types of objects to be registered and the expected kind of missalignment. Some metrics has a rather large capture region, which means that the optimizer will be able to find his way to a maximum even if the missalignment is high. Typicaly large capture regions are associated with low precision for the maximum. Other metrics can provide high precision for the final registration, but usually require to be initialized quite close to the optimal value.
-
-Unfortunately there are no clear rules about how to select a metric, other that trying some of them in different conditions. In some cases could be and advantage to use a particular metric to get an initial approximation of the transformation, and then switch to another more sensitive metric to achieve better precision in the final result.
-
-Metrics are depend on the objects they compare. The toolkit currently offers <em> Image To Image </em> and <em> PointSet to Image </em> metrics as follows:
-
-\li <b> Mean Squares </b> Sum of squared differences between intensity values. It requires the two objects to have intensity values in the same range.
-\li <b> Normalized Correlation </b> Correlation between intensity values divided by the square rooted autocorrelation of both target and reference objects: \f$ \frac{\sum_i^n{a_i * b_i }}{\sum_i^n{a_i^2}\sum_i^n{b_i^2}} \f$. This metric allows to register objects whose intensity values are related by a linear transformation.
-\li <b> Pattern Intensity </b> Squared differences between intensity values transformed by a function of type \f$ \frac{1}{1+x} \f$ and summed them up. This metric has the advantage of increase simultaneously when more samples are available and when intensity values are close.
-\li <b> Mutual Information </b> Mutual information is based in an information theory concept. Mutual information between two sets measures how much can be known from one set if only the other set is known. Given a set of values \f$ A=\{a_i\} \f$. Its entropy \f$ H(A) \f$ is defined by \f$ H(A) = \sum_i^n{- p(a_i) \log({p(a_i)})} \f$ where \f$ p(a_i) \f$ are the probabilities of the values in the set. Entropy can be interpreted as a measure of the mean uncertainty reduction that is obtained when one of the particular values is found during sampling. Given two sets \f$ A=\{a_i\} \f$ and \f$ B=\{b_i\} \f$ its joint entropy is given by the joint probabilities \f$ p_(a_i,b_i) \f$ as \f$ H(A,B) = \sum_i^n{-p(a_i,b_i) * log( p(a_i, b_i) )} \f$. Mutual information is obtained by subtracting the entropy of both sets from the joint entropy, as : \f$ H(A,B)-H(A)-H(B) \f$, and indicates how much uncertainty about one set is reduced by the knowledge of the second set. Mutual information is the metric of choice when image from different modalities need to be registered.
-
-
-\subsection RegistrationOptimizers Optimizers
-The following optimization methods are available:
-
-\li <b> Gradient Descent </b>: Advance following the direction and magnitud of the gradient scaled by a learning rate.
-
-\li <b> Regular Step Gradient Descent </b>: Advances following the direction of the gradient and use a bipartition scheme to compute the step length.
-
-\li <b> Conjugate Gradient </b>: Nonlinear Minimization that optimize search directions using a second order approximation of the cost function.
-
-\li <b> Levenberg Marquardt </b>: Nonlinear Least Squares Minimization
-
-\li <b> LBFGS </b>: Limited Memory Broyden, Fletcher, Goldfarb and Shannon minimization.
-
-\li <b> Amoeba </b>: Nelder Meade Downhill Simplex.
-
-\li <b> One Plus One Evolutionary </b>: Stategy that simulates the biological evolution of a set of samples in the search space.
-
-
-
-\section MultiResolutionRegistration Multiresolution
-
-The evaluation of a metric can be very expensive in computing time. An approach often used to improve performance is to register first reduced resolution versions of the target and reference objects. The resulting transform is used as the starting point for a second registration process performed in progresively higher resolution objects.
-
-It is usual to create first a sequence of reduced resolution version of the objects, this set of objects is called a <em>pyramid representation</em>. A Multiresolution method is basically a set of consecutive registration process, each one performed at a particular level of the pyramid, and using as initial transform the resulting transform of the previous process.
-
-Multiresolution offers the double advantage of increasing performance and at the same time improving the stability of the optimization by smoothing out local minima and increasing the capture region of the process.
-
- */
diff --git a/Documentation/Doxygen/Streaming.dox b/Documentation/Doxygen/Streaming.dox
deleted file mode 100644
index 4c13a1cf3ed972c4c80dc639a6cac2eb4ed8588a..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Streaming.dox
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- \page StreamingPage Streaming
-
- \section StreamingIntroduction Introduction
-
- \image html Streaming.gif "Pipelines can be set up to stream data through filters in small pieces."
-
-
-
-*/
diff --git a/Documentation/Doxygen/Threading.dox b/Documentation/Doxygen/Threading.dox
deleted file mode 100644
index e018e9c4f12b1719b01c12fe44c43ad188711609..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/Threading.dox
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- \page ThreadingPage Threading
-
- \section ThreadingIntroduction Introduction
-
- ITK is designed to run in multiprocessor environments. Many of
- ITK's filters are multithreaded. When a multithreading filter
- executes, it automatically divides the work amongst multiprocessors
- in a shared memory configuration. We call this "Filter Level
- Multithreading". Applications built with ITK can also manage their
- own execution threads. For instance, an application might use one
- thread for processing data and another thread for a user
- interface. We call this "Application Level Multithreading".
-
- \image html Threading.gif "Filters may process their data in multiple threads in a shared memory configuration."
-
- \section FilterThreadSafety Filter Level Multithreading
-
- A multithreaded filter provides an implementation of the
- ThreadedGenerateData() method (see
- itk::ImageSource::ThreadedGenerateData()) as opposed to the
- normal single threaded GenerateData() method (see
- itk::ImageSource::GenerateData()). A superclass of the filter will
- spawn several threads (usually matching the number of processors in
- the system) and call ThreadedGenerateData() in each thread
- specifying the portion of the output that a given thread is
- responsible for generating. For instance, on a dual processor
- computer, an image processing filter will spawn two threads, each
- processing thread will generate one half of the output image, and
- each thread is restricted to writing to separate portions of the
- output image. Note that the "entire" input and "entire" output
- images (i.e. what would be available normally to the GenerateData()
- method, see the discussion on Streaming) are available to each
- call of ThreadedGenerateData(). Each thread is allowed to read
- from anywhere in the input image but each thread can only write to
- its designated portion of the output image.
-
- The output image is a single contiguous block on memory that is
- used for all processing threads. Each thread is informed which
- pixels they are responsible for producing the output values. All
- the threads write to this same block of memory but a given thread
- is only allowed to set specific pixels.
-
- \subsection FilterMemoryAllocation Memory Management
-
- The GenerateData() method is responsible for allocation the output
- bulk data. For an image processing filter, this corresponds to
- calling Allocate() on the output image object. If a filter is
- multithreaded, then it does not provide a GenerateData() method but
- provides a ThreadedGenerateData() method. In this case, a
- superclass' GenerateData() method will allocate the output bulk
- data and call ThreadedGenerateData() for each thread. If a filter
- is not multithreaded, then it must provided its own GenerateData()
- method and allocate the bulk output data (for instance, calling
- Allocate() on an output image) itself.
-
-
- \section ApplicationThreadSafety Application Level Multithreading
-
- ITK applications can be written to have multiple execution threads.
- This is distinct from a given filter dividing its labor across
- multiple execution threads. If the former, the application is
- responsible for spawning the separate execution threads,
- terminating threads, and handling all events
- mechanisms. (itk::MultiThreader can be used to spawn threads and
- terminate threads in a platform independent manner.) In the latter
- case, an individual filter will automatically spawn threads, execute
- an algorithm, and terminate the processing threads.
-
- Care must in taken in setting up an application to have separate
- application level (as opposed to filter level) execution threads.
- Individual ITK objects are not guarenteed to be thread safe. By this
- we mean that a single instance of an object should only be modified
- by a single execution thread. You should not try to modify a single
- instance of an object in multiple execution threads.
-
- ITK is designed so that different instances of the same class can be
- accessed in different execution threads. But multiple threads should
- not attempt to modify a single instance. This granularity of thread
- safety was chosen as a compromise between performance and flexibility.
- If we allow ITK objects to be modified in multiple threads then ITK
- would have to mutex every access to every instance variable of a
- class. This would severly affect performance.
-
- \section NumericsThreadSafety Thread Safety in the Numerics Library
-
- ITK uses a C++ wrapper around the standard NETLIB distributions
- (http://www.netlib.org). These NETLIB distributions were converted
- from FORTRAN to C using the standard f2c converter
- (http://www.netlib.org/f2c/). A cursory glance at the f2c
- generated NETLIB C code yields the impression that the NETLIB code
- is not thread safe (due to COMMON blocks being translated to
- function scope statics). We are still investigating this matter.
-
-
-*/
diff --git a/Documentation/Doxygen/logoVectoriel.png b/Documentation/Doxygen/logoVectoriel.png
deleted file mode 100644
index e2e9725816015d0dd9b5176774f1fbd778cdab4a..0000000000000000000000000000000000000000
Binary files a/Documentation/Doxygen/logoVectoriel.png and /dev/null differ
diff --git a/Documentation/Doxygen/tab_b.gif b/Documentation/Doxygen/tab_b.gif
deleted file mode 100644
index 0d623483ffdf5f9f96900108042a7ab0643fe2a3..0000000000000000000000000000000000000000
Binary files a/Documentation/Doxygen/tab_b.gif and /dev/null differ
diff --git a/Documentation/Doxygen/tab_r.gif b/Documentation/Doxygen/tab_r.gif
deleted file mode 100644
index ce9dd9f533cb5486d6941844f442b59d4a9e9175..0000000000000000000000000000000000000000
Binary files a/Documentation/Doxygen/tab_r.gif and /dev/null differ
diff --git a/Documentation/Doxygen/tabs.css b/Documentation/Doxygen/tabs.css
deleted file mode 100644
index a61552a67ad217c0d67da13e4d3f24c9d2c87119..0000000000000000000000000000000000000000
--- a/Documentation/Doxygen/tabs.css
+++ /dev/null
@@ -1,102 +0,0 @@
-/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
-
-DIV.tabs
-{
- float : left;
- width : 100%;
- background : url("tab_b.gif") repeat-x bottom;
- margin-bottom : 4px;
-}
-
-DIV.tabs UL
-{
- margin : 0px;
- padding-left : 10px;
- list-style : none;
-}
-
-DIV.tabs LI, DIV.tabs FORM
-{
- display : inline;
- margin : 0px;
- padding : 0px;
-}
-
-DIV.tabs FORM
-{
- float : right;
-}
-
-DIV.tabs A
-{
- float : left;
- background : url("tab_r.gif") no-repeat right top;
- border-bottom : 1px solid #84B0C7;
- font-size : x-small;
- font-weight : bold;
- text-decoration : none;
-}
-
-DIV.tabs A:hover
-{
- background-position: 100% -150px;
-}
-
-DIV.tabs A:link, DIV.tabs A:visited,
-DIV.tabs A:active, DIV.tabs A:hover
-{
- color: #1A419D;
-}
-
-DIV.tabs SPAN
-{
- float : left;
- display : block;
- background : url("tab_l.gif") no-repeat left top;
- padding : 5px 9px;
- white-space : nowrap;
-}
-
-DIV.tabs INPUT
-{
- float : right;
- display : inline;
- font-size : 1em;
-}
-
-DIV.tabs TD
-{
- font-size : x-small;
- font-weight : bold;
- text-decoration : none;
-}
-
-
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-DIV.tabs SPAN {float : none;}
-/* End IE5-Mac hack */
-
-DIV.tabs A:hover SPAN
-{
- background-position: 0% -150px;
-}
-
-DIV.tabs LI#current A
-{
- background-position: 100% -150px;
- border-width : 0px;
-}
-
-DIV.tabs LI#current SPAN
-{
- background-position: 0% -150px;
- padding-bottom : 6px;
-}
-
-DIV.nav
-{
- background : none;
- border : none;
- border-bottom : 1px solid #84B0C7;
-}
diff --git a/Documentation/README.txt b/Documentation/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..38f7d2965c4862557e04cb6b0cf41d9d1fa6a0a5
--- /dev/null
+++ b/Documentation/README.txt
@@ -0,0 +1,3 @@
+Please have a look at the OTB-Documents project available at
+http://hg.orfeo-toolbox.org/OTB-Documents/
+
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 4a4281583735c730fcc44368c380b11ff2535d6f..d98255a130b95ef7b9472d29b27e545c3f1a5e7d 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -5,35 +5,34 @@ PROJECT(OTBExamples)
IF(OTB_BINARY_DIR)
# We are building inside the tree.
-SUBDIRS(
- BasicFilters
- FeatureExtraction
- DataRepresentation
- IO
- Filtering
- ChangeDetection
- Learning
- Classification
- Segmentation
- Iterators
- MultiScale
- DisparityMap
- Projections
- Registration
- Radiometry
- SARPolarimetry
- Fusion
- Tutorials
- Markov
- OBIA
-)
+ADD_SUBDIRECTORY(BasicFilters)
+ADD_SUBDIRECTORY(FeatureExtraction)
+ADD_SUBDIRECTORY(DataRepresentation)
+ADD_SUBDIRECTORY(IO)
+ADD_SUBDIRECTORY(Filtering)
+ADD_SUBDIRECTORY(ChangeDetection)
+ADD_SUBDIRECTORY(Learning)
+ADD_SUBDIRECTORY(Classification)
+ADD_SUBDIRECTORY(Segmentation)
+ADD_SUBDIRECTORY(Iterators)
+ADD_SUBDIRECTORY(MultiScale)
+ADD_SUBDIRECTORY(DisparityMap)
+ADD_SUBDIRECTORY(Projections)
+ADD_SUBDIRECTORY(Registration)
+ADD_SUBDIRECTORY(Radiometry)
+ADD_SUBDIRECTORY(SARPolarimetry)
+ADD_SUBDIRECTORY(Fusion)
+ADD_SUBDIRECTORY(Tutorials)
+ADD_SUBDIRECTORY(Markov)
+ADD_SUBDIRECTORY(OBIA)
+
IF(OTB_USE_VISU_GUI)
- SUBDIRS(Visu)
+ ADD_SUBDIRECTORY(Visu)
ENDIF(OTB_USE_VISU_GUI)
IF(OTB_USE_PATENTED)
- SUBDIRS( Patented )
+ ADD_SUBDIRECTORY( Patented )
ENDIF(OTB_USE_PATENTED)
#Recopie du fichier README.txt dans l'arborescence BINARY
@@ -64,34 +63,32 @@ ELSE(OTB_BINARY_DIR)
FIND_PACKAGE(OTB)
IF(OTB_FOUND)
INCLUDE(${OTB_USE_FILE})
- SUBDIRS(
- BasicFilters
- FeatureExtraction
- DataRepresentation
- IO
- Filtering
- ChangeDetection
- Learning
- Classification
- Segmentation
- Iterators
- MultiScale
- DisparityMap
- Registration
- Radiometry
- SARPolarimetry
- Fusion
- Tutorials
- Markov
- OBIA
- )
+ ADD_SUBDIRECTORY(BasicFilters)
+ ADD_SUBDIRECTORY(FeatureExtraction)
+ ADD_SUBDIRECTORY(DataRepresentation)
+ ADD_SUBDIRECTORY(IO)
+ ADD_SUBDIRECTORY(Filtering)
+ ADD_SUBDIRECTORY(ChangeDetection)
+ ADD_SUBDIRECTORY(Learning)
+ ADD_SUBDIRECTORY(Classification)
+ ADD_SUBDIRECTORY(Segmentation)
+ ADD_SUBDIRECTORY(Iterators)
+ ADD_SUBDIRECTORY(MultiScale)
+ ADD_SUBDIRECTORY(DisparityMap)
+ ADD_SUBDIRECTORY(Registration)
+ ADD_SUBDIRECTORY(Radiometry)
+ ADD_SUBDIRECTORY(SARPolarimetry)
+ ADD_SUBDIRECTORY(Fusion)
+ ADD_SUBDIRECTORY(Tutorials)
+ ADD_SUBDIRECTORY(Markov)
+ ADD_SUBDIRECTORY(OBIA)
IF(OTB_USE_VISU_GUI)
- SUBDIRS(Visu)
+ ADD_SUBDIRECTORY(Visu)
ENDIF(OTB_USE_VISU_GUI)
IF(OTB_USE_PATENTED)
- SUBDIRS( Patented )
+ ADD_SUBDIRECTORY( Patented )
ENDIF(OTB_USE_PATENTED)
ELSE(OTB_FOUND)
MESSAGE("OTB not found. Please set OTB_DIR")
diff --git a/Examples/Classification/KMeansImageClassificationExample.cxx b/Examples/Classification/KMeansImageClassificationExample.cxx
index 5d5983cff0edd7d8c8941ab4ce6ea429629730dd..ae6d77bb83eab3a533d560aec9d17a1d7ee8fd13 100644
--- a/Examples/Classification/KMeansImageClassificationExample.cxx
+++ b/Examples/Classification/KMeansImageClassificationExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/Classification/SOMImageClassificationExample.cxx b/Examples/Classification/SOMImageClassificationExample.cxx
index 940f75855701138d824eaa73ae9564956c4340df..18c17d76e90e6ebd385a51e598740f3f9eb00512 100644
--- a/Examples/Classification/SOMImageClassificationExample.cxx
+++ b/Examples/Classification/SOMImageClassificationExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
// Software Guide : BeginLatex
diff --git a/Examples/Classification/SVMImageClassifierExample.cxx b/Examples/Classification/SVMImageClassifierExample.cxx
index 22fe02a96429b33122f3a75516faeeb8226c36b4..6f07a20ac2ef6b7f8f806b82088dd27dbaf6349d 100644
--- a/Examples/Classification/SVMImageClassifierExample.cxx
+++ b/Examples/Classification/SVMImageClassifierExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/DataRepresentation/CMakeLists.txt b/Examples/DataRepresentation/CMakeLists.txt
index af9cf4a8812b74718a478a364b51ae1326ee335a..0244adc48864c550567371794be9acf7b74834fa 100644
--- a/Examples/DataRepresentation/CMakeLists.txt
+++ b/Examples/DataRepresentation/CMakeLists.txt
@@ -1,6 +1,4 @@
-SUBDIRS(
- Containers
- Image
- Mesh
- Path
- )
+ADD_SUBDIRECTORY(Containers)
+ADD_SUBDIRECTORY(Image)
+ADD_SUBDIRECTORY(Mesh)
+ADD_SUBDIRECTORY(Path)
diff --git a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
index 4b3650443259b9576b1618482f4931485f69fe96..843d9e09384ccdf01c053ca70f1a005f94a1e3e9 100644
--- a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
+++ b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
@@ -69,7 +69,7 @@ int main (int argc, char* argv[])
if (argc!= 12)
{
std::cerr <<"Usage: "<<argv[0];
- std::cerr<<"fixedFileName movingFileName fieldOutName imageOutName ";
+ std::cerr<<" fixedFileName movingFileName fieldOutName imageOutName ";
std::cerr<<"pointSetStepX pointSetStepY explorationSize windowSize learningRate ";
std::cerr<<"nbIterations metricThreshold";
diff --git a/Examples/FeatureExtraction/EdgeDensityExample.cxx b/Examples/FeatureExtraction/EdgeDensityExample.cxx
index e280b433ac9e0dc708200b692d77b8e0f2a15e20..c8f97e264d82c5ae257454caa1c2a28a40dc1a41 100644
--- a/Examples/FeatureExtraction/EdgeDensityExample.cxx
+++ b/Examples/FeatureExtraction/EdgeDensityExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
index 87acc6563a36447cf0fe1d2dea57bb2c28cd8884..2a8ef7d3d2f32e17fa70e6705713ea13dc5cd17f 100644
--- a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
+++ b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/FeatureExtraction/SIFTDensityExample.cxx b/Examples/FeatureExtraction/SIFTDensityExample.cxx
index dcb678bf861b71271a5544cc8e3d4d7b9276aea4..3c6bb1bbbf15d3f5b4cb5b63e814da91bbb35ef9 100644
--- a/Examples/FeatureExtraction/SIFTDensityExample.cxx
+++ b/Examples/FeatureExtraction/SIFTDensityExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/FeatureExtraction/SIFTExample.cxx b/Examples/FeatureExtraction/SIFTExample.cxx
index df63d7d7e8a272fac8eecb967d7345adfaeeb9ef..20475072f9a964d55045ad4c804f6048dae31fba 100644
--- a/Examples/FeatureExtraction/SIFTExample.cxx
+++ b/Examples/FeatureExtraction/SIFTExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/FeatureExtraction/SIFTFastExample.cxx b/Examples/FeatureExtraction/SIFTFastExample.cxx
index 725c82f5a347582d5bb5ae8d3412439f4d1e00a0..9a2097fc0649cc3e7ebd69e405cbe45fbd8be246 100644
--- a/Examples/FeatureExtraction/SIFTFastExample.cxx
+++ b/Examples/FeatureExtraction/SIFTFastExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
// Software Guide : BeginCommandLineArgs
diff --git a/Examples/FeatureExtraction/SURFExample.cxx b/Examples/FeatureExtraction/SURFExample.cxx
index 329cb2b4612fb958e2bf01be25acaa4bfebae1d6..473c1fb3d0237f576c4f340dc252776686c4297d 100644
--- a/Examples/FeatureExtraction/SURFExample.cxx
+++ b/Examples/FeatureExtraction/SURFExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
// Software Guide : BeginCommandLineArgs
diff --git a/Examples/IO/TileMapImageIOExample.cxx b/Examples/IO/TileMapImageIOExample.cxx
index a7ea1f376185a95ba78b35ef5203eeb4f07e5405..e6bb490179137385ce381544a22ab892eb1ce93f 100644
--- a/Examples/IO/TileMapImageIOExample.cxx
+++ b/Examples/IO/TileMapImageIOExample.cxx
@@ -96,10 +96,10 @@ int main( int argc, char* argv[] )
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
- typedef itk::RGBPixel<unsigned char> RGBPixelType;
- typedef otb::Image<RGBPixelType, 2> ImageType;
+ typedef itk::RGBPixel<unsigned char> RGBPixelType;
+ typedef otb::Image<RGBPixelType, 2> ImageType;
typedef otb::ImageFileReader<ImageType> ReaderType;
- typedef otb::TileMapImageIO ImageIOType;
+ typedef otb::TileMapImageIO ImageIOType;
ImageIOType::Pointer tileIO = ImageIOType::New();
ReaderType::Pointer readerTile = ReaderType::New();
@@ -117,7 +117,7 @@ int main( int argc, char* argv[] )
// that's why we don't want to do an update before extracting a specific
// area.
//
- // The coordinates are refered with an origin at the North Pole and the
+ // The coordinates are referred with an origin at the North Pole and the
// change date meridian in Mercator projection. So we need to translate the latitude
// and the longitude in this funny coordinate system:
//
diff --git a/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx b/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx
index 346452b1b8ba19906094dc06c2f5e5325a77df12..b847bbf64cea927d1f9a132d9dec35586b6babe3 100644
--- a/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidAnalysisFilterExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
index 53a874eafdb255f16ce9c17e91478a323c843b86..593a3478aa9597d0f36a533149da42bc0e152b77 100644
--- a/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidSegmentationExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx b/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx
index 659c7c127eed8a9a2f606bd10f638fe9485d9ade..077207dceabb86f4a29209c8e7b67744905e5545 100644
--- a/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidSegmenterExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx b/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx
index 2bb0ada2c02db9737aa22edc94aa16b4c8c71d55..7512e7ed68f886423a2c9ab78f2076a924d9a3a3 100644
--- a/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx
+++ b/Examples/MultiScale/MorphologicalPyramidSynthesisFilterExample.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Examples/OBIA/KeepNObjects.cxx b/Examples/OBIA/KeepNObjects.cxx
index c4cdd82790a5680e1d0dc2d25149735f6eddfda6..a065cc89ec60a0f16aa32892d44edca5c286773c 100644
--- a/Examples/OBIA/KeepNObjects.cxx
+++ b/Examples/OBIA/KeepNObjects.cxx
@@ -19,7 +19,7 @@
// Software Guide : BeginCommandLineArgs
// INPUTS: {MSLabeledOutput.tif}
-// OUTPUTS: {OBIAShapeAttribute.txt}
+// OUTPUTS: {OBIAShapeAttribute1.txt}
// Software Guide : EndCommandLineArgs
// Software Guide : BeginLatex
diff --git a/Examples/Projections/CMakeLists.txt b/Examples/Projections/CMakeLists.txt
index f627e3b621ffc38ee0daef5157327736e4c8ca77..b0d60fa5a11df9dfcb88abe0f484d8672fdaf0eb 100644
--- a/Examples/Projections/CMakeLists.txt
+++ b/Examples/Projections/CMakeLists.txt
@@ -116,8 +116,12 @@ ADD_TEST(prTePlaceNameToLonLatExampleTest ${EXE_TESTS2}
Toulouse
)
ADD_TEST(prTeCoordinateToNameExampleTest ${EXE_TESTS2}
+ --compare-ascii ${TOL}
+ ${BASELINE}/CoordinateToNameExample.txt
+ ${TEMP}/CoordinateToNameExample.txt
CoordinateToNameExampleTest
103.78 1.29
+ ${TEMP}/CoordinateToNameExample.txt
)
ENDIF( OTB_USE_CURL )
diff --git a/Examples/Projections/CoordinateToNameExample.cxx b/Examples/Projections/CoordinateToNameExample.cxx
index 727eaad4ef80475b9d1073815190d017889964fd..bdc7f5628172587af7727f3de89c1afcb32b4868 100644
--- a/Examples/Projections/CoordinateToNameExample.cxx
+++ b/Examples/Projections/CoordinateToNameExample.cxx
@@ -19,21 +19,22 @@
#pragma warning ( disable : 4786 )
#endif
+#include <fstream>
#include "otbCoordinateToName.h"
-
int main( int argc, char* argv[] )
{
- if (argc!=3)
+ if (argc!=4)
{
- std::cout << argv[0] <<" <lon> <lat>"
+ std::cout << argv[0] <<" <lon> <lat> <outputfile>"
<< std::endl;
return EXIT_FAILURE;
}
+ const char * outFileName = argv[3];
otb::CoordinateToName::Pointer conv = otb::CoordinateToName::New();
conv->SetLon(atof(argv[1]));
@@ -46,6 +47,11 @@ int main( int argc, char* argv[] )
std::cout << "Nearby place: " << name << std::endl;
std::cout << "Country: " << country << std::endl;
+ std::ofstream file;
+ file.open(outFileName);
+ file << "Nearby place: " << name << std::endl;
+ file << "Country: " << country << std::endl;
+ file.close();
return EXIT_SUCCESS;
diff --git a/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.cxx b/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.cxx
index 9e7b2ca0a339f9a7fbee5ff9025f28c608174e23..3be5498438a589b5d2e359b06155c5af459f644d 100644
--- a/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.cxx
+++ b/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.h b/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.h
index 0af1c5a61a2c0fc24c43cedea458e007280389ae..3108bf22d1a0762883f1bc95d2425c4ad044524d 100644
--- a/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.h
+++ b/Examples/Tutorials/BasicApplication/Common/otbMsgReporter.h
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbMsgReporter_h
diff --git a/I18n/otb-fr.po b/I18n/otb-fr.po
index a71885dcd8adce72443ccf5dacf32ec5fa9becb8..a6e4c48ad58a23a383162e4b60b8b8d77f688b93 100644
--- a/I18n/otb-fr.po
+++ b/I18n/otb-fr.po
@@ -8,9 +8,10 @@ msgid ""
msgstr ""
"Project-Id-Version: otb-fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-23 06:36+1100\n"
-"PO-Revision-Date: 2009-10-23 23:41+1100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2009-11-10 14:44+0800\n"
+"PO-Revision-Date: 2009-12-01 14:17+0800\n"
+"Last-Translator: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>"
+"\n"
"Language-Team: American English <kde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,1118 +19,1131 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.0\n"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:21
#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:42
#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:42
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:70
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:91
+#: Pireo/PireoViewerGUI.cxx:229
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:252
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:21
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:65
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:168
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:70
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:70
#: Classification/otbSupervisedClassificationAppliGUI.cxx:107
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:93
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:70
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:168
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:65
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:44
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:86
+#: Code/Application/otbMonteverdiViewGUI.cxx:148
msgid "File"
msgstr "Fichier"
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:43
-#: OrthoRectif/otbOrthoRectifGUI.cxx:417
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:181
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:57
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:71
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:92
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:253
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1185
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:43
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:273
-#: OrthoFusion/otbOrthoFusionGUI.cxx:445
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:169
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:71
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:108
-#: LandCoverMap/otbLandCoverMapView.cxx:68
-msgid "Open image"
-msgstr "Ouvrir image"
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:44
-msgid "Save label image"
-msgstr "Sauver image resultat"
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:45
-msgid "Save Polygon"
-msgstr "Sauver polygones"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:22
+msgid "Open stereoscopic couple"
+msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:46
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:46
-#: OrthoRectif/otbOrthoRectifGUI.cxx:447
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:23
+#: LandCoverMap/otbLandCoverMapView.cxx:124
+#: OrthoFusion/otbOrthoFusionGUI.cxx:475
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:221
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:493
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:538
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:46
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:46
#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:66
#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:465
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:76
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:95
+#: Pireo/PireoViewerGUI.cxx:237
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:255
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:76
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:117
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:46
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1901
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:80
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:172
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:221
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:493
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:538
+#: OrthoRectif/otbOrthoRectifGUI.cxx:447
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:73
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:313
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:522
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:577
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:23
-#: OrthoFusion/otbOrthoFusionGUI.cxx:475
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:73
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:172
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:80
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:117
-#: LandCoverMap/otbLandCoverMapView.cxx:124
-#: Code/Modules/otbViewerModuleGroup.cxx:567
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:54
-#: Code/Modules/otbWriterViewGroup.cxx:283
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:49
#: Code/Modules/otbOrthorectificationGUI.cxx:368
-#: Code/Modules/otbProjectionGroup.cxx:455
+#: Code/Modules/otbWriterViewGroup.cxx:284
+#: Code/Modules/otbViewerModuleGroup.cxx:496
+#: Code/Modules/otbViewerModuleGroup.cxx:567
msgid "Quit"
msgstr "Quitter"
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:126
-msgid "Object Counting Application"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:169
+msgid "Stereoscopic viewer"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:133
-msgid "Extract"
-msgstr "Extraire"
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:146
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:195
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:406
-msgid "Minimap"
-msgstr ""
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:176
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:292
+#: Pireo/PireoViewerGUI.cxx:738 Pireo/PireoViewerGUI.cxx:767
+msgid "Image"
+msgstr "Image"
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:147
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:348
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:407
-#: Common/otbMsgReporterGUI.cxx:15 Code/Common/otbMsgReporterGUI.cxx:15
-msgid "Navigate through the image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:177
+msgid ""
+"This area shows the main stereoscopic couple. To activate the sub-window "
+"mode, draw a rectangle with the middle mouse button pressed"
msgstr ""
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:198
#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:155
#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:215
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:198
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:328
msgid "Parameters"
msgstr "Parametres"
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:161
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:121
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:105
-msgid "SVM"
-msgstr "SVM"
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:162
-msgid "Use SVM for Classification"
-msgstr ""
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:170
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:232
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:595
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:557
-msgid "Spectral Angle"
-msgstr "Angle Spectral"
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:171
-msgid "Use Spectral Angle for Classification"
-msgstr ""
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:178
-msgid "Use Smoothing"
-msgstr ""
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:179
-msgid "Smooth input image before working"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:204
+msgid "Zoom in interpolator"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:186
-msgid "Minimum Object Size"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:205
+msgid "Choose the interpolator used when resample factor is less than 1"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:187
-msgid "Minimum Region Size"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:215
+msgid "Zoom out interpolator"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:196
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:671
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:633
-msgid "Mean Shift"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:216
+msgid "Choose the interpolator used when resample factor is more than 1"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:203
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1704
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1656
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:86
-msgid "Spatial Radius"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:226
+msgid "Magnify"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:212
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1711
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1663
-msgid "Range Radius"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:227
+msgid "Magnify the scene (nearest neighbours interpolation)"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:221
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1726
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1678
-msgid "Scale"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:242
+msgid "Resample"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:240
-msgid "Reference Pixel"
-msgstr "Pixel De Reference"
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:247
-msgid "Threshold Value"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:243
+msgid "Resample the scene"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:259
-msgid "Nu (svm) "
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:258
+#: Pireo/RegistrationParametersGUI.cxx:732
+#: Pireo/RegistrationParametersGUI.cxx:749
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1302
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1254
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:360
+#: Code/Modules/otbViewerModuleGroup.cxx:471
+msgid "X"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:260
-msgid "SVM Classifier margin"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:285
+msgid "Main visualization"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:270
-#: OrthoRectif/otbOrthoRectifGUI.cxx:497
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:289
-#: OrthoFusion/otbOrthoFusionGUI.cxx:525
-msgid "Preview"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:286
+msgid "Choose the couple to view"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:271
-msgid "Run over the extracted image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:292
+msgid "Main stereoscopic couple"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:279
-msgid "Statistics "
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:305
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:374
+msgid "Show left image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:43
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:396
-msgid "Open image pair"
-msgstr "Ouvrir une pair d'image"
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:44
-msgid "Save deformation field"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:314
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:383
+msgid "show right image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:45
-msgid "Save registered image"
-msgstr "Sauver l'image recalee"
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:167
-msgid "Fine registration application"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:323
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:392
+msgid "Show anaglyph"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:174
-msgid "Images"
-msgstr "Images"
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:175
-msgid ""
-"This area displays a color composition of the fixed image, the moving image "
-"and the resampled image"
-msgstr ""
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:333
+msgid "Normalization (%)"
+msgstr "Normalisation (%)"
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:196
-msgid ""
-"This area allows to navigate through large images. Displays an anaglyph "
-"composition of the fixed and the moving image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:353
+msgid "Insight"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:205
-msgid "Deformation field"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:354
+msgid "Choose the couple to view in the insight sub-window mode"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:206
-msgid ""
-"This area shows a color composition of the deformation field values in X, Y "
-"and intensity. To display the deformation field, please trigger the run "
-"button"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:361
+msgid "Insight tereoscopic couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:216
-msgid "This area allows you to tune parameters from the registration algorithm"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:406
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:146
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:195
+msgid "Minimap"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:222
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:82
-#: Segmentation/otbPreprocessingViewGroup.cxx:71
-msgid "Number of iterations"
-msgstr "Nombre d'iterations"
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:223
-msgid ""
-"Allows you to tune the number of iterations of the registration algorithm"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:407
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:147
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:343
+#: Common/otbMsgReporterGUI.cxx:15 Code/Common/otbMsgReporterGUI.cxx:15
+msgid "Navigate through the image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:232
-msgid "X NCC radius"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:415
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:480
+msgid "Rename couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:233
-msgid ""
-"Allows you to tune the radius used to compute the normalized correlation in "
-"the first image direction"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:416
+msgid "Rename the selected couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:243
-msgid "Y NCC radius"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:425
+msgid "Open Stereoscopic couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:244
-msgid ""
-"Allows you to tune the radius used to compute the normalized correlation in "
-"the second image direction"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:254
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:397
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:469
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:381
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:79
-msgid "Run"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:255
-msgid ""
-"This button allows you to run the deformation field estimation on the image "
-"region displayed in the \"Images\" area"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:265
-msgid "X Max"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:266
-msgid ""
-"This algorithm allows you to tune the maximum deformation in the first image "
-"direction. This is used to handle a security margin when streaming the "
-"algorithm on huge images"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:281
-msgid "Y Max"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:282
-msgid ""
-"This algorithm allows you to tune the maximum deformation in the second "
-"image direction. This is used to handle a security margin when streaming the "
-"algorithm on huge images"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:300
-msgid "Images color composition"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:301
-msgid ""
-"This area allows you to select the color composition displayed in the "
-"\"Images\" area"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:308
-msgid "Fixed"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:309
-msgid "Show or hide the fixed image in the color composition"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:320
-msgid "Moving"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:321
-msgid "Show or hide the moving image in the color composition"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:332
-msgid "Resampled"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:333
-msgid ""
-"Show or hide the resampled image in the color composition. If there is no "
-"deformation field computed yet, the resampled image is the moving image"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:347
-msgid "Deformation field color composition"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:354
-msgid "X deformation"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:355
-msgid ""
-"Show or hide the deformation in the first image direction in the color "
-"composition"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:367
-msgid "Y deformation"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:368
-msgid ""
-"Show or hide the deformation in the second image direction in the color "
-"composition"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:380
-msgid "Intensity"
-msgstr "Intensite"
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:381
-msgid "Show or hide the deformation intensity iin the color composition"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:403
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:432
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:493
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:379
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:470
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:398
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:314
+#: Pireo/PreProcessParametersGUI.cxx:200 Pireo/PireoViewerGUI.cxx:665
+#: Pireo/PireoViewerGUI.cxx:694 Pireo/PireoViewerGUI.cxx:728
+#: Pireo/PireoViewerGUI.cxx:757 Pireo/RegistrationParametersGUI.cxx:1289
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1166
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:415
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:432
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:493
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:620
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:751
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:470
#: Classification/otbSupervisedClassificationAppliGUI.cxx:831
#: Classification/otbSupervisedClassificationAppliGUI.cxx:915
-#: Code/Application/otbInputViewGroup.cxx:42
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:620
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:751
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:379
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:415
#: Code/Application/otbMonteverdiViewGroup.cxx:129
#: Code/Application/otbMonteverdiViewGroup.cxx:159
#: Code/Application/otbMonteverdiViewGroup.cxx:204
-#: Code/Modules/otbExtractROIModuleGUI.cxx:35
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:814
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:898
-#: Code/Modules/otbWriterModuleGUI.cxx:50
+#: Code/Application/otbInputViewGroup.cxx:42
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1837
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:71
#: Code/Modules/otbReaderModuleGUI.cxx:66
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:509
+#: Code/Modules/otbExtractROIModuleGUI.cxx:42
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:805
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:889
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:71
+#: Code/Modules/otbWriterModuleGUI.cxx:50
+#: Code/Modules/otbKMeansModuleGUI.cxx:43
msgid "Cancel"
msgstr "Annuler"
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:411
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:440
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:486
+#: LandCoverMap/otbLandCoverMapView.cxx:113
+#: OrthoFusion/otbOrthoFusionGUI.cxx:465
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:361
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:460
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:406
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:472
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:306
+#: Pireo/PireoViewerGUI.cxx:657 Pireo/PireoViewerGUI.cxx:686
+#: Pireo/PireoViewerGUI.cxx:720 Pireo/PireoViewerGUI.cxx:749
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1157
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:397
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:440
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:486
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:610
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:741
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:460
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:722
#: Classification/otbSupervisedClassificationAppliGUI.cxx:816
#: Classification/otbSupervisedClassificationAppliGUI.cxx:904
-#: Code/Application/otbInputViewGroup.cxx:34
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:610
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:741
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:361
+#: OrthoRectif/otbOrthoRectifGUI.cxx:437
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:397
#: Code/Application/otbMonteverdiViewGroup.cxx:121
#: Code/Application/otbMonteverdiViewGroup.cxx:167
#: Code/Application/otbMonteverdiViewGroup.cxx:212
-#: Code/Modules/otbExtractROIModuleGUI.cxx:27
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:799
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:887
+#: Code/Application/otbInputViewGroup.cxx:34
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:114
+#: Code/Modules/otbExtractROIModuleGUI.cxx:34
+#: Code/Modules/otbOrthorectificationGUI.cxx:359
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:790
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:878
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:63
#: Code/Modules/otbViewerModuleGroup.cxx:353
#: Code/Modules/otbViewerModuleGroup.cxx:483
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:63
+#: Code/Modules/otbViewerModuleGroup.cxx:574
+#: Code/Modules/otbKMeansModuleGUI.cxx:35
msgid "Ok"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:419
-msgid "Fixed image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:448
+msgid "Left image "
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:426
-msgid "Moving image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:455
+msgid "Right image "
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:433
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:441
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:560
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:573
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:462
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:470
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:428
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:436
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1093
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1102
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1111
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1120
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1144
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:462
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:470
-#: Code/Modules/otbWriterModuleGUI.cxx:58
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:560
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:573
+#: Code/Modules/otbReaderModuleGUI.cxx:74
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:499
#: Code/Modules/otbSuperimpositionModuleGUI.cxx:79
#: Code/Modules/otbWriterViewGroup.cxx:172
-#: Code/Modules/otbReaderModuleGUI.cxx:74
+#: Code/Modules/otbWriterModuleGUI.cxx:58
msgid "..."
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:89 OrthoFusion/otbOrthoFusionGUI.cxx:117
-#: Code/Modules/otbOrthorectificationGUI.cxx:88
-#: Code/Modules/otbProjectionGroup.cxx:165
-#: Code/Modules/otbProjectionGroup.cxx:311
-msgid "UTM"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:500
+msgid "Couple name: "
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:90 OrthoFusion/otbOrthoFusionGUI.cxx:118
-#: Code/Modules/otbOrthorectificationGUI.cxx:89
-#: Code/Modules/otbProjectionGroup.cxx:166
-#: Code/Modules/otbProjectionGroup.cxx:312
-msgid "LAMBERT2"
+#: LandCoverMap/otbLandCoverMapView.cxx:43
+msgid "Land Cover Map Application"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:91 OrthoFusion/otbOrthoFusionGUI.cxx:119
-#: Code/Modules/otbOrthorectificationGUI.cxx:90
-#: Code/Modules/otbProjectionGroup.cxx:167
-#: Code/Modules/otbProjectionGroup.cxx:313
-msgid "TRANSMERCATOR"
+#: LandCoverMap/otbLandCoverMapView.cxx:51
+#: LandCoverMap/otbLandCoverMapView.cxx:82
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:543
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1786
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1735
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:519
+#: Code/Modules/otbWriterViewGroup.cxx:193
+msgid "Tools for classification"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:284 OrthoFusion/otbOrthoFusionGUI.cxx:312
-#: Code/Modules/otbOrthorectificationGUI.cxx:249
-#: Code/Modules/otbProjectionGroup.cxx:432
-msgid "Linear"
+#: LandCoverMap/otbLandCoverMapView.cxx:59
+msgid "Input Image Name"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:285 OrthoFusion/otbOrthoFusionGUI.cxx:313
-#: Code/Modules/otbOrthorectificationGUI.cxx:250
-#: Code/Modules/otbProjectionGroup.cxx:433
-msgid "Nearest"
-msgstr ""
+#: LandCoverMap/otbLandCoverMapView.cxx:68
+#: OrthoFusion/otbOrthoFusionGUI.cxx:445
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:181
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:43
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:57
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:92
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:253
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1185
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:71
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:108
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:43
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:71
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:169
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:181
+#: OrthoRectif/otbOrthoRectifGUI.cxx:417
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:273
+msgid "Open image"
+msgstr "Ouvrir image"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:286 OrthoFusion/otbOrthoFusionGUI.cxx:314
-#: Code/Modules/otbOrthorectificationGUI.cxx:251
-#: Code/Modules/otbProjectionGroup.cxx:434
-msgid "SinC"
-msgstr ""
+#: LandCoverMap/otbLandCoverMapView.cxx:69
+msgid "Open a new input image"
+msgstr "Ouvrir une nouvelle image d'entree"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:333 OrthoFusion/otbOrthoFusionGUI.cxx:361
-#: Code/Modules/otbOrthorectificationGUI.cxx:298
-#: Code/Modules/otbProjectionGroup.cxx:360
-msgid "Blackman"
+#: LandCoverMap/otbLandCoverMapView.cxx:90
+msgid "Input Model Name"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:334 OrthoFusion/otbOrthoFusionGUI.cxx:362
-#: Code/Modules/otbOrthorectificationGUI.cxx:299
-#: Code/Modules/otbProjectionGroup.cxx:361
-msgid "Cosine"
-msgstr ""
+#: LandCoverMap/otbLandCoverMapView.cxx:100
+msgid "Load model"
+msgstr "Charger modele"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:335 OrthoFusion/otbOrthoFusionGUI.cxx:363
-#: Code/Modules/otbOrthorectificationGUI.cxx:300
-#: Code/Modules/otbProjectionGroup.cxx:362
-msgid "Gaussian"
-msgstr ""
+#: LandCoverMap/otbLandCoverMapView.cxx:101
+msgid "Open a new input model"
+msgstr "Ouvrir un nouveau modele"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:336 OrthoFusion/otbOrthoFusionGUI.cxx:364
-#: Code/Modules/otbOrthorectificationGUI.cxx:301
-#: Code/Modules/otbProjectionGroup.cxx:363
-msgid "Hamming"
+#: LandCoverMap/otbLandCoverMapView.cxx:114
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1869
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1816
+#: Code/Modules/otbWriterViewGroup.cxx:274
+msgid "Save the Composition"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:337 OrthoFusion/otbOrthoFusionGUI.cxx:365
-#: Code/Modules/otbOrthorectificationGUI.cxx:302
-#: Code/Modules/otbProjectionGroup.cxx:364
-msgid "Lanczos"
-msgstr ""
+#: LandCoverMap/otbLandCoverMapView.cxx:125
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1902
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1838
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:305
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:317
+#: Code/Modules/otbWriterViewGroup.cxx:285
+msgid "Quit Application"
+msgstr "Quitter"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:338 OrthoFusion/otbOrthoFusionGUI.cxx:366
-#: Code/Modules/otbOrthorectificationGUI.cxx:303
-#: Code/Modules/otbProjectionGroup.cxx:365
-msgid "Welch"
-msgstr ""
+#: LandCoverMap/otbLandCoverMapView.cxx:135
+msgid "Scroll image"
+msgstr "Image de navigation"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:411
-msgid "otbOrthoRectif"
+#: LandCoverMap/otbLandCoverMapView.cxx:142
+msgid "Feature selection"
+msgstr "Selection des attributs"
+
+#: LandCoverMap/otbLandCoverMapView.cxx:152
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:442
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:430
+msgid "Opacity"
+msgstr "Opacite"
+
+#: LandCoverMap/otbLandCoverMapView.cxx:164
+#, fuzzy
+msgid "Full resolution image"
+msgstr "Image Pleine Resolution"
+
+#: LandCoverMap/otbLandCoverMapView.cxx:171
+msgid "Nomenclature"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:418
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:182
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:274
-#: OrthoFusion/otbOrthoFusionGUI.cxx:446
-msgid "Open an image in a new image viewer"
+#: LandCoverMap/otbLandCoverMapView.cxx:175
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:632
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:594
+msgid "Vegetation"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:427
+#: LandCoverMap/otbLandCoverMapView.cxx:184
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:659
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:621
+msgid "Water"
+msgstr ""
+
+#: LandCoverMap/otbLandCoverMapView.cxx:193
+msgid "Built-up area"
+msgstr ""
+
+#: LandCoverMap/otbLandCoverMapView.cxx:202
+msgid "Roads"
+msgstr "Routes"
+
+#: LandCoverMap/otbLandCoverMapView.cxx:211
+msgid "Bare soil"
+msgstr ""
+
+#: LandCoverMap/otbLandCoverMapView.cxx:220
+msgid "Shadows"
+msgstr "Ombres"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:117 OrthoRectif/otbOrthoRectifGUI.cxx:89
+#: Code/Modules/otbProjectionGroup.cxx:99
+#: Code/Modules/otbProjectionGroup.cxx:209
+#: Code/Modules/otbOrthorectificationGUI.cxx:88
+msgid "UTM"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:118 OrthoRectif/otbOrthoRectifGUI.cxx:90
+#: Code/Modules/otbProjectionGroup.cxx:100
+#: Code/Modules/otbProjectionGroup.cxx:210
+#: Code/Modules/otbOrthorectificationGUI.cxx:89
+msgid "LAMBERT2"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:119 OrthoRectif/otbOrthoRectifGUI.cxx:91
+#: Code/Modules/otbProjectionGroup.cxx:101
+#: Code/Modules/otbProjectionGroup.cxx:211
+#: Code/Modules/otbOrthorectificationGUI.cxx:90
+msgid "TRANSMERCATOR"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:312 OrthoRectif/otbOrthoRectifGUI.cxx:284
+#: Code/Modules/otbProjectionGroup.cxx:425
+#: Code/Modules/otbOrthorectificationGUI.cxx:249
+msgid "Linear"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:313 OrthoRectif/otbOrthoRectifGUI.cxx:285
+#: Code/Modules/otbProjectionGroup.cxx:426
+#: Code/Modules/otbOrthorectificationGUI.cxx:250
+msgid "Nearest"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:314 OrthoRectif/otbOrthoRectifGUI.cxx:286
+#: Code/Modules/otbProjectionGroup.cxx:427
+#: Code/Modules/otbOrthorectificationGUI.cxx:251
+msgid "SinC"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:361 OrthoRectif/otbOrthoRectifGUI.cxx:333
+#: Code/Modules/otbProjectionGroup.cxx:353
+#: Code/Modules/otbOrthorectificationGUI.cxx:298
+msgid "Blackman"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:362 OrthoRectif/otbOrthoRectifGUI.cxx:334
+#: Code/Modules/otbProjectionGroup.cxx:354
+#: Code/Modules/otbOrthorectificationGUI.cxx:299
+msgid "Cosine"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:363 OrthoRectif/otbOrthoRectifGUI.cxx:335
+#: Code/Modules/otbProjectionGroup.cxx:355
+#: Code/Modules/otbOrthorectificationGUI.cxx:300
+msgid "Gaussian"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:364 OrthoRectif/otbOrthoRectifGUI.cxx:336
+#: Code/Modules/otbProjectionGroup.cxx:356
+#: Code/Modules/otbOrthorectificationGUI.cxx:301
+msgid "Hamming"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:365 OrthoRectif/otbOrthoRectifGUI.cxx:337
+#: Code/Modules/otbProjectionGroup.cxx:357
+#: Code/Modules/otbOrthorectificationGUI.cxx:302
+msgid "Lanczos"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:366 OrthoRectif/otbOrthoRectifGUI.cxx:338
+#: Code/Modules/otbProjectionGroup.cxx:358
+#: Code/Modules/otbOrthorectificationGUI.cxx:303
+msgid "Welch"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:439
+msgid "otbOrthoFusion"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:446
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:182
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:182
+#: OrthoRectif/otbOrthoRectifGUI.cxx:418
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:274
+msgid "Open an image in a new image viewer"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:455
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:191
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:44
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1879
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:191
+#: OrthoRectif/otbOrthoRectifGUI.cxx:427
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:283
-#: OrthoFusion/otbOrthoFusionGUI.cxx:455
msgid "Close image"
msgstr "Fermer image"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:428
+#: OrthoFusion/otbOrthoFusionGUI.cxx:456
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:192
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:192
+#: OrthoRectif/otbOrthoRectifGUI.cxx:428
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:284
-#: OrthoFusion/otbOrthoFusionGUI.cxx:456
msgid "Close the selected image"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:437
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:472
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:722
-#: OrthoFusion/otbOrthoFusionGUI.cxx:465
-#: LandCoverMap/otbLandCoverMapView.cxx:113
-#: Code/Modules/otbViewerModuleGroup.cxx:574
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:114
-#: Code/Modules/otbOrthorectificationGUI.cxx:359
-#: Code/Modules/otbProjectionGroup.cxx:446
-msgid "OK"
-msgstr ""
-
-#: OrthoRectif/otbOrthoRectifGUI.cxx:438 OrthoFusion/otbOrthoFusionGUI.cxx:466
+#: OrthoFusion/otbOrthoFusionGUI.cxx:466 OrthoRectif/otbOrthoRectifGUI.cxx:438
+#: Code/Modules/otbProjectionGroup.cxx:440
#: Code/Modules/otbOrthorectificationGUI.cxx:360
-#: Code/Modules/otbProjectionGroup.cxx:447
msgid "Compute result"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:448
+#: OrthoFusion/otbOrthoFusionGUI.cxx:476
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:222
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:222
+#: OrthoRectif/otbOrthoRectifGUI.cxx:448
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:314
-#: OrthoFusion/otbOrthoFusionGUI.cxx:476 Code/Modules/otbAlgebraGroup.cxx:132
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:55
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:115
#: Code/Modules/otbOrthorectificationGUI.cxx:369
-#: Code/Modules/otbProjectionGroup.cxx:456
+#: Code/Modules/otbAlgebraGroup.cxx:132
msgid "Quit the viewer manager"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:457
+#: OrthoFusion/otbOrthoFusionGUI.cxx:485
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:231
+#: Pireo/PireoViewerGUI.cxx:269
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:231
+#: OrthoRectif/otbOrthoRectifGUI.cxx:457
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:205
-#: OrthoFusion/otbOrthoFusionGUI.cxx:485
msgid "Information"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:458
+#: OrthoFusion/otbOrthoFusionGUI.cxx:486
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:232
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:232
+#: OrthoRectif/otbOrthoRectifGUI.cxx:458
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:206
-#: OrthoFusion/otbOrthoFusionGUI.cxx:486
msgid "Selected image viewer information"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:466
+#: OrthoFusion/otbOrthoFusionGUI.cxx:494
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:239
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:239
+#: OrthoRectif/otbOrthoRectifGUI.cxx:466
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:229
-#: OrthoFusion/otbOrthoFusionGUI.cxx:494
msgid "Show / Hide"
msgstr "Aff./Masq."
-#: OrthoRectif/otbOrthoRectifGUI.cxx:467
+#: OrthoFusion/otbOrthoFusionGUI.cxx:495
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:240
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:240
+#: OrthoRectif/otbOrthoRectifGUI.cxx:467
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:230
-#: OrthoFusion/otbOrthoFusionGUI.cxx:495
msgid "Show or hide the selected image viewer"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:476
+#: OrthoFusion/otbOrthoFusionGUI.cxx:504
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:268
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:268
+#: OrthoRectif/otbOrthoRectifGUI.cxx:476
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:239
-#: OrthoFusion/otbOrthoFusionGUI.cxx:504
msgid "Hide all"
msgstr "Tout masquer"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:477
+#: OrthoFusion/otbOrthoFusionGUI.cxx:505
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:269
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:269
+#: OrthoRectif/otbOrthoRectifGUI.cxx:477
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:240
-#: OrthoFusion/otbOrthoFusionGUI.cxx:505
msgid "Hide all the viewers"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:486
-msgid "Image List"
-msgstr ""
+#: OrthoFusion/otbOrthoFusionGUI.cxx:514
+msgid "Images list"
+msgstr "Liste d'images"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:487
+#: OrthoFusion/otbOrthoFusionGUI.cxx:515
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:279
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:279
+#: OrthoRectif/otbOrthoRectifGUI.cxx:487
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:214
-#: OrthoFusion/otbOrthoFusionGUI.cxx:515
msgid ""
"List of opened image viewer (showed image viewer are prefixed with +, and "
"hidden with -)"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:498
-msgid "Preview Window"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:525
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:289
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:270
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:289
+#: OrthoRectif/otbOrthoRectifGUI.cxx:497
+msgid "Preview"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:516 OrthoFusion/otbOrthoFusionGUI.cxx:578
-#: Code/Modules/otbOrthorectificationGUI.cxx:384
-msgid "Coordinates"
-msgstr "Coordonnees"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:526
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:290
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:290
+msgid "Preview window"
+msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:521
-#: Code/Modules/otbOrthorectificationGUI.cxx:432
-#: Code/Modules/otbProjectionGroup.cxx:761
-msgid "Map Projection"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:538 OrthoFusion/otbOrthoFusionGUI.cxx:550
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1807
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1755
+#: Code/Modules/otbWriterViewGroup.cxx:213
+msgid ">>"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:522 OrthoFusion/otbOrthoFusionGUI.cxx:584
-#: Code/Modules/otbOrthorectificationGUI.cxx:433
-#: Code/Modules/otbProjectionGroup.cxx:591
-#: Code/Modules/otbProjectionGroup.cxx:762
-msgid "Select the map projection type"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:539
+msgid "Add PAN input image"
+msgstr "Ajouter image PAN"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:544 OrthoFusion/otbOrthoFusionGUI.cxx:556
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1818
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1766
+#: Code/Modules/otbWriterViewGroup.cxx:224
+msgid "<<"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:530
-#: Code/Modules/otbOrthorectificationGUI.cxx:441
-#: Code/Modules/otbProjectionGroup.cxx:642
-msgid "Cartographic Coordinates"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:545
+msgid "Remove selected PAN"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:537 OrthoFusion/otbOrthoFusionGUI.cxx:617
-#: Code/Modules/otbOrthorectificationGUI.cxx:448
-#: Code/Modules/otbProjectionGroup.cxx:527
-#: Code/Modules/otbProjectionGroup.cxx:649
-msgid "Zone"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:551
+msgid "Add XS input image"
+msgstr "Ajouter image XS"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:557
+msgid "Remove Selected XS"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:538 OrthoFusion/otbOrthoFusionGUI.cxx:618
-#: Code/Modules/otbOrthorectificationGUI.cxx:449
-#: Code/Modules/otbProjectionGroup.cxx:528
-#: Code/Modules/otbProjectionGroup.cxx:650
-msgid "Enter the zone number"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:562
+msgid "PAN image"
+msgstr "Image PAN"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:563
+msgid "Select a PAN image"
+msgstr "Choisir image PAN"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:567
+msgid "XS image"
+msgstr "Image XS"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:568
+msgid "Select a XS image"
+msgstr "Choisir image XS"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:578 OrthoRectif/otbOrthoRectifGUI.cxx:516
+#: Code/Modules/otbOrthorectificationGUI.cxx:384
+msgid "Coordinates"
+msgstr "Coordonnees"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:583
+msgid "Map projection"
+msgstr "Projection"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:584 OrthoRectif/otbOrthoRectifGUI.cxx:522
+#: Code/Modules/otbProjectionGroup.cxx:503
+#: Code/Modules/otbProjectionGroup.cxx:627
+#: Code/Modules/otbOrthorectificationGUI.cxx:432
+msgid "Select the map projection type"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:592
+#: Code/Modules/otbProjectionGroup.cxx:636
+msgid "Cartographic coordinates"
+msgstr "Coordonnees Cartographique"
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:599 OrthoFusion/otbOrthoFusionGUI.cxx:642
+#: OrthoFusion/otbOrthoFusionGUI.cxx:664 OrthoRectif/otbOrthoRectifGUI.cxx:546
+#: OrthoRectif/otbOrthoRectifGUI.cxx:578 OrthoRectif/otbOrthoRectifGUI.cxx:627
+#: Code/Modules/otbProjectionGroup.cxx:652
+#: Code/Modules/otbProjectionGroup.cxx:684
+#: Code/Modules/otbProjectionGroup.cxx:733
+#: Code/Modules/otbOrthorectificationGUI.cxx:456
+#: Code/Modules/otbOrthorectificationGUI.cxx:488
+#: Code/Modules/otbOrthorectificationGUI.cxx:537
+msgid "Easting"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:546 OrthoRectif/otbOrthoRectifGUI.cxx:578
-#: OrthoRectif/otbOrthoRectifGUI.cxx:627 OrthoFusion/otbOrthoFusionGUI.cxx:599
-#: OrthoFusion/otbOrthoFusionGUI.cxx:642 OrthoFusion/otbOrthoFusionGUI.cxx:664
+#: OrthoFusion/otbOrthoFusionGUI.cxx:600 OrthoFusion/otbOrthoFusionGUI.cxx:643
+#: OrthoFusion/otbOrthoFusionGUI.cxx:665 OrthoRectif/otbOrthoRectifGUI.cxx:547
+#: OrthoRectif/otbOrthoRectifGUI.cxx:579 OrthoRectif/otbOrthoRectifGUI.cxx:628
+#: Code/Modules/otbProjectionGroup.cxx:653
+#: Code/Modules/otbProjectionGroup.cxx:685
+#: Code/Modules/otbProjectionGroup.cxx:734
#: Code/Modules/otbOrthorectificationGUI.cxx:457
#: Code/Modules/otbOrthorectificationGUI.cxx:489
#: Code/Modules/otbOrthorectificationGUI.cxx:538
-#: Code/Modules/otbProjectionGroup.cxx:658
-#: Code/Modules/otbProjectionGroup.cxx:690
-#: Code/Modules/otbProjectionGroup.cxx:739
-msgid "Easting"
+msgid "Enter the easting of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:547 OrthoRectif/otbOrthoRectifGUI.cxx:579
-#: OrthoRectif/otbOrthoRectifGUI.cxx:628 OrthoFusion/otbOrthoFusionGUI.cxx:600
-#: OrthoFusion/otbOrthoFusionGUI.cxx:643 OrthoFusion/otbOrthoFusionGUI.cxx:665
-#: Code/Modules/otbOrthorectificationGUI.cxx:458
-#: Code/Modules/otbOrthorectificationGUI.cxx:490
-#: Code/Modules/otbOrthorectificationGUI.cxx:539
-#: Code/Modules/otbProjectionGroup.cxx:659
-#: Code/Modules/otbProjectionGroup.cxx:691
-#: Code/Modules/otbProjectionGroup.cxx:740
-msgid "Enter the easting of the output image center"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:608 OrthoFusion/otbOrthoFusionGUI.cxx:651
+#: OrthoFusion/otbOrthoFusionGUI.cxx:673 OrthoRectif/otbOrthoRectifGUI.cxx:555
+#: OrthoRectif/otbOrthoRectifGUI.cxx:587 OrthoRectif/otbOrthoRectifGUI.cxx:636
+#: Code/Modules/otbProjectionGroup.cxx:661
+#: Code/Modules/otbProjectionGroup.cxx:693
+#: Code/Modules/otbProjectionGroup.cxx:742
+#: Code/Modules/otbOrthorectificationGUI.cxx:465
+#: Code/Modules/otbOrthorectificationGUI.cxx:497
+#: Code/Modules/otbOrthorectificationGUI.cxx:546
+msgid "Northing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:555 OrthoRectif/otbOrthoRectifGUI.cxx:587
-#: OrthoRectif/otbOrthoRectifGUI.cxx:636 OrthoFusion/otbOrthoFusionGUI.cxx:608
-#: OrthoFusion/otbOrthoFusionGUI.cxx:651 OrthoFusion/otbOrthoFusionGUI.cxx:673
+#: OrthoFusion/otbOrthoFusionGUI.cxx:609 OrthoFusion/otbOrthoFusionGUI.cxx:652
+#: OrthoFusion/otbOrthoFusionGUI.cxx:674 OrthoRectif/otbOrthoRectifGUI.cxx:556
+#: OrthoRectif/otbOrthoRectifGUI.cxx:588 OrthoRectif/otbOrthoRectifGUI.cxx:637
+#: Code/Modules/otbProjectionGroup.cxx:662
+#: Code/Modules/otbProjectionGroup.cxx:694
+#: Code/Modules/otbProjectionGroup.cxx:743
#: Code/Modules/otbOrthorectificationGUI.cxx:466
#: Code/Modules/otbOrthorectificationGUI.cxx:498
#: Code/Modules/otbOrthorectificationGUI.cxx:547
-#: Code/Modules/otbProjectionGroup.cxx:667
-#: Code/Modules/otbProjectionGroup.cxx:699
-#: Code/Modules/otbProjectionGroup.cxx:748
-msgid "Northing"
+msgid "Enter the northing of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:556 OrthoRectif/otbOrthoRectifGUI.cxx:588
-#: OrthoRectif/otbOrthoRectifGUI.cxx:637 OrthoFusion/otbOrthoFusionGUI.cxx:609
-#: OrthoFusion/otbOrthoFusionGUI.cxx:652 OrthoFusion/otbOrthoFusionGUI.cxx:674
-#: Code/Modules/otbOrthorectificationGUI.cxx:467
-#: Code/Modules/otbOrthorectificationGUI.cxx:499
-#: Code/Modules/otbOrthorectificationGUI.cxx:548
-#: Code/Modules/otbProjectionGroup.cxx:668
-#: Code/Modules/otbProjectionGroup.cxx:700
-#: Code/Modules/otbProjectionGroup.cxx:749
-msgid "Enter the northing of the output image center"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:617 OrthoRectif/otbOrthoRectifGUI.cxx:537
+#: Code/Modules/otbProjectionGroup.cxx:521
+#: Code/Modules/otbProjectionGroup.cxx:643
+#: Code/Modules/otbOrthorectificationGUI.cxx:447
+msgid "Zone"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:564
-#: Code/Modules/otbOrthorectificationGUI.cxx:475
+#: OrthoFusion/otbOrthoFusionGUI.cxx:618 OrthoRectif/otbOrthoRectifGUI.cxx:538
+#: Code/Modules/otbProjectionGroup.cxx:522
+#: Code/Modules/otbProjectionGroup.cxx:644
+#: Code/Modules/otbOrthorectificationGUI.cxx:448
+msgid "Enter the zone number"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:626
+#: Code/Modules/otbProjectionGroup.cxx:530
+#: Code/Modules/otbProjectionGroup.cxx:670
+msgid "Northern hemisphere"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:633
#: Code/Modules/otbProjectionGroup.cxx:536
#: Code/Modules/otbProjectionGroup.cxx:676
-msgid "Northern Hemisphere"
+msgid "Southern hemisphere"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:570
-#: Code/Modules/otbOrthorectificationGUI.cxx:481
-#: Code/Modules/otbProjectionGroup.cxx:542
-#: Code/Modules/otbProjectionGroup.cxx:682
-msgid "Southern Hemisphere"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:682
+#: Code/Modules/otbProjectionGroup.cxx:549
+#: Code/Modules/otbProjectionGroup.cxx:706
+msgid "False easting"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:600
+#: OrthoFusion/otbOrthoFusionGUI.cxx:683 OrthoRectif/otbOrthoRectifGUI.cxx:601
+#: Code/Modules/otbProjectionGroup.cxx:550
+#: Code/Modules/otbProjectionGroup.cxx:707
#: Code/Modules/otbOrthorectificationGUI.cxx:511
-#: Code/Modules/otbProjectionGroup.cxx:555
-#: Code/Modules/otbProjectionGroup.cxx:712
-msgid "False Easting"
-msgstr ""
-
-#: OrthoRectif/otbOrthoRectifGUI.cxx:601 OrthoFusion/otbOrthoFusionGUI.cxx:683
-#: Code/Modules/otbOrthorectificationGUI.cxx:512
-#: Code/Modules/otbProjectionGroup.cxx:556
-#: Code/Modules/otbProjectionGroup.cxx:713
msgid "Enter false easting"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:609
-#: Code/Modules/otbOrthorectificationGUI.cxx:520
-#: Code/Modules/otbProjectionGroup.cxx:564
-#: Code/Modules/otbProjectionGroup.cxx:721
-msgid "False Northing"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:691
+#: Code/Modules/otbProjectionGroup.cxx:558
+#: Code/Modules/otbProjectionGroup.cxx:715
+msgid "False northing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:610 OrthoFusion/otbOrthoFusionGUI.cxx:692
-#: Code/Modules/otbOrthorectificationGUI.cxx:521
-#: Code/Modules/otbProjectionGroup.cxx:565
-#: Code/Modules/otbProjectionGroup.cxx:722
+#: OrthoFusion/otbOrthoFusionGUI.cxx:692 OrthoRectif/otbOrthoRectifGUI.cxx:610
+#: Code/Modules/otbProjectionGroup.cxx:559
+#: Code/Modules/otbProjectionGroup.cxx:716
+#: Code/Modules/otbOrthorectificationGUI.cxx:520
msgid "Enter false northing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:618
-#: Code/Modules/otbOrthorectificationGUI.cxx:529
-#: Code/Modules/otbProjectionGroup.cxx:573
-#: Code/Modules/otbProjectionGroup.cxx:730
-msgid "Scale Factor"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:700
+#: Code/Modules/otbProjectionGroup.cxx:567
+#: Code/Modules/otbProjectionGroup.cxx:724
+msgid "Scale factor"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:619
-#: Code/Modules/otbOrthorectificationGUI.cxx:530
-#: Code/Modules/otbProjectionGroup.cxx:574
-#: Code/Modules/otbProjectionGroup.cxx:731
-msgid "Enter Scale Factor"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:701
+#: Code/Modules/otbProjectionGroup.cxx:568
+#: Code/Modules/otbProjectionGroup.cxx:725
+msgid "Enter scale factor"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:649
-#: Code/Modules/otbOrthorectificationGUI.cxx:391
-#: Code/Modules/otbProjectionGroup.cxx:478
-msgid "Geographical Coordinates"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:713
+#: Code/Modules/otbProjectionGroup.cxx:461
+msgid "Geographical coordinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:656 OrthoFusion/otbOrthoFusionGUI.cxx:720
-#: Code/Modules/otbOrthorectificationGUI.cxx:398
-#: Code/Modules/otbProjectionGroup.cxx:485
+#: OrthoFusion/otbOrthoFusionGUI.cxx:720 OrthoRectif/otbOrthoRectifGUI.cxx:656
+#: Code/Modules/otbProjectionGroup.cxx:480
+#: Code/Modules/otbOrthorectificationGUI.cxx:397
msgid "Longitude"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:657 OrthoFusion/otbOrthoFusionGUI.cxx:721
-#: Code/Modules/otbOrthorectificationGUI.cxx:399
-#: Code/Modules/otbProjectionGroup.cxx:486
+#: OrthoFusion/otbOrthoFusionGUI.cxx:721 OrthoRectif/otbOrthoRectifGUI.cxx:657
+#: Code/Modules/otbProjectionGroup.cxx:481
+#: Code/Modules/otbOrthorectificationGUI.cxx:398
msgid "Enter the longitude of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:665 OrthoFusion/otbOrthoFusionGUI.cxx:729
-#: Code/Modules/otbOrthorectificationGUI.cxx:407
-#: Code/Modules/otbProjectionGroup.cxx:494
+#: OrthoFusion/otbOrthoFusionGUI.cxx:729 OrthoRectif/otbOrthoRectifGUI.cxx:665
+#: Code/Modules/otbProjectionGroup.cxx:489
+#: Code/Modules/otbOrthorectificationGUI.cxx:406
msgid "Latitude"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:666 OrthoFusion/otbOrthoFusionGUI.cxx:730
-#: Code/Modules/otbOrthorectificationGUI.cxx:408
-#: Code/Modules/otbProjectionGroup.cxx:495
+#: OrthoFusion/otbOrthoFusionGUI.cxx:730 OrthoRectif/otbOrthoRectifGUI.cxx:666
+#: Code/Modules/otbProjectionGroup.cxx:490
+#: Code/Modules/otbOrthorectificationGUI.cxx:407
msgid "Enter the latitude of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:674 OrthoFusion/otbOrthoFusionGUI.cxx:738
-#: Code/Modules/otbOrthorectificationGUI.cxx:416
-#: Code/Modules/otbProjectionGroup.cxx:503
+#: OrthoFusion/otbOrthoFusionGUI.cxx:738 OrthoRectif/otbOrthoRectifGUI.cxx:674
+#: Code/Modules/otbOrthorectificationGUI.cxx:415
msgid "Use Center Pixel"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:675 OrthoFusion/otbOrthoFusionGUI.cxx:739
-#: Code/Modules/otbOrthorectificationGUI.cxx:417
-#: Code/Modules/otbProjectionGroup.cxx:504
+#: OrthoFusion/otbOrthoFusionGUI.cxx:739 OrthoRectif/otbOrthoRectifGUI.cxx:675
+#: Code/Modules/otbOrthorectificationGUI.cxx:416
msgid "If checked, use the output center image coodinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:681 OrthoFusion/otbOrthoFusionGUI.cxx:746
-#: Code/Modules/otbOrthorectificationGUI.cxx:423
-#: Code/Modules/otbProjectionGroup.cxx:510
+#: OrthoFusion/otbOrthoFusionGUI.cxx:746 OrthoRectif/otbOrthoRectifGUI.cxx:681
+#: Code/Modules/otbOrthorectificationGUI.cxx:422
msgid "Use Upper-Left Pixel"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:682 OrthoFusion/otbOrthoFusionGUI.cxx:747
-#: Code/Modules/otbOrthorectificationGUI.cxx:424
-#: Code/Modules/otbProjectionGroup.cxx:511
+#: OrthoFusion/otbOrthoFusionGUI.cxx:747 OrthoRectif/otbOrthoRectifGUI.cxx:682
+#: Code/Modules/otbOrthorectificationGUI.cxx:423
msgid "If checked, use the upper left output image pixel coodinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:692 OrthoFusion/otbOrthoFusionGUI.cxx:758
-#: Code/Modules/otbOrthorectificationGUI.cxx:562
-#: Code/Modules/otbProjectionGroup.cxx:603
+#: OrthoFusion/otbOrthoFusionGUI.cxx:758 OrthoRectif/otbOrthoRectifGUI.cxx:692
+#: Code/Modules/otbProjectionGroup.cxx:586
+#: Code/Modules/otbOrthorectificationGUI.cxx:561
msgid "Output image"
msgstr "Image de sortie"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:699 OrthoFusion/otbOrthoFusionGUI.cxx:764
-#: Code/Modules/otbExtractROIModuleGUI.cxx:53
-#: Code/Modules/otbExtractROIModuleGUI.cxx:67
-#: Code/Modules/otbOrthorectificationGUI.cxx:570
-#: Code/Modules/otbProjectionGroup.cxx:610
+#: OrthoFusion/otbOrthoFusionGUI.cxx:764 OrthoRectif/otbOrthoRectifGUI.cxx:699
+#: Code/Modules/otbExtractROIModuleGUI.cxx:60
+#: Code/Modules/otbExtractROIModuleGUI.cxx:86
+#: Code/Modules/otbProjectionGroup.cxx:594
+#: Code/Modules/otbOrthorectificationGUI.cxx:569
msgid "Size X"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:700 OrthoFusion/otbOrthoFusionGUI.cxx:765
-#: Code/Modules/otbOrthorectificationGUI.cxx:571
-#: Code/Modules/otbProjectionGroup.cxx:611
+#: OrthoFusion/otbOrthoFusionGUI.cxx:765 OrthoRectif/otbOrthoRectifGUI.cxx:700
+#: Code/Modules/otbProjectionGroup.cxx:595
+#: Code/Modules/otbOrthorectificationGUI.cxx:570
msgid "Enter the X output size"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:708 OrthoFusion/otbOrthoFusionGUI.cxx:773
-#: Code/Modules/otbExtractROIModuleGUI.cxx:56
-#: Code/Modules/otbExtractROIModuleGUI.cxx:69
-#: Code/Modules/otbOrthorectificationGUI.cxx:579
-#: Code/Modules/otbProjectionGroup.cxx:618
+#: OrthoFusion/otbOrthoFusionGUI.cxx:773 OrthoRectif/otbOrthoRectifGUI.cxx:708
+#: Code/Modules/otbExtractROIModuleGUI.cxx:63
+#: Code/Modules/otbExtractROIModuleGUI.cxx:88
+#: Code/Modules/otbProjectionGroup.cxx:602
+#: Code/Modules/otbOrthorectificationGUI.cxx:578
msgid "Size Y"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:709 OrthoFusion/otbOrthoFusionGUI.cxx:774
-#: Code/Modules/otbOrthorectificationGUI.cxx:580
-#: Code/Modules/otbProjectionGroup.cxx:619
+#: OrthoFusion/otbOrthoFusionGUI.cxx:774 OrthoRectif/otbOrthoRectifGUI.cxx:709
+#: Code/Modules/otbProjectionGroup.cxx:603
+#: Code/Modules/otbOrthorectificationGUI.cxx:579
msgid "Enter the Y output size"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:717 OrthoFusion/otbOrthoFusionGUI.cxx:782
-#: Code/Modules/otbOrthorectificationGUI.cxx:588
-#: Code/Modules/otbProjectionGroup.cxx:626
+#: OrthoFusion/otbOrthoFusionGUI.cxx:782 OrthoRectif/otbOrthoRectifGUI.cxx:717
+#: Code/Modules/otbProjectionGroup.cxx:610
+#: Code/Modules/otbOrthorectificationGUI.cxx:587
msgid "Spacing X"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:718 OrthoFusion/otbOrthoFusionGUI.cxx:783
-#: Code/Modules/otbOrthorectificationGUI.cxx:589
-#: Code/Modules/otbProjectionGroup.cxx:627
+#: OrthoFusion/otbOrthoFusionGUI.cxx:783 OrthoRectif/otbOrthoRectifGUI.cxx:718
+#: Code/Modules/otbProjectionGroup.cxx:611
+#: Code/Modules/otbOrthorectificationGUI.cxx:588
msgid "Enter X spacing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:726 OrthoFusion/otbOrthoFusionGUI.cxx:791
-#: Code/Modules/otbOrthorectificationGUI.cxx:597
-#: Code/Modules/otbProjectionGroup.cxx:634
+#: OrthoFusion/otbOrthoFusionGUI.cxx:791 OrthoRectif/otbOrthoRectifGUI.cxx:726
+#: Code/Modules/otbProjectionGroup.cxx:618
+#: Code/Modules/otbOrthorectificationGUI.cxx:596
msgid "Spacing Y"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:727 OrthoFusion/otbOrthoFusionGUI.cxx:792
-#: Code/Modules/otbOrthorectificationGUI.cxx:598
-#: Code/Modules/otbProjectionGroup.cxx:635
+#: OrthoFusion/otbOrthoFusionGUI.cxx:792 OrthoRectif/otbOrthoRectifGUI.cxx:727
+#: Code/Modules/otbProjectionGroup.cxx:619
+#: Code/Modules/otbOrthorectificationGUI.cxx:597
msgid "Enter Y spacing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:735 OrthoRectif/otbOrthoRectifGUI.cxx:759
#: OrthoFusion/otbOrthoFusionGUI.cxx:800 OrthoFusion/otbOrthoFusionGUI.cxx:824
-#: Code/Modules/otbOrthorectificationGUI.cxx:606
-#: Code/Modules/otbOrthorectificationGUI.cxx:630
-#: Code/Modules/otbProjectionGroup.cxx:795
-#: Code/Modules/otbProjectionGroup.cxx:822
+#: Pireo/RegistrationParametersGUI.cxx:831
+#: OrthoRectif/otbOrthoRectifGUI.cxx:735 OrthoRectif/otbOrthoRectifGUI.cxx:759
+#: Code/Modules/otbProjectionGroup.cxx:779
+#: Code/Modules/otbProjectionGroup.cxx:806
+#: Code/Modules/otbOrthorectificationGUI.cxx:605
+#: Code/Modules/otbOrthorectificationGUI.cxx:629
msgid "Interpolator"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:736 OrthoRectif/otbOrthoRectifGUI.cxx:760
-#: Code/Modules/otbOrthorectificationGUI.cxx:607
-#: Code/Modules/otbOrthorectificationGUI.cxx:631
-#: Code/Modules/otbProjectionGroup.cxx:796
-#: Code/Modules/otbProjectionGroup.cxx:823
-msgid "Select the Orthorectif Interpolator"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:801 OrthoFusion/otbOrthoFusionGUI.cxx:825
+msgid "Select the orthorectif interpolator"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:744
-#: Code/Modules/otbOrthorectificationGUI.cxx:615
-#: Code/Modules/otbProjectionGroup.cxx:780
-msgid "Interpolator Parameters"
-msgstr ""
+#: OrthoFusion/otbOrthoFusionGUI.cxx:809
+#: Code/Modules/otbProjectionGroup.cxx:764
+msgid "Interpolator parameters"
+msgstr "Parametres d'interpolation"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:768 OrthoRectif/otbOrthoRectifGUI.cxx:775
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:124
+#: OrthoFusion/otbOrthoFusionGUI.cxx:833 OrthoFusion/otbOrthoFusionGUI.cxx:840
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:123
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:820
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1630
-#: OrthoFusion/otbOrthoFusionGUI.cxx:833 OrthoFusion/otbOrthoFusionGUI.cxx:840
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:772
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1582
+#: OrthoRectif/otbOrthoRectifGUI.cxx:768 OrthoRectif/otbOrthoRectifGUI.cxx:775
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:82
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:97
-#: Code/Modules/otbOrthorectificationGUI.cxx:639
-#: Code/Modules/otbOrthorectificationGUI.cxx:646
-#: Code/Modules/otbProjectionGroup.cxx:804
-#: Code/Modules/otbProjectionGroup.cxx:811
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:772
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1582
+#: Code/Modules/otbProjectionGroup.cxx:788
+#: Code/Modules/otbProjectionGroup.cxx:795
+#: Code/Modules/otbOrthorectificationGUI.cxx:638
+#: Code/Modules/otbOrthorectificationGUI.cxx:645
msgid "Radius"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:788 OrthoFusion/otbOrthoFusionGUI.cxx:853
-#: Code/Modules/otbOrthorectificationGUI.cxx:659
+#: OrthoFusion/otbOrthoFusionGUI.cxx:853 OrthoRectif/otbOrthoRectifGUI.cxx:788
+#: Code/Modules/otbOrthorectificationGUI.cxx:658
msgid "DEM"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:801 OrthoRectif/otbOrthoRectifGUI.cxx:813
-#: Code/Modules/otbOrthorectificationGUI.cxx:673
-#: Code/Modules/otbOrthorectificationGUI.cxx:685
-msgid "DEM Path"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:866 OrthoRectif/otbOrthoRectifGUI.cxx:822
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:483
+#: Code/Modules/otbOrthorectificationGUI.cxx:696
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:90
+#: Code/Modules/otbViewerModuleGroup.cxx:267
+msgid "Use DEM"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:870 OrthoFusion/otbOrthoFusionGUI.cxx:882
+msgid "DEM path"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:802 OrthoFusion/otbOrthoFusionGUI.cxx:871
-#: Code/Modules/otbOrthorectificationGUI.cxx:674
+#: OrthoFusion/otbOrthoFusionGUI.cxx:871 OrthoRectif/otbOrthoRectifGUI.cxx:802
+#: Code/Modules/otbOrthorectificationGUI.cxx:673
msgid "Open a DEM directory"
msgstr "Ouvrir un repertoire de DEM"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:818 OrthoFusion/otbOrthoFusionGUI.cxx:887
-#: Code/Modules/otbOrthorectificationGUI.cxx:691
+#: OrthoFusion/otbOrthoFusionGUI.cxx:887 OrthoRectif/otbOrthoRectifGUI.cxx:818
+#: Code/Modules/otbOrthorectificationGUI.cxx:690
msgid "Save DEM"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:822 OrthoFusion/otbOrthoFusionGUI.cxx:866
-#: Code/Modules/otbViewerModuleGroup.cxx:267
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:90
-#: Code/Modules/otbOrthorectificationGUI.cxx:697
-msgid "Use DEM"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:902
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:94
+msgid "Use average elevation"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:837
-#: Code/Modules/otbOrthorectificationGUI.cxx:712
-msgid "Average Elevation"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:907
+msgid "Average elevation"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:838 OrthoFusion/otbOrthoFusionGUI.cxx:908
-#: Code/Modules/otbOrthorectificationGUI.cxx:713
+#: OrthoFusion/otbOrthoFusionGUI.cxx:908 OrthoRectif/otbOrthoRectifGUI.cxx:838
+#: Code/Modules/otbOrthorectificationGUI.cxx:712
msgid "Enter the Average Elevation Value"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:844
-#: Code/Modules/otbOrthorectificationGUI.cxx:719
-msgid "Use Average Elevation"
-msgstr ""
-
-#: OrthoRectif/otbOrthoRectifGUI.cxx:855
-#: Code/Modules/otbOrthorectificationGUI.cxx:730
-msgid "Image Extent"
-msgstr ""
+#: OrthoFusion/otbOrthoFusionGUI.cxx:920
+msgid "Image extent"
+msgstr "Image extension"
-#: OrthoRectif/otbOrthoRectifGUI.cxx:868 OrthoFusion/otbOrthoFusionGUI.cxx:933
+#: OrthoFusion/otbOrthoFusionGUI.cxx:933 OrthoRectif/otbOrthoRectifGUI.cxx:868
msgid "Advanced"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:875 OrthoFusion/otbOrthoFusionGUI.cxx:940
+#: OrthoFusion/otbOrthoFusionGUI.cxx:940 OrthoRectif/otbOrthoRectifGUI.cxx:875
msgid "Work with 8bits"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:876 OrthoFusion/otbOrthoFusionGUI.cxx:941
+#: OrthoFusion/otbOrthoFusionGUI.cxx:941 OrthoRectif/otbOrthoRectifGUI.cxx:876
msgid "Work with unsigned char pixel type"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:881 OrthoFusion/otbOrthoFusionGUI.cxx:946
+#: OrthoFusion/otbOrthoFusionGUI.cxx:946 OrthoRectif/otbOrthoRectifGUI.cxx:881
msgid "Work with 16bits"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:882 OrthoFusion/otbOrthoFusionGUI.cxx:947
+#: OrthoFusion/otbOrthoFusionGUI.cxx:947 OrthoRectif/otbOrthoRectifGUI.cxx:882
msgid "Work with short pixel type"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:888
-msgid "Maximum Tile Size (MB)"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:953
+msgid "Maximum tile size (MB)"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:889
-msgid "From Streaming pipeline, precise the maximum tile size"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:954
+msgid "From streaming pipeline, precise the maximum tile size"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:175
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:175
msgid "otbImageViewerManager"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:201
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:305
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:79
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:400
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:685
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:201
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:305
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:293
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:341
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:685
msgid "Viewer setup"
msgstr "Vue"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:202
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:202
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:294
msgid "Set up the selected viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:211
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:430
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:211
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:430
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:303
msgid "Link setup"
msgstr "Lien"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:212
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:212
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:304
msgid "Add or remove links with the selected viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:249
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:249
msgid "Zoom small images"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:250
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:250
msgid "Zoom small images in preview window"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:258
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:506
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:258
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:506
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:323
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:545
msgid "Slideshow"
msgstr "Diaporama"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:259
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:259
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:324
msgid "Launch the slideshow mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:278
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:278
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:213
msgid "Viewers List"
msgstr "Liste des viewers"
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:290
-#: OrthoFusion/otbOrthoFusionGUI.cxx:526
-msgid "Preview window"
-msgstr ""
-
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:311
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:406
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:347
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:848
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:691
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:311
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:595
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:644
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:693
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:691
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:848
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:831
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:347
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:598
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:647
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:696
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:822
#: Code/Modules/otbViewerModuleGroup.cxx:303
msgid "Grayscale mode"
msgstr "Composition coloree"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:312
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:407
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:348
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:692
#: Classification/otbSupervisedClassificationAppliGUI.cxx:849
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:832
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:692
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:312
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:348
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:823
#: Code/Modules/otbViewerModuleGroup.cxx:304
msgid "Swith the image viewer mode to grayscale"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:321
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:416
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:357
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:859
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:701
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:321
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:602
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:651
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:700
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:701
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:859
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:842
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:357
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:605
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:654
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:703
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:833
#: Code/Modules/otbViewerModuleGroup.cxx:313
msgid "RGB composition mode"
msgstr "Composition coloree"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:322
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:417
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:358
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:702
#: Classification/otbSupervisedClassificationAppliGUI.cxx:860
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:843
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:702
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:322
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:358
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:834
#: Code/Modules/otbViewerModuleGroup.cxx:314
msgid "Switch the image viewer mode to RGB composition"
msgstr ""
@@ -1137,26 +1151,29 @@ msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:330
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:425
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:585
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:366
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:710
#: Classification/otbSupervisedClassificationAppliGUI.cxx:869
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:852
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:710
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:330
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:366
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:843
#: Code/Modules/otbViewerModuleGroup.cxx:322
msgid "Channel index"
msgstr "Index du canal"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:331
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:426
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:367
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:711
#: Classification/otbSupervisedClassificationAppliGUI.cxx:870
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:853
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:711
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:331
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:367
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:844
#: Code/Modules/otbViewerModuleGroup.cxx:323
msgid "Select the band to view in grayscale mode"
msgstr "Selectionne la bande a afficher en niveaux de gris"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:337
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:433
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:877
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:967
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:987
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1029
@@ -1171,11 +1188,10 @@ msgstr "Selectionne la bande a afficher en niveaux de gris"
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1397
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1433
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1569
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:373
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:667
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:717
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:877
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:860
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:337
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:373
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:919
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:939
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:981
@@ -1190,23 +1206,26 @@ msgstr "Selectionne la bande a afficher en niveaux de gris"
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1349
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1385
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1521
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:851
#: Code/Modules/otbViewerModuleGroup.cxx:329
msgid "Red channel"
msgstr "Canal rouge"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:338
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:434
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:374
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:878
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:668
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:718
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:878
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:861
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:338
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:374
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:852
#: Code/Modules/otbViewerModuleGroup.cxx:330
msgid "Select band for red channel in RGB composition"
msgstr "Selectionne la bande a afficher en rouge"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:345
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:442
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:886
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1322
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1371
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1390
@@ -1214,11 +1233,10 @@ msgstr "Selectionne la bande a afficher en rouge"
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1529
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1557
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1577
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:381
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:660
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:725
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:886
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:869
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:345
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:381
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1274
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1323
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1342
@@ -1226,189 +1244,214 @@ msgstr "Selectionne la bande a afficher en rouge"
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1481
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1509
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1529
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:860
#: Code/Modules/otbViewerModuleGroup.cxx:337
msgid "Green channel"
msgstr "Canal vert"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:346
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:443
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:382
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:887
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:661
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:726
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:887
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:870
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:346
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:382
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:861
#: Code/Modules/otbViewerModuleGroup.cxx:338
msgid "Select band for green channel in RGB composition"
msgstr "Selectionne la bande a afficher en vert"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:353
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:451
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:895
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1172
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1207
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1268
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:389
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:733
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:895
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:878
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:353
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:389
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1124
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1159
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1220
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:869
#: Code/Modules/otbViewerModuleGroup.cxx:345
msgid "Blue channel"
msgstr "Canal bleu"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:354
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:452
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:390
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:734
#: Classification/otbSupervisedClassificationAppliGUI.cxx:896
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:879
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:734
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:354
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:390
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:870
#: Code/Modules/otbViewerModuleGroup.cxx:346
msgid "Select band for blue channel in RGB composition"
msgstr "Selectionne la bande a afficher en bleu"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:362
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:461
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:398
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:611
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:742
#: Classification/otbSupervisedClassificationAppliGUI.cxx:905
#: Classification/otbSupervisedClassificationAppliGUI.cxx:1030
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:888
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1013
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:611
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:742
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:362
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:398
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:879
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1004
#: Code/Modules/otbViewerModuleGroup.cxx:354
msgid "Save changes and leave viewer set up interface"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:371
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:371
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:407
msgid "Viewer name"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:372
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:372
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:408
msgid "Set a new name for the selected viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:380
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:471
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:416
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:621
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:752
#: Classification/otbSupervisedClassificationAppliGUI.cxx:832
#: Classification/otbSupervisedClassificationAppliGUI.cxx:916
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:815
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:899
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:621
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:752
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:380
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:416
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:806
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:890
msgid "Leave viewer set up interface without saving changes"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:388
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:424
#: Classification/otbSupervisedClassificationAppliGUI.cxx:925
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:908
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:388
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:424
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:899
#: Code/Modules/otbViewerModuleGroup.cxx:365
msgid "Complex composition mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:389
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:425
#: Classification/otbSupervisedClassificationAppliGUI.cxx:926
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:909
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:389
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:425
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:900
#: Code/Modules/otbViewerModuleGroup.cxx:366
msgid "Switch the image viewer mode to complex composition"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:397
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:433
#: Classification/otbSupervisedClassificationAppliGUI.cxx:935
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:918
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:397
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:433
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:909
#: Code/Modules/otbViewerModuleGroup.cxx:376
msgid "Real channel index"
msgstr "Index du canal rouge"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:398
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:434
#: Classification/otbSupervisedClassificationAppliGUI.cxx:936
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:919
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:398
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:434
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:910
#: Code/Modules/otbViewerModuleGroup.cxx:377
msgid "Select band for real channel in complex composition"
msgstr "Selectionne la bande reelle pour la composition complexe"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:405
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:441
#: Classification/otbSupervisedClassificationAppliGUI.cxx:944
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:927
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:405
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:441
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:918
#: Code/Modules/otbViewerModuleGroup.cxx:385
msgid "Imaginary channel index"
msgstr "Index du canal imaginaire"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:406
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:442
#: Classification/otbSupervisedClassificationAppliGUI.cxx:945
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:928
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:406
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:442
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:919
#: Code/Modules/otbViewerModuleGroup.cxx:386
msgid "Select band for imaginary channel in complex composition"
msgstr "Selectionne la bande imaginaire pour la composition complexe"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:413
#: Classification/otbSupervisedClassificationAppliGUI.cxx:953
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:936
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:413
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:927
msgid "Modulus"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:414
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:450
#: Classification/otbSupervisedClassificationAppliGUI.cxx:954
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:937
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:414
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:450
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:928
#: Code/Modules/otbViewerModuleGroup.cxx:395
msgid "Toggle modulus mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:421
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:457
#: Classification/otbSupervisedClassificationAppliGUI.cxx:963
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:946
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:421
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:457
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:937
#: Code/Modules/otbViewerModuleGroup.cxx:403
msgid "Phase"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:422
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:458
#: Classification/otbSupervisedClassificationAppliGUI.cxx:964
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:947
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:422
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:458
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:938
#: Code/Modules/otbViewerModuleGroup.cxx:404
msgid "Toggle phase mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:436
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:436
msgid "Link to viewer:"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:437
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:437
msgid "Select the viewer to link with"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:443
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:443
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:472
msgid "X offset"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:444
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:444
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:473
msgid "Set the x offset of the link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:450
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:450
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:479
msgid "Y offset"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:451
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:451
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:480
msgid "Set the Y offset of the link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:457
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:457
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:486
#: Code/Modules/otbViewerModuleGroup.cxx:438
#: Code/Modules/otbViewerModuleGroup.cxx:446
@@ -1416,684 +1459,736 @@ msgid "Apply"
msgstr "Appliquer"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:458
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:458
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:487
msgid "Save the current link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:465
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:465
msgid "Existing links"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:466
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:466
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:495
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:533
msgid "List of image viewers already linked with the selected image viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:475
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:504
#: Classification/otbSupervisedClassificationAppliGUI.cxx:447
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:430
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:475
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:504
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:425
msgid "Remove"
msgstr "Enlever"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:476
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:476
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:505
msgid "Remove the selected link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:484
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:269
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:513
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:385
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:461
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:484
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:385
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:513
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:367
msgid "Clear"
msgstr "Effacer"
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:485
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:485
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:514
msgid "Clear all links for the selected image viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:494
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:494
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:523
msgid "Leave the link set up interface"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:512
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:512
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:551
msgid "Progress"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:513
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:513
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:552
msgid "Position in diaporama"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:518
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:518
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:557
msgid "Previous"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:519
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:519
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:558
msgid "Previous image in diaporama"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:528
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:528
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:567
msgid "Next"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:529
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:529
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:568
msgid "Next image in diaporama"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:539
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:539
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:578
msgid "Leave diaporama mode"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:56
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:42
-msgid "Menu"
-msgstr "Menu"
-
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:58
-msgid "Vector Data"
-msgstr "Donnees vecteur"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:44
+msgid "Save label image"
+msgstr "Sauver image resultat"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:59
-msgid "Import Vector"
-msgstr ""
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:45
+#, fuzzy
+msgid "Save polygon"
+msgstr "Sauver polygones"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:60
-msgid "DEM Management"
-msgstr ""
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:126
+#, fuzzy
+msgid "Object counting application"
+msgstr "Quitter"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:62
-#: Code/Modules/otbWriterModuleGUI.cxx:42
-#: Code/Modules/otbWriterViewGroup.cxx:272
-msgid "Save"
-msgstr "Sauver"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:133
+msgid "Extract"
+msgstr "Extraire"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:63
-msgid "Save Full"
-msgstr ""
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:161
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:121
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:97
+msgid "SVM"
+msgstr "SVM"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:64
-msgid "Save Extract Result"
-msgstr ""
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:162
+#, fuzzy
+msgid "Use SVM for classification"
+msgstr "Classification"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:196
-msgid "Image To Data Base Registration Application"
-msgstr ""
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:170
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:595
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:557
+msgid "Spectral Angle"
+msgstr "Angle Spectral"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:215
-msgid "ROI Selection"
-msgstr ""
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:171
+#, fuzzy
+msgid "Use spectral angle for classification"
+msgstr "Utiliser Angle Spectral"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:224
-msgid "ROI Full Resolution"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:178
+#: Segmentation/otbPreprocessingViewGroup.cxx:53
+msgid "Use smoothing"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:236
-msgid "ROI"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:179
+msgid "Smooth input image before working"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:237
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:423
-msgid "This area display a minimap of the full image"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:186
+msgid "Minimum object size"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:262
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:435
-msgid "Extraction parameters"
-msgstr ""
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:187
+#, fuzzy
+msgid "Minimum region size"
+msgstr "Taille region min"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:268
-msgid "Angle threshold"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:196
+msgid "Mean shift"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:274
-msgid "Segment Length "
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:203
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:86
+#, fuzzy
+msgid "Spatial radius"
+msgstr "Angle Spectral"
+
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:212
+msgid "Range radius"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:280
-msgid "Max. Triplet Dist"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:221
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1726
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1678
+msgid "Scale"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:286
-msgid "Set Reference Data"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:232
+#, fuzzy
+msgid "Spectral angle"
+msgstr "Angle Spectral"
+
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:240
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:288
+msgid "Reference pixel"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:292
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:176
-msgid "Image"
-msgstr "Image"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:247
+#, fuzzy
+msgid "Threshold value"
+msgstr "Seuils"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:302
-msgid "Data Base"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:259
+msgid "Nu (svm)"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:314
-#: Code/Modules/otbViewerModuleGroup.cxx:209
-msgid "Vector Datas"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:260
+msgid "SVM classifier margin"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:315
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:509
-msgid "Region of interest control panel"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:271
+msgid "Run over the extracted image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:322
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:516
-#: Code/Modules/otbViewerModuleGroup.cxx:218
-msgid "Display the selected ROI color"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:279
+msgid "Statistics"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:330
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:524
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:469
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:452
-#: Code/Modules/otbViewerModuleGroup.cxx:225
-msgid "Color"
-msgstr "Couleur"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:43
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:391
+msgid "Open image pair"
+msgstr "Ouvrir une pair d'image"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:331
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:525
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:470
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:453
-#: Code/Modules/otbViewerModuleGroup.cxx:226
-msgid "Change the color of the selected class"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:44
+msgid "Save deformation field"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:341
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:536
-#: Code/Modules/otbViewerModuleGroup.cxx:236
-msgid "Browse and select ROI"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:45
+msgid "Save registered image"
+msgstr "Sauver l'image recalee"
+
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:167
+msgid "Fine registration application"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:351
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:262
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:547
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:611
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:594
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:230
-msgid "Delete"
-msgstr "Supprimer"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:174
+msgid "Images"
+msgstr "Images"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:352
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:548
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:612
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:595
-#: Code/Modules/otbViewerModuleGroup.cxx:248
-msgid "Delete the selected region of interest"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:175
+msgid ""
+"This area displays a color composition of the fixed image, the moving image "
+"and the resampled image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:361
-msgid "ClearAll"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:196
+msgid ""
+"This area allows to navigate through large images. Displays an anaglyph "
+"composition of the fixed and the moving image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:362
-#: Code/Modules/otbViewerModuleGroup.cxx:258
-#: Code/Modules/otbViewerModuleGroup.cxx:274
-#: Code/Modules/otbViewerModuleGroup.cxx:284
-msgid "Clear all vector data"
-msgstr "Effacer toutes les donnees vecteur"
-
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:374
-msgid "Transform"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:205
+msgid "Deformation field"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:389
-msgid "Switch scroll"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:206
+msgid ""
+"This area shows a color composition of the deformation field values in X, Y "
+"and intensity. To display the deformation field, please trigger the run "
+"button"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:398
-msgid "Run the Registration"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:216
+msgid "This area allows you to tune parameters from the registration algorithm"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:406
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:416
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:390
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:398
-msgid "Pixel Value"
-msgstr ""
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:222
+#: Segmentation/otbPreprocessingViewGroup.cxx:71
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:82
+msgid "Number of iterations"
+msgstr "Nombre d'iterations"
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:433
-#: Code/Modules/otbViewerModuleGroup.cxx:549
-msgid "DEM Selection"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:223
+msgid ""
+"Allows you to tune the number of iterations of the registration algorithm"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:440
-msgid "Use DEM for Loading"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:231
+msgid "X NCC radius"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:445
-msgid "Use DEM for Processing"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:232
+msgid ""
+"Allows you to tune the radius used to compute the normalized correlation in "
+"the first image direction"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:452
-#: Code/Modules/otbViewerModuleGroup.cxx:556
-msgid "Load"
-msgstr "Charger"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:241
+msgid "Y NCC radius"
+msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:72
-msgid "Save luminance image"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:242
+msgid ""
+"Allows you to tune the radius used to compute the normalized correlation in "
+"the second image direction"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:73
-msgid "Save reflectance TOA image"
-msgstr "Sauver image de reflectance TOA"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:251
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:397
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:381
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:469
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:79
+msgid "Run"
+msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:74
-msgid "Save reflectance TOC image"
-msgstr "Sauver image reflectance TOC"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:252
+msgid ""
+"This button allows you to run the deformation field estimation on the image "
+"region displayed in the \"Images\" area"
+msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:75
-msgid "Save TOA-TOC diff image"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:262
+msgid "X Max"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:78
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:82
-#: Code/Modules/otbProjectionGroup.cxx:773
-msgid "Settings"
-msgstr "Parametres"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:263
+msgid ""
+"This algorithm allows you to tune the maximum deformation in the first image "
+"direction. This is used to handle a security margin when streaming the "
+"algorithm on huge images"
+msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:79
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:84
-msgid "Viewer Setup"
-msgstr "Configuration visu"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:277
+msgid "Y Max"
+msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:80
-msgid "Coef. Setup"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:278
+msgid ""
+"This algorithm allows you to tune the maximum deformation in the second "
+"image direction. This is used to handle a security margin when streaming the "
+"algorithm on huge images"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:156
-msgid "NO AEROSOL"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:295
+msgid "Images color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:157
-msgid "CONTINENTAL"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:296
+msgid ""
+"This area allows you to select the color composition displayed in the "
+"\"Images\" area"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:158
-msgid "MARITIME"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:303
+msgid "Fixed"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:159
-msgid "URBAN"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:304
+msgid "Show or hide the fixed image in the color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:160
-msgid "DESERTIC"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:315
+msgid "Moving"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:207
-msgid "0"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:316
+msgid "Show or hide the moving image in the color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:260
-msgid "Radiometric Calibration Application"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:327
+msgid "Resampled"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:281
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:72
-msgid "Navigation View"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:328
+msgid ""
+"Show or hide the resampled image in the color composition. If there is no "
+"deformation field computed yet, the resampled image is the moving image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:289
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:297
-msgid "Zoom View"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:342
+msgid "Deformation field color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:305
-msgid "Histograms"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:349
+msgid "X deformation"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:313
-msgid "Pixel Information"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:350
+msgid ""
+"Show or hide the deformation in the first image direction in the color "
+"composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:321
-msgid "Result Pixel Information"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:362
+msgid "Y deformation"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:353
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:169
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:187
-msgid "Input image"
-msgstr "Image en Entree"
-
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:361
-msgid "Luminance"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:363
+msgid ""
+"Show or hide the deformation in the second image direction in the color "
+"composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:369
-msgid "Reflect. TOA"
-msgstr ""
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:375
+msgid "Intensity"
+msgstr "Intensite"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:377
-msgid "Reflect. TOC"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:376
+msgid "Show or hide the deformation intensity iin the color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:385
-msgid "Diff. TOA/TOC"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:414
+#: Pireo/PreProcessParametersGUI.cxx:69 Pireo/PireoViewerGUI.cxx:534
+msgid "Fixed image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:481
-msgid "Radiometric Coefficients Setup"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:421
+#: Pireo/PreProcessParametersGUI.cxx:70 Pireo/PireoViewerGUI.cxx:556
+#: Pireo/PireoViewerGUI.cxx:712
+msgid "Moving image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:492
-msgid "Correction parameters"
-msgstr ""
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:56
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:42
+msgid "Menu"
+msgstr "Menu"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:499
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:500
-msgid "Aerosol model"
-msgstr ""
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:58
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:314
+#: Code/Modules/otbViewerModuleGroup.cxx:209
+msgid "Vector data"
+msgstr "Donnees vecteur"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:508
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:509
-msgid "Ozone Amount"
-msgstr ""
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:59
+#, fuzzy
+msgid "Import vector"
+msgstr "Importer donnees vecteur"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:517
-msgid "Atmo. Pressure"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:60
+msgid "DEM management"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:518
-msgid "Atmospheric Pressure"
-msgstr ""
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:62
+#: Pireo/PireoViewerGUI.cxx:232 Pireo/PireoViewerGUI.cxx:233
+#: Code/Modules/otbWriterViewGroup.cxx:273
+#: Code/Modules/otbWriterModuleGUI.cxx:42
+msgid "Save"
+msgstr "Sauver"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:531
-msgid "Aerosol Thickness"
-msgstr ""
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:63
+#, fuzzy
+msgid "Save full"
+msgstr "Sauver Resultat"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:532
-msgid "Aerosol Optical Thickness"
-msgstr ""
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:64
+#, fuzzy
+msgid "Save extract result"
+msgstr "Sauver Resultat"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:542
-msgid "Water Amount"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:196
+msgid "Image to database registration application"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:543
-msgid "Water Vapor Amount"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:215
+msgid "ROI selection"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:553
-msgid "Aeronet File"
-msgstr "Fichier Aeronet"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:224
+#, fuzzy
+msgid "ROI full resolution"
+msgstr "Image Pleine Resolution"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:566
-msgid "Filter Function Values File"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:236
+msgid "ROI"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:579
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:740
-msgid "Radiative Terms"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:237
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:423
+msgid "This area display a minimap of the full image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:600
-msgid "Intrinsic Ref"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:262
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:435
+msgid "Extraction parameters"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:601
-msgid "Intrinsic Atmospheric Reflectance"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:268
+msgid "Angle threshold"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:611
-msgid "Albedo"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:274
+msgid "Segment length "
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:612
-msgid "Shperical Albedo of the Atmosphere"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:280
+msgid "Max triplet distance"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:622
-msgid "Gaseous Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:286
+msgid "Set reference data"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:623
-msgid "Total Gaseous Transmission"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:302
+msgid "Database"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:633
-msgid "Down. Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:315
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:509
+msgid "Region of interest control panel"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:634
-msgid "Downward Transmittance of the Atmospher"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:322
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:516
+#: Code/Modules/otbViewerModuleGroup.cxx:218
+msgid "Display the selected ROI color"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:644
-msgid "Up Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:330
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:469
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:524
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:447
+#: Code/Modules/otbViewerModuleGroup.cxx:225
+msgid "Color"
+msgstr "Couleur"
+
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:331
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:470
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:525
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:448
+#: Code/Modules/otbViewerModuleGroup.cxx:226
+msgid "Change the color of the selected class"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:645
-msgid "Upward Transmittance of the Atmospher"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:341
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:536
+#: Code/Modules/otbViewerModuleGroup.cxx:236
+msgid "Browse and select ROI"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:655
-msgid "Up diffuse Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:351
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:262
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:611
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:547
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:235
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:230
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:587
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:352
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:612
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:548
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:588
+#: Code/Modules/otbViewerModuleGroup.cxx:248
+msgid "Delete the selected region of interest"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:656
-msgid "Upward diffuse transmittance"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:361
+msgid "ClearAll"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:666
-msgid "Up direct Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:362
+#: Code/Modules/otbViewerModuleGroup.cxx:258
+#: Code/Modules/otbViewerModuleGroup.cxx:274
+#: Code/Modules/otbViewerModuleGroup.cxx:284
+msgid "Clear all vector data"
+msgstr "Effacer toutes les donnees vecteur"
+
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:374
+msgid "Transform"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:667
-msgid "Upward direct Transmittance"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:389
+msgid "Switch scroll"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:677
-msgid "Up diff. Trans. (Rayleigh)"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:398
+msgid "Run the Registration"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:678
-msgid "Upward diffuse transmittance for Rayleigh"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:406
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:416
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1030
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1031
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:862
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:814
+msgid "Pixel value"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:688
-msgid "Up diff Trans. (aerososl)"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:433
+msgid "DEM selection"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:689
-msgid "Upward diffuse transmittance for aerosols"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:440
+msgid "Use DEM for loading"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:701
-msgid "Reload Channel Radiative Terms"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:445
+msgid "Use DEM for processing"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:714
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1029
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1012
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:140
-msgid "Close"
-msgstr "Fermer"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:452
+#: Code/Modules/otbViewerModuleGroup.cxx:556
+msgid "Load"
+msgstr "Charger"
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:715
-msgid "Close the window"
-msgstr "Fermer"
+#: Common/otbMsgReporterGUI.cxx:7 Code/Common/otbMsgReporterGUI.cxx:7
+msgid "Msg Reporter"
+msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:723
-msgid "Set up Radiometric parameters"
+#: Segmentation/otbVectorizationViewGroup.cxx:19
+msgid "Vectorization parameters"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:732
-msgid "Atmospheric parameters"
-msgstr "Parametres Atmospherique"
+#: Segmentation/otbVectorizationViewGroup.cxx:25
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:112
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:360
+msgid "Tolerance"
+msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:68
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:75
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:55
-msgid "Segmentation parameters"
+#: Segmentation/otbVectorizationViewGroup.cxx:37
+msgid "Original image"
+msgstr ""
+
+#: Segmentation/otbVectorizationViewGroup.cxx:45
+msgid "Segmented image"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:69
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:76
#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:49
#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:56
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:69
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:76
msgid "Click on speed map for seeds selection"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:75
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:135
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:104
-msgid "Clear seeds"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:55
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:68
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:75
+msgid "Segmentation parameters"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:83
-msgid "Spectral angle distances"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:62
+msgid "Stopping time"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:91
-msgid "Thresholds"
-msgstr "Seuils"
-
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:99
-msgid "View feature "
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:72
+msgid "Sigmoid alpha"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:110
-msgid "Inside seeds"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:83
+msgid "Sigmoid beta"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:118
-msgid "Outside seeds"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:94
+msgid "Gradient sigma "
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:125
-msgid "Automatic update"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:104
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:75
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:133
+msgid "Clear seeds"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:134
-msgid "Update"
-msgstr "Mettre a Jour"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:112
+msgid "Time threshold"
+msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:145
-msgid "Features"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:129
+msgid "Speed map"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:153
-msgid "Distance to hyperplane"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:137
+msgid "Time crossing map"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:161
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:179
#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:145
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:159
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:188
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:291
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:177
msgid "Segmentation"
msgstr ""
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:93
-msgid "Lower threshold"
-msgstr ""
-
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:103
-msgid "Upper threshold"
-msgstr ""
-
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:113
-#: Segmentation/otbVectorizationViewGroup.cxx:25
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:360
-msgid "Tolerance"
-msgstr ""
-
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:143
-msgid "Inside seed"
-msgstr ""
-
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:154
-msgid "Outside seed"
-msgstr ""
-
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:164
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:234
-msgid "Algorithm"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:153
+msgid "Gradient Magnitude"
msgstr ""
#: Segmentation/otbPreprocessingViewGroup.cxx:47
msgid "Preprocessing parameters"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:53
-msgid "Use smoothing"
-msgstr ""
-
#: Segmentation/otbPreprocessingViewGroup.cxx:62
msgid "Use edge enhancement"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:80
+#: Segmentation/otbPreprocessingViewGroup.cxx:79
msgid "Time step"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:89
+#: Segmentation/otbPreprocessingViewGroup.cxx:88
msgid "Amount"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:100
+#: Segmentation/otbPreprocessingViewGroup.cxx:99
msgid "Edge enhancement"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:108
+#: Segmentation/otbPreprocessingViewGroup.cxx:107
msgid "Anisotropic diffusion"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:62
-msgid "Stopping time"
-msgstr ""
-
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:72
-msgid "Sigmoid alpha"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:83
+msgid "Spectral angle distances"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:83
-msgid "Sigmoid beta"
-msgstr ""
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:90
+msgid "Thresholds"
+msgstr "Seuils"
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:94
-msgid "Gradient sigma "
-msgstr ""
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:97
+msgid "View feature "
+msgstr "Voir les attributs"
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:112
-msgid "Time threshold"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:108
+msgid "Inside seeds"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:129
-msgid "Speed map"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:116
+msgid "Outside seeds"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:137
-msgid "Time crossing map"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:123
+msgid "Automatic update"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:153
-msgid "Gradient Magnitude"
-msgstr ""
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:132
+msgid "Update"
+msgstr "Mettre a Jour"
-#: Segmentation/otbVectorizationViewGroup.cxx:19
-msgid "Vectorization parameters"
-msgstr ""
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:143
+msgid "Features"
+msgstr "Attributs"
-#: Segmentation/otbVectorizationViewGroup.cxx:37
-msgid "Original image"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:151
+msgid "Distance to hyperplane"
msgstr ""
-#: Segmentation/otbVectorizationViewGroup.cxx:45
-msgid "Segmented image"
-msgstr ""
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:167
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:185
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:353
+#: Code/Modules/otbProjectionGroup.cxx:455
+#: Code/Modules/GCPToSensorModel/otbGCPToSensorModelModule.cxx:45
+msgid "Input image"
+msgstr "Image en Entree"
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:93
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:170
@@ -2111,9 +2206,10 @@ msgstr ""
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:171
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:467
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1920
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:221
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1856
-msgid "Full Resolution"
+#: Code/Modules/otbWriterViewGroup.cxx:304
+msgid "Full resolution"
msgstr ""
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:180
@@ -2121,7 +2217,8 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1913
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:230
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1849
-#: Code/Modules/otbWriterViewGroup.cxx:295
+#: Code/Modules/otbThresholdGroup.cxx:126
+#: Code/Modules/otbWriterViewGroup.cxx:296
msgid "Scroll"
msgstr ""
@@ -2144,6 +2241,11 @@ msgstr ""
msgid "Channel "
msgstr "Canal"
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:234
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:162
+msgid "Algorithm"
+msgstr ""
+
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:245
msgid "Segment !"
msgstr ""
@@ -2153,686 +2255,2072 @@ msgid "Trigger the segmentation once an area as been selected"
msgstr ""
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:255
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:569
#: Classification/otbSupervisedClassificationAppliGUI.cxx:709
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:692
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:569
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:685
msgid "Focus"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:254
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1868
-msgid "Save result"
-msgstr "Sauver Resultat"
-
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:460
-msgid "Polarimetric synthesis application"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:92
+msgid "Lower threshold"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:468
-msgid ""
-"This area display a piece of the image at full resolution. You can change "
-"the displayed region by clicking on the scroll area"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:102
+msgid "Upper threshold"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:479
-msgid ""
-"This area display a minimap of the full image, allowing you to change the "
-"region displayed by the full resolution area by clicking"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:141
+msgid "Inside seed"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:488
-msgid "Polarization parameters"
-msgstr "Parametres Polarisation"
-
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:498
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:306
-msgid "Red"
-msgstr "Rouge"
-
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:501
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:622
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:743
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:870
-msgid "Emission"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:152
+msgid "Outside seed"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:507
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:549
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:628
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:670
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:749
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:791
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:876
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:918
-msgid "Psi"
+#: Pireo/PreProcessParametersGUI.cxx:41
+msgid "None"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:508
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:629
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:750
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:877
-msgid "Change the incident Psi value (in degree)"
+#: Pireo/PreProcessParametersGUI.cxx:42
+msgid "Blurring"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:524
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:566
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:645
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:687
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:766
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:808
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:893
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:935
-msgid "Khi"
-msgstr ""
+#: Pireo/PreProcessParametersGUI.cxx:43
+#, fuzzy
+msgid "Normalize"
+msgstr "Normalisation (%)"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:525
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:646
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:767
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:894
-msgid "Change the incident Khi value (in degree)"
-msgstr ""
+#: Pireo/PreProcessParametersGUI.cxx:71
+#, fuzzy
+msgid "Both Images"
+msgstr "Images"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:543
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:664
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:785
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:912
-msgid "Reception"
-msgstr ""
+#: Pireo/PreProcessParametersGUI.cxx:83
+#, fuzzy
+msgid "Pre-Processing parameters"
+msgstr "Parametres Polarisation"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:550
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:671
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:792
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:919
-msgid "Change the reflected Psi value (in degree)"
+#: Pireo/PreProcessParametersGUI.cxx:92
+#, fuzzy
+msgid "Filter parameters"
+msgstr "Parametres de Frost"
+
+#: Pireo/PreProcessParametersGUI.cxx:98
+#, fuzzy
+msgid "Select Filter"
+msgstr "Filtre selectionne"
+
+#: Pireo/PreProcessParametersGUI.cxx:103
+#, fuzzy
+msgid "Use Filter"
+msgstr "Choisir Filtre"
+
+#: Pireo/PreProcessParametersGUI.cxx:109 Pireo/PireoViewerGUI.cxx:272
+#: Pireo/RegistrationParametersGUI.cxx:721
+#: Pireo/RegistrationParametersGUI.cxx:871
+#: Pireo/RegistrationParametersGUI.cxx:985
+msgid "Options"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:567
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:688
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:809
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:936
-msgid "Change the emitted Khi value (in degree)"
+#: Pireo/PreProcessParametersGUI.cxx:116
+#, fuzzy
+msgid "Set Variance"
+msgstr "Variance"
+
+#: Pireo/PreProcessParametersGUI.cxx:125
+msgid "Maximum Kernel Size"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:586
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:707
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:828
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:955
-msgid "Cross-polarization"
+#: Pireo/PreProcessParametersGUI.cxx:134
+msgid "DiscreteGaussianImageFilter: Parameters"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:587
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:708
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:829
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:956
-msgid "Force cross polarization"
+#: Pireo/PreProcessParametersGUI.cxx:152
+msgid "Set Lower threshold"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:595
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:716
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:837
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:964
-msgid "Co-polarization"
+#: Pireo/PreProcessParametersGUI.cxx:160
+#, fuzzy
+msgid "BinaryImageFilter: Parameters"
+msgstr "Parametres de Lee"
+
+#: Pireo/PreProcessParametersGUI.cxx:173
+msgid "Apply Filter On"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:596
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:717
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:838
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:965
-msgid "Force co-polarization"
-msgstr "Forcer co-polarization"
+#: Pireo/PreProcessParametersGUI.cxx:191
+msgid "Select the image on which the pre-processing will be applyed"
+msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:604
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:725
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:846
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:973
-msgid "Indifferent polarization"
+#: Pireo/PreProcessParametersGUI.cxx:206
+msgid "&Help!"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:605
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:726
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:847
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:974
-msgid "Allows any polarization"
+#: Pireo/PreProcessParametersGUI.cxx:212
+#: Pireo/RegistrationParametersGUI.cxx:1300
+msgid "&Accept"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:618
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:316
-msgid "Green"
-msgstr "Vert"
+#: Pireo/PireoViewerGUI.cxx:230
+msgid "Load fixed image"
+msgstr "Ouvrir image fixe"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:739
-msgid "Blue"
-msgstr "Bleu"
+#: Pireo/PireoViewerGUI.cxx:231
+msgid "Load moving image"
+msgstr "Ouvrir image a recaler"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:867
-msgid "Grayscale"
-msgstr "Niveaux de gris"
+#: Pireo/PireoViewerGUI.cxx:234
+#, fuzzy
+msgid "Auto Save"
+msgstr "Sauver"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:989
-msgid "Gain"
+#: Pireo/PireoViewerGUI.cxx:235
+msgid "Deactivate Auto Save"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1021
-msgid "Poincare Sphere"
+#: Pireo/PireoViewerGUI.cxx:239
+msgid "Flip"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1022
-msgid "Drag the sphere to rotate it"
+#: Pireo/PireoViewerGUI.cxx:240
+msgid "Flip fixed image"
+msgstr "Retourner image fixe"
+
+#: Pireo/PireoViewerGUI.cxx:241 Pireo/PireoViewerGUI.cxx:245
+msgid "Flip X"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1030
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1031
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:862
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:814
-msgid "Pixel value"
+#: Pireo/PireoViewerGUI.cxx:242 Pireo/PireoViewerGUI.cxx:246
+msgid "Flip Y"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1038
-msgid "RGB"
-msgstr "RVB"
+#: Pireo/PireoViewerGUI.cxx:244
+#, fuzzy
+msgid "Flip moving image"
+msgstr "Image a recaler filtree"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1047
-msgid "Image file chooser"
+#: Pireo/PireoViewerGUI.cxx:249
+msgid "Build"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1057
-msgid "HH image"
-msgstr "Image HH"
+#: Pireo/PireoViewerGUI.cxx:250
+msgid "View in Transparency"
+msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1058
+#: Pireo/PireoViewerGUI.cxx:251
#, fuzzy
-msgid "HH input image path"
-msgstr "Ouvrir Image"
+msgid "Registration"
+msgstr "Sauver les parametres de recalage"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1066
-msgid "HV image"
-msgstr "Image HV"
+#: Pireo/PireoViewerGUI.cxx:252
+#, fuzzy
+msgid "Set parameters"
+msgstr "Sauver les parametres"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1067
+#: Pireo/PireoViewerGUI.cxx:253
#, fuzzy
-msgid "HV input image path"
-msgstr "Ouvrir Image"
+msgid "Select parameters"
+msgstr "Sauver les parametres"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1075
-msgid "VH image"
-msgstr "Image VH"
+#: Pireo/PireoViewerGUI.cxx:254
+#, fuzzy
+msgid "Read parameters from a file..."
+msgstr "Parametres du rayon de Lee"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1076
+#: Pireo/PireoViewerGUI.cxx:256
#, fuzzy
-msgid "VH input image path"
-msgstr "Ouvrir Image"
+msgid "Start "
+msgstr "Demarrer"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1084
-msgid "VV image"
-msgstr "Image VV"
+#: Pireo/PireoViewerGUI.cxx:257
+msgid "Pause ||"
+msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1085
+#: Pireo/PireoViewerGUI.cxx:258
#, fuzzy
-msgid "VV input image path"
-msgstr "Ouvrir Image"
+msgid "Stop "
+msgstr "Configuration"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1094
-msgid "Choose the HH image file name"
+#: Pireo/PireoViewerGUI.cxx:260
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:550
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:526
+#: Code/Modules/otbViewerModuleGroup.cxx:283
+msgid "Display"
+msgstr "Afficher"
+
+#: Pireo/PireoViewerGUI.cxx:261
+msgid "Grid (default)"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1103
-msgid "Choose the HV image file name"
+#: Pireo/PireoViewerGUI.cxx:262
+msgid "Vector Field"
+msgstr "Champ vecteur"
+
+#: Pireo/PireoViewerGUI.cxx:263
+#, fuzzy
+msgid "Set Parameter"
+msgstr "Sauver les parametres"
+
+#: Pireo/PireoViewerGUI.cxx:266
+msgid "PreProcess"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1112
-msgid "Choose the VH image file name"
+#: Pireo/PireoViewerGUI.cxx:267
+msgid "Choose filter"
+msgstr "Choisir Filtre"
+
+#: Pireo/PireoViewerGUI.cxx:270
+msgid "View loaded image filenames"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1121
-msgid "Choose the VV image file name"
+#: Pireo/PireoViewerGUI.cxx:273 Pireo/PireoViewerGUI.cxx:683
+msgid "Save Registration parameters"
+msgstr "Sauver les parametres de recalage"
+
+#: Pireo/PireoViewerGUI.cxx:274
+msgid "Display Metric values"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1133
-msgid "Vector image"
-msgstr "Image vecteur"
+#: Pireo/PireoViewerGUI.cxx:275 Code/Modules/otbViewerModuleGroup.cxx:504
+msgid "Show"
+msgstr "Afficher"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1134
+#: Pireo/PireoViewerGUI.cxx:276
#, fuzzy
-msgid "Vector input image path"
-msgstr "Ouvrir Image"
+msgid "Deactivate"
+msgstr "Type donnees"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1145
-msgid "Choose the vector image file name"
-msgstr ""
+#: Pireo/PireoViewerGUI.cxx:443 Pireo/PireoViewerGUI.cxx:465
+msgid "Filtered fixed image"
+msgstr "Image fixe filtree"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1158
-msgid "Load images into the application"
-msgstr ""
+#: Pireo/PireoViewerGUI.cxx:444 Pireo/PireoViewerGUI.cxx:466
+msgid "Filtered moving image"
+msgstr "Image a recaler filtree"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1167
-msgid "Hide the open images window"
+#: Pireo/PireoViewerGUI.cxx:445 Pireo/PireoViewerGUI.cxx:467
+msgid "Deformed image"
+msgstr "Image deformee"
+
+#: Pireo/PireoViewerGUI.cxx:446 Pireo/PireoViewerGUI.cxx:468
+msgid "Blender (images in transparency)"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1175
-msgid "Open Vector image"
-msgstr "Ouvrir une image vecteur"
+#: Pireo/PireoViewerGUI.cxx:479
+#, fuzzy
+msgid "Pireo Viewer"
+msgstr "Vue groupe"
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1176
-msgid "Import a polarimetric vector image"
+#: Pireo/PireoViewerGUI.cxx:491 Pireo/PireoViewerGUI.cxx:567
+#: Pireo/PireoViewerGUI.cxx:574
+msgid "@+"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1186
-msgid "Import images corresponding to the HH, HV, VH, VV channels"
+#: Pireo/PireoViewerGUI.cxx:498
+msgid "@"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1196
-msgid "V Emission"
+#: Pireo/PireoViewerGUI.cxx:512
+msgid "VTK Window"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1197
-msgid "Enable or disable the vertical emssion for the polarimetric data"
+#: Pireo/PireoViewerGUI.cxx:523
+#, fuzzy
+msgid "Zoom fixed image"
+msgstr "Ouvrir image fixe"
+
+#: Pireo/PireoViewerGUI.cxx:545
+#, fuzzy
+msgid "Zoom moving image"
+msgstr "Ouvrir image a recaler"
+
+#: Pireo/PireoViewerGUI.cxx:581 Pireo/PireoViewerGUI.cxx:630
+msgid "@2"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1206
-msgid "H Emission"
+#: Pireo/PireoViewerGUI.cxx:588 Pireo/PireoViewerGUI.cxx:616
+msgid "@4"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1207
-msgid "Enable or disable the horizontcal emssion for the polarimetric data"
+#: Pireo/PireoViewerGUI.cxx:595 Pireo/PireoViewerGUI.cxx:623
+msgid "@6"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:45
-msgid "Save Result"
-msgstr "Sauver resultat"
+#: Pireo/PireoViewerGUI.cxx:602 Pireo/PireoViewerGUI.cxx:609
+msgid "@8"
+msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:593
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:555
-msgid "Touzi"
+#: Pireo/PireoViewerGUI.cxx:637
+#, fuzzy
+msgid "Vector window"
+msgstr "Image vecteur"
+
+#: Pireo/PireoViewerGUI.cxx:654
+msgid "Grid / Vector"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:594
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:556
-msgid "Harris (experimental)"
+#: Pireo/PireoViewerGUI.cxx:672
+msgid "Input number of displayed points along each axe"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:596
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:617
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1651
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:558
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:579
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1603
-msgid "Variance"
-msgstr "Variance"
+#: Pireo/PireoViewerGUI.cxx:673
+msgid "Up to 100 only"
+msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:597
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:612
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:559
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:574
-msgid "Mean"
+#: Pireo/PireoViewerGUI.cxx:701 Pireo/PireoViewerGUI.cxx:735
+#: Pireo/PireoViewerGUI.cxx:764
+msgid "Enter filename"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:598
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:560
-msgid "Rec. Gradient"
+#: Pireo/PireoViewerGUI.cxx:707
+#, fuzzy
+msgid "Input Filenames"
+msgstr "Image en Entree"
+
+#: Pireo/PireoViewerGUI.cxx:710
+#, fuzzy
+msgid "Fixed Image"
+msgstr "Retourner image fixe"
+
+#: Pireo/PireoViewerGUI.cxx:717
+#, fuzzy
+msgid "Save Registration Results"
+msgstr "Sauver les parametres de recalage"
+
+#: Pireo/PireoViewerGUI.cxx:746
+msgid "Automatic save"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:599
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:561
-msgid "Textures"
+#: Pireo/RegistrationParametersGUI.cxx:126
+#, fuzzy
+msgid "Translation Transform"
+msgstr "Translation"
+
+#: Pireo/RegistrationParametersGUI.cxx:127
+#, fuzzy
+msgid "Affine Transform"
+msgstr "Transformation"
+
+#: Pireo/RegistrationParametersGUI.cxx:128
+#, fuzzy
+msgid "Scale Transform"
+msgstr "Transformation"
+
+#: Pireo/RegistrationParametersGUI.cxx:129
+msgid "BSpline Deformable Transform"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:600
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:562
-msgid "Angular Second Momentum Order"
+#: Pireo/RegistrationParametersGUI.cxx:130
+#, fuzzy
+msgid "RigidTransform"
+msgstr "Transformation"
+
+#: Pireo/RegistrationParametersGUI.cxx:131
+msgid "Centered Affine Transform"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:601
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:563
-msgid "Cluster Shade"
+#: Pireo/RegistrationParametersGUI.cxx:178
+#: Pireo/RegistrationParametersGUI.cxx:650
+msgid "1"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:602
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:564
-msgid "Cluster Prominence"
+#: Pireo/RegistrationParametersGUI.cxx:179
+#: Pireo/RegistrationParametersGUI.cxx:651
+msgid "2"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:603
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:565
-msgid "Contrast"
-msgstr "Contraste"
+#: Pireo/RegistrationParametersGUI.cxx:180
+#: Pireo/RegistrationParametersGUI.cxx:652
+msgid "3"
+msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:604
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:566
-msgid "Correlation"
+#: Pireo/RegistrationParametersGUI.cxx:181
+#: Pireo/RegistrationParametersGUI.cxx:653
+msgid "4"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:605
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:567
-msgid "Difference Entropy"
+#: Pireo/RegistrationParametersGUI.cxx:182
+msgid "5"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:606
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:568
-msgid "Difference Variance"
+#: Pireo/RegistrationParametersGUI.cxx:229
+#, fuzzy
+msgid "Nearest Neighbor Interpolation"
+msgstr "Interpolation Lineaire"
+
+#: Pireo/RegistrationParametersGUI.cxx:230
+msgid "Linear Interpolation"
+msgstr "Interpolation Lineaire"
+
+#: Pireo/RegistrationParametersGUI.cxx:231
+msgid "B-Spline Interpolation"
+msgstr "Interpolation B-Spline"
+
+#: Pireo/RegistrationParametersGUI.cxx:296
+#, fuzzy
+msgid "Mean Squares Metric"
+msgstr "Erreur quadratique moyenne:"
+
+#: Pireo/RegistrationParametersGUI.cxx:297
+msgid "Mutual Information Metric"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:607
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:569
-msgid "Energy"
-msgstr "Energie"
+#: Pireo/RegistrationParametersGUI.cxx:298
+#, fuzzy
+msgid "Normalized Correlation Metric"
+msgstr "Normalisation (%)"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:608
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:570
-msgid "Entropy"
+#: Pireo/RegistrationParametersGUI.cxx:299
+msgid "Mean Reciprocal Square Difference Metric"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:609
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:571
-msgid "Information Correlation 1"
+#: Pireo/RegistrationParametersGUI.cxx:300
+msgid "Mattes Mutual Information Metric"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:610
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:572
-msgid "Information Correlation 2"
+#: Pireo/RegistrationParametersGUI.cxx:400
+msgid "Regular Step Gradient Descent Optimizer"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:611
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:573
-msgid "Inverse Difference Moment"
+#: Pireo/RegistrationParametersGUI.cxx:401
+msgid "Conjugate Gradient Optimizer"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:613
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:575
-msgid "PanTex"
+#: Pireo/RegistrationParametersGUI.cxx:402
+msgid "Gradient Descent Optimizer"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:614
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:576
-msgid "Sum Average"
+#: Pireo/RegistrationParametersGUI.cxx:403
+msgid "One Plus One Evolutionary Optimizer"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:615
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:577
-msgid "Sum Entropy"
+#: Pireo/RegistrationParametersGUI.cxx:694
+#, fuzzy
+msgid "Registration parameters"
+msgstr "Sauver les parametres de recalage"
+
+#: Pireo/RegistrationParametersGUI.cxx:703
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:109
+msgid "Transformation"
+msgstr "Transformation"
+
+#: Pireo/RegistrationParametersGUI.cxx:709
+#: Pireo/RegistrationParametersGUI.cxx:837
+#: Pireo/RegistrationParametersGUI.cxx:859
+#: Pireo/RegistrationParametersGUI.cxx:973
+#: Pireo/RegistrationParametersGUI.cxx:1250
+msgid "Select"
+msgstr "Selectionner"
+
+#: Pireo/RegistrationParametersGUI.cxx:714
+#: Pireo/RegistrationParametersGUI.cxx:842
+#: Pireo/RegistrationParametersGUI.cxx:864
+#: Pireo/RegistrationParametersGUI.cxx:978
+msgid "Use"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:616
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:578
-msgid "Sum Variance"
+#: Pireo/RegistrationParametersGUI.cxx:727
+msgid "Translation Transform: Parameters"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:618
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:580
-msgid "SFS"
+#: Pireo/RegistrationParametersGUI.cxx:736
+#: Pireo/RegistrationParametersGUI.cxx:753
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:369
+#: Code/Modules/otbViewerModuleGroup.cxx:477
+msgid "Y"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:619
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:581
-msgid "Length"
+#: Pireo/RegistrationParametersGUI.cxx:744
+#, fuzzy
+msgid "Scale Transform: Parameters"
+msgstr "Sauver les parametres"
+
+#: Pireo/RegistrationParametersGUI.cxx:761
+#: Pireo/RegistrationParametersGUI.cxx:776
+#, fuzzy
+msgid "Affine Transform: Parameters"
+msgstr "Parametres d'interpolation"
+
+#: Pireo/RegistrationParametersGUI.cxx:766
+#: Pireo/RegistrationParametersGUI.cxx:817
+msgid "Initialize with image geometry"
+msgstr "Initialisation avec la geometrie d'une image"
+
+#: Pireo/RegistrationParametersGUI.cxx:785
+#, fuzzy
+msgid "BSpline Transform: Parameters"
+msgstr "Parametres d'interpolation"
+
+#: Pireo/RegistrationParametersGUI.cxx:790
+#, fuzzy
+msgid "BSpline order"
+msgstr "Splines"
+
+#: Pireo/RegistrationParametersGUI.cxx:802
+msgid "Rigid Transform: Parameters"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:620
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:582
-msgid "Width"
+#: Pireo/RegistrationParametersGUI.cxx:807
+msgid "Angle"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:621
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:583
-msgid "PSI"
+#: Pireo/RegistrationParametersGUI.cxx:811
+msgid "Initialize with image moments"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:622
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:584
-msgid "W-mean"
+#: Pireo/RegistrationParametersGUI.cxx:853
+msgid "Metric"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:623
-#: Code/Modules/otbAlgebraGroup.cxx:52
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:585
-msgid "Ratio"
+#: Pireo/RegistrationParametersGUI.cxx:878
+msgid "Mutual Information Metric: Parameters"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:624
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:586
-msgid "SD"
+#: Pireo/RegistrationParametersGUI.cxx:883
+#: Pireo/RegistrationParametersGUI.cxx:890
+msgid "Fixed Image Standard Deviation"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:627
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:589
-msgid "Morphology"
-msgstr "Morphologie"
+#: Pireo/RegistrationParametersGUI.cxx:897
+#: Pireo/RegistrationParametersGUI.cxx:924
+#, fuzzy
+msgid "Number of Spatial Samples"
+msgstr "Nombre d'iterations"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:628
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:590
-msgid "Morphological Opening Profile (experimental)"
+#: Pireo/RegistrationParametersGUI.cxx:910
+msgid "NONE"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:629
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:591
-msgid "Morphological Closing Profile (experimental)"
+#: Pireo/RegistrationParametersGUI.cxx:919
+msgid "Mattes Mutual Information Metric: Parameters"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:631
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:593
-msgid "Radiometry Indexes"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:934
+#, fuzzy
+msgid "Number of Histogram Bins"
+msgstr "Nombre d'iterations"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:632
-#: LandCoverMap/otbLandCoverMapView.cxx:175
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:594
-msgid "Vegetation"
+#: Pireo/RegistrationParametersGUI.cxx:948
+msgid "Mean Reciprocal Square Metric: Parameters"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:633
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:595
-msgid "NDVI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:953
+#, fuzzy
+msgid "Lambda"
+msgstr "Charger"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:634
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:596
-msgid "RVI"
+#: Pireo/RegistrationParametersGUI.cxx:968
+msgid "Optimizer"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:635
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:597
-msgid "PVI"
+#: Pireo/RegistrationParametersGUI.cxx:992
+msgid "Scaling Rotation Matrix"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:636
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:598
-msgid "SAVI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1026
+#: Pireo/RegistrationParametersGUI.cxx:1067
+#: Pireo/RegistrationParametersGUI.cxx:1149
+#, fuzzy
+msgid "Scaling Translation X"
+msgstr "Translation"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:637
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:599
-msgid "MSAVI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1033
+#: Pireo/RegistrationParametersGUI.cxx:1072
+#: Pireo/RegistrationParametersGUI.cxx:1156
+#, fuzzy
+msgid "Scaling Translation Y"
+msgstr "Translation"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:638
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:600
-msgid "MSAVI2"
+#: Pireo/RegistrationParametersGUI.cxx:1040
+msgid "Scaling Center X"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:639
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:601
-msgid "TSAVI"
+#: Pireo/RegistrationParametersGUI.cxx:1047
+msgid "Scaling Center Y"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:640
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:602
-msgid "GEMI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1054
+#: Pireo/RegistrationParametersGUI.cxx:1062
+#: Pireo/RegistrationParametersGUI.cxx:1081
+#: Pireo/RegistrationParametersGUI.cxx:1163
+#, fuzzy
+msgid "Optimizer: Parameters"
+msgstr "Sauver les parametres"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:641
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:603
-msgid "WDVI"
+#: Pireo/RegistrationParametersGUI.cxx:1086
+msgid "Angle scale"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:642
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:604
-msgid "IPVI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1091
+#, fuzzy
+msgid "X translation"
+msgstr "Translation"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:643
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:605
-msgid "TNDVI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1096
+#, fuzzy
+msgid "Y translation"
+msgstr "Translation"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:644
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:606
-msgid "ARVI"
+#: Pireo/RegistrationParametersGUI.cxx:1101
+msgid "X center"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:645
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:607
-msgid "EVI"
+#: Pireo/RegistrationParametersGUI.cxx:1106
+msgid "Y center"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:646
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:608
-msgid "TSARVI"
+#: Pireo/RegistrationParametersGUI.cxx:1115
+msgid "Scaling, rotation, shearing Matrix"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:647
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:609
-msgid "AVI"
+#: Pireo/RegistrationParametersGUI.cxx:1183
+msgid "Generator Seed"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:649
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:611
-msgid "Soil"
+#: Pireo/RegistrationParametersGUI.cxx:1190
+#: Pireo/RegistrationParametersGUI.cxx:1213
+#: Pireo/RegistrationParametersGUI.cxx:1230
+msgid "Maximize"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:650
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:612
-msgid "RI"
+#: Pireo/RegistrationParametersGUI.cxx:1199
+msgid "Maximum Step Length"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:651
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:613
-msgid "CI"
+#: Pireo/RegistrationParametersGUI.cxx:1206
+msgid "Minimum Step Length"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:652
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:614
-msgid "BI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1223
+msgid "Learning rate"
+msgstr "Taux d'apprentissage"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:653
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:615
-msgid "BI2"
+#: Pireo/RegistrationParametersGUI.cxx:1244
+msgid "Others"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:655
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:617
-msgid "Built Up"
+#: Pireo/RegistrationParametersGUI.cxx:1255
+msgid "Registration Number of Levels"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:656
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:618
-msgid "NDBI"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1263
+#, fuzzy
+msgid "Number of Iterations"
+msgstr "Nombre d'iterations"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:657
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:619
-msgid "ISU"
-msgstr ""
+#: Pireo/RegistrationParametersGUI.cxx:1273
+msgid "Refresh GUI"
+msgstr "Rafraichir"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:659
-#: LandCoverMap/otbLandCoverMapView.cxx:184
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:621
-msgid "Water"
+#: Pireo/RegistrationParametersGUI.cxx:1295
+msgid "&Help"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:660
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:622
-msgid "SRWI"
-msgstr ""
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:254
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1868
+msgid "Save result"
+msgstr "Sauver Resultat"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:661
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:623
-msgid "NDWI"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:460
+msgid "Polarimetric synthesis application"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:662
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:624
-msgid "NDWI2"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:468
+msgid ""
+"This area display a piece of the image at full resolution. You can change "
+"the displayed region by clicking on the scroll area"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:663
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:625
-msgid "MNDWI"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:479
+msgid ""
+"This area display a minimap of the full image, allowing you to change the "
+"region displayed by the full resolution area by clicking"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:664
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:626
-msgid "NDPI"
-msgstr ""
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:488
+msgid "Polarization parameters"
+msgstr "Parametres Polarisation"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:665
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:627
-msgid "NDTI"
-msgstr ""
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:498
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:306
+msgid "Red"
+msgstr "Rouge"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:668
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:630
-msgid "Edge Density"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:501
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:622
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:743
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:870
+msgid "Emission"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:669
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:631
-msgid "Sobel"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:507
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:549
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:628
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:670
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:749
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:791
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:876
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:918
+msgid "Psi"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:672
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:634
-msgid "Smooth"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:508
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:629
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:750
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:877
+msgid "Change the incident Psi value (in degree)"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:673
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:635
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:133
-msgid "Clusters"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:524
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:566
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:645
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:687
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:766
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:808
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:893
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:935
+msgid "Khi"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:674
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:636
-msgid "Labels"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:525
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:646
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:767
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:894
+msgid "Change the incident Khi value (in degree)"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:675
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:637
-msgid "Boundries"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:543
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:664
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:785
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:912
+msgid "Reception"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:677
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:639
-msgid "Original data"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:550
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:671
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:792
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:919
+msgid "Change the reflected Psi value (in degree)"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:774
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:729
-msgid "Feature Extraction Application"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:567
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:688
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:809
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:936
+msgid "Change the emitted Khi value (in degree)"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:792
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:743
-#: Code/Modules/otbWriterViewGroup.cxx:161
-msgid "Action"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:586
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:707
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:828
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:955
+msgid "Cross-polarization"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:799
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:750
-msgid "Feature Choice"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:587
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:708
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:829
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:956
+msgid "Force cross polarization"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:808
-msgid "Feature parameters"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:595
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:716
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:837
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:964
+msgid "Co-polarization"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:831
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:783
-msgid "Sigma D"
-msgstr ""
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:596
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:717
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:838
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:965
+msgid "Force co-polarization"
+msgstr "Forcer co-polarization"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:838
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:790
-msgid "Sigma I"
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:604
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:725
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:846
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:973
+msgid "Indifferent polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:605
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:726
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:847
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:974
+msgid "Allows any polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:618
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:316
+msgid "Green"
+msgstr "Vert"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:739
+msgid "Blue"
+msgstr "Bleu"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:867
+msgid "Grayscale"
+msgstr "Niveaux de gris"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:989
+msgid "Gain"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1021
+msgid "Poincare Sphere"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1022
+msgid "Drag the sphere to rotate it"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1038
+msgid "RGB"
+msgstr "RVB"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1047
+msgid "Image file chooser"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1057
+msgid "HH image"
+msgstr "Image HH"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1058
+#, fuzzy
+msgid "HH input image path"
+msgstr "Ouvrir Image"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1066
+msgid "HV image"
+msgstr "Image HV"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1067
+#, fuzzy
+msgid "HV input image path"
+msgstr "Ouvrir Image"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1075
+msgid "VH image"
+msgstr "Image VH"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1076
+#, fuzzy
+msgid "VH input image path"
+msgstr "Ouvrir Image"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1084
+msgid "VV image"
+msgstr "Image VV"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1085
+#, fuzzy
+msgid "VV input image path"
+msgstr "Ouvrir Image"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1094
+msgid "Choose the HH image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1103
+msgid "Choose the HV image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1112
+msgid "Choose the VH image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1121
+msgid "Choose the VV image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1133
+msgid "Vector image"
+msgstr "Image vecteur"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1134
+#, fuzzy
+msgid "Vector input image path"
+msgstr "Ouvrir Image"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1145
+msgid "Choose the vector image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1158
+msgid "Load images into the application"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1167
+msgid "Hide the open images window"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1175
+msgid "Open Vector image"
+msgstr "Ouvrir une image vecteur"
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1176
+msgid "Import a polarimetric vector image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1186
+msgid "Import images corresponding to the HH, HV, VH, VV channels"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1196
+msgid "V Emission"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1197
+msgid "Enable or disable the vertical emssion for the polarimetric data"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1206
+msgid "H Emission"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1207
+msgid "Enable or disable the horizontcal emssion for the polarimetric data"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:72
+msgid "Save luminance image"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:73
+msgid "Save reflectance TOA image"
+msgstr "Sauver image de reflectance TOA"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:74
+msgid "Save reflectance TOC image"
+msgstr "Sauver image reflectance TOC"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:75
+#, fuzzy
+msgid "Save TOA-TOC image"
+msgstr "Sauver image resultat"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:78
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:82
+#: Code/Modules/otbProjectionGroup.cxx:757
+msgid "Settings"
+msgstr "Parametres"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:80
+#, fuzzy
+msgid "Coef. setup"
+msgstr "Vue"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:156
+msgid "NO AEROSOL"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:157
+msgid "CONTINENTAL"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:158
+msgid "MARITIME"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:159
+msgid "URBAN"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:160
+msgid "DESERTIC"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:207
+msgid "0"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:260
+msgid "Radiometric calibration application"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:281
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:72
+msgid "Navigation view"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:289
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:297
+#, fuzzy
+msgid "Zoom view"
+msgstr "Zoom image a recaler"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:305
+msgid "Histograms"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:313
+#, fuzzy
+msgid "Pixel information"
+msgstr "Transformation"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:321
+msgid "Result pixel information"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:361
+msgid "Luminance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:369
+#, fuzzy
+msgid "Reflectance TOA"
+msgstr "Sauver image de reflectance TOA"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:377
+#, fuzzy
+msgid "Reflectance TOC"
+msgstr "Sauver image reflectance TOC"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:385
+msgid "TOA - TOC"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:481
+msgid "Radiometric Coefficients Setup"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:492
+msgid "Correction parameters"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:499
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:500
+msgid "Aerosol model"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:508
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:509
+msgid "Ozone Amount"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:517
+msgid "Atmo. Pressure"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:518
+msgid "Atmospheric Pressure"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:531
+msgid "Aerosol thickness"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:532
+msgid "Aerosol optical thickness"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:542
+msgid "Water amount"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:543
+msgid "Water vapor amount"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:553
+msgid "Aeronet file"
+msgstr "Fichier Aeronet"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:566
+msgid "Filter function values file"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:579
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:740
+msgid "Radiative terms"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:600
+msgid "Intrinsic refl"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:601
+msgid "Intrinsic atmospheric reflectance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:611
+msgid "Albedo"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:612
+msgid "Shperical albedo of the atmosphere"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:622
+msgid "Gaseous trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:623
+msgid "Total gaseous transmission"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:633
+#, fuzzy
+msgid "Down trans"
+msgstr "Contraste"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:634
+msgid "Downward transmittance of the atmosphere"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:644
+msgid "Up trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:645
+msgid "Upward transmittance of the atmosphere"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:655
+msgid "Up diffuse trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:656
+msgid "Upward diffuse transmittance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:666
+msgid "Up direct trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:667
+msgid "Upward direct transmittance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:677
+msgid "Up diff. trans. (Rayleigh)"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:678
+msgid "Upward diffuse transmittance for Rayleigh"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:688
+msgid "Up diff trans. (aerososl)"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:689
+msgid "Upward diffuse transmittance for aerosols"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:701
+msgid "Reload channel radiative terms"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:714
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1029
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:140
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1003
+msgid "Close"
+msgstr "Fermer"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:715
+msgid "Close the window"
+msgstr "Fermer"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:723
+#, fuzzy
+msgid "Set up radiometric parameters"
+msgstr "Parametres Atmospherique"
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:732
+msgid "Atmospheric parameters"
+msgstr "Parametres Atmospherique"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:109
+msgid "Save result image"
+msgstr "Sauver resultat"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:110
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:87
+msgid "Save classif as vector data (Experimental)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:111
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:88
+msgid "Open SVM model"
+msgstr "Ouvrir modele SVM"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:112
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:89
+msgid "Save SVM model"
+msgstr "Sauver Modele SVM"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:113
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:90
+msgid "Import vector data (ROI)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:114
+msgid "Export vector data (ROI)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:115
+msgid "Export all vector data (ROI)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:116
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:92
+msgid "Import ROIs from labeled image"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:119
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:455
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:571
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:444
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:573
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:95
+#: Code/Modules/otbViewerModuleGroup.cxx:295
+msgid "Setup"
+msgstr "Configuration"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:120
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:96
+msgid "Visualisation"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:273
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:342
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:324
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:251
+msgid "c_svc"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:274
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:343
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:325
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:252
+msgid "nu_svc"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:275
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:344
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:326
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:253
+msgid "one_class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:276
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:345
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:327
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:254
+msgid "epsilon_svr"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:277
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:346
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:328
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:255
+msgid "nu_svr"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:282
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:351
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:333
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:260
+msgid "linear"
+msgstr "lineaire"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:283
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:352
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:334
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:261
+msgid "polynomial"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:284
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:353
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:335
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:262
+msgid "rbf"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:285
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:354
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:336
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:263
+msgid "sigmoid"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:382
+msgid "Supervised Classification Application"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:387
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:365
+msgid "Classes list"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:388
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:366
+msgid "Browse and select classes"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:400
+msgid "Class Information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:401
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:379
+msgid "Display selected class information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:418
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:396
+msgid "Image information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:419
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:397
+msgid "Display image information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:428
+msgid "Edit Classes"
+msgstr "Editer les classes"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:429
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:407
+msgid "Tools to edit classes attributes"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:436
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1749
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1700
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:421
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:301
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:414
+msgid "Add"
+msgstr "Ajouter"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:437
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:415
+msgid "Add a new class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:448
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:426
+msgid "Remove the selected class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:458
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:436
+msgid "Name"
+msgstr "Nom"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:459
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:437
+msgid "Change the name of the selected class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:482
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:460
+msgid "Sets"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:489
+msgid "Training"
+msgstr "Entrainement"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:490
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:468
+msgid "Display the training set"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:503
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1010
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:984
+msgid "Validation"
+msgstr "Validation"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:504
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:481
+msgid ""
+"Display the validation set. Only available if random validation samples is "
+"not activated"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:517
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:493
+msgid "Random"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:518
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:494
+msgid ""
+"If activated, validation sample is randomly choosen as a subset of the "
+"training samples"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:526
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:502
+msgid "Probability "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:527
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:503
+msgid ""
+"Tune the probability for a sample to be choosen as a training sample. Only "
+"available is random validation sample generation is activated"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:542
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:518
+msgid "Classification"
+msgstr "Classification"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:551
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:527
+msgid "Display the results of the classification"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:563
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:539
+msgid "Learn"
+msgstr "Apprentissage"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:564
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:540
+msgid "Learn the SVM model from training samples"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:577
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:553
+msgid "Validate"
+msgstr "Validation"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:578
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:554
+msgid "Display some quality assesment on the classification"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:592
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:568
+msgid "Regions of interest"
+msgstr "Regions d'interet"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:593
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:569
+msgid "Tools to edit the regions of interest"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:600
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:514
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:507
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:576
+msgid "Erase last point"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:601
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:577
+msgid "Delete the last point of the selected region of interest"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:622
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:558
+msgid "ClearROIs"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:623
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:559
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:599
+msgid "Clear all regions of interest"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:633
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:522
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:516
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:609
+msgid "End polygon"
+msgstr "Finir polygone"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:634
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:610
+msgid "End the current polygon"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:644
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:620
+msgid "Polygon"
+msgstr "Polygone"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:645
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:621
+msgid "Switch between polygonal or rectangular selection"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:658
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:634
+msgid "Opacity "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:659
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:635
+msgid "Tune the region of interest and classification result opacity"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:675
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:481
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:472
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:651
+msgid "Pixel locations and values"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:676
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:652
+msgid "Display pixel location and values"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:688
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:664
+msgid "Class color"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:689
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:665
+msgid "Display the selected class color"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:697
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:673
+msgid "ROI list"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:698
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:674
+msgid "Browse and select ROI associated to the selected class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:710
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:686
+msgid "Focus the viewer on the selected ROI"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:722
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:770
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:773
+msgid "SVM Setup"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:727
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:776
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:778
+msgid "SVM Type"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:728
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:704
+msgid "Set the SVM type"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:738
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:786
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:788
+msgid "Kernel Type"
+msgstr "Type de noyau"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:739
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:715
+msgid "Set the kernel type"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:749
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:796
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:798
+msgid "Kernel Degree "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:757
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:803
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:805
+msgid "Gamma "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:764
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:810
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:812
+msgid "Nu "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:771
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:817
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:819
+msgid "Coef0 "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:778
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:824
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:826
+msgid "C "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:785
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:831
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:833
+msgid "Epsilon "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:792
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:838
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:840
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:767
+msgid "Shrinking"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:800
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:846
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:848
+msgid "Probability Estimation"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:808
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:854
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:856
+msgid "Cache Size "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:824
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:869
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:871
+msgid "P "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:843
+msgid "Visualisation Setup"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:974
+msgid "Full Window"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:982
+msgid "Scroll Window"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:990
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:964
+msgid "Class name chooser"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:994
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:968
+msgid "Name: "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:998
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:972
+msgid "ok"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1015
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:989
+msgid "Confusion matrix"
+msgstr "Matrice de confusion"
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1022
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:996
+msgid "Accuracy"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:45
+msgid "Save Result"
+msgstr "Sauver resultat"
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:593
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:555
+msgid "Touzi"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:594
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:556
+msgid "Harris (experimental)"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:596
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:617
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1651
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:558
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:579
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1603
+msgid "Variance"
+msgstr "Variance"
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:597
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:612
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:559
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:574
+msgid "Mean"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:598
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:560
+msgid "Rec. Gradient"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:599
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:561
+msgid "Textures"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:600
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:562
+msgid "Angular Second Momentum Order"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:601
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:563
+msgid "Cluster Shade"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:602
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:564
+msgid "Cluster Prominence"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:603
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:565
+msgid "Contrast"
+msgstr "Contraste"
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:604
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:566
+msgid "Correlation"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:605
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:567
+msgid "Difference Entropy"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:606
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:568
+msgid "Difference Variance"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:607
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:569
+msgid "Energy"
+msgstr "Energie"
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:608
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:570
+msgid "Entropy"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:609
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:571
+msgid "Information Correlation 1"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:610
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:572
+msgid "Information Correlation 2"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:611
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:573
+msgid "Inverse Difference Moment"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:613
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:575
+msgid "PanTex"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:614
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:576
+msgid "Sum Average"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:615
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:577
+msgid "Sum Entropy"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:616
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:578
+msgid "Sum Variance"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:618
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:580
+msgid "SFS"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:619
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:581
+msgid "Length"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:620
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:582
+msgid "Width"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:621
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:583
+msgid "PSI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:622
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:584
+msgid "W-mean"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:623
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:585
+#: Code/Modules/otbAlgebraGroup.cxx:52
+msgid "Ratio"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:624
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:586
+msgid "SD"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:627
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:589
+msgid "Morphology"
+msgstr "Morphologie"
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:628
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:590
+msgid "Morphological Opening Profile (experimental)"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:629
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:591
+msgid "Morphological Closing Profile (experimental)"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:631
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:593
+msgid "Radiometry Indexes"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:633
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:595
+msgid "NDVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:634
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:596
+msgid "RVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:635
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:597
+msgid "PVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:636
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:598
+msgid "SAVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:637
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:599
+msgid "MSAVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:638
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:600
+msgid "MSAVI2"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:639
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:601
+msgid "TSAVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:640
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:602
+msgid "GEMI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:641
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:603
+msgid "WDVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:642
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:604
+msgid "IPVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:643
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:605
+msgid "TNDVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:644
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:606
+msgid "ARVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:645
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:607
+msgid "EVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:646
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:608
+msgid "TSARVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:647
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:609
+msgid "AVI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:649
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:611
+msgid "Soil"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:650
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:612
+msgid "RI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:651
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:613
+msgid "CI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:652
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:614
+msgid "BI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:653
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:615
+msgid "BI2"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:655
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:617
+msgid "Built Up"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:656
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:618
+msgid "NDBI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:657
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:619
+msgid "ISU"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:660
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:622
+msgid "SRWI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:661
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:623
+msgid "NDWI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:662
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:624
+msgid "NDWI2"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:663
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:625
+msgid "MNDWI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:664
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:626
+msgid "NDPI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:665
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:627
+msgid "NDTI"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:668
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:630
+msgid "Edge Density"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:669
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:631
+msgid "Sobel"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:671
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:633
+msgid "Mean Shift"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:672
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:634
+msgid "Smooth"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:673
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:635
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:133
+msgid "Clusters"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:674
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:636
+msgid "Labels"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:675
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:637
+msgid "Boundries"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:677
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:639
+msgid "Original data"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:774
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:729
+msgid "Feature Extraction Application"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:792
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:743
+#: Code/Modules/otbWriterViewGroup.cxx:162
+msgid "Action"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:799
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:750
+msgid "Feature Choice"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:808
+msgid "Feature parameters"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:831
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:783
+msgid "Sigma D"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:838
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:790
+msgid "Sigma I"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:845
@@ -3031,15 +4519,9 @@ msgstr ""
msgid "a_rb"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1292
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1244
-msgid "b_rb"
-msgstr ""
-
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1302
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:258
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1254
-msgid "X"
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1292
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1244
+msgid "b_rb"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1336
@@ -3146,6 +4628,16 @@ msgstr ""
msgid "Upper Thresh"
msgstr ""
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1704
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1656
+msgid "Spatial Radius"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1711
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1663
+msgid "Range Radius"
+msgstr ""
+
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1719
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1671
msgid "Min. Region Size"
@@ -3156,18 +4648,10 @@ msgstr ""
msgid "Channels Selection"
msgstr "Selection des canaux"
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1749
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:436
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:419
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1700
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:301
-msgid "Add"
-msgstr "Ajouter"
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1750
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1701
msgid "Add feature to list (one per selected channel)"
-msgstr ""
+msgstr "Ajoute un attribut a la liste (un par canal selectionne)"
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1760
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1794
@@ -3180,14 +4664,14 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1795
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1712
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1744
-#: Code/Modules/otbWriterViewGroup.cxx:201
+#: Code/Modules/otbWriterViewGroup.cxx:202
msgid "Contains each Computed Feature"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1773
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1723
msgid "Feature Information"
-msgstr ""
+msgstr "Information sur les attributs"
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1785
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1734
@@ -3195,39 +4679,15 @@ msgstr ""
msgid "Output"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1786
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:543
-#: LandCoverMap/otbLandCoverMapView.cxx:51
-#: LandCoverMap/otbLandCoverMapView.cxx:82
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:526
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1735
-#: Code/Modules/otbWriterViewGroup.cxx:193
-msgid "Tools for classification"
-msgstr ""
-
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1807
-#: OrthoFusion/otbOrthoFusionGUI.cxx:538 OrthoFusion/otbOrthoFusionGUI.cxx:550
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1755
-#: Code/Modules/otbWriterViewGroup.cxx:212
-msgid ">>"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1808
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1756
-#: Code/Modules/otbWriterViewGroup.cxx:213
+#: Code/Modules/otbWriterViewGroup.cxx:214
msgid "Add mono Channel Image to Intput List"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1818
-#: OrthoFusion/otbOrthoFusionGUI.cxx:544 OrthoFusion/otbOrthoFusionGUI.cxx:556
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1766
-#: Code/Modules/otbWriterViewGroup.cxx:223
-msgid "<<"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1819
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1767
-#: Code/Modules/otbWriterViewGroup.cxx:224
+#: Code/Modules/otbWriterViewGroup.cxx:225
msgid "Remove Mono channel Image from Output List"
msgstr ""
@@ -3238,13 +4698,13 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1830
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1778
-#: Code/Modules/otbWriterViewGroup.cxx:235
+#: Code/Modules/otbWriterViewGroup.cxx:236
msgid "Contains each Selected Feature for Output Generation"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1842
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1789
-#: Code/Modules/otbWriterViewGroup.cxx:246
+#: Code/Modules/otbWriterViewGroup.cxx:247
msgid "+"
msgstr ""
@@ -3252,322 +4712,379 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1854
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1790
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1801
-#: Code/Modules/otbWriterViewGroup.cxx:247
-#: Code/Modules/otbWriterViewGroup.cxx:258
+#: Code/Modules/otbWriterViewGroup.cxx:248
+#: Code/Modules/otbWriterViewGroup.cxx:259
msgid "Change selected Feature Position in Output Image"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1853
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1800
-#: Code/Modules/otbWriterViewGroup.cxx:257
+#: Code/Modules/otbWriterViewGroup.cxx:258
msgid "-"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1869
-#: LandCoverMap/otbLandCoverMapView.cxx:114
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1816
-#: Code/Modules/otbWriterViewGroup.cxx:273
-msgid "Save the Composition"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1880
msgid "Erase Feature and Close Input Image"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1890
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1826
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:219
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:224
msgid "Clear List"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1891
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1827
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:220
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:231
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:225
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:236
msgid "Clear Feature List"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1902
-#: LandCoverMap/otbLandCoverMapView.cxx:125
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1838
-#: Code/Modules/otbWriterViewGroup.cxx:284
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:163
-msgid "Quit Application"
-msgstr "Quitter"
-
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1920
-#: Code/Modules/otbWriterViewGroup.cxx:303
-msgid "Full resolution"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1927
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1863
msgid "Feature"
+msgstr "Attribut"
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:72
+msgid "Open vector"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:199
-msgid "otbImageViewerManagerView"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:73
+msgid "Save Image Result"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:253
-msgid "Packed View"
-msgstr "Vue groupe"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:74
+msgid "Save image on extract"
+msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:254
-msgid "Toggle Packed mode"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:76
+msgid "Save Vector Data"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:262
-msgid "Splitted View"
-msgstr "Vue separe"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:77
+msgid "Save vector on extract"
+msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:263
-msgid "Toggle Splitted mode"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:78
+msgid "Save vector on full"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:449
-#: Code/Modules/otbViewerModuleGroup.cxx:394
-msgid "Amplitude"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:83
+msgid "Configure "
+msgstr "Configurer"
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:84
+msgid "Viewer Setup"
+msgstr "Configuration visu"
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:329
+msgid "Urban Area Extraction Application"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:466
-msgid "Link Images"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:349
+msgid "Master View Selection"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:494
-msgid "First image"
-msgstr "Image 1"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:358
+msgid "Selected ROI"
+msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:532
-#, fuzzy
-msgid "Second image"
-msgstr "Image de navigation"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:373
+msgid "Switch View"
+msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:22
-msgid "Open stereoscopic couple"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:390
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:398
+msgid "Pixel Value"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:169
-msgid "Stereoscopic viewer"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:406
+msgid "Display Vectors"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:177
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:407
+msgid "Display/Hide the vector datas"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:422
+msgid "Focus in ROI"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:441
+msgid "Detail level"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:447
+msgid "Min Size"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:448
+#: Code/Modules/otbThresholdGroup.cxx:150
+#: Code/Modules/otbThresholdGroup.cxx:166
+msgid "Minimum size of a detected region (m2)"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:464
+msgid "SubSample"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:465
+msgid "Control of the sub-sample factor"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:484
+msgid "Threshold"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:490
+msgid "NonVeget/Water "
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:491
msgid ""
-"This area shows the main stereoscopic couple. To activate the sub-window "
-"mode, draw a rectangle with the middle mouse button pressed"
+"Threshold value applied on the RadiometricNonVegetationNonWaterIndex image "
+"result [ 0 ; 1 ]"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:204
-msgid "Zoom in interpolator"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:497
+msgid "Density "
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:205
-msgid "Choose the interpolator used when resample factor is less than 1"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:498
+msgid "Threshold value applied on the edge density image result [ 0 ; 1 ]"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:215
-msgid "Zoom out interpolator"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:508
+msgid "Region of interest"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:570
+msgid "Focus on the selected ROI"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:588
+msgid "Modify the alpha blending between the input image and the result"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:604
+msgid "Algorithm Configuration"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:629
+msgid "Sobel Thresholds"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:635
+msgid "Lower Threshold "
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:636
+msgid "Lower threshold of the sobel edge detector"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:643
+msgid "Upper Threshold "
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:644
+msgid ""
+"Upper threshold of the sobel edge detector. (ex: 200 for Quickbird, 50 for "
+"SPOT)"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:654
+msgid "Indices Configuration"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:674
+msgid "NIR channel index"
+msgstr "Index du canal NIR"
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:675
+msgid "Select band for NIR channel in RGB composition"
+msgstr "Selectionne la bande pour le canal NIR dans la composition RVB"
+
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:214
+msgid "Road extraction application"
+msgstr ""
+
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:245
+msgid "Input type"
+msgstr ""
+
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:279
+msgid "Use spectral angle"
+msgstr "Utiliser Angle Spectral"
+
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:297
+msgid "Use water index"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:216
-msgid "Choose the interpolator used when resample factor is more than 1"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:336
+msgid "Set the alpha value"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:226
-msgid "Magnify"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:347
+msgid "Resolution"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:227
-msgid "Magnify the scene (nearest neighbours interpolation)"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:348
+msgid "Set the revolution"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:242
-msgid "Resample"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:361
+msgid ""
+"Set the tolerance for segment consistency (tolerance in terms of distance)"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:243
-msgid "Resample the scene"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:373
+msgid "MaxAngle"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:285
-msgid "Main visualization"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:374
+msgid "Set the max angle"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:286
-msgid "Choose the couple to view"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:386
+msgid "AngularThreshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:292
-msgid "Main stereoscopic couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:387
+msgid "Set the angular threshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:305
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:374
-msgid "Show left image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:399
+msgid "AmplitudeThreshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:314
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:383
-msgid "show right image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:400
+msgid "Set the amplitude threshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:323
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:392
-msgid "Show anaglyph"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:412
+msgid "DistanceThreshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:333
-msgid "Normalization (%)"
-msgstr "Normalisation (%)"
-
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:353
-msgid "Insight"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:413
+msgid "Set the distance threshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:354
-msgid "Choose the couple to view in the insight sub-window mode"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:425
+msgid "FirstMeanDistThr"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:361
-msgid "Insight tereoscopic couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:426
+msgid "First Mean Distance threshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:415
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:480
-msgid "Rename couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:438
+msgid "SecondMeanDistThr"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:416
-msgid "Rename the selected couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:439
+msgid "Second Mean Distance threshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:425
-msgid "Open Stereoscopic couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:455
+msgid "Controls"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:448
-msgid "Left image "
+#: OrthoRectif/otbOrthoRectifGUI.cxx:411
+msgid "otbOrthoRectif"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:455
-msgid "Right image "
+#: OrthoRectif/otbOrthoRectifGUI.cxx:486
+msgid "Image List"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:500
-msgid "Couple name: "
+#: OrthoRectif/otbOrthoRectifGUI.cxx:498
+msgid "Preview Window"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:439
-msgid "otbOrthoFusion"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:521
+#: Code/Modules/otbOrthorectificationGUI.cxx:431
+msgid "Map Projection"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:514
-msgid "Images list"
-msgstr "Liste d'images"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:539
-msgid "Add PAN input image"
-msgstr "Ajouter image PAN"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:545
-msgid "Remove selected PAN"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:530
+#: Code/Modules/otbOrthorectificationGUI.cxx:440
+msgid "Cartographic Coordinates"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:551
-msgid "Add XS input image"
-msgstr "Ajouter image XS"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:557
-msgid "Remove Selected XS"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:564
+#: Code/Modules/otbOrthorectificationGUI.cxx:474
+msgid "Northern Hemisphere"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:562
-msgid "PAN image"
-msgstr "Image PAN"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:563
-msgid "Select a PAN image"
-msgstr "Choisir image PAN"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:567
-msgid "XS image"
-msgstr "Image XS"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:568
-msgid "Select a XS image"
-msgstr "Choisir image XS"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:583
-msgid "Map projection"
-msgstr "Projection"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:592
-msgid "Cartographic coordinates"
-msgstr "Coordonnees Cartographique"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:626
-msgid "Northern hemisphere"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:570
+#: Code/Modules/otbOrthorectificationGUI.cxx:480
+msgid "Southern Hemisphere"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:633
-msgid "Southern hemisphere"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:600
+#: Code/Modules/otbOrthorectificationGUI.cxx:510
+msgid "False Easting"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:682
-msgid "False easting"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:609
+#: Code/Modules/otbOrthorectificationGUI.cxx:519
+msgid "False Northing"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:691
-msgid "False northing"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:618
+#: Code/Modules/otbOrthorectificationGUI.cxx:528
+msgid "Scale Factor"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:700
-msgid "Scale factor"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:619
+#: Code/Modules/otbOrthorectificationGUI.cxx:529
+msgid "Enter Scale Factor"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:701
-msgid "Enter scale factor"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:649
+#: Code/Modules/otbOrthorectificationGUI.cxx:390
+msgid "Geographical Coordinates"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:713
-msgid "Geographical coordinates"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:736 OrthoRectif/otbOrthoRectifGUI.cxx:760
+#: Code/Modules/otbProjectionGroup.cxx:807
+#: Code/Modules/otbOrthorectificationGUI.cxx:606
+#: Code/Modules/otbOrthorectificationGUI.cxx:630
+msgid "Select the Orthorectif Interpolator"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:801 OrthoFusion/otbOrthoFusionGUI.cxx:825
-msgid "Select the orthorectif interpolator"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:744
+#: Code/Modules/otbOrthorectificationGUI.cxx:614
+msgid "Interpolator Parameters"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:809
-msgid "Interpolator parameters"
-msgstr "Parametres d'interpolation"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:870 OrthoFusion/otbOrthoFusionGUI.cxx:882
-msgid "DEM path"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:801 OrthoRectif/otbOrthoRectifGUI.cxx:813
+#: Code/Modules/otbOrthorectificationGUI.cxx:672
+#: Code/Modules/otbOrthorectificationGUI.cxx:684
+msgid "DEM Path"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:902
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:94
-msgid "Use average elevation"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:837
+#: Code/Modules/otbOrthorectificationGUI.cxx:711
+msgid "Average Elevation"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:907
-msgid "Average elevation"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:844
+#: Code/Modules/otbOrthorectificationGUI.cxx:718
+msgid "Use Average Elevation"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:920
-msgid "Image extent"
-msgstr "Image extension"
-
-#: OrthoFusion/otbOrthoFusionGUI.cxx:953
-msgid "Maximum tile size (MB)"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:855
+#: Code/Modules/otbOrthorectificationGUI.cxx:729
+msgid "Image Extent"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:954
-msgid "From streaming pipeline, precise the maximum tile size"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:888
+msgid "Maximum Tile Size (MB)"
msgstr ""
-#: Common/otbMsgReporterGUI.cxx:7 Code/Common/otbMsgReporterGUI.cxx:7
-msgid "Msg Reporter"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:889
+msgid "From Streaming pipeline, precise the maximum tile size"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:66
@@ -3579,80 +5096,31 @@ msgid "Load Right Image ..."
msgstr "Charger image a droite"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:68
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:45
msgid "Load SVM model ..."
msgstr "Charger modele SVM"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:69
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:46
msgid "Import vector data ..."
msgstr "Importer donnees vecteur"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:70
-msgid "Export vector data ..."
-msgstr "Exporter donnee vecteur"
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:71
-msgid "Save SVM model ..."
-msgstr "Sauver modele SVM"
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:72
-msgid "Save result image ..."
-msgstr "Sauver image resultat"
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:342
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:273
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:256
-msgid "c_svc"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:343
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:274
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:257
-msgid "nu_svc"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:344
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:275
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:258
-msgid "one_class"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:345
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:276
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:259
-msgid "epsilon_svr"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:346
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:277
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:260
-msgid "nu_svr"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:351
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:282
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:265
-msgid "linear"
-msgstr "lineaire"
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:352
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:283
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:266
-msgid "polynomial"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:353
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:284
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:267
-msgid "rbf"
-msgstr ""
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:47
+msgid "Export vector data ..."
+msgstr "Exporter donnee vecteur"
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:354
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:285
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:268
-msgid "sigmoid"
-msgstr ""
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:71
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:48
+msgid "Save SVM model ..."
+msgstr "Sauver modele SVM"
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:72
+msgid "Save result image ..."
+msgstr "Sauver image resultat"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:372
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:354
msgid "Principal Window"
msgstr ""
@@ -3661,1055 +5129,1047 @@ msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:515
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:523
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:531
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:368
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:445
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:508
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:517
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:526
msgid "Clear the entire drawing"
msgstr "Effacer tout le dessin"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:393
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:376
msgid "Learn "
msgstr "Apprentissage"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:394
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:503
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:377
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:495
msgid "Learn the SVM model from the training set"
msgstr "Apprentissage du SVM depuis l'ensemble d'entrainement"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:404
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:388
msgid "Unchanged class"
msgstr "Classe sans changements"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:405
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:427
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:389
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:413
msgid "Choose changed class training set color"
msgstr "Choix de la couleur de la classe changements"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:415
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:400
msgid "Changed class"
msgstr "Changer la classe"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:416
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:401
msgid "Toggle changed class training set display"
msgstr "Affiche la classe changements"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:426
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:434
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:412
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:421
msgid "Color ..."
msgstr "Couleur..."
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:435
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:422
msgid "Choose unchanged class training set color"
msgstr "Choix de la couleur de la classe sans changement"
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:442
-#: LandCoverMap/otbLandCoverMapView.cxx:152
-msgid "Opacity"
-msgstr "Opacite"
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:443
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:431
msgid "Set the training set opacity"
msgstr "Modifie l'opacite de l'ensemble d'entrainement"
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:455
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:571
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:119
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:103
-#: Code/Modules/otbViewerModuleGroup.cxx:295
-msgid "Setup"
-msgstr "Configuration"
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:463
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:453
msgid "Use change detectors"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:464
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:454
msgid ""
"Enrich feature vector with mean-difference and mean-ratio change detectors "
"attributes"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:475
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:466
msgid "Logs"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:481
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:675
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:658
-msgid "Pixel locations and values"
-msgstr ""
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:493
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:484
msgid "Polygonal ROI"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:502
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:494
msgid "Display results "
msgstr "Afficher resultats"
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:514
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:600
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:583
-msgid "Erase last point"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:522
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:633
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:616
-msgid "End polygon"
-msgstr "Finir polygone"
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:530
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:525
msgid "Erase last polygon"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:541
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:543
msgid "Before full resolution image"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:546
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:548
msgid "Center full resolution image"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:551
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:553
msgid "After full resolution image"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:556
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:558
msgid "Before scroll image"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:561
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:563
msgid "Center scroll image"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:566
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:568
msgid "After scroll image"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:585
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:587
msgid "Color composition"
msgstr "Composition coloree"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:590
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:593
msgid "Left Viewer"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:609
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:658
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:707
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:612
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:661
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:710
msgid "Channel: "
msgstr "Canal:"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:616
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:665
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:714
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:619
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:668
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:717
msgid "Red channel "
msgstr "Canal rouge"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:623
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:672
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:721
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:626
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:675
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:724
msgid "Green channel "
msgstr "Canal vert"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:630
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:679
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:728
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:633
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:682
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:731
msgid "Blue channel "
msgstr "Canal bleu"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:639
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:642
msgid "Right Viewer"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:688
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:691
msgid "Center Viewer"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:739
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:742
#: Code/Modules/otbViewerModuleGroup.cxx:413
msgid "Histogram"
msgstr "Histogramme"
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:747
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:750
msgid "Left Viewer Histogram"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:754
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:757
msgid "Right Viewer Histogram"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:761
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:764
msgid "Center Viewer Histogram"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:770
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:722
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:705
-msgid "SVM Setup"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:776
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:727
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:710
-msgid "SVM Type"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:786
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:738
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:721
-msgid "Kernel Type"
-msgstr "Type de noyau"
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:796
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:749
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:732
-msgid "Kernel Degree "
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:804
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:757
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:740
-msgid "Gamma "
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:811
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:764
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:747
-msgid "Nu "
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:818
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:771
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:754
-msgid "Coef0 "
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:825
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:778
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:761
-msgid "C "
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:832
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:785
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:768
-msgid "Epsilon "
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:839
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:792
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:775
-msgid "Shrinking"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:847
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:800
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:783
-msgid "Probability Estimation"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:855
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:808
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:791
-msgid "Cache Size "
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:863
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:861
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:863
msgid "Save parameters"
msgstr "Sauver les parametres"
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:871
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:824
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:807
-msgid "P "
-msgstr ""
-
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:214
-msgid "Road extraction application"
-msgstr ""
-
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:245
-msgid "Input type"
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:199
+msgid "otbImageViewerManagerView"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:279
-msgid "Use spectral angle"
-msgstr "Utiliser Angle Spectral"
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:253
+msgid "Packed View"
+msgstr "Vue groupe"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:288
-msgid "Reference pixel"
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:254
+msgid "Toggle Packed mode"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:297
-msgid "Use water index"
-msgstr ""
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:262
+msgid "Splitted View"
+msgstr "Vue separe"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:336
-msgid "Set the alpha value"
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:263
+msgid "Toggle Splitted mode"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:347
-msgid "Resolution"
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:449
+#: Code/Modules/otbViewerModuleGroup.cxx:394
+msgid "Amplitude"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:348
-msgid "Set the revolution"
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:466
+msgid "Link Images"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:361
-msgid ""
-"Set the tolerance for segment consistency (tolerance in terms of distance)"
-msgstr ""
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:494
+#: Code/Modules/otbAlgebraGroup.cxx:63
+#: Code/Modules/Algebra/otbAlgebraModule.cxx:33
+msgid "First image"
+msgstr "Image 1"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:373
-msgid "MaxAngle"
-msgstr ""
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:532
+#: Code/Modules/otbAlgebraGroup.cxx:64
+#: Code/Modules/Algebra/otbAlgebraModule.cxx:34
+#, fuzzy
+msgid "Second image"
+msgstr "Image de navigation"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:374
-msgid "Set the max angle"
+#: Code/Application/otbMonteverdiViewGroup.cxx:73
+msgid "Monteverdi"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:386
-msgid "AngularThreshold"
-msgstr ""
+#: Code/Application/otbMonteverdiViewGroup.cxx:94
+msgid "Help me..."
+msgstr "Aidez moi..."
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:387
-msgid "Set the angular threshold"
-msgstr ""
+#: Code/Application/otbMonteverdiViewGroup.cxx:114
+#: Code/Application/otbInputViewGroup.cxx:24
+msgid "Set inputs"
+msgstr "Donnees d'entree"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:399
-msgid "AmplitudeThreshold"
-msgstr ""
+#: Code/Application/otbMonteverdiViewGroup.cxx:140
+#, fuzzy
+msgid "Module renamer"
+msgstr "Image de sortie"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:400
-msgid "Set the amplitude threshold"
-msgstr ""
+#: Code/Application/otbMonteverdiViewGroup.cxx:147
+#: Code/Application/otbMonteverdiViewGroup.cxx:192
+msgid "Old instance label"
+msgstr "Ancien nom d'instance"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:412
-msgid "DistanceThreshold"
-msgstr ""
+#: Code/Application/otbMonteverdiViewGroup.cxx:153
+#: Code/Application/otbMonteverdiViewGroup.cxx:198
+msgid "New instance label"
+msgstr "Nouveau nom d'instance"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:413
-msgid "Set the distance threshold"
-msgstr ""
+#: Code/Application/otbMonteverdiViewGroup.cxx:179
+#, fuzzy
+msgid "Output renamer"
+msgstr "Image de sortie"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:425
-msgid "FirstMeanDistThr"
-msgstr ""
+#: Code/Application/otbMonteverdiViewGroup.cxx:186
+msgid "Root instance label"
+msgstr "Base du nom d'instance"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:426
-msgid "First Mean Distance threshold"
-msgstr ""
+#: Code/Application/otbInputViewGroup.cxx:50
+msgid "Instance label"
+msgstr "Nom d'instance"
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:438
-msgid "SecondMeanDistThr"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:35
+msgid "Frost"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:439
-msgid "Second Mean Distance threshold"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:36
+msgid "Lee"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:455
-msgid "Controls"
-msgstr ""
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:48
+#, fuzzy
+msgid "SpeckleFilteringApplication"
+msgstr "Quitter"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:72
-msgid "Open vector"
-msgstr ""
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:63
+msgid "Filter type"
+msgstr "Type de filtre"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:73
-msgid "Save Image Result"
-msgstr ""
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:64
+#: Code/Modules/otbAlgebraGroup.cxx:85 Code/Modules/otbAlgebraGroup.cxx:120
+#, fuzzy
+msgid "Set the filter type"
+msgstr "Type de filtre"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:74
-msgid "Save image on extract"
-msgstr ""
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:74
+msgid "Lee filter parameters"
+msgstr "Parametres de Lee"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:76
-msgid "Save Vector Data"
-msgstr ""
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:83
+msgid "Radius parameter for Lee filter"
+msgstr "Parametres du rayon de Lee"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:77
-msgid "Save vector on extract"
-msgstr ""
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:91
+msgid "Frost filter parameters"
+msgstr "Parametres de Frost"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:78
-msgid "Save vector on full"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:98
+#: Code/Modules/otbAlgebraGroup.cxx:101
+#, fuzzy
+msgid "Radius parameter for Frost image filter"
+msgstr "Parametres du rayon de Lee"
+
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:104
+msgid "DeRamp"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:83
-msgid "Configure "
-msgstr "Configurer"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:105
+#: Code/Modules/otbAlgebraGroup.cxx:110
+#, fuzzy
+msgid "Deramp parameter for Frost image filter"
+msgstr "Parametres du rayon de Lee"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:329
-msgid "Urban Area Extraction Application"
-msgstr ""
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:759
+msgid "Feature Parameters"
+msgstr "Parametres des attributs"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:349
-msgid "Master View Selection"
-msgstr ""
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1815
+#, fuzzy
+msgid "Extract Feature"
+msgstr "Extraire"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:358
-msgid "Selected ROI"
-msgstr ""
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1856
+#, fuzzy
+msgid "Full Resolution"
+msgstr "Image Pleine Resolution"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:373
-msgid "Switch View"
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:56
+msgid "Mean shift module"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:406
-msgid "Display Vectors"
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:87
+msgid "Set the mean shift spatial radius"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:407
-msgid "Display/Hide the vector datas"
-msgstr ""
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:102
+#, fuzzy
+msgid "Spectral radius"
+msgstr "Angle Spectral"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:422
-msgid "Focus in ROI"
-msgstr ""
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:103
+#, fuzzy
+msgid "Set the mean shift spectral radius"
+msgstr "Angle Spectral"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:441
-msgid "Detail level"
-msgstr ""
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:117
+#, fuzzy
+msgid "Min region size"
+msgstr "Taille region min"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:447
-msgid "Min Size"
-msgstr ""
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:118
+#, fuzzy
+msgid "Set the mean shift minimum region size"
+msgstr "Taille region min"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:448
-msgid "Minimum size of a detected region (m2)"
-msgstr ""
+#: Code/Modules/otbReaderModuleGUI.cxx:42
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:48
+#, fuzzy
+msgid "Open dataset"
+msgstr "Ouvrir image"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:464
-msgid "SubSample"
-msgstr ""
+#: Code/Modules/otbReaderModuleGUI.cxx:58
+msgid "Open"
+msgstr "Ouvrir"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:465
-msgid "Control of the sub-sample factor"
-msgstr ""
+#: Code/Modules/otbReaderModuleGUI.cxx:82
+msgid "Data type "
+msgstr "Type donnees"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:484
-msgid "Threshold"
-msgstr ""
+#: Code/Modules/otbReaderModuleGUI.cxx:91
+msgid "Name "
+msgstr "Nom"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:490
-msgid "NonVeget/Water "
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:21
+#, fuzzy
+msgid "Bilinear"
+msgstr "lineaire"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:491
-msgid ""
-"Threshold value applied on the RadiometricNonVegetationNonWaterIndex image "
-"result [ 0 ; 1 ]"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:22
+msgid "RPC"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:497
-msgid "Density "
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:190
+msgid "GCP to sensor model module"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:498
-msgid "Threshold value applied on the edge density image result [ 0 ; 1 ]"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:201
+#, fuzzy
+msgid "Projection:"
+msgstr "Projection"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:508
-msgid "Region of interest"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:212
+msgid "GCPs List"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:558
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:622
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:605
-msgid "ClearROIs"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:213
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:208
+msgid "Contains selected points"
+msgstr "Contient les points selectionnes"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:559
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:623
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:606
-msgid "Clear all regions of interest"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:246
+#, fuzzy
+msgid "Reload"
+msgstr "Routes"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:570
-msgid "Focus on the selected ROI"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:247
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:258
+msgid "Focus on the selected point couple."
+msgstr "Focalise sur le couple de point selectionne"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:588
-msgid "Modify the alpha blending between the input image and the result"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:257
+msgid "Focus Point"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:604
-msgid "Algorithm Configuration"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:268
+msgid "Point Errors"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:629
-msgid "Sobel Thresholds"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:269
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:127
+msgid "Euclidean distances"
+msgstr "Distances euclidiennes"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:635
-msgid "Lower Threshold "
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:280
+msgid "Ground Error Var (m^2):"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:636
-msgid "Lower threshold of the sobel edge detector"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:288
+msgid "Mean Square Error:"
+msgstr "Erreur quadratique moyenne:"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:643
-msgid "Upper Threshold "
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:296
+#, fuzzy
+msgid "Pixel Values"
+msgstr "Coordonnees Pixel"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:644
-msgid ""
-"Upper threshold of the sobel edge detector. (ex: 200 for Quickbird, 50 for "
-"SPOT)"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:304
+#, fuzzy
+msgid "Elevation"
+msgstr "Altitude"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:654
-msgid "Indices Configuration"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:316
+#: Code/Modules/otbAlgebraGroup.cxx:131
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:162
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:93
+#, fuzzy
+msgid "Save/Quit"
+msgstr "Quitter"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:674
-msgid "NIR channel index"
-msgstr "Index du canal NIR"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:333
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:188
+#, fuzzy
+msgid "Scroll fix"
+msgstr "Image de navigation"
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:675
-msgid "Select band for NIR channel in RGB composition"
-msgstr "Selectionne la bande pour le canal NIR dans la composition RVB"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:341
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:196
+#, fuzzy
+msgid "Zoom fix"
+msgstr "Zoom image a recaler"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:109
-msgid "Save result image"
-msgstr "Sauver resultat"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:349
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:180
+#, fuzzy
+msgid "Full fix"
+msgstr "Image de navigation"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:110
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:94
-msgid "Save classif as vector data (Experimental)"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:378
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:313
+msgid "Focus Click"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:111
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:95
-msgid "Open SVM model"
-msgstr "Ouvrir modele SVM"
-
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:112
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:96
-msgid "Save SVM model"
-msgstr "Sauver Modele SVM"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:379
+#, fuzzy
+msgid "Focus on the last clicked point couple."
+msgstr "Focalise sur le couple de point selectionne"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:113
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:97
-msgid "Import vector data (ROI)"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:390
+msgid "Long"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:114
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:98
-msgid "Export vector data (ROI)"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:400
+msgid "Lat"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:115
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:99
-msgid "Export all vector data (ROI)"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:410
+#, fuzzy
+msgid "Elev"
+msgstr "Altitude"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:116
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:100
-msgid "Import ROIs from labeled image"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:422
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:302
+msgid "Clear Feature List (shortcut KP_Enter)"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:120
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:104
-msgid "Visualisation"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:443
+#, fuzzy
+msgid "Elevation manager"
+msgstr "Altitude"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:382
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:365
-msgid "Supervised Classification Application"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:450
+#, fuzzy
+msgid "GCPs elevation"
+msgstr "Selection des canaux"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:387
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:370
-msgid "Classes list"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:463
+#, fuzzy
+msgid "Use mean elevation"
+msgstr "Selection des canaux"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:388
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:371
-msgid "Browse and select classes"
-msgstr ""
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:473
+#, fuzzy
+msgid "value:"
+msgstr "Validation"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:400
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:383
-msgid "Class Information"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:493
+#, fuzzy
+msgid "file:"
+msgstr "Fichier"
+
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:518
+msgid "OK"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:401
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:384
-msgid "Display selected class information"
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:534
+#: Code/Modules/otbThresholdGroup.cxx:142
+#, fuzzy
+msgid "Save Quit"
+msgstr "Sauver resultat"
+
+#: Code/Modules/otbExtractROIModuleGUI.cxx:28
+#, fuzzy
+msgid "Select the ROI"
+msgstr "Filtre selectionne"
+
+#: Code/Modules/otbExtractROIModuleGUI.cxx:50
+msgid "Definition of the ROI extracted"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:418
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:401
-msgid "Image information"
-msgstr ""
+#: Code/Modules/otbExtractROIModuleGUI.cxx:54
+#, fuzzy
+msgid "Start X"
+msgstr "Demarrer"
+
+#: Code/Modules/otbExtractROIModuleGUI.cxx:57
+#, fuzzy
+msgid "Start Y"
+msgstr "Demarrer"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:419
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:402
-msgid "Display image information"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:70
+msgid "Longitude1"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:428
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:411
-msgid "Edit Classes"
-msgstr "Editer les classes"
-
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:429
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:412
-msgid "Tools to edit classes attributes"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:72
+msgid "Latitude1"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:437
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:420
-msgid "Add a new class"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:74
+msgid "Longitude2"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:448
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:431
-msgid "Remove the selected class"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:76
+msgid "Latitude2"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:458
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:441
-msgid "Name"
-msgstr "Nom"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:82
+#, fuzzy
+msgid "Input image size information"
+msgstr "Transformation"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:459
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:442
-msgid "Change the name of the selected class"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:94
+msgid "Select Long/Lat (NW (1) ; SE (2))"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:482
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:465
-msgid "Sets"
-msgstr ""
+#: Code/Modules/otbProjectionGroup.cxx:102
+msgid "SENSOR MODEL"
+msgstr "MODEL CAPTEUR"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:489
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:472
-msgid "Training"
-msgstr "Entrainement"
+#: Code/Modules/otbProjectionGroup.cxx:428
+msgid "Splines"
+msgstr "Splines"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:490
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:473
-msgid "Display the training set"
-msgstr ""
+#: Code/Modules/otbProjectionGroup.cxx:433
+#, fuzzy
+msgid "Projection"
+msgstr "Projection"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:503
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1010
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:486
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:993
-msgid "Validation"
-msgstr "Validation"
+#: Code/Modules/otbProjectionGroup.cxx:439
+#, fuzzy
+msgid "Save / Quit"
+msgstr "Sauver resultat"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:504
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:487
-msgid ""
-"Display the validation set. Only available if random validation samples is "
-"not activated"
+#: Code/Modules/otbProjectionGroup.cxx:468
+msgid "Use center pixel"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:517
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:500
-msgid "Random"
+#: Code/Modules/otbProjectionGroup.cxx:469
+msgid "If checked, use the output center image coordinates"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:518
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:501
-msgid ""
-"If activated, validation sample is randomly choosen as a subset of the "
-"training samples"
+#: Code/Modules/otbProjectionGroup.cxx:475
+msgid "Use upper-left pixel"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:526
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:509
-msgid "Probability "
+#: Code/Modules/otbProjectionGroup.cxx:476
+msgid "If checked, use the upper left output image pixel coordinates"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:527
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:510
-msgid ""
-"Tune the probability for a sample to be choosen as a training sample. Only "
-"available is random validation sample generation is activated"
-msgstr ""
+#: Code/Modules/otbProjectionGroup.cxx:502
+#, fuzzy
+msgid "Input map projection"
+msgstr "Projection"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:542
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:525
-msgid "Classification"
-msgstr "Classification"
+#: Code/Modules/otbProjectionGroup.cxx:513
+#, fuzzy
+msgid "Input cartographic coordinates"
+msgstr "Coordonnees Cartographique"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:550
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:533
-#: Code/Modules/otbViewerModuleGroup.cxx:283
-msgid "Display"
-msgstr "Afficher"
+#: Code/Modules/otbProjectionGroup.cxx:626
+#, fuzzy
+msgid "Map Pprojection"
+msgstr "Projection"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:551
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:534
-msgid "Display the results of the classification"
+#: Code/Modules/otbProjectionGroup.cxx:780
+msgid "Select the orthorectification interpolator"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:563
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:546
-msgid "Learn"
-msgstr "Apprentissage"
+#: Code/Modules/otbCachingModuleGUI.cxx:7
+msgid "Caching Data"
+msgstr "Mise des donnees en cache"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:564
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:547
-msgid "Learn the SVM model from training samples"
+#: Code/Modules/otbOrthorectificationGUI.cxx:353
+msgid "otbOrthorectification"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:577
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:560
-msgid "Validate"
-msgstr "Validation"
-
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:578
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:561
-msgid "Display some quality assesment on the classification"
+#: Code/Modules/otbAlgebraGroup.cxx:49
+msgid "Addition"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:592
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:575
-msgid "Regions of interest"
-msgstr "Regions d'interet"
+#: Code/Modules/otbAlgebraGroup.cxx:50
+#, fuzzy
+msgid "Subtraction"
+msgstr "Sauver les parametres de recalage"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:593
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:576
-msgid "Tools to edit the regions of interest"
-msgstr ""
+#: Code/Modules/otbAlgebraGroup.cxx:51
+#, fuzzy
+msgid "Multiplication"
+msgstr "Quitter"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:601
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:584
-msgid "Delete the last point of the selected region of interest"
+#: Code/Modules/otbAlgebraGroup.cxx:53
+msgid "Shift-scale"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:634
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:617
-msgid "End the current polygon"
+#: Code/Modules/otbAlgebraGroup.cxx:78
+msgid "Band math module"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:644
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:627
-msgid "Polygon"
-msgstr "Polygone"
+#: Code/Modules/otbAlgebraGroup.cxx:84
+#, fuzzy
+msgid "Operation type"
+msgstr "Type de noyau"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:645
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:628
-msgid "Switch between polygonal or rectangular selection"
+#: Code/Modules/otbAlgebraGroup.cxx:94
+msgid "Shift scale parameters : A*X + B"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:658
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:641
-msgid "Opacity "
+#: Code/Modules/otbAlgebraGroup.cxx:100
+msgid "A"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:659
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:642
-msgid "Tune the region of interest and classification result opacity"
+#: Code/Modules/otbAlgebraGroup.cxx:109
+msgid "B"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:676
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:659
-msgid "Display pixel location and values"
-msgstr ""
+#: Code/Modules/otbAlgebraGroup.cxx:119
+#, fuzzy
+msgid "Choose input"
+msgstr "Choisir Filtre"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:688
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:671
-msgid "Class color"
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:21
+msgid "Translation"
+msgstr "Translation"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:689
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:672
-msgid "Display the selected class color"
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:22
+msgid "Affine"
+msgstr "Affine"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:697
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:680
-msgid "ROI list"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:23
+msgid "Similarity 2D"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:698
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:681
-msgid "Browse and select ROI associated to the selected class"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:98
+msgid "Homologous point extraction"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:710
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:693
-msgid "Focus the viewer on the selected ROI"
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:119
+#, fuzzy
+msgid "Transform value"
+msgstr "Transformation"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:728
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:711
-msgid "Set the SVM type"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:126
+msgid "Point errors"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:739
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:722
-msgid "Set the kernel type"
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:138
+#, fuzzy
+msgid "Mean square error"
+msgstr "Erreur quadratique moyenne:"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:843
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:826
-msgid "Visualisation Setup"
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:146
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:154
+#, fuzzy
+msgid "Pixel values"
+msgstr "Coordonnees Pixel"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:974
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:957
-msgid "Full Window"
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:163
+#, fuzzy
+msgid "Quit application"
+msgstr "Quitter"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:982
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:965
-msgid "Scroll Window"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:207
+msgid "Point List"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:990
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:973
-msgid "Class name chooser"
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:219
+#, fuzzy
+msgid "Clear list"
+msgstr "Effacer"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:994
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:977
-msgid "Name: "
-msgstr ""
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:220
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:231
+msgid "Clear feature list"
+msgstr "Effacer la liste d'attributs"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:998
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:981
-msgid "ok"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:241
+msgid "Focus point"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1015
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:998
-msgid "Confusion matrix"
-msgstr "Matrice de confusion"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:242
+#, fuzzy
+msgid "Focus on the selected point couple"
+msgstr "Focalise sur le couple de point selectionne"
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1022
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1005
-msgid "Accuracy"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:252
+#, fuzzy
+msgid "Evaluate"
+msgstr "Validation"
+
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:253
+#, fuzzy
+msgid "Quit application (shortcut: enter)"
+msgstr "Quitter"
+
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:267
+msgid "X1"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:43
-msgid "Land Cover Map Application"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:275
+msgid "Y1"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:59
-msgid "Input Image Name"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:283
+msgid "X2"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:69
-msgid "Open a new input image"
-msgstr "Ouvrir une nouvelle image d'entree"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:292
+msgid "Y2"
+msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:90
-msgid "Input Model Name"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:314
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:326
+#, fuzzy
+msgid "Focus on the last clicked point couple"
+msgstr "Focalise sur le couple de point selectionne"
+
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:325
+msgid "Guess"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:100
-msgid "Load model"
-msgstr "Charger modele"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:343
+msgid "Full moving"
+msgstr "Full image a recaler"
+
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:351
+msgid "Scroll moving"
+msgstr "Scroll image a recaler"
-#: LandCoverMap/otbLandCoverMapView.cxx:101
-msgid "Open a new input model"
-msgstr "Ouvrir un nouveau modele"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:359
+msgid "Zoom moving"
+msgstr "Zoom image a recaler"
-#: LandCoverMap/otbLandCoverMapView.cxx:135
-msgid "Scroll image"
-msgstr "Image de navigation"
+#: Code/Modules/otbThresholdGroup.cxx:114
+#, fuzzy
+msgid "Threshold Module"
+msgstr "Seuils"
-#: LandCoverMap/otbLandCoverMapView.cxx:142
-msgid "Feature Selection"
+#: Code/Modules/otbThresholdGroup.cxx:121
+#, fuzzy
+msgid "Inside Value :"
+msgstr "Coordonnees Pixel"
+
+#: Code/Modules/otbThresholdGroup.cxx:134
+msgid "Full"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:164
-msgid "Full Resolution image"
-msgstr "Image Pleine Resolution"
+#: Code/Modules/otbThresholdGroup.cxx:149
+#, fuzzy
+msgid "Lower Threshold :"
+msgstr "Seuils"
-#: LandCoverMap/otbLandCoverMapView.cxx:171
-msgid "Nomenclature"
-msgstr ""
+#: Code/Modules/otbThresholdGroup.cxx:165
+#, fuzzy
+msgid "Upper Threshold :"
+msgstr "Seuils"
-#: LandCoverMap/otbLandCoverMapView.cxx:193
-msgid "Built-up area"
-msgstr ""
+#: Code/Modules/otbThresholdGroup.cxx:182
+#, fuzzy
+msgid "Outside value :"
+msgstr "Coordonnees Pixel"
-#: LandCoverMap/otbLandCoverMapView.cxx:202
-msgid "Roads"
-msgstr "Routes"
+#: Code/Modules/otbThresholdGroup.cxx:192
+#, fuzzy
+msgid "Threshold Above"
+msgstr "Seuils"
-#: LandCoverMap/otbLandCoverMapView.cxx:211
-msgid "Bare soil"
-msgstr ""
+#: Code/Modules/otbThresholdGroup.cxx:199
+#, fuzzy
+msgid "Threshold Below"
+msgstr "Seuils"
-#: LandCoverMap/otbLandCoverMapView.cxx:220
-msgid "Shadows"
-msgstr "Ombres"
+#: Code/Modules/otbThresholdGroup.cxx:206
+#, fuzzy
+msgid "Threshold Outside"
+msgstr "Seuils"
-#: Code/Application/otbInputViewGroup.cxx:24
-msgid "Set Inputs"
+#: Code/Modules/otbThresholdGroup.cxx:214
+msgid "alpha :"
msgstr ""
-#: Code/Application/otbInputViewGroup.cxx:50
-msgid "Instance label"
-msgstr ""
+#: Code/Modules/otbThresholdGroup.cxx:229
+#, fuzzy
+msgid "Inside value :"
+msgstr "Coordonnees Pixel"
-#: Code/Application/otbMonteverdiViewGroup.cxx:73
-msgid "Monteverdi"
-msgstr ""
+#: Code/Modules/otbThresholdGroup.cxx:241
+#, fuzzy
+msgid "Generic Threshold"
+msgstr "Seuils"
-#: Code/Application/otbMonteverdiViewGroup.cxx:94
-msgid "Help me..."
-msgstr ""
+#: Code/Modules/otbThresholdGroup.cxx:249
+#, fuzzy
+msgid "Binary Threshold"
+msgstr "Seuils"
-#: Code/Application/otbMonteverdiViewGroup.cxx:114
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:91
#, fuzzy
-msgid "Set inputs"
-msgstr "Parametres"
+msgid "Export selected polygons"
+msgstr "Contient les points selectionnes"
-#: Code/Application/otbMonteverdiViewGroup.cxx:140
-msgid "Module renamer"
-msgstr ""
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:360
+#, fuzzy
+msgid "Supervised classification"
+msgstr "Classification"
-#: Code/Application/otbMonteverdiViewGroup.cxx:147
-#: Code/Application/otbMonteverdiViewGroup.cxx:192
-msgid "Old instance label"
-msgstr ""
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:378
+#, fuzzy
+msgid "Class information"
+msgstr "Classification"
-#: Code/Application/otbMonteverdiViewGroup.cxx:153
-#: Code/Application/otbMonteverdiViewGroup.cxx:198
-msgid "New instance label"
-msgstr ""
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:406
+#, fuzzy
+msgid "Edit classes"
+msgstr "Editer les classes"
-#: Code/Application/otbMonteverdiViewGroup.cxx:179
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:467
#, fuzzy
-msgid "Output renamer"
-msgstr "Image de sortie"
+msgid "Training Set"
+msgstr "Entrainement"
-#: Code/Application/otbMonteverdiViewGroup.cxx:186
-msgid "Root instance label"
-msgstr ""
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:480
+#, fuzzy
+msgid "Validation Set"
+msgstr "Validation"
-#: Code/Modules/otbExtractROIModuleGUI.cxx:21
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:598
#, fuzzy
-msgid "Select the ROI"
-msgstr "Filtre selectionne"
+msgid "Clear ROIs"
+msgstr "Effacer"
-#: Code/Modules/otbExtractROIModuleGUI.cxx:43
-msgid "Definition of the ROI extracted"
-msgstr ""
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:698
+#, fuzzy
+msgid "SVM setup"
+msgstr "Configuration"
-#: Code/Modules/otbExtractROIModuleGUI.cxx:47
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:703
#, fuzzy
-msgid "Start X"
-msgstr "Demarrer"
+msgid "SVM type"
+msgstr "Configuration"
-#: Code/Modules/otbExtractROIModuleGUI.cxx:50
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:714
#, fuzzy
-msgid "Start Y"
-msgstr "Demarrer"
+msgid "Kernel type"
+msgstr "Type de noyau"
-#: Code/Modules/otbExtractROIModuleGUI.cxx:63
-msgid "Input image size information"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:725
+#, fuzzy
+msgid "Kernel degree"
+msgstr "Type de noyau"
+
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:732
+msgid "Gamma"
msgstr ""
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:101
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:162
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:739
+msgid "Nu"
+msgstr ""
+
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:746
#, fuzzy
-msgid "Save/Quit"
-msgstr "Quitter"
+msgid "Coef0"
+msgstr "Fermer"
-#: Code/Modules/otbAlgebraGroup.cxx:49
-msgid "Addition"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:753
+msgid "C"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:50
-msgid "Subtraction"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:760
+msgid "Epsilon"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:51
-#, fuzzy
-msgid "Multiplication"
-msgstr "Quitter"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:775
+msgid "Probability estimation"
+msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:53
-msgid "Shift-Scale"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:783
+msgid "Cache size"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:63
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:798
+msgid "P"
+msgstr ""
+
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:817
#, fuzzy
-msgid "First Image"
-msgstr "Image 1"
+msgid "Visualisation setup"
+msgstr "Validation"
-#: Code/Modules/otbAlgebraGroup.cxx:64
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:948
#, fuzzy
-msgid "Second Image"
-msgstr "Ouvrir Image"
+msgid "Full window"
+msgstr "Full image a recaler"
-#: Code/Modules/otbAlgebraGroup.cxx:78
-msgid "Band Math Module"
-msgstr ""
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:956
+#, fuzzy
+msgid "Scroll window"
+msgstr "Image de navigation"
-#: Code/Modules/otbAlgebraGroup.cxx:84
-msgid "Operation type"
-msgstr ""
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:87
+msgid "Elevation value "
+msgstr "Altitude"
-#: Code/Modules/otbAlgebraGroup.cxx:85 Code/Modules/otbAlgebraGroup.cxx:120
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:64
-msgid "Set the filter type"
+#: Code/Modules/otbWriterViewGroup.cxx:78
+msgid "unsigned char"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:94
-msgid "Shift Scale Parameters : A*X + B"
+#: Code/Modules/otbWriterViewGroup.cxx:79
+msgid "short int"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:100
-msgid "A :"
+#: Code/Modules/otbWriterViewGroup.cxx:80
+msgid "int"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:101
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:98
-msgid "Radius parameter for Frost image filter"
+#: Code/Modules/otbWriterViewGroup.cxx:81
+msgid "float"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:109
-msgid "B :"
+#: Code/Modules/otbWriterViewGroup.cxx:82
+msgid "double"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:110
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:105
-msgid "Deramp parameter for Frost image filter"
+#: Code/Modules/otbWriterViewGroup.cxx:83
+msgid "unsigned short int"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:119
-msgid "Choose Input : "
+#: Code/Modules/otbWriterViewGroup.cxx:84
+msgid "unsigned int"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:131
-#, fuzzy
-msgid "Save | Quit"
-msgstr "Sauver resultat"
+#: Code/Modules/otbWriterViewGroup.cxx:147
+msgid "Writer application"
+msgstr "Application d'ecriture"
-#: Code/Modules/otbWriterModuleGUI.cxx:28
-#, fuzzy
-msgid "Save dataset"
-msgstr "Sauver les parametres"
+#: Code/Modules/otbWriterViewGroup.cxx:177
+msgid "Output pixel type"
+msgstr "Type pixel de sortie"
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:759
-#, fuzzy
-msgid "Feature Parameters"
-msgstr "Sauver les parametres"
+#: Code/Modules/otbWriterViewGroup.cxx:185
+msgid "Use scaling"
+msgstr "Utiliser echelle"
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1815
-#, fuzzy
-msgid "Extract Feature"
-msgstr "Extraire"
+#: Code/Modules/otbWriterViewGroup.cxx:201
+msgid "Feature image list"
+msgstr "Liste d'attributs"
+
+#: Code/Modules/otbWriterViewGroup.cxx:235
+msgid "Selected output channels"
+msgstr "Canaux de sortie selectionnes"
+
+#: Code/Modules/otbWriterViewGroup.cxx:312
+msgid "Band"
+msgstr "Bande"
#: Code/Modules/otbViewerModuleGroup.cxx:202
#: Code/Modules/otbViewerModuleGroup.cxx:210
-#, fuzzy
-msgid "Vector Datas Propreties"
-msgstr "Donnees vecteur"
+msgid "Vector data propreties"
+msgstr "Proprietes donnees vecteur"
#: Code/Modules/otbViewerModuleGroup.cxx:247
#, fuzzy
@@ -4726,364 +6186,495 @@ msgid "Display All"
msgstr "Afficher"
#: Code/Modules/otbViewerModuleGroup.cxx:425
-msgid "Upper Quantile %:"
+msgid "Upper quantile %:"
msgstr ""
#: Code/Modules/otbViewerModuleGroup.cxx:431
-msgid "Lower Quantile %:"
+msgid "Lower quantile %:"
msgstr ""
#: Code/Modules/otbViewerModuleGroup.cxx:461
-msgid "PixelDescription"
-msgstr ""
+#, fuzzy
+msgid "Pixel description"
+msgstr "Transformation"
-#: Code/Modules/otbViewerModuleGroup.cxx:471
-msgid "X:"
-msgstr ""
+#: Code/Modules/otbViewerModuleGroup.cxx:549
+#, fuzzy
+msgid "DEM Selection"
+msgstr "Selection des canaux"
-#: Code/Modules/otbViewerModuleGroup.cxx:477
-msgid "Y:"
+#: Code/Modules/otbWriterModuleGUI.cxx:28
+#, fuzzy
+msgid "Save dataset"
+msgstr "Sauver les parametres"
+
+#: Code/Modules/otbKMeansModuleGUI.cxx:28
+#, fuzzy
+msgid "KMeans setup"
+msgstr "Lien"
+
+#: Code/Modules/otbKMeansModuleGUI.cxx:51
+msgid "Sampling (0%)"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:496
+#: Code/Modules/otbKMeansModuleGUI.cxx:56
#, fuzzy
-msgid "Quit "
-msgstr "Quitter"
+msgid "Number of classes "
+msgstr "Nombre d'iterations"
-#: Code/Modules/otbViewerModuleGroup.cxx:504
-msgid "Show"
-msgstr "Afficher"
+#: Code/Modules/otbKMeansModuleGUI.cxx:59
+#, fuzzy
+msgid "Number of samples"
+msgstr "Nombre d'iterations"
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:35
-msgid "Frost"
+#: Code/Modules/otbKMeansModuleGUI.cxx:70
+#, c-format
+msgid "0% of image (0 samples)"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:36
-msgid "Lee"
-msgstr ""
+#: Code/Modules/otbKMeansModuleGUI.cxx:72
+#, fuzzy
+msgid "Max. nb. of iterations "
+msgstr "Nombre d'iterations"
+
+#: Code/Modules/otbKMeansModuleGUI.cxx:76
+#, fuzzy
+msgid "Convergence threshold "
+msgstr "Seuils"
+
+#: Code/Application/Monteverdi.cxx:99
+msgid "File/Open dataset"
+msgstr "Fichier/Ouvrir donnees"
+
+#: Code/Application/Monteverdi.cxx:100
+msgid "File/Save dataset"
+msgstr "Fichier/Sauver donnees"
+
+#: Code/Application/Monteverdi.cxx:101
+msgid "File/Save dataset (advanced)"
+msgstr "Fichier/Sauver donnees (avance)"
+
+#: Code/Application/Monteverdi.cxx:102
+msgid "File/Cache dataset"
+msgstr "Fichier/Mise en cache des donnees"
+
+#: Code/Application/Monteverdi.cxx:103
+msgid "File/Extract ROI from dataset"
+msgstr "Fichier/Extraire ROI"
+
+#: Code/Application/Monteverdi.cxx:104
+msgid "File/Concatenate images"
+msgstr "Fichier/Concatener images"
+
+#: Code/Application/Monteverdi.cxx:106
+msgid "Visualization/Viewer"
+msgstr "Visualisation/Image"
+
+#: Code/Application/Monteverdi.cxx:108
+msgid "Filtering/Band math"
+msgstr "Filtrage/Math bandes"
+
+#: Code/Application/Monteverdi.cxx:109
+msgid "Filtering/Threshold"
+msgstr "Filtrage/Seuillage"
+
+#: Code/Application/Monteverdi.cxx:110
+msgid "Filtering/Pansharpening"
+msgstr "Filtrage/Pansharpening"
+
+#: Code/Application/Monteverdi.cxx:111
+msgid "Filtering/Mean shift clustering"
+msgstr "Filtrage/Mean shift clusterisation"
+
+#: Code/Application/Monteverdi.cxx:112
+msgid "Filtering/Feature extraction"
+msgstr "Filtrage/Extraction d'attributs"
+
+#: Code/Application/Monteverdi.cxx:113
+msgid "Filtering/Change detection"
+msgstr "Filtrage/Detection de changements"
+
+#: Code/Application/Monteverdi.cxx:115
+msgid "SAR/Despeckle image"
+msgstr "SAR/Suppression du speckle"
+
+#: Code/Application/Monteverdi.cxx:116
+msgid "SAR/Compute intensity and log-intensity"
+msgstr "SAR/Calcul intensite et log-intensite"
+
+#: Code/Application/Monteverdi.cxx:118
+msgid "Learning/SVM classification"
+msgstr "Apprentissage/Classification par SVM"
+
+#: Code/Application/Monteverdi.cxx:119
+msgid "Learning/KMeans clustering"
+msgstr "Apprentissage/KMeans clusterisation"
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:48
-#, fuzzy
-msgid "SpeckleFilteringApplication"
-msgstr "Quitter"
+#: Code/Application/Monteverdi.cxx:121
+msgid "Geometry/Orthorectification"
+msgstr "Geometrie/Orthorectification"
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:63
-msgid "Filter type"
-msgstr "Type de filtre"
+#: Code/Application/Monteverdi.cxx:122
+msgid "Geometry/Reproject image"
+msgstr "Geometrie/Reprojection d'une image"
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:74
-msgid "Lee filter parameters"
-msgstr "Parametres de Lee"
+#: Code/Application/Monteverdi.cxx:123
+msgid "Geometry/Superimpose two images"
+msgstr "Geometrie/Superposition de deux images"
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:83
-msgid "Radius parameter for Lee filter"
-msgstr "Parametres du rayon de Lee"
+#: Code/Application/Monteverdi.cxx:124
+msgid "Geometry/Homologous points extraction"
+msgstr "Geometrie/Extraction des points homologues"
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:91
-msgid "Frost filter parameters"
-msgstr "Parametres de Frost"
+#: Code/Application/Monteverdi.cxx:125
+msgid "Geometry/GCP to sensor model"
+msgstr "Geometrie/GCP vers modele capteur"
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:104
-msgid "DeRamp"
+#: Code/Application/otbMonteverdiViewGUI.cxx:168
+msgid "File/Quit"
+msgstr "Fichier/Quitter"
+
+#: Code/Application/otbMonteverdiViewGUI.cxx:169
+msgid "?/Help"
+msgstr "?/Aide"
+
+#: Code/Application/otbMonteverdiViewGUI.cxx:182
+msgid "Datasets Browser"
msgstr ""
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:48
-#: Code/Modules/otbReaderModuleGUI.cxx:42
+#: Code/Application/otbMonteverdiViewGUI.cxx:199
#, fuzzy
-msgid "Open dataset"
+msgid "Dataset"
msgstr "Ouvrir image"
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:87
-msgid "Elevation value "
-msgstr "Altitude"
+#: Code/Modules/HomologousPointExtraction/otbHomologousPointExtractionModule.cxx:46
+#, fuzzy
+msgid "Fix image"
+msgstr "Retourner image fixe"
-#: Code/Modules/otbWriterViewGroup.cxx:78
-msgid "unsigned char"
-msgstr ""
+#: Code/Modules/HomologousPointExtraction/otbHomologousPointExtractionModule.cxx:47
+#, fuzzy
+msgid "Moving Image"
+msgstr "Ouvrir image a recaler"
-#: Code/Modules/otbWriterViewGroup.cxx:79
-msgid "short int"
-msgstr ""
+#: Code/Modules/HomologousPointExtraction/otbHomologousPointExtractionModule.cxx:106
+#, fuzzy
+msgid "Transformed moving image"
+msgstr "Ouvrir image a recaler"
-#: Code/Modules/otbWriterViewGroup.cxx:80
-msgid "int"
-msgstr ""
+#: Code/Modules/Algebra/otbAlgebraModule.cxx:211
+#, fuzzy
+msgid "Result image"
+msgstr "Sauver resultat"
-#: Code/Modules/otbWriterViewGroup.cxx:81
-msgid "float"
+#: Code/Modules/GCPToSensorModel/otbGCPToSensorModelModule.cxx:100
+msgid "Input image with new keyword list"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:82
-msgid "double"
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:36
+msgid "Reference image for reprojection"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:83
-msgid "unsigned short int"
-msgstr ""
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:38
+#, fuzzy
+msgid "Image to reproject"
+msgstr "Image extension"
-#: Code/Modules/otbWriterViewGroup.cxx:84
-msgid "unsigned int"
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:159
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:182
+msgid "Image superimposable to reference"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:146
-msgid "Writer application"
-msgstr "Application d'ecriture"
-
-#: Code/Modules/otbWriterViewGroup.cxx:177
-msgid "Output pixel type"
-msgstr "Type pixel de sortie"
-
-#: Code/Modules/otbWriterViewGroup.cxx:185
-msgid "Use scaling"
-msgstr "Utiliser echelle"
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:193
+msgid "Choose the dataset dir..."
+msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:200
+#: Code/Modules/Caching/otbCachingModule.cxx:36
+#: Code/Modules/Writer/otbWriterModule.cxx:33
+#: Code/Modules/WriterMVC/otbWriterMVCModule.cxx:45
#, fuzzy
-msgid "Feature image list"
-msgstr "Liste d'images"
-
-#: Code/Modules/otbWriterViewGroup.cxx:234
-msgid "Selected output channels"
-msgstr "Canaux de sortie selectionnes"
-
-#: Code/Modules/otbWriterViewGroup.cxx:311
-msgid "Band"
-msgstr "Bande"
+msgid "Dataset to write"
+msgstr "Ouvrir image"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:21
-msgid "Translation"
-msgstr "Translation"
+#: Code/Modules/Caching/otbCachingModule.cxx:50
+#, fuzzy
+msgid "Caching dataset (0%)"
+msgstr "Mise des donnees en cache"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:22
-msgid "Affine"
-msgstr "Affine"
+#: Code/Modules/Caching/otbCachingModule.cxx:82
+#, fuzzy
+msgid "Caching dataset"
+msgstr "Mise des donnees en cache"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:23
-msgid "Similarity2D"
+#: Code/Modules/Caching/otbCachingModule.cxx:176
+msgid "Cached data from"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:98
-msgid "Homologous Point Extraction"
+#: Code/Modules/Writer/otbWriterModule.cxx:72
+msgid "Choose the dataset file..."
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:109
-msgid "Transformation"
-msgstr "Transformation"
+#: Code/Modules/Writer/otbWriterModule.cxx:96
+#, fuzzy
+msgid "Writing dataset"
+msgstr "Ouvrir image"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:119
-msgid "Transform Value"
-msgstr ""
+#: Code/Modules/Reader/otbReaderModule.cxx:41
+msgid "Unknown"
+msgstr "Inconnu"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:126
-msgid "Point Errors"
-msgstr ""
+#: Code/Modules/Reader/otbReaderModule.cxx:42
+msgid "Optical image"
+msgstr "Image optique"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:127
-msgid "Euclidean distances"
-msgstr "Distances euclidiennes"
+#: Code/Modules/Reader/otbReaderModule.cxx:43
+msgid "SAR image"
+msgstr "Image SAR"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:138
-msgid "Mean Square Error:"
-msgstr "Erreur quadratique moyenne:"
+#: Code/Modules/Reader/otbReaderModule.cxx:44
+msgid "Vector"
+msgstr "Vecteur"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:146
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:154
+#: Code/Modules/Orthorectification/otbOrthorectificationModule.cxx:34
#, fuzzy
-msgid "Pixel Values"
-msgstr "Coordonnees Pixel"
+msgid "Image to apply OrthoRectification on"
+msgstr "Geometrie/Orthorectification"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:180
-msgid "Full fix"
-msgstr ""
+#: Code/Modules/Orthorectification/otbOrthorectificationModule.cxx:84
+#, fuzzy
+msgid "Orthorectified image"
+msgstr "Image fixe filtree"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:188
+#: Code/Modules/Projection/otbProjectionModule.cxx:39
#, fuzzy
-msgid "Scroll fix"
-msgstr "Image de navigation"
+msgid "Image to project"
+msgstr "Image extension"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:196
-msgid "Zoom fix"
-msgstr ""
+#: Code/Modules/Projection/otbProjectionModule.cxx:76
+#, fuzzy
+msgid "Projected image"
+msgstr "Image vecteur"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:207
-msgid "Point List"
-msgstr ""
+#: Code/Modules/ExtractROI/otbExtractROIModule.cxx:31
+#, fuzzy
+msgid "Image to read"
+msgstr "Image extension"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:208
-msgid "Contains selected points"
-msgstr "Contient les points selectionnes"
+#: Code/Modules/ExtractROI/otbExtractROIModule.cxx:213
+#: Code/Modules/ExtractROI/otbExtractROIModule.cxx:263
+#, fuzzy
+msgid "Image extracted"
+msgstr "Image extension"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:241
-msgid "Focus Point"
-msgstr ""
+#: Code/Modules/Concatenate/otbConcatenateModule.cxx:30
+#, fuzzy
+msgid "Image to concatenate"
+msgstr "Image extension"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:242
-msgid "Focus on the selected point couple."
-msgstr "Focalise sur le couple de point selectionne"
+#: Code/Modules/Concatenate/otbConcatenateModule.cxx:75
+#, fuzzy
+msgid "Image concatenated"
+msgstr "Image extension"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:252
+#: Code/Modules/PanSharpening/otbPanSharpeningModule.cxx:31
#, fuzzy
-msgid "Evaluate"
-msgstr "Validation"
+msgid "Panchromatic image"
+msgstr "Image de navigation"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:253
+#: Code/Modules/PanSharpening/otbPanSharpeningModule.cxx:32
#, fuzzy
-msgid "Quit Application (shortcut : Enter)"
-msgstr "Quitter"
+msgid "Multispectral image"
+msgstr "Image optique"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:267
-msgid "X1"
-msgstr ""
+#: Code/Modules/PanSharpening/otbPanSharpeningModule.cxx:74
+#, fuzzy
+msgid "Pansharpened image"
+msgstr "Ouvrir image"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:275
-msgid "Y1"
-msgstr ""
+#: Code/Modules/Classification/otbSupervisedClassificationModule.cxx:34
+#, fuzzy
+msgid "Image to apply Classification on"
+msgstr "Classification"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:283
-msgid "X2"
-msgstr ""
+#: Code/Modules/Classification/otbSupervisedClassificationModule.cxx:88
+#, fuzzy
+msgid "Classified image"
+msgstr "Retourner image fixe"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:292
-msgid "Y2"
-msgstr ""
+#: Code/Modules/Classification/otbSupervisedClassificationModule.cxx:114
+#, fuzzy
+msgid "Vectors of classified image"
+msgstr "Image vecteur"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:302
-msgid "Clear Feature List (shortcut KP_Enter)"
-msgstr ""
+#: Code/Modules/FeatureExtraction/otbFeatureExtractionModule.cxx:45
+msgid "Image to apply feature extraction"
+msgstr "Image pour la selection d'attributs"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:313
-msgid "Focus Click"
+#: Code/Modules/FeatureExtraction/otbFeatureExtractionModule.cxx:88
+msgid "Feature image extraction"
+msgstr "Extraction d'attributs"
+
+#: Code/Modules/KMeans/otbKMeansModule.cxx:38
+#, fuzzy
+msgid "Image to cluster"
+msgstr "Liste d'images"
+
+#: Code/Modules/KMeans/otbKMeansModule.cxx:117
+msgid "Generating decision tree"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:314
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:326
-msgid "Focus on the last clicked point couple."
+#: Code/Modules/KMeans/otbKMeansModule.cxx:253
+msgid "Tree generated"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:325
-msgid "Guess"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:262
+msgid "Optimization ended"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:343
-msgid "Full moving"
-msgstr "Full image a recaler"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:289
+#, fuzzy
+msgid "The labeled image from kmeans classification"
+msgstr "Utiliser Angle Spectral"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:351
-msgid "Scroll moving"
-msgstr "Scroll image a recaler"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:291
+#, fuzzy
+msgid "The clustered image from kmeans classification"
+msgstr "Utiliser Angle Spectral"
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:359
-msgid "Zoom moving"
-msgstr "Zoom image a recaler"
+#: Code/Modules/MeanShift/otbMeanShiftModuleView.cxx:108
+#, fuzzy
+msgid "Select an input image"
+msgstr "Choisir image XS"
-#: Code/Modules/otbReaderModuleGUI.cxx:58
-msgid "Open"
-msgstr "Ouvrir"
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:45
+msgid "Image to apply MeanShift on"
+msgstr ""
-#: Code/Modules/otbReaderModuleGUI.cxx:82
-msgid "Data type "
-msgstr "Type donnees"
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:107
+msgid "Result of the MeanShift filtering"
+msgstr ""
-#: Code/Modules/otbReaderModuleGUI.cxx:91
-msgid "Name "
-msgstr "Nom"
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:113
+#, fuzzy
+msgid "Result of the MeanShift clustering"
+msgstr "Filtrage/Mean shift clusterisation"
-#: Code/Modules/otbOrthorectificationGUI.cxx:353
-msgid "otbOrthorectification"
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:119
+msgid "Result of the MeanShift labeling"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:56
-msgid "MeanShift Module"
-msgstr ""
+#: Code/Modules/Threshold/otbThresholdModule.cxx:104
+#, fuzzy
+msgid "Image to threshold"
+msgstr "Seuils"
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:87
-msgid "Set the MeanShift spatial radius"
+#: Code/Modules/Threshold/otbThresholdModule.cxx:131
+#: Code/Modules/Viewer/otbViewerModule.cxx:251
+msgid "Generating QuickLook ..."
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:102
+#: Code/Modules/Threshold/otbThresholdModule.cxx:303
+#: Code/Modules/Threshold/otbThresholdModule.cxx:307
#, fuzzy
-msgid "Spectral Radius"
-msgstr "Angle Spectral"
+msgid "Thresholded image"
+msgstr "Seuils"
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:103
-msgid "Set the MeanShift spectral radius"
+#: Code/Modules/SARIntensity/otbSarIntensityModule.cxx:31
+msgid "Complex image to extract intensity from"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:117
-msgid "Min Region Size"
-msgstr "Taille region min"
+#: Code/Modules/SARIntensity/otbSarIntensityModule.cxx:72
+msgid "Intensity of the complex image"
+msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:118
-msgid "Set the MeanShift minimum region size"
+#: Code/Modules/SARIntensity/otbSarIntensityModule.cxx:73
+msgid "Log10-intensity of the complex image"
msgstr ""
-#: Code/Modules/otbCachingModuleGUI.cxx:7
-msgid "Caching Data"
-msgstr "Mise des donnees en cache"
+#: Code/Modules/ChangeDetection/otbChangeDetectionModule.cxx:35
+#, fuzzy
+msgid "Left image"
+msgstr "Image vecteur"
-#: Code/Modules/otbProjectionGroup.cxx:168
-msgid "SENSOR MODEL"
-msgstr "MODEL CAPTEUR"
+#: Code/Modules/ChangeDetection/otbChangeDetectionModule.cxx:36
+#, fuzzy
+msgid "Right image"
+msgstr "Image 1"
-#: Code/Modules/otbProjectionGroup.cxx:435
-msgid "Splines"
-msgstr "Splines"
+#: Code/Modules/ChangeDetection/otbChangeDetectionModule.cxx:102
+msgid "Change image Label"
+msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:440
+#: Code/Modules/Viewer/otbViewerModule.cxx:74
#, fuzzy
-msgid "otbProjection"
-msgstr "Projection"
+msgid "Pixels"
+msgstr "Coordonnees Pixel"
-#: Code/Modules/otbProjectionGroup.cxx:471
-#, fuzzy
-msgid "Input Image"
-msgstr "Image en Entree"
+#: Code/Modules/Viewer/otbViewerModule.cxx:75
+msgid "Frequency"
+msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:519
-#, fuzzy
-msgid "Input Cartographic Coordinates"
-msgstr "Coordonnees Cartographique"
+#: Code/Modules/Viewer/otbViewerModule.cxx:173
+msgid "Image to visualize"
+msgstr "Image a visualiser"
-#: Code/Modules/otbProjectionGroup.cxx:590
+#: Code/Modules/Viewer/otbViewerModule.cxx:175
+msgid "VectorData to visualize"
+msgstr "Donnees vecteurs a visualiser"
+
+#: Code/Modules/Viewer/otbViewerModule.cxx:600
#, fuzzy
-msgid "Input Map Projection"
-msgstr "Projection"
+msgid "Changed class color"
+msgstr "Changer la classe"
-#~ msgid "Load fixed image"
-#~ msgstr "Ouvrir image fixe"
+#: Code/Modules/Speckle/otbSpeckleFilteringModule.cxx:39
+msgid "Image to apply speckle filtering on"
+msgstr ""
-#~ msgid "Load moving image"
-#~ msgstr "Ouvrir image a recaler"
+#: Code/Modules/Speckle/otbSpeckleFilteringModule.cxx:75
+#, fuzzy
+msgid "Speckle filtered image"
+msgstr "Sauver l'image recalee"
-#~ msgid "Flip fixed image"
-#~ msgstr "Retourner image fixe"
+#: StarterKit/otbExampleModule.cxx:30
+msgid "This is my input"
+msgstr ""
-#~ msgid "Choose filter"
-#~ msgstr "Choisir Filtre"
+#: StarterKit/otbExampleModule.cxx:36
+msgid "This is my optional input"
+msgstr ""
-#~ msgid "Save Registration parameters"
-#~ msgstr "Sauver les parametres de recalage"
+#: StarterKit/otbExampleModule.cxx:39
+msgid "This is my multiple input"
+msgstr ""
-#~ msgid "Filtered fixed image"
-#~ msgstr "Image fixe filtree"
+#: StarterKit/otbExampleModule.cxx:126
+msgid "This is my image output"
+msgstr ""
-#~ msgid "Filtered moving image"
-#~ msgstr "Image a recaler filtree"
+#: StarterKit/otbExampleModule.cxx:131
+msgid "These are my pointset outputs"
+msgstr ""
-#~ msgid "Deformed image"
-#~ msgstr "Image deformee"
+#, fuzzy
+#~ msgid "Set Inputs"
+#~ msgstr "Parametres"
-#~ msgid "Linear Interpolation"
-#~ msgstr "Interpolation Lineaire"
+#~ msgid "Reference Pixel"
+#~ msgstr "Pixel De Reference"
-#~ msgid "B-Spline Interpolation"
-#~ msgstr "Interpolation B-Spline"
+#, fuzzy
+#~ msgid "First Image"
+#~ msgstr "Image 1"
-#~ msgid "Select"
-#~ msgstr "Selectionner"
+#, fuzzy
+#~ msgid "Second Image"
+#~ msgstr "Ouvrir Image"
-#~ msgid "Learning rate"
-#~ msgstr "Taux d'apprentissage"
+#, fuzzy
+#~ msgid "Quit "
+#~ msgstr "Quitter"
-#~ msgid "Refresh GUI"
-#~ msgstr "Rafraichir"
+#, fuzzy
+#~ msgid "Input Image"
+#~ msgstr "Image en Entree"
diff --git a/I18n/otb.pot b/I18n/otb.pot
index a68ea42cf1542a13cc38f694375571d334ece095..df37fb89c4f8c2a0ffae8f076a40d17abb9ea11b 100644
--- a/I18n/otb.pot
+++ b/I18n/otb.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: otb 3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-23 06:36+1100\n"
+"POT-Creation-Date: 2009-11-10 14:44+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,1184 +16,1130 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:21
#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:42
#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:42
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:70
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:91
+#: Pireo/PireoViewerGUI.cxx:229
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:252
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:21
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:65
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:168
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:70
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:70
#: Classification/otbSupervisedClassificationAppliGUI.cxx:107
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:93
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:70
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:168
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:65
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:44
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:86
+#: Code/Application/otbMonteverdiViewGUI.cxx:148
msgid "File"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:43
-#: OrthoRectif/otbOrthoRectifGUI.cxx:417
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:181
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:57
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:71
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:92
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:253
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1185
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:43
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:273
-#: OrthoFusion/otbOrthoFusionGUI.cxx:445
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:169
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:71
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:108
-#: LandCoverMap/otbLandCoverMapView.cxx:68
-msgid "Open image"
-msgstr ""
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:44
-msgid "Save label image"
-msgstr ""
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:45
-msgid "Save Polygon"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:22
+msgid "Open stereoscopic couple"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:46
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:46
-#: OrthoRectif/otbOrthoRectifGUI.cxx:447
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:23
+#: LandCoverMap/otbLandCoverMapView.cxx:124
+#: OrthoFusion/otbOrthoFusionGUI.cxx:475
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:221
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:493
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:538
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:46
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:46
#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:66
#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:465
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:76
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:95
+#: Pireo/PireoViewerGUI.cxx:237
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:255
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:76
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:117
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:46
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1901
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:80
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:172
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:221
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:493
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:538
+#: OrthoRectif/otbOrthoRectifGUI.cxx:447
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:73
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:313
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:522
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:577
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:23
-#: OrthoFusion/otbOrthoFusionGUI.cxx:475
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:73
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:172
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:80
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:117
-#: LandCoverMap/otbLandCoverMapView.cxx:124
-#: Code/Modules/otbViewerModuleGroup.cxx:567
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:54
-#: Code/Modules/otbWriterViewGroup.cxx:283
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:49
#: Code/Modules/otbOrthorectificationGUI.cxx:368
-#: Code/Modules/otbProjectionGroup.cxx:455
+#: Code/Modules/otbWriterViewGroup.cxx:284
+#: Code/Modules/otbViewerModuleGroup.cxx:496
+#: Code/Modules/otbViewerModuleGroup.cxx:567
msgid "Quit"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:126
-msgid "Object Counting Application"
-msgstr ""
-
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:133
-msgid "Extract"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:169
+msgid "Stereoscopic viewer"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:146
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:195
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:406
-msgid "Minimap"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:176
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:292
+#: Pireo/PireoViewerGUI.cxx:738 Pireo/PireoViewerGUI.cxx:767
+msgid "Image"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:147
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:348
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:407
-#: Common/otbMsgReporterGUI.cxx:15
-#: Code/Common/otbMsgReporterGUI.cxx:15
-msgid "Navigate through the image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:177
+msgid ""
+"This area shows the main stereoscopic couple. To activate the sub-window "
+"mode, draw a rectangle with the middle mouse button pressed"
msgstr ""
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:198
#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:155
#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:215
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:198
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:328
msgid "Parameters"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:161
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:121
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:105
-msgid "SVM"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:204
+msgid "Zoom in interpolator"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:162
-msgid "Use SVM for Classification"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:205
+msgid "Choose the interpolator used when resample factor is less than 1"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:170
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:232
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:595
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:557
-msgid "Spectral Angle"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:215
+msgid "Zoom out interpolator"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:171
-msgid "Use Spectral Angle for Classification"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:216
+msgid "Choose the interpolator used when resample factor is more than 1"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:178
-msgid "Use Smoothing"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:226
+msgid "Magnify"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:179
-msgid "Smooth input image before working"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:227
+msgid "Magnify the scene (nearest neighbours interpolation)"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:186
-msgid "Minimum Object Size"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:242
+msgid "Resample"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:187
-msgid "Minimum Region Size"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:243
+msgid "Resample the scene"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:196
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:671
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:633
-msgid "Mean Shift"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:258
+#: Pireo/RegistrationParametersGUI.cxx:732
+#: Pireo/RegistrationParametersGUI.cxx:749
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1302
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1254
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:360
+#: Code/Modules/otbViewerModuleGroup.cxx:471
+msgid "X"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:203
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1704
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1656
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:86
-msgid "Spatial Radius"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:285
+msgid "Main visualization"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:212
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1711
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1663
-msgid "Range Radius"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:286
+msgid "Choose the couple to view"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:221
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1726
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1678
-msgid "Scale"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:292
+msgid "Main stereoscopic couple"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:240
-msgid "Reference Pixel"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:305
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:374
+msgid "Show left image"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:247
-msgid "Threshold Value"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:314
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:383
+msgid "show right image"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:259
-msgid "Nu (svm) "
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:323
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:392
+msgid "Show anaglyph"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:260
-msgid "SVM Classifier margin"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:333
+msgid "Normalization (%)"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:270
-#: OrthoRectif/otbOrthoRectifGUI.cxx:497
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:289
-#: OrthoFusion/otbOrthoFusionGUI.cxx:525
-msgid "Preview"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:353
+msgid "Insight"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:271
-msgid "Run over the extracted image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:354
+msgid "Choose the couple to view in the insight sub-window mode"
msgstr ""
-#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:279
-msgid "Statistics "
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:361
+msgid "Insight tereoscopic couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:43
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:396
-msgid "Open image pair"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:406
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:146
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:195
+msgid "Minimap"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:44
-msgid "Save deformation field"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:407
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:147
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:343
+#: Common/otbMsgReporterGUI.cxx:15 Code/Common/otbMsgReporterGUI.cxx:15
+msgid "Navigate through the image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:45
-msgid "Save registered image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:415
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:480
+msgid "Rename couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:167
-msgid "Fine registration application"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:416
+msgid "Rename the selected couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:174
-msgid "Images"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:425
+msgid "Open Stereoscopic couple"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:175
-msgid ""
-"This area displays a color composition of the fixed image, the moving image "
-"and the resampled image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:432
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:493
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:379
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:398
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:314
+#: Pireo/PreProcessParametersGUI.cxx:200 Pireo/PireoViewerGUI.cxx:665
+#: Pireo/PireoViewerGUI.cxx:694 Pireo/PireoViewerGUI.cxx:728
+#: Pireo/PireoViewerGUI.cxx:757 Pireo/RegistrationParametersGUI.cxx:1289
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1166
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:470
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:831
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:915
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:620
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:751
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:379
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:415
+#: Code/Application/otbMonteverdiViewGroup.cxx:129
+#: Code/Application/otbMonteverdiViewGroup.cxx:159
+#: Code/Application/otbMonteverdiViewGroup.cxx:204
+#: Code/Application/otbInputViewGroup.cxx:42
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1837
+#: Code/Modules/otbReaderModuleGUI.cxx:66
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:509
+#: Code/Modules/otbExtractROIModuleGUI.cxx:42
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:805
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:889
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:71
+#: Code/Modules/otbWriterModuleGUI.cxx:50
+#: Code/Modules/otbKMeansModuleGUI.cxx:43
+msgid "Cancel"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:196
-msgid ""
-"This area allows to navigate through large images. Displays an anaglyph "
-"composition of the fixed and the moving image"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:440
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:486
+#: LandCoverMap/otbLandCoverMapView.cxx:113
+#: OrthoFusion/otbOrthoFusionGUI.cxx:465
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:361
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:406
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:472
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:306
+#: Pireo/PireoViewerGUI.cxx:657 Pireo/PireoViewerGUI.cxx:686
+#: Pireo/PireoViewerGUI.cxx:720 Pireo/PireoViewerGUI.cxx:749
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1157
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:460
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:722
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:816
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:904
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:610
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:741
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:361
+#: OrthoRectif/otbOrthoRectifGUI.cxx:437
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:397
+#: Code/Application/otbMonteverdiViewGroup.cxx:121
+#: Code/Application/otbMonteverdiViewGroup.cxx:167
+#: Code/Application/otbMonteverdiViewGroup.cxx:212
+#: Code/Application/otbInputViewGroup.cxx:34
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:114
+#: Code/Modules/otbExtractROIModuleGUI.cxx:34
+#: Code/Modules/otbOrthorectificationGUI.cxx:359
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:790
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:878
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:63
+#: Code/Modules/otbViewerModuleGroup.cxx:353
+#: Code/Modules/otbViewerModuleGroup.cxx:483
+#: Code/Modules/otbViewerModuleGroup.cxx:574
+#: Code/Modules/otbKMeansModuleGUI.cxx:35
+msgid "Ok"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:205
-msgid "Deformation field"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:206
-msgid ""
-"This area shows a color composition of the deformation field values in X, Y "
-"and intensity. To display the deformation field, please trigger the run "
-"button"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:216
-msgid "This area allows you to tune parameters from the registration algorithm"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:222
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:82
-#: Segmentation/otbPreprocessingViewGroup.cxx:71
-msgid "Number of iterations"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:223
-msgid ""
-"Allows you to tune the number of iterations of the registration algorithm"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:232
-msgid "X NCC radius"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:233
-msgid ""
-"Allows you to tune the radius used to compute the normalized correlation in "
-"the first image direction"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:243
-msgid "Y NCC radius"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:244
-msgid ""
-"Allows you to tune the radius used to compute the normalized correlation in "
-"the second image direction"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:254
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:397
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:469
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:381
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:79
-msgid "Run"
-msgstr ""
-
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:255
-msgid ""
-"This button allows you to run the deformation field estimation on the image "
-"region displayed in the \"Images\" area"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:448
+msgid "Left image "
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:265
-msgid "X Max"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:455
+msgid "Right image "
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:266
-msgid ""
-"This algorithm allows you to tune the maximum deformation in the first image "
-"direction. This is used to handle a security margin when streaming the "
-"algorithm on huge images"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:462
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:470
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:428
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:436
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1093
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1102
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1111
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1120
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1144
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:560
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:573
+#: Code/Modules/otbReaderModuleGUI.cxx:74
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:499
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:79
+#: Code/Modules/otbWriterViewGroup.cxx:172
+#: Code/Modules/otbWriterModuleGUI.cxx:58
+msgid "..."
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:281
-msgid "Y Max"
+#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:500
+msgid "Couple name: "
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:282
-msgid ""
-"This algorithm allows you to tune the maximum deformation in the second "
-"image direction. This is used to handle a security margin when streaming the "
-"algorithm on huge images"
+#: LandCoverMap/otbLandCoverMapView.cxx:43
+msgid "Land Cover Map Application"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:300
-msgid "Images color composition"
+#: LandCoverMap/otbLandCoverMapView.cxx:51
+#: LandCoverMap/otbLandCoverMapView.cxx:82
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:543
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1786
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1735
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:519
+#: Code/Modules/otbWriterViewGroup.cxx:193
+msgid "Tools for classification"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:301
-msgid ""
-"This area allows you to select the color composition displayed in the "
-"\"Images\" area"
+#: LandCoverMap/otbLandCoverMapView.cxx:59
+msgid "Input Image Name"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:308
-msgid "Fixed"
+#: LandCoverMap/otbLandCoverMapView.cxx:68
+#: OrthoFusion/otbOrthoFusionGUI.cxx:445
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:181
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:43
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:57
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:92
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:253
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1185
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:71
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:108
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:43
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:71
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:169
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:181
+#: OrthoRectif/otbOrthoRectifGUI.cxx:417
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:273
+msgid "Open image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:309
-msgid "Show or hide the fixed image in the color composition"
+#: LandCoverMap/otbLandCoverMapView.cxx:69
+msgid "Open a new input image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:320
-msgid "Moving"
+#: LandCoverMap/otbLandCoverMapView.cxx:90
+msgid "Input Model Name"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:321
-msgid "Show or hide the moving image in the color composition"
+#: LandCoverMap/otbLandCoverMapView.cxx:100
+msgid "Load model"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:332
-msgid "Resampled"
+#: LandCoverMap/otbLandCoverMapView.cxx:101
+msgid "Open a new input model"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:333
-msgid ""
-"Show or hide the resampled image in the color composition. If there is no "
-"deformation field computed yet, the resampled image is the moving image"
+#: LandCoverMap/otbLandCoverMapView.cxx:114
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1869
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1816
+#: Code/Modules/otbWriterViewGroup.cxx:274
+msgid "Save the Composition"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:347
-msgid "Deformation field color composition"
+#: LandCoverMap/otbLandCoverMapView.cxx:125
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1902
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1838
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:305
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:317
+#: Code/Modules/otbWriterViewGroup.cxx:285
+msgid "Quit Application"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:354
-msgid "X deformation"
+#: LandCoverMap/otbLandCoverMapView.cxx:135
+msgid "Scroll image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:355
-msgid ""
-"Show or hide the deformation in the first image direction in the color "
-"composition"
+#: LandCoverMap/otbLandCoverMapView.cxx:142
+msgid "Feature selection"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:367
-msgid "Y deformation"
+#: LandCoverMap/otbLandCoverMapView.cxx:152
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:442
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:430
+msgid "Opacity"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:368
-msgid ""
-"Show or hide the deformation in the second image direction in the color "
-"composition"
+#: LandCoverMap/otbLandCoverMapView.cxx:164
+msgid "Full resolution image"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:380
-msgid "Intensity"
+#: LandCoverMap/otbLandCoverMapView.cxx:171
+msgid "Nomenclature"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:381
-msgid "Show or hide the deformation intensity iin the color composition"
+#: LandCoverMap/otbLandCoverMapView.cxx:175
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:632
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:594
+msgid "Vegetation"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:403
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:379
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:470
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:314
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1166
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:415
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:432
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:493
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:620
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:751
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:831
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:915
-#: Code/Application/otbInputViewGroup.cxx:42
-#: Code/Application/otbMonteverdiViewGroup.cxx:129
-#: Code/Application/otbMonteverdiViewGroup.cxx:159
-#: Code/Application/otbMonteverdiViewGroup.cxx:204
-#: Code/Modules/otbExtractROIModuleGUI.cxx:35
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:814
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:898
-#: Code/Modules/otbWriterModuleGUI.cxx:50
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1837
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:71
-#: Code/Modules/otbReaderModuleGUI.cxx:66
-msgid "Cancel"
+#: LandCoverMap/otbLandCoverMapView.cxx:184
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:659
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:621
+msgid "Water"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:411
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:361
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:460
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:306
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1157
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:397
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:440
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:486
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:610
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:741
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:816
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:904
-#: Code/Application/otbInputViewGroup.cxx:34
-#: Code/Application/otbMonteverdiViewGroup.cxx:121
-#: Code/Application/otbMonteverdiViewGroup.cxx:167
-#: Code/Application/otbMonteverdiViewGroup.cxx:212
-#: Code/Modules/otbExtractROIModuleGUI.cxx:27
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:799
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:887
-#: Code/Modules/otbViewerModuleGroup.cxx:353
-#: Code/Modules/otbViewerModuleGroup.cxx:483
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:63
-msgid "Ok"
+#: LandCoverMap/otbLandCoverMapView.cxx:193
+msgid "Built-up area"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:419
-msgid "Fixed image"
+#: LandCoverMap/otbLandCoverMapView.cxx:202
+msgid "Roads"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:426
-msgid "Moving image"
+#: LandCoverMap/otbLandCoverMapView.cxx:211
+msgid "Bare soil"
msgstr ""
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:433
-#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:441
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:560
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:573
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1093
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1102
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1111
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1120
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1144
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:462
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:470
-#: Code/Modules/otbWriterModuleGUI.cxx:58
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:79
-#: Code/Modules/otbWriterViewGroup.cxx:172
-#: Code/Modules/otbReaderModuleGUI.cxx:74
-msgid "..."
+#: LandCoverMap/otbLandCoverMapView.cxx:220
+msgid "Shadows"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:89
-#: OrthoFusion/otbOrthoFusionGUI.cxx:117
+#: OrthoFusion/otbOrthoFusionGUI.cxx:117 OrthoRectif/otbOrthoRectifGUI.cxx:89
+#: Code/Modules/otbProjectionGroup.cxx:99
+#: Code/Modules/otbProjectionGroup.cxx:209
#: Code/Modules/otbOrthorectificationGUI.cxx:88
-#: Code/Modules/otbProjectionGroup.cxx:165
-#: Code/Modules/otbProjectionGroup.cxx:311
msgid "UTM"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:90
-#: OrthoFusion/otbOrthoFusionGUI.cxx:118
+#: OrthoFusion/otbOrthoFusionGUI.cxx:118 OrthoRectif/otbOrthoRectifGUI.cxx:90
+#: Code/Modules/otbProjectionGroup.cxx:100
+#: Code/Modules/otbProjectionGroup.cxx:210
#: Code/Modules/otbOrthorectificationGUI.cxx:89
-#: Code/Modules/otbProjectionGroup.cxx:166
-#: Code/Modules/otbProjectionGroup.cxx:312
msgid "LAMBERT2"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:91
-#: OrthoFusion/otbOrthoFusionGUI.cxx:119
+#: OrthoFusion/otbOrthoFusionGUI.cxx:119 OrthoRectif/otbOrthoRectifGUI.cxx:91
+#: Code/Modules/otbProjectionGroup.cxx:101
+#: Code/Modules/otbProjectionGroup.cxx:211
#: Code/Modules/otbOrthorectificationGUI.cxx:90
-#: Code/Modules/otbProjectionGroup.cxx:167
-#: Code/Modules/otbProjectionGroup.cxx:313
msgid "TRANSMERCATOR"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:284
-#: OrthoFusion/otbOrthoFusionGUI.cxx:312
+#: OrthoFusion/otbOrthoFusionGUI.cxx:312 OrthoRectif/otbOrthoRectifGUI.cxx:284
+#: Code/Modules/otbProjectionGroup.cxx:425
#: Code/Modules/otbOrthorectificationGUI.cxx:249
-#: Code/Modules/otbProjectionGroup.cxx:432
msgid "Linear"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:285
-#: OrthoFusion/otbOrthoFusionGUI.cxx:313
+#: OrthoFusion/otbOrthoFusionGUI.cxx:313 OrthoRectif/otbOrthoRectifGUI.cxx:285
+#: Code/Modules/otbProjectionGroup.cxx:426
#: Code/Modules/otbOrthorectificationGUI.cxx:250
-#: Code/Modules/otbProjectionGroup.cxx:433
msgid "Nearest"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:286
-#: OrthoFusion/otbOrthoFusionGUI.cxx:314
+#: OrthoFusion/otbOrthoFusionGUI.cxx:314 OrthoRectif/otbOrthoRectifGUI.cxx:286
+#: Code/Modules/otbProjectionGroup.cxx:427
#: Code/Modules/otbOrthorectificationGUI.cxx:251
-#: Code/Modules/otbProjectionGroup.cxx:434
msgid "SinC"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:333
-#: OrthoFusion/otbOrthoFusionGUI.cxx:361
+#: OrthoFusion/otbOrthoFusionGUI.cxx:361 OrthoRectif/otbOrthoRectifGUI.cxx:333
+#: Code/Modules/otbProjectionGroup.cxx:353
#: Code/Modules/otbOrthorectificationGUI.cxx:298
-#: Code/Modules/otbProjectionGroup.cxx:360
msgid "Blackman"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:334
-#: OrthoFusion/otbOrthoFusionGUI.cxx:362
+#: OrthoFusion/otbOrthoFusionGUI.cxx:362 OrthoRectif/otbOrthoRectifGUI.cxx:334
+#: Code/Modules/otbProjectionGroup.cxx:354
#: Code/Modules/otbOrthorectificationGUI.cxx:299
-#: Code/Modules/otbProjectionGroup.cxx:361
msgid "Cosine"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:335
-#: OrthoFusion/otbOrthoFusionGUI.cxx:363
+#: OrthoFusion/otbOrthoFusionGUI.cxx:363 OrthoRectif/otbOrthoRectifGUI.cxx:335
+#: Code/Modules/otbProjectionGroup.cxx:355
#: Code/Modules/otbOrthorectificationGUI.cxx:300
-#: Code/Modules/otbProjectionGroup.cxx:362
msgid "Gaussian"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:336
-#: OrthoFusion/otbOrthoFusionGUI.cxx:364
+#: OrthoFusion/otbOrthoFusionGUI.cxx:364 OrthoRectif/otbOrthoRectifGUI.cxx:336
+#: Code/Modules/otbProjectionGroup.cxx:356
#: Code/Modules/otbOrthorectificationGUI.cxx:301
-#: Code/Modules/otbProjectionGroup.cxx:363
msgid "Hamming"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:337
-#: OrthoFusion/otbOrthoFusionGUI.cxx:365
+#: OrthoFusion/otbOrthoFusionGUI.cxx:365 OrthoRectif/otbOrthoRectifGUI.cxx:337
+#: Code/Modules/otbProjectionGroup.cxx:357
#: Code/Modules/otbOrthorectificationGUI.cxx:302
-#: Code/Modules/otbProjectionGroup.cxx:364
msgid "Lanczos"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:338
-#: OrthoFusion/otbOrthoFusionGUI.cxx:366
+#: OrthoFusion/otbOrthoFusionGUI.cxx:366 OrthoRectif/otbOrthoRectifGUI.cxx:338
+#: Code/Modules/otbProjectionGroup.cxx:358
#: Code/Modules/otbOrthorectificationGUI.cxx:303
-#: Code/Modules/otbProjectionGroup.cxx:365
msgid "Welch"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:411
-msgid "otbOrthoRectif"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:439
+msgid "otbOrthoFusion"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:418
+#: OrthoFusion/otbOrthoFusionGUI.cxx:446
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:182
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:182
+#: OrthoRectif/otbOrthoRectifGUI.cxx:418
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:274
-#: OrthoFusion/otbOrthoFusionGUI.cxx:446
msgid "Open an image in a new image viewer"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:427
+#: OrthoFusion/otbOrthoFusionGUI.cxx:455
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:191
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:44
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1879
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:191
+#: OrthoRectif/otbOrthoRectifGUI.cxx:427
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:283
-#: OrthoFusion/otbOrthoFusionGUI.cxx:455
msgid "Close image"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:428
+#: OrthoFusion/otbOrthoFusionGUI.cxx:456
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:192
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:192
+#: OrthoRectif/otbOrthoRectifGUI.cxx:428
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:284
-#: OrthoFusion/otbOrthoFusionGUI.cxx:456
msgid "Close the selected image"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:437
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:472
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:722
-#: OrthoFusion/otbOrthoFusionGUI.cxx:465
-#: LandCoverMap/otbLandCoverMapView.cxx:113
-#: Code/Modules/otbViewerModuleGroup.cxx:574
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:114
-#: Code/Modules/otbOrthorectificationGUI.cxx:359
-#: Code/Modules/otbProjectionGroup.cxx:446
-msgid "OK"
-msgstr ""
-
-#: OrthoRectif/otbOrthoRectifGUI.cxx:438
-#: OrthoFusion/otbOrthoFusionGUI.cxx:466
+#: OrthoFusion/otbOrthoFusionGUI.cxx:466 OrthoRectif/otbOrthoRectifGUI.cxx:438
+#: Code/Modules/otbProjectionGroup.cxx:440
#: Code/Modules/otbOrthorectificationGUI.cxx:360
-#: Code/Modules/otbProjectionGroup.cxx:447
msgid "Compute result"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:448
+#: OrthoFusion/otbOrthoFusionGUI.cxx:476
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:222
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:222
+#: OrthoRectif/otbOrthoRectifGUI.cxx:448
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:314
-#: OrthoFusion/otbOrthoFusionGUI.cxx:476
-#: Code/Modules/otbAlgebraGroup.cxx:132
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:55
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:115
#: Code/Modules/otbOrthorectificationGUI.cxx:369
-#: Code/Modules/otbProjectionGroup.cxx:456
+#: Code/Modules/otbAlgebraGroup.cxx:132
msgid "Quit the viewer manager"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:457
+#: OrthoFusion/otbOrthoFusionGUI.cxx:485
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:231
+#: Pireo/PireoViewerGUI.cxx:269
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:231
+#: OrthoRectif/otbOrthoRectifGUI.cxx:457
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:205
-#: OrthoFusion/otbOrthoFusionGUI.cxx:485
msgid "Information"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:458
+#: OrthoFusion/otbOrthoFusionGUI.cxx:486
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:232
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:232
+#: OrthoRectif/otbOrthoRectifGUI.cxx:458
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:206
-#: OrthoFusion/otbOrthoFusionGUI.cxx:486
msgid "Selected image viewer information"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:466
+#: OrthoFusion/otbOrthoFusionGUI.cxx:494
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:239
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:239
+#: OrthoRectif/otbOrthoRectifGUI.cxx:466
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:229
-#: OrthoFusion/otbOrthoFusionGUI.cxx:494
msgid "Show / Hide"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:467
+#: OrthoFusion/otbOrthoFusionGUI.cxx:495
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:240
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:240
+#: OrthoRectif/otbOrthoRectifGUI.cxx:467
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:230
-#: OrthoFusion/otbOrthoFusionGUI.cxx:495
msgid "Show or hide the selected image viewer"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:476
+#: OrthoFusion/otbOrthoFusionGUI.cxx:504
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:268
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:268
+#: OrthoRectif/otbOrthoRectifGUI.cxx:476
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:239
-#: OrthoFusion/otbOrthoFusionGUI.cxx:504
msgid "Hide all"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:477
+#: OrthoFusion/otbOrthoFusionGUI.cxx:505
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:269
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:269
+#: OrthoRectif/otbOrthoRectifGUI.cxx:477
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:240
-#: OrthoFusion/otbOrthoFusionGUI.cxx:505
msgid "Hide all the viewers"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:486
-msgid "Image List"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:514
+msgid "Images list"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:487
+#: OrthoFusion/otbOrthoFusionGUI.cxx:515
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:279
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:279
+#: OrthoRectif/otbOrthoRectifGUI.cxx:487
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:214
-#: OrthoFusion/otbOrthoFusionGUI.cxx:515
msgid ""
"List of opened image viewer (showed image viewer are prefixed with +, and "
"hidden with -)"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:498
-msgid "Preview Window"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:525
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:289
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:270
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:289
+#: OrthoRectif/otbOrthoRectifGUI.cxx:497
+msgid "Preview"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:526
+#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:290
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:290
+msgid "Preview window"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:538 OrthoFusion/otbOrthoFusionGUI.cxx:550
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1807
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1755
+#: Code/Modules/otbWriterViewGroup.cxx:213
+msgid ">>"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:539
+msgid "Add PAN input image"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:544 OrthoFusion/otbOrthoFusionGUI.cxx:556
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1818
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1766
+#: Code/Modules/otbWriterViewGroup.cxx:224
+msgid "<<"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:545
+msgid "Remove selected PAN"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:551
+msgid "Add XS input image"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:557
+msgid "Remove Selected XS"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:562
+msgid "PAN image"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:563
+msgid "Select a PAN image"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:567
+msgid "XS image"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:568
+msgid "Select a XS image"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:516
-#: OrthoFusion/otbOrthoFusionGUI.cxx:578
+#: OrthoFusion/otbOrthoFusionGUI.cxx:578 OrthoRectif/otbOrthoRectifGUI.cxx:516
#: Code/Modules/otbOrthorectificationGUI.cxx:384
msgid "Coordinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:521
-#: Code/Modules/otbOrthorectificationGUI.cxx:432
-#: Code/Modules/otbProjectionGroup.cxx:761
-msgid "Map Projection"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:583
+msgid "Map projection"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:522
-#: OrthoFusion/otbOrthoFusionGUI.cxx:584
-#: Code/Modules/otbOrthorectificationGUI.cxx:433
-#: Code/Modules/otbProjectionGroup.cxx:591
-#: Code/Modules/otbProjectionGroup.cxx:762
+#: OrthoFusion/otbOrthoFusionGUI.cxx:584 OrthoRectif/otbOrthoRectifGUI.cxx:522
+#: Code/Modules/otbProjectionGroup.cxx:503
+#: Code/Modules/otbProjectionGroup.cxx:627
+#: Code/Modules/otbOrthorectificationGUI.cxx:432
msgid "Select the map projection type"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:530
-#: Code/Modules/otbOrthorectificationGUI.cxx:441
-#: Code/Modules/otbProjectionGroup.cxx:642
-msgid "Cartographic Coordinates"
-msgstr ""
-
-#: OrthoRectif/otbOrthoRectifGUI.cxx:537
-#: OrthoFusion/otbOrthoFusionGUI.cxx:617
-#: Code/Modules/otbOrthorectificationGUI.cxx:448
-#: Code/Modules/otbProjectionGroup.cxx:527
-#: Code/Modules/otbProjectionGroup.cxx:649
-msgid "Zone"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:592
+#: Code/Modules/otbProjectionGroup.cxx:636
+msgid "Cartographic coordinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:538
-#: OrthoFusion/otbOrthoFusionGUI.cxx:618
-#: Code/Modules/otbOrthorectificationGUI.cxx:449
-#: Code/Modules/otbProjectionGroup.cxx:528
-#: Code/Modules/otbProjectionGroup.cxx:650
-msgid "Enter the zone number"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:599 OrthoFusion/otbOrthoFusionGUI.cxx:642
+#: OrthoFusion/otbOrthoFusionGUI.cxx:664 OrthoRectif/otbOrthoRectifGUI.cxx:546
+#: OrthoRectif/otbOrthoRectifGUI.cxx:578 OrthoRectif/otbOrthoRectifGUI.cxx:627
+#: Code/Modules/otbProjectionGroup.cxx:652
+#: Code/Modules/otbProjectionGroup.cxx:684
+#: Code/Modules/otbProjectionGroup.cxx:733
+#: Code/Modules/otbOrthorectificationGUI.cxx:456
+#: Code/Modules/otbOrthorectificationGUI.cxx:488
+#: Code/Modules/otbOrthorectificationGUI.cxx:537
+msgid "Easting"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:546
-#: OrthoRectif/otbOrthoRectifGUI.cxx:578
-#: OrthoRectif/otbOrthoRectifGUI.cxx:627
-#: OrthoFusion/otbOrthoFusionGUI.cxx:599
-#: OrthoFusion/otbOrthoFusionGUI.cxx:642
-#: OrthoFusion/otbOrthoFusionGUI.cxx:664
+#: OrthoFusion/otbOrthoFusionGUI.cxx:600 OrthoFusion/otbOrthoFusionGUI.cxx:643
+#: OrthoFusion/otbOrthoFusionGUI.cxx:665 OrthoRectif/otbOrthoRectifGUI.cxx:547
+#: OrthoRectif/otbOrthoRectifGUI.cxx:579 OrthoRectif/otbOrthoRectifGUI.cxx:628
+#: Code/Modules/otbProjectionGroup.cxx:653
+#: Code/Modules/otbProjectionGroup.cxx:685
+#: Code/Modules/otbProjectionGroup.cxx:734
#: Code/Modules/otbOrthorectificationGUI.cxx:457
#: Code/Modules/otbOrthorectificationGUI.cxx:489
#: Code/Modules/otbOrthorectificationGUI.cxx:538
-#: Code/Modules/otbProjectionGroup.cxx:658
-#: Code/Modules/otbProjectionGroup.cxx:690
-#: Code/Modules/otbProjectionGroup.cxx:739
-msgid "Easting"
+msgid "Enter the easting of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:547
-#: OrthoRectif/otbOrthoRectifGUI.cxx:579
-#: OrthoRectif/otbOrthoRectifGUI.cxx:628
-#: OrthoFusion/otbOrthoFusionGUI.cxx:600
-#: OrthoFusion/otbOrthoFusionGUI.cxx:643
-#: OrthoFusion/otbOrthoFusionGUI.cxx:665
-#: Code/Modules/otbOrthorectificationGUI.cxx:458
-#: Code/Modules/otbOrthorectificationGUI.cxx:490
-#: Code/Modules/otbOrthorectificationGUI.cxx:539
-#: Code/Modules/otbProjectionGroup.cxx:659
-#: Code/Modules/otbProjectionGroup.cxx:691
-#: Code/Modules/otbProjectionGroup.cxx:740
-msgid "Enter the easting of the output image center"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:608 OrthoFusion/otbOrthoFusionGUI.cxx:651
+#: OrthoFusion/otbOrthoFusionGUI.cxx:673 OrthoRectif/otbOrthoRectifGUI.cxx:555
+#: OrthoRectif/otbOrthoRectifGUI.cxx:587 OrthoRectif/otbOrthoRectifGUI.cxx:636
+#: Code/Modules/otbProjectionGroup.cxx:661
+#: Code/Modules/otbProjectionGroup.cxx:693
+#: Code/Modules/otbProjectionGroup.cxx:742
+#: Code/Modules/otbOrthorectificationGUI.cxx:465
+#: Code/Modules/otbOrthorectificationGUI.cxx:497
+#: Code/Modules/otbOrthorectificationGUI.cxx:546
+msgid "Northing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:555
-#: OrthoRectif/otbOrthoRectifGUI.cxx:587
-#: OrthoRectif/otbOrthoRectifGUI.cxx:636
-#: OrthoFusion/otbOrthoFusionGUI.cxx:608
-#: OrthoFusion/otbOrthoFusionGUI.cxx:651
-#: OrthoFusion/otbOrthoFusionGUI.cxx:673
+#: OrthoFusion/otbOrthoFusionGUI.cxx:609 OrthoFusion/otbOrthoFusionGUI.cxx:652
+#: OrthoFusion/otbOrthoFusionGUI.cxx:674 OrthoRectif/otbOrthoRectifGUI.cxx:556
+#: OrthoRectif/otbOrthoRectifGUI.cxx:588 OrthoRectif/otbOrthoRectifGUI.cxx:637
+#: Code/Modules/otbProjectionGroup.cxx:662
+#: Code/Modules/otbProjectionGroup.cxx:694
+#: Code/Modules/otbProjectionGroup.cxx:743
#: Code/Modules/otbOrthorectificationGUI.cxx:466
#: Code/Modules/otbOrthorectificationGUI.cxx:498
#: Code/Modules/otbOrthorectificationGUI.cxx:547
-#: Code/Modules/otbProjectionGroup.cxx:667
-#: Code/Modules/otbProjectionGroup.cxx:699
-#: Code/Modules/otbProjectionGroup.cxx:748
-msgid "Northing"
+msgid "Enter the northing of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:556
-#: OrthoRectif/otbOrthoRectifGUI.cxx:588
-#: OrthoRectif/otbOrthoRectifGUI.cxx:637
-#: OrthoFusion/otbOrthoFusionGUI.cxx:609
-#: OrthoFusion/otbOrthoFusionGUI.cxx:652
-#: OrthoFusion/otbOrthoFusionGUI.cxx:674
-#: Code/Modules/otbOrthorectificationGUI.cxx:467
-#: Code/Modules/otbOrthorectificationGUI.cxx:499
-#: Code/Modules/otbOrthorectificationGUI.cxx:548
-#: Code/Modules/otbProjectionGroup.cxx:668
-#: Code/Modules/otbProjectionGroup.cxx:700
-#: Code/Modules/otbProjectionGroup.cxx:749
-msgid "Enter the northing of the output image center"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:617 OrthoRectif/otbOrthoRectifGUI.cxx:537
+#: Code/Modules/otbProjectionGroup.cxx:521
+#: Code/Modules/otbProjectionGroup.cxx:643
+#: Code/Modules/otbOrthorectificationGUI.cxx:447
+msgid "Zone"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:564
-#: Code/Modules/otbOrthorectificationGUI.cxx:475
+#: OrthoFusion/otbOrthoFusionGUI.cxx:618 OrthoRectif/otbOrthoRectifGUI.cxx:538
+#: Code/Modules/otbProjectionGroup.cxx:522
+#: Code/Modules/otbProjectionGroup.cxx:644
+#: Code/Modules/otbOrthorectificationGUI.cxx:448
+msgid "Enter the zone number"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:626
+#: Code/Modules/otbProjectionGroup.cxx:530
+#: Code/Modules/otbProjectionGroup.cxx:670
+msgid "Northern hemisphere"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:633
#: Code/Modules/otbProjectionGroup.cxx:536
#: Code/Modules/otbProjectionGroup.cxx:676
-msgid "Northern Hemisphere"
+msgid "Southern hemisphere"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:570
-#: Code/Modules/otbOrthorectificationGUI.cxx:481
-#: Code/Modules/otbProjectionGroup.cxx:542
-#: Code/Modules/otbProjectionGroup.cxx:682
-msgid "Southern Hemisphere"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:682
+#: Code/Modules/otbProjectionGroup.cxx:549
+#: Code/Modules/otbProjectionGroup.cxx:706
+msgid "False easting"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:600
+#: OrthoFusion/otbOrthoFusionGUI.cxx:683 OrthoRectif/otbOrthoRectifGUI.cxx:601
+#: Code/Modules/otbProjectionGroup.cxx:550
+#: Code/Modules/otbProjectionGroup.cxx:707
#: Code/Modules/otbOrthorectificationGUI.cxx:511
-#: Code/Modules/otbProjectionGroup.cxx:555
-#: Code/Modules/otbProjectionGroup.cxx:712
-msgid "False Easting"
-msgstr ""
-
-#: OrthoRectif/otbOrthoRectifGUI.cxx:601
-#: OrthoFusion/otbOrthoFusionGUI.cxx:683
-#: Code/Modules/otbOrthorectificationGUI.cxx:512
-#: Code/Modules/otbProjectionGroup.cxx:556
-#: Code/Modules/otbProjectionGroup.cxx:713
msgid "Enter false easting"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:609
-#: Code/Modules/otbOrthorectificationGUI.cxx:520
-#: Code/Modules/otbProjectionGroup.cxx:564
-#: Code/Modules/otbProjectionGroup.cxx:721
-msgid "False Northing"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:691
+#: Code/Modules/otbProjectionGroup.cxx:558
+#: Code/Modules/otbProjectionGroup.cxx:715
+msgid "False northing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:610
-#: OrthoFusion/otbOrthoFusionGUI.cxx:692
-#: Code/Modules/otbOrthorectificationGUI.cxx:521
-#: Code/Modules/otbProjectionGroup.cxx:565
-#: Code/Modules/otbProjectionGroup.cxx:722
+#: OrthoFusion/otbOrthoFusionGUI.cxx:692 OrthoRectif/otbOrthoRectifGUI.cxx:610
+#: Code/Modules/otbProjectionGroup.cxx:559
+#: Code/Modules/otbProjectionGroup.cxx:716
+#: Code/Modules/otbOrthorectificationGUI.cxx:520
msgid "Enter false northing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:618
-#: Code/Modules/otbOrthorectificationGUI.cxx:529
-#: Code/Modules/otbProjectionGroup.cxx:573
-#: Code/Modules/otbProjectionGroup.cxx:730
-msgid "Scale Factor"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:700
+#: Code/Modules/otbProjectionGroup.cxx:567
+#: Code/Modules/otbProjectionGroup.cxx:724
+msgid "Scale factor"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:619
-#: Code/Modules/otbOrthorectificationGUI.cxx:530
-#: Code/Modules/otbProjectionGroup.cxx:574
-#: Code/Modules/otbProjectionGroup.cxx:731
-msgid "Enter Scale Factor"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:701
+#: Code/Modules/otbProjectionGroup.cxx:568
+#: Code/Modules/otbProjectionGroup.cxx:725
+msgid "Enter scale factor"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:649
-#: Code/Modules/otbOrthorectificationGUI.cxx:391
-#: Code/Modules/otbProjectionGroup.cxx:478
-msgid "Geographical Coordinates"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:713
+#: Code/Modules/otbProjectionGroup.cxx:461
+msgid "Geographical coordinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:656
-#: OrthoFusion/otbOrthoFusionGUI.cxx:720
-#: Code/Modules/otbOrthorectificationGUI.cxx:398
-#: Code/Modules/otbProjectionGroup.cxx:485
+#: OrthoFusion/otbOrthoFusionGUI.cxx:720 OrthoRectif/otbOrthoRectifGUI.cxx:656
+#: Code/Modules/otbProjectionGroup.cxx:480
+#: Code/Modules/otbOrthorectificationGUI.cxx:397
msgid "Longitude"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:657
-#: OrthoFusion/otbOrthoFusionGUI.cxx:721
-#: Code/Modules/otbOrthorectificationGUI.cxx:399
-#: Code/Modules/otbProjectionGroup.cxx:486
+#: OrthoFusion/otbOrthoFusionGUI.cxx:721 OrthoRectif/otbOrthoRectifGUI.cxx:657
+#: Code/Modules/otbProjectionGroup.cxx:481
+#: Code/Modules/otbOrthorectificationGUI.cxx:398
msgid "Enter the longitude of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:665
-#: OrthoFusion/otbOrthoFusionGUI.cxx:729
-#: Code/Modules/otbOrthorectificationGUI.cxx:407
-#: Code/Modules/otbProjectionGroup.cxx:494
+#: OrthoFusion/otbOrthoFusionGUI.cxx:729 OrthoRectif/otbOrthoRectifGUI.cxx:665
+#: Code/Modules/otbProjectionGroup.cxx:489
+#: Code/Modules/otbOrthorectificationGUI.cxx:406
msgid "Latitude"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:666
-#: OrthoFusion/otbOrthoFusionGUI.cxx:730
-#: Code/Modules/otbOrthorectificationGUI.cxx:408
-#: Code/Modules/otbProjectionGroup.cxx:495
+#: OrthoFusion/otbOrthoFusionGUI.cxx:730 OrthoRectif/otbOrthoRectifGUI.cxx:666
+#: Code/Modules/otbProjectionGroup.cxx:490
+#: Code/Modules/otbOrthorectificationGUI.cxx:407
msgid "Enter the latitude of the output image center"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:674
-#: OrthoFusion/otbOrthoFusionGUI.cxx:738
-#: Code/Modules/otbOrthorectificationGUI.cxx:416
-#: Code/Modules/otbProjectionGroup.cxx:503
+#: OrthoFusion/otbOrthoFusionGUI.cxx:738 OrthoRectif/otbOrthoRectifGUI.cxx:674
+#: Code/Modules/otbOrthorectificationGUI.cxx:415
msgid "Use Center Pixel"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:675
-#: OrthoFusion/otbOrthoFusionGUI.cxx:739
-#: Code/Modules/otbOrthorectificationGUI.cxx:417
-#: Code/Modules/otbProjectionGroup.cxx:504
+#: OrthoFusion/otbOrthoFusionGUI.cxx:739 OrthoRectif/otbOrthoRectifGUI.cxx:675
+#: Code/Modules/otbOrthorectificationGUI.cxx:416
msgid "If checked, use the output center image coodinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:681
-#: OrthoFusion/otbOrthoFusionGUI.cxx:746
-#: Code/Modules/otbOrthorectificationGUI.cxx:423
-#: Code/Modules/otbProjectionGroup.cxx:510
+#: OrthoFusion/otbOrthoFusionGUI.cxx:746 OrthoRectif/otbOrthoRectifGUI.cxx:681
+#: Code/Modules/otbOrthorectificationGUI.cxx:422
msgid "Use Upper-Left Pixel"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:682
-#: OrthoFusion/otbOrthoFusionGUI.cxx:747
-#: Code/Modules/otbOrthorectificationGUI.cxx:424
-#: Code/Modules/otbProjectionGroup.cxx:511
+#: OrthoFusion/otbOrthoFusionGUI.cxx:747 OrthoRectif/otbOrthoRectifGUI.cxx:682
+#: Code/Modules/otbOrthorectificationGUI.cxx:423
msgid "If checked, use the upper left output image pixel coodinates"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:692
-#: OrthoFusion/otbOrthoFusionGUI.cxx:758
-#: Code/Modules/otbOrthorectificationGUI.cxx:562
-#: Code/Modules/otbProjectionGroup.cxx:603
+#: OrthoFusion/otbOrthoFusionGUI.cxx:758 OrthoRectif/otbOrthoRectifGUI.cxx:692
+#: Code/Modules/otbProjectionGroup.cxx:586
+#: Code/Modules/otbOrthorectificationGUI.cxx:561
msgid "Output image"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:699
-#: OrthoFusion/otbOrthoFusionGUI.cxx:764
-#: Code/Modules/otbExtractROIModuleGUI.cxx:53
-#: Code/Modules/otbExtractROIModuleGUI.cxx:67
-#: Code/Modules/otbOrthorectificationGUI.cxx:570
-#: Code/Modules/otbProjectionGroup.cxx:610
+#: OrthoFusion/otbOrthoFusionGUI.cxx:764 OrthoRectif/otbOrthoRectifGUI.cxx:699
+#: Code/Modules/otbExtractROIModuleGUI.cxx:60
+#: Code/Modules/otbExtractROIModuleGUI.cxx:86
+#: Code/Modules/otbProjectionGroup.cxx:594
+#: Code/Modules/otbOrthorectificationGUI.cxx:569
msgid "Size X"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:700
-#: OrthoFusion/otbOrthoFusionGUI.cxx:765
-#: Code/Modules/otbOrthorectificationGUI.cxx:571
-#: Code/Modules/otbProjectionGroup.cxx:611
+#: OrthoFusion/otbOrthoFusionGUI.cxx:765 OrthoRectif/otbOrthoRectifGUI.cxx:700
+#: Code/Modules/otbProjectionGroup.cxx:595
+#: Code/Modules/otbOrthorectificationGUI.cxx:570
msgid "Enter the X output size"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:708
-#: OrthoFusion/otbOrthoFusionGUI.cxx:773
-#: Code/Modules/otbExtractROIModuleGUI.cxx:56
-#: Code/Modules/otbExtractROIModuleGUI.cxx:69
-#: Code/Modules/otbOrthorectificationGUI.cxx:579
-#: Code/Modules/otbProjectionGroup.cxx:618
+#: OrthoFusion/otbOrthoFusionGUI.cxx:773 OrthoRectif/otbOrthoRectifGUI.cxx:708
+#: Code/Modules/otbExtractROIModuleGUI.cxx:63
+#: Code/Modules/otbExtractROIModuleGUI.cxx:88
+#: Code/Modules/otbProjectionGroup.cxx:602
+#: Code/Modules/otbOrthorectificationGUI.cxx:578
msgid "Size Y"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:709
-#: OrthoFusion/otbOrthoFusionGUI.cxx:774
-#: Code/Modules/otbOrthorectificationGUI.cxx:580
-#: Code/Modules/otbProjectionGroup.cxx:619
+#: OrthoFusion/otbOrthoFusionGUI.cxx:774 OrthoRectif/otbOrthoRectifGUI.cxx:709
+#: Code/Modules/otbProjectionGroup.cxx:603
+#: Code/Modules/otbOrthorectificationGUI.cxx:579
msgid "Enter the Y output size"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:717
-#: OrthoFusion/otbOrthoFusionGUI.cxx:782
-#: Code/Modules/otbOrthorectificationGUI.cxx:588
-#: Code/Modules/otbProjectionGroup.cxx:626
+#: OrthoFusion/otbOrthoFusionGUI.cxx:782 OrthoRectif/otbOrthoRectifGUI.cxx:717
+#: Code/Modules/otbProjectionGroup.cxx:610
+#: Code/Modules/otbOrthorectificationGUI.cxx:587
msgid "Spacing X"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:718
-#: OrthoFusion/otbOrthoFusionGUI.cxx:783
-#: Code/Modules/otbOrthorectificationGUI.cxx:589
-#: Code/Modules/otbProjectionGroup.cxx:627
+#: OrthoFusion/otbOrthoFusionGUI.cxx:783 OrthoRectif/otbOrthoRectifGUI.cxx:718
+#: Code/Modules/otbProjectionGroup.cxx:611
+#: Code/Modules/otbOrthorectificationGUI.cxx:588
msgid "Enter X spacing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:726
-#: OrthoFusion/otbOrthoFusionGUI.cxx:791
-#: Code/Modules/otbOrthorectificationGUI.cxx:597
-#: Code/Modules/otbProjectionGroup.cxx:634
+#: OrthoFusion/otbOrthoFusionGUI.cxx:791 OrthoRectif/otbOrthoRectifGUI.cxx:726
+#: Code/Modules/otbProjectionGroup.cxx:618
+#: Code/Modules/otbOrthorectificationGUI.cxx:596
msgid "Spacing Y"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:727
-#: OrthoFusion/otbOrthoFusionGUI.cxx:792
-#: Code/Modules/otbOrthorectificationGUI.cxx:598
-#: Code/Modules/otbProjectionGroup.cxx:635
+#: OrthoFusion/otbOrthoFusionGUI.cxx:792 OrthoRectif/otbOrthoRectifGUI.cxx:727
+#: Code/Modules/otbProjectionGroup.cxx:619
+#: Code/Modules/otbOrthorectificationGUI.cxx:597
msgid "Enter Y spacing"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:735
-#: OrthoRectif/otbOrthoRectifGUI.cxx:759
-#: OrthoFusion/otbOrthoFusionGUI.cxx:800
-#: OrthoFusion/otbOrthoFusionGUI.cxx:824
-#: Code/Modules/otbOrthorectificationGUI.cxx:606
-#: Code/Modules/otbOrthorectificationGUI.cxx:630
-#: Code/Modules/otbProjectionGroup.cxx:795
-#: Code/Modules/otbProjectionGroup.cxx:822
+#: OrthoFusion/otbOrthoFusionGUI.cxx:800 OrthoFusion/otbOrthoFusionGUI.cxx:824
+#: Pireo/RegistrationParametersGUI.cxx:831
+#: OrthoRectif/otbOrthoRectifGUI.cxx:735 OrthoRectif/otbOrthoRectifGUI.cxx:759
+#: Code/Modules/otbProjectionGroup.cxx:779
+#: Code/Modules/otbProjectionGroup.cxx:806
+#: Code/Modules/otbOrthorectificationGUI.cxx:605
+#: Code/Modules/otbOrthorectificationGUI.cxx:629
msgid "Interpolator"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:736
-#: OrthoRectif/otbOrthoRectifGUI.cxx:760
-#: Code/Modules/otbOrthorectificationGUI.cxx:607
-#: Code/Modules/otbOrthorectificationGUI.cxx:631
-#: Code/Modules/otbProjectionGroup.cxx:796
-#: Code/Modules/otbProjectionGroup.cxx:823
-msgid "Select the Orthorectif Interpolator"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:801 OrthoFusion/otbOrthoFusionGUI.cxx:825
+msgid "Select the orthorectif interpolator"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:744
-#: Code/Modules/otbOrthorectificationGUI.cxx:615
-#: Code/Modules/otbProjectionGroup.cxx:780
-msgid "Interpolator Parameters"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:809
+#: Code/Modules/otbProjectionGroup.cxx:764
+msgid "Interpolator parameters"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:768
-#: OrthoRectif/otbOrthoRectifGUI.cxx:775
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:124
+#: OrthoFusion/otbOrthoFusionGUI.cxx:833 OrthoFusion/otbOrthoFusionGUI.cxx:840
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:123
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:820
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1630
-#: OrthoFusion/otbOrthoFusionGUI.cxx:833
-#: OrthoFusion/otbOrthoFusionGUI.cxx:840
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:772
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1582
+#: OrthoRectif/otbOrthoRectifGUI.cxx:768 OrthoRectif/otbOrthoRectifGUI.cxx:775
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:82
#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:97
-#: Code/Modules/otbOrthorectificationGUI.cxx:639
-#: Code/Modules/otbOrthorectificationGUI.cxx:646
-#: Code/Modules/otbProjectionGroup.cxx:804
-#: Code/Modules/otbProjectionGroup.cxx:811
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:772
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1582
+#: Code/Modules/otbProjectionGroup.cxx:788
+#: Code/Modules/otbProjectionGroup.cxx:795
+#: Code/Modules/otbOrthorectificationGUI.cxx:638
+#: Code/Modules/otbOrthorectificationGUI.cxx:645
msgid "Radius"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:788
-#: OrthoFusion/otbOrthoFusionGUI.cxx:853
-#: Code/Modules/otbOrthorectificationGUI.cxx:659
+#: OrthoFusion/otbOrthoFusionGUI.cxx:853 OrthoRectif/otbOrthoRectifGUI.cxx:788
+#: Code/Modules/otbOrthorectificationGUI.cxx:658
msgid "DEM"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:801
-#: OrthoRectif/otbOrthoRectifGUI.cxx:813
-#: Code/Modules/otbOrthorectificationGUI.cxx:673
-#: Code/Modules/otbOrthorectificationGUI.cxx:685
-msgid "DEM Path"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:866 OrthoRectif/otbOrthoRectifGUI.cxx:822
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:483
+#: Code/Modules/otbOrthorectificationGUI.cxx:696
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:90
+#: Code/Modules/otbViewerModuleGroup.cxx:267
+msgid "Use DEM"
+msgstr ""
+
+#: OrthoFusion/otbOrthoFusionGUI.cxx:870 OrthoFusion/otbOrthoFusionGUI.cxx:882
+msgid "DEM path"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:802
-#: OrthoFusion/otbOrthoFusionGUI.cxx:871
-#: Code/Modules/otbOrthorectificationGUI.cxx:674
+#: OrthoFusion/otbOrthoFusionGUI.cxx:871 OrthoRectif/otbOrthoRectifGUI.cxx:802
+#: Code/Modules/otbOrthorectificationGUI.cxx:673
msgid "Open a DEM directory"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:818
-#: OrthoFusion/otbOrthoFusionGUI.cxx:887
-#: Code/Modules/otbOrthorectificationGUI.cxx:691
+#: OrthoFusion/otbOrthoFusionGUI.cxx:887 OrthoRectif/otbOrthoRectifGUI.cxx:818
+#: Code/Modules/otbOrthorectificationGUI.cxx:690
msgid "Save DEM"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:822
-#: OrthoFusion/otbOrthoFusionGUI.cxx:866
-#: Code/Modules/otbViewerModuleGroup.cxx:267
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:90
-#: Code/Modules/otbOrthorectificationGUI.cxx:697
-msgid "Use DEM"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:902
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:94
+msgid "Use average elevation"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:837
-#: Code/Modules/otbOrthorectificationGUI.cxx:712
-msgid "Average Elevation"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:907
+msgid "Average elevation"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:838
-#: OrthoFusion/otbOrthoFusionGUI.cxx:908
-#: Code/Modules/otbOrthorectificationGUI.cxx:713
+#: OrthoFusion/otbOrthoFusionGUI.cxx:908 OrthoRectif/otbOrthoRectifGUI.cxx:838
+#: Code/Modules/otbOrthorectificationGUI.cxx:712
msgid "Enter the Average Elevation Value"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:844
-#: Code/Modules/otbOrthorectificationGUI.cxx:719
-msgid "Use Average Elevation"
-msgstr ""
-
-#: OrthoRectif/otbOrthoRectifGUI.cxx:855
-#: Code/Modules/otbOrthorectificationGUI.cxx:730
-msgid "Image Extent"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:920
+msgid "Image extent"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:868
-#: OrthoFusion/otbOrthoFusionGUI.cxx:933
+#: OrthoFusion/otbOrthoFusionGUI.cxx:933 OrthoRectif/otbOrthoRectifGUI.cxx:868
msgid "Advanced"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:875
-#: OrthoFusion/otbOrthoFusionGUI.cxx:940
+#: OrthoFusion/otbOrthoFusionGUI.cxx:940 OrthoRectif/otbOrthoRectifGUI.cxx:875
msgid "Work with 8bits"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:876
-#: OrthoFusion/otbOrthoFusionGUI.cxx:941
+#: OrthoFusion/otbOrthoFusionGUI.cxx:941 OrthoRectif/otbOrthoRectifGUI.cxx:876
msgid "Work with unsigned char pixel type"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:881
-#: OrthoFusion/otbOrthoFusionGUI.cxx:946
+#: OrthoFusion/otbOrthoFusionGUI.cxx:946 OrthoRectif/otbOrthoRectifGUI.cxx:881
msgid "Work with 16bits"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:882
-#: OrthoFusion/otbOrthoFusionGUI.cxx:947
+#: OrthoFusion/otbOrthoFusionGUI.cxx:947 OrthoRectif/otbOrthoRectifGUI.cxx:882
msgid "Work with short pixel type"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:888
-msgid "Maximum Tile Size (MB)"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:953
+msgid "Maximum tile size (MB)"
msgstr ""
-#: OrthoRectif/otbOrthoRectifGUI.cxx:889
-msgid "From Streaming pipeline, precise the maximum tile size"
+#: OrthoFusion/otbOrthoFusionGUI.cxx:954
+msgid "From streaming pipeline, precise the maximum tile size"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:175
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:175
msgid "otbImageViewerManager"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:201
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:305
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:79
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:400
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:685
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:201
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:305
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:293
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:341
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:685
msgid "Viewer setup"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:202
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:202
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:294
msgid "Set up the selected viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:211
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:430
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:211
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:430
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:303
msgid "Link setup"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:212
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:212
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:304
msgid "Add or remove links with the selected viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:249
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:249
msgid "Zoom small images"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:250
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:250
msgid "Zoom small images in preview window"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:258
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:506
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:258
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:506
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:323
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:545
msgid "Slideshow"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:259
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:259
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:324
msgid "Launch the slideshow mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:278
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:278
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:213
msgid "Viewers List"
msgstr ""
-#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:290
-#: OrthoFusion/otbOrthoFusionGUI.cxx:526
-msgid "Preview window"
-msgstr ""
-
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:311
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:406
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:347
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:848
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:691
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:311
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:595
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:644
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:693
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:691
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:848
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:831
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:347
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:598
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:647
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:696
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:822
#: Code/Modules/otbViewerModuleGroup.cxx:303
msgid "Grayscale mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:312
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:407
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:348
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:692
#: Classification/otbSupervisedClassificationAppliGUI.cxx:849
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:832
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:692
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:312
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:348
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:823
#: Code/Modules/otbViewerModuleGroup.cxx:304
msgid "Swith the image viewer mode to grayscale"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:321
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:416
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:357
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:859
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:701
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:321
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:602
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:651
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:700
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:701
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:859
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:842
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:357
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:605
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:654
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:703
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:833
#: Code/Modules/otbViewerModuleGroup.cxx:313
msgid "RGB composition mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:322
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:417
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:358
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:702
#: Classification/otbSupervisedClassificationAppliGUI.cxx:860
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:843
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:702
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:322
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:358
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:834
#: Code/Modules/otbViewerModuleGroup.cxx:314
msgid "Switch the image viewer mode to RGB composition"
msgstr ""
@@ -1201,26 +1147,29 @@ msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:330
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:425
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:585
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:366
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:710
#: Classification/otbSupervisedClassificationAppliGUI.cxx:869
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:852
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:710
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:330
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:366
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:843
#: Code/Modules/otbViewerModuleGroup.cxx:322
msgid "Channel index"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:331
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:426
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:367
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:711
#: Classification/otbSupervisedClassificationAppliGUI.cxx:870
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:853
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:711
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:331
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:367
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:844
#: Code/Modules/otbViewerModuleGroup.cxx:323
msgid "Select the band to view in grayscale mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:337
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:433
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:877
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:967
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:987
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1029
@@ -1235,11 +1184,10 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1397
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1433
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1569
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:373
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:667
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:717
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:877
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:860
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:337
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:373
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:919
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:939
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:981
@@ -1254,23 +1202,26 @@ msgstr ""
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1349
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1385
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1521
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:851
#: Code/Modules/otbViewerModuleGroup.cxx:329
msgid "Red channel"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:338
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:434
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:374
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:878
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:668
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:718
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:878
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:861
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:338
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:374
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:852
#: Code/Modules/otbViewerModuleGroup.cxx:330
msgid "Select band for red channel in RGB composition"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:345
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:442
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:886
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1322
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1371
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1390
@@ -1278,11 +1229,10 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1529
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1557
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1577
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:381
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:660
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:725
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:886
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:869
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:345
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:381
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1274
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1323
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1342
@@ -1290,189 +1240,214 @@ msgstr ""
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1481
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1509
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1529
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:860
#: Code/Modules/otbViewerModuleGroup.cxx:337
msgid "Green channel"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:346
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:443
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:382
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:887
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:661
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:726
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:887
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:870
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:346
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:382
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:861
#: Code/Modules/otbViewerModuleGroup.cxx:338
msgid "Select band for green channel in RGB composition"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:353
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:451
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:895
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1172
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1207
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1268
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:389
#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:733
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:895
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:878
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:353
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:389
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1124
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1159
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1220
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:869
#: Code/Modules/otbViewerModuleGroup.cxx:345
msgid "Blue channel"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:354
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:452
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:390
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:734
#: Classification/otbSupervisedClassificationAppliGUI.cxx:896
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:879
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:734
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:354
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:390
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:870
#: Code/Modules/otbViewerModuleGroup.cxx:346
msgid "Select band for blue channel in RGB composition"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:362
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:461
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:398
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:611
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:742
#: Classification/otbSupervisedClassificationAppliGUI.cxx:905
#: Classification/otbSupervisedClassificationAppliGUI.cxx:1030
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:888
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1013
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:611
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:742
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:362
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:398
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:879
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1004
#: Code/Modules/otbViewerModuleGroup.cxx:354
msgid "Save changes and leave viewer set up interface"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:371
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:371
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:407
msgid "Viewer name"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:372
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:372
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:408
msgid "Set a new name for the selected viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:380
#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:471
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:416
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:621
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:752
#: Classification/otbSupervisedClassificationAppliGUI.cxx:832
#: Classification/otbSupervisedClassificationAppliGUI.cxx:916
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:815
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:899
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:621
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:752
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:380
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:416
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:806
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:890
msgid "Leave viewer set up interface without saving changes"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:388
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:424
#: Classification/otbSupervisedClassificationAppliGUI.cxx:925
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:908
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:388
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:424
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:899
#: Code/Modules/otbViewerModuleGroup.cxx:365
msgid "Complex composition mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:389
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:425
#: Classification/otbSupervisedClassificationAppliGUI.cxx:926
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:909
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:389
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:425
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:900
#: Code/Modules/otbViewerModuleGroup.cxx:366
msgid "Switch the image viewer mode to complex composition"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:397
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:433
#: Classification/otbSupervisedClassificationAppliGUI.cxx:935
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:918
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:397
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:433
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:909
#: Code/Modules/otbViewerModuleGroup.cxx:376
msgid "Real channel index"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:398
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:434
#: Classification/otbSupervisedClassificationAppliGUI.cxx:936
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:919
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:398
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:434
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:910
#: Code/Modules/otbViewerModuleGroup.cxx:377
msgid "Select band for real channel in complex composition"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:405
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:441
#: Classification/otbSupervisedClassificationAppliGUI.cxx:944
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:927
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:405
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:441
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:918
#: Code/Modules/otbViewerModuleGroup.cxx:385
msgid "Imaginary channel index"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:406
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:442
#: Classification/otbSupervisedClassificationAppliGUI.cxx:945
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:928
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:406
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:442
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:919
#: Code/Modules/otbViewerModuleGroup.cxx:386
msgid "Select band for imaginary channel in complex composition"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:413
#: Classification/otbSupervisedClassificationAppliGUI.cxx:953
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:936
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:413
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:927
msgid "Modulus"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:414
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:450
#: Classification/otbSupervisedClassificationAppliGUI.cxx:954
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:937
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:414
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:450
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:928
#: Code/Modules/otbViewerModuleGroup.cxx:395
msgid "Toggle modulus mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:421
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:457
#: Classification/otbSupervisedClassificationAppliGUI.cxx:963
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:946
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:421
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:457
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:937
#: Code/Modules/otbViewerModuleGroup.cxx:403
msgid "Phase"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:422
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:458
#: Classification/otbSupervisedClassificationAppliGUI.cxx:964
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:947
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:422
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:458
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:938
#: Code/Modules/otbViewerModuleGroup.cxx:404
msgid "Toggle phase mode"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:436
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:436
msgid "Link to viewer:"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:437
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:437
msgid "Select the viewer to link with"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:443
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:443
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:472
msgid "X offset"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:444
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:444
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:473
msgid "Set the x offset of the link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:450
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:450
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:479
msgid "Y offset"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:451
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:451
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:480
msgid "Set the Y offset of the link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:457
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:457
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:486
#: Code/Modules/otbViewerModuleGroup.cxx:438
#: Code/Modules/otbViewerModuleGroup.cxx:446
@@ -1480,683 +1455,723 @@ msgid "Apply"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:458
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:458
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:487
msgid "Save the current link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:465
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:465
msgid "Existing links"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:466
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:466
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:495
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:533
msgid "List of image viewers already linked with the selected image viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:475
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:504
#: Classification/otbSupervisedClassificationAppliGUI.cxx:447
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:430
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:475
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:504
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:425
msgid "Remove"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:476
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:476
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:505
msgid "Remove the selected link"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:484
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:269
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:513
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:385
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:461
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:484
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:385
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:513
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:367
msgid "Clear"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:485
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:485
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:514
msgid "Clear all links for the selected image viewer"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:494
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:494
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:523
msgid "Leave the link set up interface"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:512
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:512
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:551
msgid "Progress"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:513
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:513
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:552
msgid "Position in diaporama"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:518
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:518
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:557
msgid "Previous"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:519
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:519
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:558
msgid "Previous image in diaporama"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:528
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:528
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:567
msgid "Next"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:529
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:529
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:568
msgid "Next image in diaporama"
msgstr ""
#: ViewerManagerOld/otbImageViewerManagerGUI.cxx:539
+#: Testing/ViewerManagerOld/otbImageViewerManagerGUI.cxx:539
#: ViewerManager/otbImageViewerManagerViewGroup.cxx:578
msgid "Leave diaporama mode"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:56
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:42
-msgid "Menu"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:44
+msgid "Save label image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:58
-msgid "Vector Data"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:45
+msgid "Save polygon"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:59
-msgid "Import Vector"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:126
+msgid "Object counting application"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:60
-msgid "DEM Management"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:133
+msgid "Extract"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:62
-#: Code/Modules/otbWriterModuleGUI.cxx:42
-#: Code/Modules/otbWriterViewGroup.cxx:272
-msgid "Save"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:161
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:121
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:97
+msgid "SVM"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:63
-msgid "Save Full"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:162
+msgid "Use SVM for classification"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:64
-msgid "Save Extract Result"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:170
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:595
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:557
+msgid "Spectral Angle"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:196
-msgid "Image To Data Base Registration Application"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:171
+msgid "Use spectral angle for classification"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:215
-msgid "ROI Selection"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:178
+#: Segmentation/otbPreprocessingViewGroup.cxx:53
+msgid "Use smoothing"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:224
-msgid "ROI Full Resolution"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:179
+msgid "Smooth input image before working"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:236
-msgid "ROI"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:186
+msgid "Minimum object size"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:237
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:423
-msgid "This area display a minimap of the full image"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:187
+msgid "Minimum region size"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:262
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:435
-msgid "Extraction parameters"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:196
+msgid "Mean shift"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:268
-msgid "Angle threshold"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:203
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:86
+msgid "Spatial radius"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:274
-msgid "Segment Length "
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:212
+msgid "Range radius"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:280
-msgid "Max. Triplet Dist"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:221
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1726
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1678
+msgid "Scale"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:286
-msgid "Set Reference Data"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:232
+msgid "Spectral angle"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:292
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:176
-msgid "Image"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:240
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:288
+msgid "Reference pixel"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:302
-msgid "Data Base"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:247
+msgid "Threshold value"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:314
-#: Code/Modules/otbViewerModuleGroup.cxx:209
-msgid "Vector Datas"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:259
+msgid "Nu (svm)"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:315
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:509
-msgid "Region of interest control panel"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:260
+msgid "SVM classifier margin"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:322
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:516
-#: Code/Modules/otbViewerModuleGroup.cxx:218
-msgid "Display the selected ROI color"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:271
+msgid "Run over the extracted image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:330
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:524
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:469
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:452
-#: Code/Modules/otbViewerModuleGroup.cxx:225
-msgid "Color"
+#: ObjectCountingApplication/otbObjectCountingViewGroup.cxx:279
+msgid "Statistics"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:331
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:525
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:470
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:453
-#: Code/Modules/otbViewerModuleGroup.cxx:226
-msgid "Change the color of the selected class"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:43
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:391
+msgid "Open image pair"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:341
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:536
-#: Code/Modules/otbViewerModuleGroup.cxx:236
-msgid "Browse and select ROI"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:44
+msgid "Save deformation field"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:351
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:262
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:547
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:611
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:594
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:230
-msgid "Delete"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:45
+msgid "Save registered image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:352
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:548
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:612
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:595
-#: Code/Modules/otbViewerModuleGroup.cxx:248
-msgid "Delete the selected region of interest"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:167
+msgid "Fine registration application"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:361
-msgid "ClearAll"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:174
+msgid "Images"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:362
-#: Code/Modules/otbViewerModuleGroup.cxx:258
-#: Code/Modules/otbViewerModuleGroup.cxx:274
-#: Code/Modules/otbViewerModuleGroup.cxx:284
-msgid "Clear all vector data"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:175
+msgid ""
+"This area displays a color composition of the fixed image, the moving image "
+"and the resampled image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:374
-msgid "Transform"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:196
+msgid ""
+"This area allows to navigate through large images. Displays an anaglyph "
+"composition of the fixed and the moving image"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:389
-msgid "Switch scroll"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:205
+msgid "Deformation field"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:398
-msgid "Run the Registration"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:206
+msgid ""
+"This area shows a color composition of the deformation field values in X, Y "
+"and intensity. To display the deformation field, please trigger the run "
+"button"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:406
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:416
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:390
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:398
-msgid "Pixel Value"
-msgstr ""
-
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:433
-#: Code/Modules/otbViewerModuleGroup.cxx:549
-msgid "DEM Selection"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:216
+msgid "This area allows you to tune parameters from the registration algorithm"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:440
-msgid "Use DEM for Loading"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:222
+#: Segmentation/otbPreprocessingViewGroup.cxx:71
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:82
+msgid "Number of iterations"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:445
-msgid "Use DEM for Processing"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:223
+msgid ""
+"Allows you to tune the number of iterations of the registration algorithm"
msgstr ""
-#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:452
-#: Code/Modules/otbViewerModuleGroup.cxx:556
-msgid "Load"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:231
+msgid "X NCC radius"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:72
-msgid "Save luminance image"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:232
+msgid ""
+"Allows you to tune the radius used to compute the normalized correlation in "
+"the first image direction"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:73
-msgid "Save reflectance TOA image"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:241
+msgid "Y NCC radius"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:74
-msgid "Save reflectance TOC image"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:242
+msgid ""
+"Allows you to tune the radius used to compute the normalized correlation in "
+"the second image direction"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:75
-msgid "Save TOA-TOC diff image"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:251
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:397
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:381
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:469
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:79
+msgid "Run"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:78
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:82
-#: Code/Modules/otbProjectionGroup.cxx:773
-msgid "Settings"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:252
+msgid ""
+"This button allows you to run the deformation field estimation on the image "
+"region displayed in the \"Images\" area"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:79
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:84
-msgid "Viewer Setup"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:262
+msgid "X Max"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:80
-msgid "Coef. Setup"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:263
+msgid ""
+"This algorithm allows you to tune the maximum deformation in the first image "
+"direction. This is used to handle a security margin when streaming the "
+"algorithm on huge images"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:156
-msgid "NO AEROSOL"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:277
+msgid "Y Max"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:157
-msgid "CONTINENTAL"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:278
+msgid ""
+"This algorithm allows you to tune the maximum deformation in the second "
+"image direction. This is used to handle a security margin when streaming the "
+"algorithm on huge images"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:158
-msgid "MARITIME"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:295
+msgid "Images color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:159
-msgid "URBAN"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:296
+msgid ""
+"This area allows you to select the color composition displayed in the "
+"\"Images\" area"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:160
-msgid "DESERTIC"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:303
+msgid "Fixed"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:207
-msgid "0"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:304
+msgid "Show or hide the fixed image in the color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:260
-msgid "Radiometric Calibration Application"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:315
+msgid "Moving"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:281
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:72
-msgid "Navigation View"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:316
+msgid "Show or hide the moving image in the color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:289
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:297
-msgid "Zoom View"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:327
+msgid "Resampled"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:305
-msgid "Histograms"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:328
+msgid ""
+"Show or hide the resampled image in the color composition. If there is no "
+"deformation field computed yet, the resampled image is the moving image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:313
-msgid "Pixel Information"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:342
+msgid "Deformation field color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:321
-msgid "Result Pixel Information"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:349
+msgid "X deformation"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:353
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:169
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:187
-msgid "Input image"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:350
+msgid ""
+"Show or hide the deformation in the first image direction in the color "
+"composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:361
-msgid "Luminance"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:362
+msgid "Y deformation"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:369
-msgid "Reflect. TOA"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:363
+msgid ""
+"Show or hide the deformation in the second image direction in the color "
+"composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:377
-msgid "Reflect. TOC"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:375
+msgid "Intensity"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:385
-msgid "Diff. TOA/TOC"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:376
+msgid "Show or hide the deformation intensity iin the color composition"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:481
-msgid "Radiometric Coefficients Setup"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:414
+#: Pireo/PreProcessParametersGUI.cxx:69 Pireo/PireoViewerGUI.cxx:534
+msgid "Fixed image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:492
-msgid "Correction parameters"
+#: FineRegistrationApplication/otbFineRegistrationApplicationViewGroup.cxx:421
+#: Pireo/PreProcessParametersGUI.cxx:70 Pireo/PireoViewerGUI.cxx:556
+#: Pireo/PireoViewerGUI.cxx:712
+msgid "Moving image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:499
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:500
-msgid "Aerosol model"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:56
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:42
+msgid "Menu"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:508
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:509
-msgid "Ozone Amount"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:58
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:314
+#: Code/Modules/otbViewerModuleGroup.cxx:209
+msgid "Vector data"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:517
-msgid "Atmo. Pressure"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:59
+msgid "Import vector"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:518
-msgid "Atmospheric Pressure"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:60
+msgid "DEM management"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:531
-msgid "Aerosol Thickness"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:62
+#: Pireo/PireoViewerGUI.cxx:232 Pireo/PireoViewerGUI.cxx:233
+#: Code/Modules/otbWriterViewGroup.cxx:273
+#: Code/Modules/otbWriterModuleGUI.cxx:42
+msgid "Save"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:532
-msgid "Aerosol Optical Thickness"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:63
+msgid "Save full"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:542
-msgid "Water Amount"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:64
+msgid "Save extract result"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:543
-msgid "Water Vapor Amount"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:196
+msgid "Image to database registration application"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:553
-msgid "Aeronet File"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:215
+msgid "ROI selection"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:566
-msgid "Filter Function Values File"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:224
+msgid "ROI full resolution"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:579
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:740
-msgid "Radiative Terms"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:236
+msgid "ROI"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:600
-msgid "Intrinsic Ref"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:237
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:423
+msgid "This area display a minimap of the full image"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:601
-msgid "Intrinsic Atmospheric Reflectance"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:262
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:435
+msgid "Extraction parameters"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:611
-msgid "Albedo"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:268
+msgid "Angle threshold"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:612
-msgid "Shperical Albedo of the Atmosphere"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:274
+msgid "Segment length "
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:622
-msgid "Gaseous Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:280
+msgid "Max triplet distance"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:623
-msgid "Total Gaseous Transmission"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:286
+msgid "Set reference data"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:633
-msgid "Down. Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:302
+msgid "Database"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:634
-msgid "Downward Transmittance of the Atmospher"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:315
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:509
+msgid "Region of interest control panel"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:644
-msgid "Up Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:322
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:516
+#: Code/Modules/otbViewerModuleGroup.cxx:218
+msgid "Display the selected ROI color"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:645
-msgid "Upward Transmittance of the Atmospher"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:330
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:469
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:524
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:447
+#: Code/Modules/otbViewerModuleGroup.cxx:225
+msgid "Color"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:655
-msgid "Up diffuse Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:331
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:470
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:525
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:448
+#: Code/Modules/otbViewerModuleGroup.cxx:226
+msgid "Change the color of the selected class"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:656
-msgid "Upward diffuse transmittance"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:341
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:536
+#: Code/Modules/otbViewerModuleGroup.cxx:236
+msgid "Browse and select ROI"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:666
-msgid "Up direct Trans"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:351
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:262
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:611
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:547
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:235
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:230
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:587
+msgid "Delete"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:667
-msgid "Upward direct Transmittance"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:352
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:612
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:548
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:588
+#: Code/Modules/otbViewerModuleGroup.cxx:248
+msgid "Delete the selected region of interest"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:677
-msgid "Up diff. Trans. (Rayleigh)"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:361
+msgid "ClearAll"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:678
-msgid "Upward diffuse transmittance for Rayleigh"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:362
+#: Code/Modules/otbViewerModuleGroup.cxx:258
+#: Code/Modules/otbViewerModuleGroup.cxx:274
+#: Code/Modules/otbViewerModuleGroup.cxx:284
+msgid "Clear all vector data"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:688
-msgid "Up diff Trans. (aerososl)"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:374
+msgid "Transform"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:689
-msgid "Upward diffuse transmittance for aerosols"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:389
+msgid "Switch scroll"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:701
-msgid "Reload Channel Radiative Terms"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:398
+msgid "Run the Registration"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:714
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1029
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1012
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:140
-msgid "Close"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:406
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:416
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1030
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1031
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:862
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:814
+msgid "Pixel value"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:715
-msgid "Close the window"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:433
+msgid "DEM selection"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:723
-msgid "Set up Radiometric parameters"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:440
+msgid "Use DEM for loading"
msgstr ""
-#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:732
-msgid "Atmospheric parameters"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:445
+msgid "Use DEM for processing"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:68
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:75
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:55
-msgid "Segmentation parameters"
-msgstr ""
-
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:69
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:76
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:49
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:56
-msgid "Click on speed map for seeds selection"
+#: ImageToDBRegistration/otbImageToDBRegistrationViewGroup.cxx:452
+#: Code/Modules/otbViewerModuleGroup.cxx:556
+msgid "Load"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:75
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:135
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:104
-msgid "Clear seeds"
+#: Common/otbMsgReporterGUI.cxx:7 Code/Common/otbMsgReporterGUI.cxx:7
+msgid "Msg Reporter"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:83
-msgid "Spectral angle distances"
+#: Segmentation/otbVectorizationViewGroup.cxx:19
+msgid "Vectorization parameters"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:91
-msgid "Thresholds"
+#: Segmentation/otbVectorizationViewGroup.cxx:25
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:112
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:360
+msgid "Tolerance"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:99
-msgid "View feature "
+#: Segmentation/otbVectorizationViewGroup.cxx:37
+msgid "Original image"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:110
-msgid "Inside seeds"
+#: Segmentation/otbVectorizationViewGroup.cxx:45
+msgid "Segmented image"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:118
-msgid "Outside seeds"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:49
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:56
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:69
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:76
+msgid "Click on speed map for seeds selection"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:125
-msgid "Automatic update"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:55
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:68
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:75
+msgid "Segmentation parameters"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:134
-msgid "Update"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:62
+msgid "Stopping time"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:145
-msgid "Features"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:72
+msgid "Sigmoid alpha"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:153
-msgid "Distance to hyperplane"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:83
+msgid "Sigmoid beta"
msgstr ""
-#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:161
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:179
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:145
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:188
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:291
-msgid "Segmentation"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:94
+msgid "Gradient sigma "
msgstr ""
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:93
-msgid "Lower threshold"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:104
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:75
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:133
+msgid "Clear seeds"
msgstr ""
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:103
-msgid "Upper threshold"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:112
+msgid "Time threshold"
msgstr ""
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:113
-#: Segmentation/otbVectorizationViewGroup.cxx:25
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:360
-msgid "Tolerance"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:129
+msgid "Speed map"
msgstr ""
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:143
-msgid "Inside seed"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:137
+msgid "Time crossing map"
msgstr ""
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:154
-msgid "Outside seed"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:145
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:159
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:188
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:291
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:177
+msgid "Segmentation"
msgstr ""
-#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:164
-#: Segmentation/otbSegmentationApplicationViewGroup.cxx:234
-msgid "Algorithm"
+#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:153
+msgid "Gradient Magnitude"
msgstr ""
#: Segmentation/otbPreprocessingViewGroup.cxx:47
msgid "Preprocessing parameters"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:53
-msgid "Use smoothing"
-msgstr ""
-
#: Segmentation/otbPreprocessingViewGroup.cxx:62
msgid "Use edge enhancement"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:80
+#: Segmentation/otbPreprocessingViewGroup.cxx:79
msgid "Time step"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:89
+#: Segmentation/otbPreprocessingViewGroup.cxx:88
msgid "Amount"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:100
+#: Segmentation/otbPreprocessingViewGroup.cxx:99
msgid "Edge enhancement"
msgstr ""
-#: Segmentation/otbPreprocessingViewGroup.cxx:108
+#: Segmentation/otbPreprocessingViewGroup.cxx:107
msgid "Anisotropic diffusion"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:62
-msgid "Stopping time"
-msgstr ""
-
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:72
-msgid "Sigmoid alpha"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:83
+msgid "Spectral angle distances"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:83
-msgid "Sigmoid beta"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:90
+msgid "Thresholds"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:94
-msgid "Gradient sigma "
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:97
+msgid "View feature "
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:112
-msgid "Time threshold"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:108
+msgid "Inside seeds"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:129
-msgid "Speed map"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:116
+msgid "Outside seeds"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:137
-msgid "Time crossing map"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:123
+msgid "Automatic update"
msgstr ""
-#: Segmentation/otbLevelSetSegmentationViewGroup.cxx:153
-msgid "Gradient Magnitude"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:132
+msgid "Update"
msgstr ""
-#: Segmentation/otbVectorizationViewGroup.cxx:19
-msgid "Vectorization parameters"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:143
+msgid "Features"
msgstr ""
-#: Segmentation/otbVectorizationViewGroup.cxx:37
-msgid "Original image"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:151
+msgid "Distance to hyperplane"
msgstr ""
-#: Segmentation/otbVectorizationViewGroup.cxx:45
-msgid "Segmented image"
+#: Segmentation/otbSVMBasedRegionGrowingSegmentationViewGroup.cxx:167
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:185
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:353
+#: Code/Modules/otbProjectionGroup.cxx:455
+#: Code/Modules/GCPToSensorModel/otbGCPToSensorModelModule.cxx:45
+msgid "Input image"
msgstr ""
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:93
@@ -2175,9 +2190,10 @@ msgstr ""
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:171
#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:467
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1920
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:221
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1856
-msgid "Full Resolution"
+#: Code/Modules/otbWriterViewGroup.cxx:304
+msgid "Full resolution"
msgstr ""
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:180
@@ -2185,7 +2201,8 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1913
#: RoadExtraction/otbRoadExtractionViewGroup.cxx:230
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1849
-#: Code/Modules/otbWriterViewGroup.cxx:295
+#: Code/Modules/otbThresholdGroup.cxx:126
+#: Code/Modules/otbWriterViewGroup.cxx:296
msgid "Scroll"
msgstr ""
@@ -2208,6 +2225,11 @@ msgstr ""
msgid "Channel "
msgstr ""
+#: Segmentation/otbSegmentationApplicationViewGroup.cxx:234
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:162
+msgid "Algorithm"
+msgstr ""
+
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:245
msgid "Segment !"
msgstr ""
@@ -2217,282 +2239,1621 @@ msgid "Trigger the segmentation once an area as been selected"
msgstr ""
#: Segmentation/otbSegmentationApplicationViewGroup.cxx:255
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:569
#: Classification/otbSupervisedClassificationAppliGUI.cxx:709
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:692
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:569
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:685
msgid "Focus"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:254
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1868
-msgid "Save result"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:92
+msgid "Lower threshold"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:460
-msgid "Polarimetric synthesis application"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:102
+msgid "Upper threshold"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:468
-msgid ""
-"This area display a piece of the image at full resolution. You can change "
-"the displayed region by clicking on the scroll area"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:141
+msgid "Inside seed"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:479
-msgid ""
-"This area display a minimap of the full image, allowing you to change the "
-"region displayed by the full resolution area by clicking"
+#: Segmentation/otbRegionGrowingSegmentationViewGroup.cxx:152
+msgid "Outside seed"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:488
-msgid "Polarization parameters"
+#: Pireo/PreProcessParametersGUI.cxx:41
+msgid "None"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:498
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:306
-msgid "Red"
+#: Pireo/PreProcessParametersGUI.cxx:42
+msgid "Blurring"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:501
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:622
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:743
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:870
-msgid "Emission"
+#: Pireo/PreProcessParametersGUI.cxx:43
+msgid "Normalize"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:507
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:549
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:628
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:670
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:749
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:791
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:876
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:918
-msgid "Psi"
+#: Pireo/PreProcessParametersGUI.cxx:71
+msgid "Both Images"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:508
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:629
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:750
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:877
-msgid "Change the incident Psi value (in degree)"
+#: Pireo/PreProcessParametersGUI.cxx:83
+msgid "Pre-Processing parameters"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:524
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:566
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:645
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:687
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:766
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:808
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:893
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:935
-msgid "Khi"
+#: Pireo/PreProcessParametersGUI.cxx:92
+msgid "Filter parameters"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:525
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:646
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:767
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:894
-msgid "Change the incident Khi value (in degree)"
+#: Pireo/PreProcessParametersGUI.cxx:98
+msgid "Select Filter"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:543
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:664
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:785
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:912
-msgid "Reception"
+#: Pireo/PreProcessParametersGUI.cxx:103
+msgid "Use Filter"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:550
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:671
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:792
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:919
-msgid "Change the reflected Psi value (in degree)"
+#: Pireo/PreProcessParametersGUI.cxx:109 Pireo/PireoViewerGUI.cxx:272
+#: Pireo/RegistrationParametersGUI.cxx:721
+#: Pireo/RegistrationParametersGUI.cxx:871
+#: Pireo/RegistrationParametersGUI.cxx:985
+msgid "Options"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:567
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:688
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:809
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:936
-msgid "Change the emitted Khi value (in degree)"
+#: Pireo/PreProcessParametersGUI.cxx:116
+msgid "Set Variance"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:586
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:707
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:828
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:955
-msgid "Cross-polarization"
+#: Pireo/PreProcessParametersGUI.cxx:125
+msgid "Maximum Kernel Size"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:587
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:708
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:829
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:956
-msgid "Force cross polarization"
+#: Pireo/PreProcessParametersGUI.cxx:134
+msgid "DiscreteGaussianImageFilter: Parameters"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:595
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:716
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:837
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:964
-msgid "Co-polarization"
+#: Pireo/PreProcessParametersGUI.cxx:152
+msgid "Set Lower threshold"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:596
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:717
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:838
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:965
-msgid "Force co-polarization"
+#: Pireo/PreProcessParametersGUI.cxx:160
+msgid "BinaryImageFilter: Parameters"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:604
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:725
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:846
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:973
-msgid "Indifferent polarization"
+#: Pireo/PreProcessParametersGUI.cxx:173
+msgid "Apply Filter On"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:605
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:726
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:847
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:974
-msgid "Allows any polarization"
+#: Pireo/PreProcessParametersGUI.cxx:191
+msgid "Select the image on which the pre-processing will be applyed"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:618
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:316
-msgid "Green"
+#: Pireo/PreProcessParametersGUI.cxx:206
+msgid "&Help!"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:739
-msgid "Blue"
+#: Pireo/PreProcessParametersGUI.cxx:212
+#: Pireo/RegistrationParametersGUI.cxx:1300
+msgid "&Accept"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:230
+msgid "Load fixed image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:231
+msgid "Load moving image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:234
+msgid "Auto Save"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:235
+msgid "Deactivate Auto Save"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:239
+msgid "Flip"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:240
+msgid "Flip fixed image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:241 Pireo/PireoViewerGUI.cxx:245
+msgid "Flip X"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:242 Pireo/PireoViewerGUI.cxx:246
+msgid "Flip Y"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:244
+msgid "Flip moving image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:249
+msgid "Build"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:250
+msgid "View in Transparency"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:251
+msgid "Registration"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:252
+msgid "Set parameters"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:253
+msgid "Select parameters"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:254
+msgid "Read parameters from a file..."
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:256
+msgid "Start "
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:257
+msgid "Pause ||"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:258
+msgid "Stop "
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:260
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:550
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:526
+#: Code/Modules/otbViewerModuleGroup.cxx:283
+msgid "Display"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:261
+msgid "Grid (default)"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:262
+msgid "Vector Field"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:263
+msgid "Set Parameter"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:266
+msgid "PreProcess"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:267
+msgid "Choose filter"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:270
+msgid "View loaded image filenames"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:273 Pireo/PireoViewerGUI.cxx:683
+msgid "Save Registration parameters"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:274
+msgid "Display Metric values"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:275 Code/Modules/otbViewerModuleGroup.cxx:504
+msgid "Show"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:276
+msgid "Deactivate"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:443 Pireo/PireoViewerGUI.cxx:465
+msgid "Filtered fixed image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:444 Pireo/PireoViewerGUI.cxx:466
+msgid "Filtered moving image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:445 Pireo/PireoViewerGUI.cxx:467
+msgid "Deformed image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:446 Pireo/PireoViewerGUI.cxx:468
+msgid "Blender (images in transparency)"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:479
+msgid "Pireo Viewer"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:491 Pireo/PireoViewerGUI.cxx:567
+#: Pireo/PireoViewerGUI.cxx:574
+msgid "@+"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:498
+msgid "@"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:512
+msgid "VTK Window"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:523
+msgid "Zoom fixed image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:545
+msgid "Zoom moving image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:581 Pireo/PireoViewerGUI.cxx:630
+msgid "@2"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:588 Pireo/PireoViewerGUI.cxx:616
+msgid "@4"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:595 Pireo/PireoViewerGUI.cxx:623
+msgid "@6"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:602 Pireo/PireoViewerGUI.cxx:609
+msgid "@8"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:637
+msgid "Vector window"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:654
+msgid "Grid / Vector"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:672
+msgid "Input number of displayed points along each axe"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:673
+msgid "Up to 100 only"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:701 Pireo/PireoViewerGUI.cxx:735
+#: Pireo/PireoViewerGUI.cxx:764
+msgid "Enter filename"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:707
+msgid "Input Filenames"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:710
+msgid "Fixed Image"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:717
+msgid "Save Registration Results"
+msgstr ""
+
+#: Pireo/PireoViewerGUI.cxx:746
+msgid "Automatic save"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:126
+msgid "Translation Transform"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:127
+msgid "Affine Transform"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:128
+msgid "Scale Transform"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:129
+msgid "BSpline Deformable Transform"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:130
+msgid "RigidTransform"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:131
+msgid "Centered Affine Transform"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:178
+#: Pireo/RegistrationParametersGUI.cxx:650
+msgid "1"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:179
+#: Pireo/RegistrationParametersGUI.cxx:651
+msgid "2"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:180
+#: Pireo/RegistrationParametersGUI.cxx:652
+msgid "3"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:181
+#: Pireo/RegistrationParametersGUI.cxx:653
+msgid "4"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:182
+msgid "5"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:229
+msgid "Nearest Neighbor Interpolation"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:230
+msgid "Linear Interpolation"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:231
+msgid "B-Spline Interpolation"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:296
+msgid "Mean Squares Metric"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:297
+msgid "Mutual Information Metric"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:298
+msgid "Normalized Correlation Metric"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:299
+msgid "Mean Reciprocal Square Difference Metric"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:300
+msgid "Mattes Mutual Information Metric"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:400
+msgid "Regular Step Gradient Descent Optimizer"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:401
+msgid "Conjugate Gradient Optimizer"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:402
+msgid "Gradient Descent Optimizer"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:403
+msgid "One Plus One Evolutionary Optimizer"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:694
+msgid "Registration parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:703
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:109
+msgid "Transformation"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:709
+#: Pireo/RegistrationParametersGUI.cxx:837
+#: Pireo/RegistrationParametersGUI.cxx:859
+#: Pireo/RegistrationParametersGUI.cxx:973
+#: Pireo/RegistrationParametersGUI.cxx:1250
+msgid "Select"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:714
+#: Pireo/RegistrationParametersGUI.cxx:842
+#: Pireo/RegistrationParametersGUI.cxx:864
+#: Pireo/RegistrationParametersGUI.cxx:978
+msgid "Use"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:727
+msgid "Translation Transform: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:736
+#: Pireo/RegistrationParametersGUI.cxx:753
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:369
+#: Code/Modules/otbViewerModuleGroup.cxx:477
+msgid "Y"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:744
+msgid "Scale Transform: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:761
+#: Pireo/RegistrationParametersGUI.cxx:776
+msgid "Affine Transform: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:766
+#: Pireo/RegistrationParametersGUI.cxx:817
+msgid "Initialize with image geometry"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:785
+msgid "BSpline Transform: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:790
+msgid "BSpline order"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:802
+msgid "Rigid Transform: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:807
+msgid "Angle"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:811
+msgid "Initialize with image moments"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:853
+msgid "Metric"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:878
+msgid "Mutual Information Metric: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:883
+#: Pireo/RegistrationParametersGUI.cxx:890
+msgid "Fixed Image Standard Deviation"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:897
+#: Pireo/RegistrationParametersGUI.cxx:924
+msgid "Number of Spatial Samples"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:910
+msgid "NONE"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:919
+msgid "Mattes Mutual Information Metric: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:934
+msgid "Number of Histogram Bins"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:948
+msgid "Mean Reciprocal Square Metric: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:953
+msgid "Lambda"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:968
+msgid "Optimizer"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:992
+msgid "Scaling Rotation Matrix"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1026
+#: Pireo/RegistrationParametersGUI.cxx:1067
+#: Pireo/RegistrationParametersGUI.cxx:1149
+msgid "Scaling Translation X"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1033
+#: Pireo/RegistrationParametersGUI.cxx:1072
+#: Pireo/RegistrationParametersGUI.cxx:1156
+msgid "Scaling Translation Y"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1040
+msgid "Scaling Center X"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1047
+msgid "Scaling Center Y"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1054
+#: Pireo/RegistrationParametersGUI.cxx:1062
+#: Pireo/RegistrationParametersGUI.cxx:1081
+#: Pireo/RegistrationParametersGUI.cxx:1163
+msgid "Optimizer: Parameters"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1086
+msgid "Angle scale"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1091
+msgid "X translation"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1096
+msgid "Y translation"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1101
+msgid "X center"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1106
+msgid "Y center"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1115
+msgid "Scaling, rotation, shearing Matrix"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1183
+msgid "Generator Seed"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1190
+#: Pireo/RegistrationParametersGUI.cxx:1213
+#: Pireo/RegistrationParametersGUI.cxx:1230
+msgid "Maximize"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1199
+msgid "Maximum Step Length"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1206
+msgid "Minimum Step Length"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1223
+msgid "Learning rate"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1244
+msgid "Others"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1255
+msgid "Registration Number of Levels"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1263
+msgid "Number of Iterations"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1273
+msgid "Refresh GUI"
+msgstr ""
+
+#: Pireo/RegistrationParametersGUI.cxx:1295
+msgid "&Help"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:254
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1868
+msgid "Save result"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:460
+msgid "Polarimetric synthesis application"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:468
+msgid ""
+"This area display a piece of the image at full resolution. You can change "
+"the displayed region by clicking on the scroll area"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:479
+msgid ""
+"This area display a minimap of the full image, allowing you to change the "
+"region displayed by the full resolution area by clicking"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:488
+msgid "Polarization parameters"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:498
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:306
+msgid "Red"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:501
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:622
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:743
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:870
+msgid "Emission"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:507
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:549
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:628
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:670
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:749
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:791
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:876
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:918
+msgid "Psi"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:508
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:629
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:750
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:877
+msgid "Change the incident Psi value (in degree)"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:524
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:566
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:645
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:687
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:766
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:808
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:893
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:935
+msgid "Khi"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:525
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:646
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:767
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:894
+msgid "Change the incident Khi value (in degree)"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:543
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:664
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:785
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:912
+msgid "Reception"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:550
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:671
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:792
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:919
+msgid "Change the reflected Psi value (in degree)"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:567
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:688
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:809
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:936
+msgid "Change the emitted Khi value (in degree)"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:586
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:707
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:828
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:955
+msgid "Cross-polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:587
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:708
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:829
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:956
+msgid "Force cross polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:595
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:716
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:837
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:964
+msgid "Co-polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:596
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:717
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:838
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:965
+msgid "Force co-polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:604
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:725
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:846
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:973
+msgid "Indifferent polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:605
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:726
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:847
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:974
+msgid "Allows any polarization"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:618
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:316
+msgid "Green"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:739
+msgid "Blue"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:867
+msgid "Grayscale"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:989
+msgid "Gain"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1021
+msgid "Poincare Sphere"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1022
+msgid "Drag the sphere to rotate it"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1038
+msgid "RGB"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1047
+msgid "Image file chooser"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1057
+msgid "HH image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1058
+msgid "HH input image path"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1066
+msgid "HV image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1067
+msgid "HV input image path"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1075
+msgid "VH image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1076
+msgid "VH input image path"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1084
+msgid "VV image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1085
+msgid "VV input image path"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1094
+msgid "Choose the HH image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1103
+msgid "Choose the HV image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1112
+msgid "Choose the VH image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1121
+msgid "Choose the VV image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1133
+msgid "Vector image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1134
+msgid "Vector input image path"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1145
+msgid "Choose the vector image file name"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1158
+msgid "Load images into the application"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1167
+msgid "Hide the open images window"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1175
+msgid "Open Vector image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1176
+msgid "Import a polarimetric vector image"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1186
+msgid "Import images corresponding to the HH, HV, VH, VV channels"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1196
+msgid "V Emission"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1197
+msgid "Enable or disable the vertical emssion for the polarimetric data"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1206
+msgid "H Emission"
+msgstr ""
+
+#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1207
+msgid "Enable or disable the horizontcal emssion for the polarimetric data"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:72
+msgid "Save luminance image"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:73
+msgid "Save reflectance TOA image"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:74
+msgid "Save reflectance TOC image"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:75
+msgid "Save TOA-TOC image"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:78
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:82
+#: Code/Modules/otbProjectionGroup.cxx:757
+msgid "Settings"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:80
+msgid "Coef. setup"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:156
+msgid "NO AEROSOL"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:157
+msgid "CONTINENTAL"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:158
+msgid "MARITIME"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:159
+msgid "URBAN"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:160
+msgid "DESERTIC"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:207
+msgid "0"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:260
+msgid "Radiometric calibration application"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:281
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:72
+msgid "Navigation view"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:289
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:297
+msgid "Zoom view"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:305
+msgid "Histograms"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:313
+msgid "Pixel information"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:321
+msgid "Result pixel information"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:361
+msgid "Luminance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:369
+msgid "Reflectance TOA"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:377
+msgid "Reflectance TOC"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:385
+msgid "TOA - TOC"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:481
+msgid "Radiometric Coefficients Setup"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:492
+msgid "Correction parameters"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:499
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:500
+msgid "Aerosol model"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:508
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:509
+msgid "Ozone Amount"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:517
+msgid "Atmo. Pressure"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:518
+msgid "Atmospheric Pressure"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:531
+msgid "Aerosol thickness"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:532
+msgid "Aerosol optical thickness"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:542
+msgid "Water amount"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:543
+msgid "Water vapor amount"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:553
+msgid "Aeronet file"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:566
+msgid "Filter function values file"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:579
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:740
+msgid "Radiative terms"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:600
+msgid "Intrinsic refl"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:601
+msgid "Intrinsic atmospheric reflectance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:611
+msgid "Albedo"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:612
+msgid "Shperical albedo of the atmosphere"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:622
+msgid "Gaseous trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:623
+msgid "Total gaseous transmission"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:633
+msgid "Down trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:634
+msgid "Downward transmittance of the atmosphere"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:644
+msgid "Up trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:645
+msgid "Upward transmittance of the atmosphere"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:655
+msgid "Up diffuse trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:656
+msgid "Upward diffuse transmittance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:666
+msgid "Up direct trans"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:667
+msgid "Upward direct transmittance"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:677
+msgid "Up diff. trans. (Rayleigh)"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:678
+msgid "Upward diffuse transmittance for Rayleigh"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:688
+msgid "Up diff trans. (aerososl)"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:689
+msgid "Upward diffuse transmittance for aerosols"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:701
+msgid "Reload channel radiative terms"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:714
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1029
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:140
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1003
+msgid "Close"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:715
+msgid "Close the window"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:723
+msgid "Set up radiometric parameters"
+msgstr ""
+
+#: RadiometricCalibration/otbRadiometricCalibrationViewGroup.cxx:732
+msgid "Atmospheric parameters"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:109
+msgid "Save result image"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:110
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:87
+msgid "Save classif as vector data (Experimental)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:111
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:88
+msgid "Open SVM model"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:112
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:89
+msgid "Save SVM model"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:113
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:90
+msgid "Import vector data (ROI)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:114
+msgid "Export vector data (ROI)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:115
+msgid "Export all vector data (ROI)"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:116
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:92
+msgid "Import ROIs from labeled image"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:119
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:455
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:571
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:444
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:573
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:95
+#: Code/Modules/otbViewerModuleGroup.cxx:295
+msgid "Setup"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:120
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:96
+msgid "Visualisation"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:273
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:342
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:324
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:251
+msgid "c_svc"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:274
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:343
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:325
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:252
+msgid "nu_svc"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:275
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:344
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:326
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:253
+msgid "one_class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:276
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:345
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:327
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:254
+msgid "epsilon_svr"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:277
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:346
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:328
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:255
+msgid "nu_svr"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:282
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:351
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:333
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:260
+msgid "linear"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:283
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:352
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:334
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:261
+msgid "polynomial"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:284
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:353
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:335
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:262
+msgid "rbf"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:285
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:354
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:336
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:263
+msgid "sigmoid"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:382
+msgid "Supervised Classification Application"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:387
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:365
+msgid "Classes list"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:388
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:366
+msgid "Browse and select classes"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:400
+msgid "Class Information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:401
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:379
+msgid "Display selected class information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:418
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:396
+msgid "Image information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:419
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:397
+msgid "Display image information"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:428
+msgid "Edit Classes"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:429
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:407
+msgid "Tools to edit classes attributes"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:436
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1749
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1700
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:421
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:301
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:414
+msgid "Add"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:437
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:415
+msgid "Add a new class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:448
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:426
+msgid "Remove the selected class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:458
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:436
+msgid "Name"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:459
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:437
+msgid "Change the name of the selected class"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:482
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:460
+msgid "Sets"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:489
+msgid "Training"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:490
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:468
+msgid "Display the training set"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:503
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1010
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:984
+msgid "Validation"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:504
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:481
+msgid ""
+"Display the validation set. Only available if random validation samples is "
+"not activated"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:517
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:493
+msgid "Random"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:518
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:494
+msgid ""
+"If activated, validation sample is randomly choosen as a subset of the "
+"training samples"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:526
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:502
+msgid "Probability "
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:527
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:503
+msgid ""
+"Tune the probability for a sample to be choosen as a training sample. Only "
+"available is random validation sample generation is activated"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:542
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:518
+msgid "Classification"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:551
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:527
+msgid "Display the results of the classification"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:563
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:539
+msgid "Learn"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:564
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:540
+msgid "Learn the SVM model from training samples"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:577
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:553
+msgid "Validate"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:578
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:554
+msgid "Display some quality assesment on the classification"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:592
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:568
+msgid "Regions of interest"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:593
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:569
+msgid "Tools to edit the regions of interest"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:600
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:514
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:507
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:576
+msgid "Erase last point"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:601
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:577
+msgid "Delete the last point of the selected region of interest"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:622
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:558
+msgid "ClearROIs"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:623
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:559
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:599
+msgid "Clear all regions of interest"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:633
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:522
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:516
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:609
+msgid "End polygon"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:634
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:610
+msgid "End the current polygon"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:644
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:620
+msgid "Polygon"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:645
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:621
+msgid "Switch between polygonal or rectangular selection"
+msgstr ""
+
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:658
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:634
+msgid "Opacity "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:867
-msgid "Grayscale"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:659
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:635
+msgid "Tune the region of interest and classification result opacity"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:989
-msgid "Gain"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:675
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:481
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:472
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:651
+msgid "Pixel locations and values"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1021
-msgid "Poincare Sphere"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:676
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:652
+msgid "Display pixel location and values"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1022
-msgid "Drag the sphere to rotate it"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:688
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:664
+msgid "Class color"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1030
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1031
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:862
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:814
-msgid "Pixel value"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:689
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:665
+msgid "Display the selected class color"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1038
-msgid "RGB"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:697
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:673
+msgid "ROI list"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1047
-msgid "Image file chooser"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:698
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:674
+msgid "Browse and select ROI associated to the selected class"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1057
-msgid "HH image"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:710
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:686
+msgid "Focus the viewer on the selected ROI"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1058
-msgid "HH input image path"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:722
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:770
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:773
+msgid "SVM Setup"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1066
-msgid "HV image"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:727
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:776
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:778
+msgid "SVM Type"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1067
-msgid "HV input image path"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:728
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:704
+msgid "Set the SVM type"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1075
-msgid "VH image"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:738
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:786
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:788
+msgid "Kernel Type"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1076
-msgid "VH input image path"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:739
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:715
+msgid "Set the kernel type"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1084
-msgid "VV image"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:749
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:796
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:798
+msgid "Kernel Degree "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1085
-msgid "VV input image path"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:757
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:803
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:805
+msgid "Gamma "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1094
-msgid "Choose the HH image file name"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:764
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:810
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:812
+msgid "Nu "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1103
-msgid "Choose the HV image file name"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:771
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:817
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:819
+msgid "Coef0 "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1112
-msgid "Choose the VH image file name"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:778
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:824
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:826
+msgid "C "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1121
-msgid "Choose the VV image file name"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:785
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:831
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:833
+msgid "Epsilon "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1133
-msgid "Vector image"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:792
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:838
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:840
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:767
+msgid "Shrinking"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1134
-msgid "Vector input image path"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:800
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:846
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:848
+msgid "Probability Estimation"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1145
-msgid "Choose the vector image file name"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:808
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:854
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:856
+msgid "Cache Size "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1158
-msgid "Load images into the application"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:824
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:869
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:871
+msgid "P "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1167
-msgid "Hide the open images window"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:843
+msgid "Visualisation Setup"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1175
-msgid "Open Vector image"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:974
+msgid "Full Window"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1176
-msgid "Import a polarimetric vector image"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:982
+msgid "Scroll Window"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1186
-msgid "Import images corresponding to the HH, HV, VH, VV channels"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:990
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:964
+msgid "Class name chooser"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1196
-msgid "V Emission"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:994
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:968
+msgid "Name: "
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1197
-msgid "Enable or disable the vertical emssion for the polarimetric data"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:998
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:972
+msgid "ok"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1206
-msgid "H Emission"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1015
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:989
+msgid "Confusion matrix"
msgstr ""
-#: PolarimetricSynthesis/otbPolarimetricSynthesisApplicationViewGroup.cxx:1207
-msgid "Enable or disable the horizontcal emssion for the polarimetric data"
+#: Classification/otbSupervisedClassificationAppliGUI.cxx:1022
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:996
+msgid "Accuracy"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:45
@@ -2641,8 +4002,8 @@ msgid "W-mean"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:623
-#: Code/Modules/otbAlgebraGroup.cxx:52
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:585
+#: Code/Modules/otbAlgebraGroup.cxx:52
msgid "Ratio"
msgstr ""
@@ -2671,12 +4032,6 @@ msgstr ""
msgid "Radiometry Indexes"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:632
-#: LandCoverMap/otbLandCoverMapView.cxx:175
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:594
-msgid "Vegetation"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:633
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:595
msgid "NDVI"
@@ -2792,12 +4147,6 @@ msgstr ""
msgid "ISU"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:659
-#: LandCoverMap/otbLandCoverMapView.cxx:184
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:621
-msgid "Water"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:660
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:622
msgid "SRWI"
@@ -2838,6 +4187,11 @@ msgstr ""
msgid "Sobel"
msgstr ""
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:671
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:633
+msgid "Mean Shift"
+msgstr ""
+
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:672
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:634
msgid "Smooth"
@@ -2871,7 +4225,7 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:792
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:743
-#: Code/Modules/otbWriterViewGroup.cxx:161
+#: Code/Modules/otbWriterViewGroup.cxx:162
msgid "Action"
msgstr ""
@@ -3095,12 +4449,6 @@ msgstr ""
msgid "b_rb"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1302
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:258
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1254
-msgid "X"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1336
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1288
msgid "lambda 1"
@@ -3205,6 +4553,16 @@ msgstr ""
msgid "Upper Thresh"
msgstr ""
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1704
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1656
+msgid "Spatial Radius"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1711
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1663
+msgid "Range Radius"
+msgstr ""
+
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1719
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1671
msgid "Min. Region Size"
@@ -3215,14 +4573,6 @@ msgstr ""
msgid "Channels Selection"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1749
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:436
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:419
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1700
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:301
-msgid "Add"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1750
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1701
msgid "Add feature to list (one per selected channel)"
@@ -3239,7 +4589,7 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1795
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1712
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1744
-#: Code/Modules/otbWriterViewGroup.cxx:201
+#: Code/Modules/otbWriterViewGroup.cxx:202
msgid "Contains each Computed Feature"
msgstr ""
@@ -3254,41 +4604,15 @@ msgstr ""
msgid "Output"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1786
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:543
-#: LandCoverMap/otbLandCoverMapView.cxx:51
-#: LandCoverMap/otbLandCoverMapView.cxx:82
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:526
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1735
-#: Code/Modules/otbWriterViewGroup.cxx:193
-msgid "Tools for classification"
-msgstr ""
-
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1807
-#: OrthoFusion/otbOrthoFusionGUI.cxx:538
-#: OrthoFusion/otbOrthoFusionGUI.cxx:550
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1755
-#: Code/Modules/otbWriterViewGroup.cxx:212
-msgid ">>"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1808
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1756
-#: Code/Modules/otbWriterViewGroup.cxx:213
+#: Code/Modules/otbWriterViewGroup.cxx:214
msgid "Add mono Channel Image to Intput List"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1818
-#: OrthoFusion/otbOrthoFusionGUI.cxx:544
-#: OrthoFusion/otbOrthoFusionGUI.cxx:556
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1766
-#: Code/Modules/otbWriterViewGroup.cxx:223
-msgid "<<"
-msgstr ""
-
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1819
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1767
-#: Code/Modules/otbWriterViewGroup.cxx:224
+#: Code/Modules/otbWriterViewGroup.cxx:225
msgid "Remove Mono channel Image from Output List"
msgstr ""
@@ -3299,338 +4623,393 @@ msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1830
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1778
-#: Code/Modules/otbWriterViewGroup.cxx:235
+#: Code/Modules/otbWriterViewGroup.cxx:236
msgid "Contains each Selected Feature for Output Generation"
msgstr ""
#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1842
#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1789
-#: Code/Modules/otbWriterViewGroup.cxx:246
+#: Code/Modules/otbWriterViewGroup.cxx:247
msgid "+"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1843
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1854
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1790
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1801
-#: Code/Modules/otbWriterViewGroup.cxx:247
-#: Code/Modules/otbWriterViewGroup.cxx:258
-msgid "Change selected Feature Position in Output Image"
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1843
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1854
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1790
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1801
+#: Code/Modules/otbWriterViewGroup.cxx:248
+#: Code/Modules/otbWriterViewGroup.cxx:259
+msgid "Change selected Feature Position in Output Image"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1853
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1800
+#: Code/Modules/otbWriterViewGroup.cxx:258
+msgid "-"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1880
+msgid "Erase Feature and Close Input Image"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1890
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1826
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:224
+msgid "Clear List"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1891
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1827
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:225
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:236
+msgid "Clear Feature List"
+msgstr ""
+
+#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1927
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1863
+msgid "Feature"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:72
+msgid "Open vector"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:73
+msgid "Save Image Result"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:74
+msgid "Save image on extract"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:76
+msgid "Save Vector Data"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:77
+msgid "Save vector on extract"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:78
+msgid "Save vector on full"
+msgstr ""
+
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:83
+msgid "Configure "
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1853
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1800
-#: Code/Modules/otbWriterViewGroup.cxx:257
-msgid "-"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:84
+msgid "Viewer Setup"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1869
-#: LandCoverMap/otbLandCoverMapView.cxx:114
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1816
-#: Code/Modules/otbWriterViewGroup.cxx:273
-msgid "Save the Composition"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:329
+msgid "Urban Area Extraction Application"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1880
-msgid "Erase Feature and Close Input Image"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:349
+msgid "Master View Selection"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1890
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1826
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:219
-msgid "Clear List"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:358
+msgid "Selected ROI"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1891
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1827
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:220
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:231
-msgid "Clear Feature List"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:373
+msgid "Switch View"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1902
-#: LandCoverMap/otbLandCoverMapView.cxx:125
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1838
-#: Code/Modules/otbWriterViewGroup.cxx:284
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:163
-msgid "Quit Application"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:390
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:398
+msgid "Pixel Value"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1920
-#: Code/Modules/otbWriterViewGroup.cxx:303
-msgid "Full resolution"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:406
+msgid "Display Vectors"
msgstr ""
-#: FeatureExtraction/otbFeatureExtractionViewGroup.cxx:1927
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1863
-msgid "Feature"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:407
+msgid "Display/Hide the vector datas"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:199
-msgid "otbImageViewerManagerView"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:422
+msgid "Focus in ROI"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:253
-msgid "Packed View"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:441
+msgid "Detail level"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:254
-msgid "Toggle Packed mode"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:447
+msgid "Min Size"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:262
-msgid "Splitted View"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:448
+#: Code/Modules/otbThresholdGroup.cxx:150
+#: Code/Modules/otbThresholdGroup.cxx:166
+msgid "Minimum size of a detected region (m2)"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:263
-msgid "Toggle Splitted mode"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:464
+msgid "SubSample"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:449
-#: Code/Modules/otbViewerModuleGroup.cxx:394
-msgid "Amplitude"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:465
+msgid "Control of the sub-sample factor"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:466
-msgid "Link Images"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:484
+msgid "Threshold"
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:494
-msgid "First image"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:490
+msgid "NonVeget/Water "
msgstr ""
-#: ViewerManager/otbImageViewerManagerViewGroup.cxx:532
-msgid "Second image"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:491
+msgid ""
+"Threshold value applied on the RadiometricNonVegetationNonWaterIndex image "
+"result [ 0 ; 1 ]"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:22
-msgid "Open stereoscopic couple"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:497
+msgid "Density "
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:169
-msgid "Stereoscopic viewer"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:498
+msgid "Threshold value applied on the edge density image result [ 0 ; 1 ]"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:177
-msgid ""
-"This area shows the main stereoscopic couple. To activate the sub-window "
-"mode, draw a rectangle with the middle mouse button pressed"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:508
+msgid "Region of interest"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:204
-msgid "Zoom in interpolator"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:570
+msgid "Focus on the selected ROI"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:205
-msgid "Choose the interpolator used when resample factor is less than 1"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:588
+msgid "Modify the alpha blending between the input image and the result"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:215
-msgid "Zoom out interpolator"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:604
+msgid "Algorithm Configuration"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:216
-msgid "Choose the interpolator used when resample factor is more than 1"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:629
+msgid "Sobel Thresholds"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:226
-msgid "Magnify"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:635
+msgid "Lower Threshold "
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:227
-msgid "Magnify the scene (nearest neighbours interpolation)"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:636
+msgid "Lower threshold of the sobel edge detector"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:242
-msgid "Resample"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:643
+msgid "Upper Threshold "
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:243
-msgid "Resample the scene"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:644
+msgid ""
+"Upper threshold of the sobel edge detector. (ex: 200 for Quickbird, 50 for "
+"SPOT)"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:285
-msgid "Main visualization"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:654
+msgid "Indices Configuration"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:286
-msgid "Choose the couple to view"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:674
+msgid "NIR channel index"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:292
-msgid "Main stereoscopic couple"
+#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:675
+msgid "Select band for NIR channel in RGB composition"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:305
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:374
-msgid "Show left image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:214
+msgid "Road extraction application"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:314
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:383
-msgid "show right image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:245
+msgid "Input type"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:323
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:392
-msgid "Show anaglyph"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:279
+msgid "Use spectral angle"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:333
-msgid "Normalization (%)"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:297
+msgid "Use water index"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:353
-msgid "Insight"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:336
+msgid "Set the alpha value"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:354
-msgid "Choose the couple to view in the insight sub-window mode"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:347
+msgid "Resolution"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:361
-msgid "Insight tereoscopic couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:348
+msgid "Set the revolution"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:415
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:480
-msgid "Rename couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:361
+msgid ""
+"Set the tolerance for segment consistency (tolerance in terms of distance)"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:416
-msgid "Rename the selected couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:373
+msgid "MaxAngle"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:425
-msgid "Open Stereoscopic couple"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:374
+msgid "Set the max angle"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:448
-msgid "Left image "
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:386
+msgid "AngularThreshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:455
-msgid "Right image "
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:387
+msgid "Set the angular threshold"
msgstr ""
-#: StereoscopicApplication/otbStereoscopicApplicationViewGroup.cxx:500
-msgid "Couple name: "
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:399
+msgid "AmplitudeThreshold"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:439
-msgid "otbOrthoFusion"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:400
+msgid "Set the amplitude threshold"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:514
-msgid "Images list"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:412
+msgid "DistanceThreshold"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:539
-msgid "Add PAN input image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:413
+msgid "Set the distance threshold"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:545
-msgid "Remove selected PAN"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:425
+msgid "FirstMeanDistThr"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:551
-msgid "Add XS input image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:426
+msgid "First Mean Distance threshold"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:557
-msgid "Remove Selected XS"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:438
+msgid "SecondMeanDistThr"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:562
-msgid "PAN image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:439
+msgid "Second Mean Distance threshold"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:563
-msgid "Select a PAN image"
+#: RoadExtraction/otbRoadExtractionViewGroup.cxx:455
+msgid "Controls"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:567
-msgid "XS image"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:411
+msgid "otbOrthoRectif"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:568
-msgid "Select a XS image"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:486
+msgid "Image List"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:583
-msgid "Map projection"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:498
+msgid "Preview Window"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:592
-msgid "Cartographic coordinates"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:521
+#: Code/Modules/otbOrthorectificationGUI.cxx:431
+msgid "Map Projection"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:626
-msgid "Northern hemisphere"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:530
+#: Code/Modules/otbOrthorectificationGUI.cxx:440
+msgid "Cartographic Coordinates"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:633
-msgid "Southern hemisphere"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:564
+#: Code/Modules/otbOrthorectificationGUI.cxx:474
+msgid "Northern Hemisphere"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:682
-msgid "False easting"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:570
+#: Code/Modules/otbOrthorectificationGUI.cxx:480
+msgid "Southern Hemisphere"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:691
-msgid "False northing"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:600
+#: Code/Modules/otbOrthorectificationGUI.cxx:510
+msgid "False Easting"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:700
-msgid "Scale factor"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:609
+#: Code/Modules/otbOrthorectificationGUI.cxx:519
+msgid "False Northing"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:701
-msgid "Enter scale factor"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:618
+#: Code/Modules/otbOrthorectificationGUI.cxx:528
+msgid "Scale Factor"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:713
-msgid "Geographical coordinates"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:619
+#: Code/Modules/otbOrthorectificationGUI.cxx:529
+msgid "Enter Scale Factor"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:801
-#: OrthoFusion/otbOrthoFusionGUI.cxx:825
-msgid "Select the orthorectif interpolator"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:649
+#: Code/Modules/otbOrthorectificationGUI.cxx:390
+msgid "Geographical Coordinates"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:809
-msgid "Interpolator parameters"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:736 OrthoRectif/otbOrthoRectifGUI.cxx:760
+#: Code/Modules/otbProjectionGroup.cxx:807
+#: Code/Modules/otbOrthorectificationGUI.cxx:606
+#: Code/Modules/otbOrthorectificationGUI.cxx:630
+msgid "Select the Orthorectif Interpolator"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:870
-#: OrthoFusion/otbOrthoFusionGUI.cxx:882
-msgid "DEM path"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:744
+#: Code/Modules/otbOrthorectificationGUI.cxx:614
+msgid "Interpolator Parameters"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:902
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:94
-msgid "Use average elevation"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:801 OrthoRectif/otbOrthoRectifGUI.cxx:813
+#: Code/Modules/otbOrthorectificationGUI.cxx:672
+#: Code/Modules/otbOrthorectificationGUI.cxx:684
+msgid "DEM Path"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:907
-msgid "Average elevation"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:837
+#: Code/Modules/otbOrthorectificationGUI.cxx:711
+msgid "Average Elevation"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:920
-msgid "Image extent"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:844
+#: Code/Modules/otbOrthorectificationGUI.cxx:718
+msgid "Use Average Elevation"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:953
-msgid "Maximum tile size (MB)"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:855
+#: Code/Modules/otbOrthorectificationGUI.cxx:729
+msgid "Image Extent"
msgstr ""
-#: OrthoFusion/otbOrthoFusionGUI.cxx:954
-msgid "From streaming pipeline, precise the maximum tile size"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:888
+msgid "Maximum Tile Size (MB)"
msgstr ""
-#: Common/otbMsgReporterGUI.cxx:7
-#: Code/Common/otbMsgReporterGUI.cxx:7
-msgid "Msg Reporter"
+#: OrthoRectif/otbOrthoRectifGUI.cxx:889
+msgid "From Streaming pipeline, precise the maximum tile size"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:66
@@ -3642,18 +5021,22 @@ msgid "Load Right Image ..."
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:68
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:45
msgid "Load SVM model ..."
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:69
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:46
msgid "Import vector data ..."
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:70
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:47
msgid "Export vector data ..."
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:71
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:48
msgid "Save SVM model ..."
msgstr ""
@@ -3661,61 +5044,8 @@ msgstr ""
msgid "Save result image ..."
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:342
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:273
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:256
-msgid "c_svc"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:343
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:274
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:257
-msgid "nu_svc"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:344
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:275
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:258
-msgid "one_class"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:345
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:276
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:259
-msgid "epsilon_svr"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:346
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:277
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:260
-msgid "nu_svr"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:351
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:282
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:265
-msgid "linear"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:352
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:283
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:266
-msgid "polynomial"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:353
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:284
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:267
-msgid "rbf"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:354
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:285
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:268
-msgid "sigmoid"
-msgstr ""
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:372
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:354
msgid "Principal Window"
msgstr ""
@@ -3724,1362 +5054,1404 @@ msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:515
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:523
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:531
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:368
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:445
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:508
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:517
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:526
msgid "Clear the entire drawing"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:393
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:376
msgid "Learn "
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:394
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:503
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:377
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:495
msgid "Learn the SVM model from the training set"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:404
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:388
msgid "Unchanged class"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:405
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:427
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:389
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:413
msgid "Choose changed class training set color"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:415
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:400
msgid "Changed class"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:416
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:401
msgid "Toggle changed class training set display"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:426
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:434
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:412
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:421
msgid "Color ..."
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:435
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:422
msgid "Choose unchanged class training set color"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:442
-#: LandCoverMap/otbLandCoverMapView.cxx:152
-msgid "Opacity"
-msgstr ""
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:443
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:431
msgid "Set the training set opacity"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:455
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:571
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:119
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:103
-#: Code/Modules/otbViewerModuleGroup.cxx:295
-msgid "Setup"
-msgstr ""
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:463
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:453
msgid "Use change detectors"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:464
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:454
msgid ""
"Enrich feature vector with mean-difference and mean-ratio change detectors "
"attributes"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:475
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:466
msgid "Logs"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:481
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:675
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:658
-msgid "Pixel locations and values"
-msgstr ""
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:493
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:484
msgid "Polygonal ROI"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:502
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:494
msgid "Display results "
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:514
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:600
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:583
-msgid "Erase last point"
-msgstr ""
-
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:522
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:633
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:616
-msgid "End polygon"
-msgstr ""
-
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:530
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:525
msgid "Erase last polygon"
msgstr ""
#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:541
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:543
msgid "Before full resolution image"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:546
-msgid "Center full resolution image"
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:546
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:548
+msgid "Center full resolution image"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:551
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:553
+msgid "After full resolution image"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:556
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:558
+msgid "Before scroll image"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:561
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:563
+msgid "Center scroll image"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:566
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:568
+msgid "After scroll image"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:585
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:587
+msgid "Color composition"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:590
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:593
+msgid "Left Viewer"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:609
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:658
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:707
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:612
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:661
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:710
+msgid "Channel: "
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:616
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:665
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:714
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:619
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:668
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:717
+msgid "Red channel "
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:623
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:672
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:721
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:626
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:675
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:724
+msgid "Green channel "
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:630
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:679
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:728
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:633
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:682
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:731
+msgid "Blue channel "
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:639
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:642
+msgid "Right Viewer"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:688
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:691
+msgid "Center Viewer"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:739
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:742
+#: Code/Modules/otbViewerModuleGroup.cxx:413
+msgid "Histogram"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:747
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:750
+msgid "Left Viewer Histogram"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:754
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:757
+msgid "Right Viewer Histogram"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:761
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:764
+msgid "Center Viewer Histogram"
+msgstr ""
+
+#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:861
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:863
+msgid "Save parameters"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:199
+msgid "otbImageViewerManagerView"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:253
+msgid "Packed View"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:254
+msgid "Toggle Packed mode"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:262
+msgid "Splitted View"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:263
+msgid "Toggle Splitted mode"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:449
+#: Code/Modules/otbViewerModuleGroup.cxx:394
+msgid "Amplitude"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:466
+msgid "Link Images"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:494
+#: Code/Modules/otbAlgebraGroup.cxx:63
+#: Code/Modules/Algebra/otbAlgebraModule.cxx:33
+msgid "First image"
+msgstr ""
+
+#: ViewerManager/otbImageViewerManagerViewGroup.cxx:532
+#: Code/Modules/otbAlgebraGroup.cxx:64
+#: Code/Modules/Algebra/otbAlgebraModule.cxx:34
+msgid "Second image"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:551
-msgid "After full resolution image"
+#: Code/Application/otbMonteverdiViewGroup.cxx:73
+msgid "Monteverdi"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:556
-msgid "Before scroll image"
+#: Code/Application/otbMonteverdiViewGroup.cxx:94
+msgid "Help me..."
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:561
-msgid "Center scroll image"
+#: Code/Application/otbMonteverdiViewGroup.cxx:114
+#: Code/Application/otbInputViewGroup.cxx:24
+msgid "Set inputs"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:566
-msgid "After scroll image"
+#: Code/Application/otbMonteverdiViewGroup.cxx:140
+msgid "Module renamer"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:585
-msgid "Color composition"
+#: Code/Application/otbMonteverdiViewGroup.cxx:147
+#: Code/Application/otbMonteverdiViewGroup.cxx:192
+msgid "Old instance label"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:590
-msgid "Left Viewer"
+#: Code/Application/otbMonteverdiViewGroup.cxx:153
+#: Code/Application/otbMonteverdiViewGroup.cxx:198
+msgid "New instance label"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:609
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:658
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:707
-msgid "Channel: "
+#: Code/Application/otbMonteverdiViewGroup.cxx:179
+msgid "Output renamer"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:616
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:665
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:714
-msgid "Red channel "
+#: Code/Application/otbMonteverdiViewGroup.cxx:186
+msgid "Root instance label"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:623
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:672
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:721
-msgid "Green channel "
+#: Code/Application/otbInputViewGroup.cxx:50
+msgid "Instance label"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:630
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:679
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:728
-msgid "Blue channel "
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:35
+msgid "Frost"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:639
-msgid "Right Viewer"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:36
+msgid "Lee"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:688
-msgid "Center Viewer"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:48
+msgid "SpeckleFilteringApplication"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:739
-#: Code/Modules/otbViewerModuleGroup.cxx:413
-msgid "Histogram"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:63
+msgid "Filter type"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:747
-msgid "Left Viewer Histogram"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:64
+#: Code/Modules/otbAlgebraGroup.cxx:85 Code/Modules/otbAlgebraGroup.cxx:120
+msgid "Set the filter type"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:754
-msgid "Right Viewer Histogram"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:74
+msgid "Lee filter parameters"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:761
-msgid "Center Viewer Histogram"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:83
+msgid "Radius parameter for Lee filter"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:770
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:722
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:705
-msgid "SVM Setup"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:91
+msgid "Frost filter parameters"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:776
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:727
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:710
-msgid "SVM Type"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:98
+#: Code/Modules/otbAlgebraGroup.cxx:101
+msgid "Radius parameter for Frost image filter"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:786
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:738
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:721
-msgid "Kernel Type"
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:104
+msgid "DeRamp"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:796
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:749
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:732
-msgid "Kernel Degree "
+#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:105
+#: Code/Modules/otbAlgebraGroup.cxx:110
+msgid "Deramp parameter for Frost image filter"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:804
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:757
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:740
-msgid "Gamma "
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:759
+msgid "Feature Parameters"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:811
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:764
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:747
-msgid "Nu "
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1815
+msgid "Extract Feature"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:818
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:771
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:754
-msgid "Coef0 "
+#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1856
+msgid "Full Resolution"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:825
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:778
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:761
-msgid "C "
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:56
+msgid "Mean shift module"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:832
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:785
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:768
-msgid "Epsilon "
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:87
+msgid "Set the mean shift spatial radius"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:839
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:792
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:775
-msgid "Shrinking"
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:102
+msgid "Spectral radius"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:847
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:800
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:783
-msgid "Probability Estimation"
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:103
+msgid "Set the mean shift spectral radius"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:855
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:808
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:791
-msgid "Cache Size "
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:117
+msgid "Min region size"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:863
-msgid "Save parameters"
+#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:118
+msgid "Set the mean shift minimum region size"
msgstr ""
-#: ChangeDetection/otbInteractiveChangeDetectionGUI.cxx:871
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:824
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:807
-msgid "P "
+#: Code/Modules/otbReaderModuleGUI.cxx:42
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:48
+msgid "Open dataset"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:214
-msgid "Road extraction application"
+#: Code/Modules/otbReaderModuleGUI.cxx:58
+msgid "Open"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:245
-msgid "Input type"
+#: Code/Modules/otbReaderModuleGUI.cxx:82
+msgid "Data type "
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:279
-msgid "Use spectral angle"
+#: Code/Modules/otbReaderModuleGUI.cxx:91
+msgid "Name "
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:288
-msgid "Reference pixel"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:21
+msgid "Bilinear"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:297
-msgid "Use water index"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:22
+msgid "RPC"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:336
-msgid "Set the alpha value"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:190
+msgid "GCP to sensor model module"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:347
-msgid "Resolution"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:201
+msgid "Projection:"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:348
-msgid "Set the revolution"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:212
+msgid "GCPs List"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:361
-msgid ""
-"Set the tolerance for segment consistency (tolerance in terms of distance)"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:213
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:208
+msgid "Contains selected points"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:373
-msgid "MaxAngle"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:246
+msgid "Reload"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:374
-msgid "Set the max angle"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:247
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:258
+msgid "Focus on the selected point couple."
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:386
-msgid "AngularThreshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:257
+msgid "Focus Point"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:387
-msgid "Set the angular threshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:268
+msgid "Point Errors"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:399
-msgid "AmplitudeThreshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:269
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:127
+msgid "Euclidean distances"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:400
-msgid "Set the amplitude threshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:280
+msgid "Ground Error Var (m^2):"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:412
-msgid "DistanceThreshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:288
+msgid "Mean Square Error:"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:413
-msgid "Set the distance threshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:296
+msgid "Pixel Values"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:425
-msgid "FirstMeanDistThr"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:304
+msgid "Elevation"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:426
-msgid "First Mean Distance threshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:316
+#: Code/Modules/otbAlgebraGroup.cxx:131
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:162
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:93
+msgid "Save/Quit"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:438
-msgid "SecondMeanDistThr"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:333
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:188
+msgid "Scroll fix"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:439
-msgid "Second Mean Distance threshold"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:341
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:196
+msgid "Zoom fix"
msgstr ""
-#: RoadExtraction/otbRoadExtractionViewGroup.cxx:455
-msgid "Controls"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:349
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:180
+msgid "Full fix"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:72
-msgid "Open vector"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:378
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:313
+msgid "Focus Click"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:73
-msgid "Save Image Result"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:379
+msgid "Focus on the last clicked point couple."
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:74
-msgid "Save image on extract"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:390
+msgid "Long"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:76
-msgid "Save Vector Data"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:400
+msgid "Lat"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:77
-msgid "Save vector on extract"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:410
+msgid "Elev"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:78
-msgid "Save vector on full"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:422
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:302
+msgid "Clear Feature List (shortcut KP_Enter)"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:83
-msgid "Configure "
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:443
+msgid "Elevation manager"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:329
-msgid "Urban Area Extraction Application"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:450
+msgid "GCPs elevation"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:349
-msgid "Master View Selection"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:463
+msgid "Use mean elevation"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:358
-msgid "Selected ROI"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:473
+msgid "value:"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:373
-msgid "Switch View"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:493
+msgid "file:"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:406
-msgid "Display Vectors"
+#: Code/Modules/otbGCPToSensorModelViewGroup.cxx:518
+msgid "OK"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:407
-msgid "Display/Hide the vector datas"
+#: Code/Modules/otbInteractiveChangeDetectionGUI.cxx:534
+#: Code/Modules/otbThresholdGroup.cxx:142
+msgid "Save Quit"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:422
-msgid "Focus in ROI"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:28
+msgid "Select the ROI"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:441
-msgid "Detail level"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:50
+msgid "Definition of the ROI extracted"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:447
-msgid "Min Size"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:54
+msgid "Start X"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:448
-msgid "Minimum size of a detected region (m2)"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:57
+msgid "Start Y"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:464
-msgid "SubSample"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:70
+msgid "Longitude1"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:465
-msgid "Control of the sub-sample factor"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:72
+msgid "Latitude1"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:484
-msgid "Threshold"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:74
+msgid "Longitude2"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:490
-msgid "NonVeget/Water "
+#: Code/Modules/otbExtractROIModuleGUI.cxx:76
+msgid "Latitude2"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:491
-msgid ""
-"Threshold value applied on the RadiometricNonVegetationNonWaterIndex image "
-"result [ 0 ; 1 ]"
+#: Code/Modules/otbExtractROIModuleGUI.cxx:82
+msgid "Input image size information"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:497
-msgid "Density "
+#: Code/Modules/otbExtractROIModuleGUI.cxx:94
+msgid "Select Long/Lat (NW (1) ; SE (2))"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:498
-msgid "Threshold value applied on the edge density image result [ 0 ; 1 ]"
+#: Code/Modules/otbProjectionGroup.cxx:102
+msgid "SENSOR MODEL"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:508
-msgid "Region of interest"
+#: Code/Modules/otbProjectionGroup.cxx:428
+msgid "Splines"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:558
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:622
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:605
-msgid "ClearROIs"
+#: Code/Modules/otbProjectionGroup.cxx:433
+msgid "Projection"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:559
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:623
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:606
-msgid "Clear all regions of interest"
+#: Code/Modules/otbProjectionGroup.cxx:439
+msgid "Save / Quit"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:570
-msgid "Focus on the selected ROI"
+#: Code/Modules/otbProjectionGroup.cxx:468
+msgid "Use center pixel"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:588
-msgid "Modify the alpha blending between the input image and the result"
+#: Code/Modules/otbProjectionGroup.cxx:469
+msgid "If checked, use the output center image coordinates"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:604
-msgid "Algorithm Configuration"
+#: Code/Modules/otbProjectionGroup.cxx:475
+msgid "Use upper-left pixel"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:629
-msgid "Sobel Thresholds"
+#: Code/Modules/otbProjectionGroup.cxx:476
+msgid "If checked, use the upper left output image pixel coordinates"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:635
-msgid "Lower Threshold "
+#: Code/Modules/otbProjectionGroup.cxx:502
+msgid "Input map projection"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:636
-msgid "Lower threshold of the sobel edge detector"
+#: Code/Modules/otbProjectionGroup.cxx:513
+msgid "Input cartographic coordinates"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:643
-msgid "Upper Threshold "
+#: Code/Modules/otbProjectionGroup.cxx:626
+msgid "Map Pprojection"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:644
-msgid ""
-"Upper threshold of the sobel edge detector. (ex: 200 for Quickbird, 50 for "
-"SPOT)"
+#: Code/Modules/otbProjectionGroup.cxx:780
+msgid "Select the orthorectification interpolator"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:654
-msgid "Indices Configuration"
+#: Code/Modules/otbCachingModuleGUI.cxx:7
+msgid "Caching Data"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:674
-msgid "NIR channel index"
+#: Code/Modules/otbOrthorectificationGUI.cxx:353
+msgid "otbOrthorectification"
msgstr ""
-#: UrbanAreaExtraction/otbUrbanAreaExtractionViewGroup.cxx:675
-msgid "Select band for NIR channel in RGB composition"
+#: Code/Modules/otbAlgebraGroup.cxx:49
+msgid "Addition"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:109
-msgid "Save result image"
+#: Code/Modules/otbAlgebraGroup.cxx:50
+msgid "Subtraction"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:110
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:94
-msgid "Save classif as vector data (Experimental)"
+#: Code/Modules/otbAlgebraGroup.cxx:51
+msgid "Multiplication"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:111
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:95
-msgid "Open SVM model"
+#: Code/Modules/otbAlgebraGroup.cxx:53
+msgid "Shift-scale"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:112
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:96
-msgid "Save SVM model"
+#: Code/Modules/otbAlgebraGroup.cxx:78
+msgid "Band math module"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:113
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:97
-msgid "Import vector data (ROI)"
+#: Code/Modules/otbAlgebraGroup.cxx:84
+msgid "Operation type"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:114
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:98
-msgid "Export vector data (ROI)"
+#: Code/Modules/otbAlgebraGroup.cxx:94
+msgid "Shift scale parameters : A*X + B"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:115
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:99
-msgid "Export all vector data (ROI)"
+#: Code/Modules/otbAlgebraGroup.cxx:100
+msgid "A"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:116
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:100
-msgid "Import ROIs from labeled image"
+#: Code/Modules/otbAlgebraGroup.cxx:109
+msgid "B"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:120
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:104
-msgid "Visualisation"
+#: Code/Modules/otbAlgebraGroup.cxx:119
+msgid "Choose input"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:382
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:365
-msgid "Supervised Classification Application"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:21
+msgid "Translation"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:387
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:370
-msgid "Classes list"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:22
+msgid "Affine"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:388
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:371
-msgid "Browse and select classes"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:23
+msgid "Similarity 2D"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:400
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:383
-msgid "Class Information"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:98
+msgid "Homologous point extraction"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:401
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:384
-msgid "Display selected class information"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:119
+msgid "Transform value"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:418
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:401
-msgid "Image information"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:126
+msgid "Point errors"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:419
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:402
-msgid "Display image information"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:138
+msgid "Mean square error"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:428
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:411
-msgid "Edit Classes"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:146
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:154
+msgid "Pixel values"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:429
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:412
-msgid "Tools to edit classes attributes"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:163
+msgid "Quit application"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:437
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:420
-msgid "Add a new class"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:207
+msgid "Point List"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:448
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:431
-msgid "Remove the selected class"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:219
+msgid "Clear list"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:458
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:441
-msgid "Name"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:220
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:231
+msgid "Clear feature list"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:459
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:442
-msgid "Change the name of the selected class"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:241
+msgid "Focus point"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:482
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:465
-msgid "Sets"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:242
+msgid "Focus on the selected point couple"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:489
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:472
-msgid "Training"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:252
+msgid "Evaluate"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:490
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:473
-msgid "Display the training set"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:253
+msgid "Quit application (shortcut: enter)"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:503
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1010
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:486
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:993
-msgid "Validation"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:267
+msgid "X1"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:504
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:487
-msgid ""
-"Display the validation set. Only available if random validation samples is "
-"not activated"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:275
+msgid "Y1"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:517
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:500
-msgid "Random"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:283
+msgid "X2"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:518
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:501
-msgid ""
-"If activated, validation sample is randomly choosen as a subset of the "
-"training samples"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:292
+msgid "Y2"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:526
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:509
-msgid "Probability "
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:314
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:326
+msgid "Focus on the last clicked point couple"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:527
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:510
-msgid ""
-"Tune the probability for a sample to be choosen as a training sample. Only "
-"available is random validation sample generation is activated"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:325
+msgid "Guess"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:542
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:525
-msgid "Classification"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:343
+msgid "Full moving"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:550
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:533
-#: Code/Modules/otbViewerModuleGroup.cxx:283
-msgid "Display"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:351
+msgid "Scroll moving"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:551
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:534
-msgid "Display the results of the classification"
+#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:359
+msgid "Zoom moving"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:563
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:546
-msgid "Learn"
+#: Code/Modules/otbThresholdGroup.cxx:114
+msgid "Threshold Module"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:564
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:547
-msgid "Learn the SVM model from training samples"
+#: Code/Modules/otbThresholdGroup.cxx:121
+msgid "Inside Value :"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:577
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:560
-msgid "Validate"
+#: Code/Modules/otbThresholdGroup.cxx:134
+msgid "Full"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:578
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:561
-msgid "Display some quality assesment on the classification"
+#: Code/Modules/otbThresholdGroup.cxx:149
+msgid "Lower Threshold :"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:592
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:575
-msgid "Regions of interest"
+#: Code/Modules/otbThresholdGroup.cxx:165
+msgid "Upper Threshold :"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:593
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:576
-msgid "Tools to edit the regions of interest"
+#: Code/Modules/otbThresholdGroup.cxx:182
+msgid "Outside value :"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:601
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:584
-msgid "Delete the last point of the selected region of interest"
+#: Code/Modules/otbThresholdGroup.cxx:192
+msgid "Threshold Above"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:634
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:617
-msgid "End the current polygon"
+#: Code/Modules/otbThresholdGroup.cxx:199
+msgid "Threshold Below"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:644
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:627
-msgid "Polygon"
+#: Code/Modules/otbThresholdGroup.cxx:206
+msgid "Threshold Outside"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:645
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:628
-msgid "Switch between polygonal or rectangular selection"
+#: Code/Modules/otbThresholdGroup.cxx:214
+msgid "alpha :"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:658
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:641
-msgid "Opacity "
+#: Code/Modules/otbThresholdGroup.cxx:229
+msgid "Inside value :"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:659
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:642
-msgid "Tune the region of interest and classification result opacity"
+#: Code/Modules/otbThresholdGroup.cxx:241
+msgid "Generic Threshold"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:676
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:659
-msgid "Display pixel location and values"
+#: Code/Modules/otbThresholdGroup.cxx:249
+msgid "Binary Threshold"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:688
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:671
-msgid "Class color"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:91
+msgid "Export selected polygons"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:689
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:672
-msgid "Display the selected class color"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:360
+msgid "Supervised classification"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:697
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:680
-msgid "ROI list"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:378
+msgid "Class information"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:698
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:681
-msgid "Browse and select ROI associated to the selected class"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:406
+msgid "Edit classes"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:710
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:693
-msgid "Focus the viewer on the selected ROI"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:467
+msgid "Training Set"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:728
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:711
-msgid "Set the SVM type"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:480
+msgid "Validation Set"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:739
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:722
-msgid "Set the kernel type"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:598
+msgid "Clear ROIs"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:843
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:826
-msgid "Visualisation Setup"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:698
+msgid "SVM setup"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:974
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:957
-msgid "Full Window"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:703
+msgid "SVM type"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:982
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:965
-msgid "Scroll Window"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:714
+msgid "Kernel type"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:990
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:973
-msgid "Class name chooser"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:725
+msgid "Kernel degree"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:994
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:977
-msgid "Name: "
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:732
+msgid "Gamma"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:998
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:981
-msgid "ok"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:739
+msgid "Nu"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1015
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:998
-msgid "Confusion matrix"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:746
+msgid "Coef0"
msgstr ""
-#: Classification/otbSupervisedClassificationAppliGUI.cxx:1022
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:1005
-msgid "Accuracy"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:753
+msgid "C"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:43
-msgid "Land Cover Map Application"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:760
+msgid "Epsilon"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:59
-msgid "Input Image Name"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:775
+msgid "Probability estimation"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:69
-msgid "Open a new input image"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:783
+msgid "Cache size"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:90
-msgid "Input Model Name"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:798
+msgid "P"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:100
-msgid "Load model"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:817
+msgid "Visualisation setup"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:101
-msgid "Open a new input model"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:948
+msgid "Full window"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:135
-msgid "Scroll image"
+#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:956
+msgid "Scroll window"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:142
-msgid "Feature Selection"
+#: Code/Modules/otbSuperimpositionModuleGUI.cxx:87
+msgid "Elevation value "
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:164
-msgid "Full Resolution image"
+#: Code/Modules/otbWriterViewGroup.cxx:78
+msgid "unsigned char"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:171
-msgid "Nomenclature"
+#: Code/Modules/otbWriterViewGroup.cxx:79
+msgid "short int"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:193
-msgid "Built-up area"
+#: Code/Modules/otbWriterViewGroup.cxx:80
+msgid "int"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:202
-msgid "Roads"
+#: Code/Modules/otbWriterViewGroup.cxx:81
+msgid "float"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:211
-msgid "Bare soil"
+#: Code/Modules/otbWriterViewGroup.cxx:82
+msgid "double"
msgstr ""
-#: LandCoverMap/otbLandCoverMapView.cxx:220
-msgid "Shadows"
+#: Code/Modules/otbWriterViewGroup.cxx:83
+msgid "unsigned short int"
msgstr ""
-#: Code/Application/otbInputViewGroup.cxx:24
-msgid "Set Inputs"
+#: Code/Modules/otbWriterViewGroup.cxx:84
+msgid "unsigned int"
msgstr ""
-#: Code/Application/otbInputViewGroup.cxx:50
-msgid "Instance label"
+#: Code/Modules/otbWriterViewGroup.cxx:147
+msgid "Writer application"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:73
-msgid "Monteverdi"
+#: Code/Modules/otbWriterViewGroup.cxx:177
+msgid "Output pixel type"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:94
-msgid "Help me..."
+#: Code/Modules/otbWriterViewGroup.cxx:185
+msgid "Use scaling"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:114
-msgid "Set inputs"
+#: Code/Modules/otbWriterViewGroup.cxx:201
+msgid "Feature image list"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:140
-msgid "Module renamer"
+#: Code/Modules/otbWriterViewGroup.cxx:235
+msgid "Selected output channels"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:147
-#: Code/Application/otbMonteverdiViewGroup.cxx:192
-msgid "Old instance label"
+#: Code/Modules/otbWriterViewGroup.cxx:312
+msgid "Band"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:153
-#: Code/Application/otbMonteverdiViewGroup.cxx:198
-msgid "New instance label"
+#: Code/Modules/otbViewerModuleGroup.cxx:202
+#: Code/Modules/otbViewerModuleGroup.cxx:210
+msgid "Vector data propreties"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:179
-msgid "Output renamer"
+#: Code/Modules/otbViewerModuleGroup.cxx:247
+msgid "Hide"
msgstr ""
-#: Code/Application/otbMonteverdiViewGroup.cxx:186
-msgid "Root instance label"
+#: Code/Modules/otbViewerModuleGroup.cxx:257
+msgid "Hide All"
msgstr ""
-#: Code/Modules/otbExtractROIModuleGUI.cxx:21
-msgid "Select the ROI"
+#: Code/Modules/otbViewerModuleGroup.cxx:273
+msgid "Display All"
msgstr ""
-#: Code/Modules/otbExtractROIModuleGUI.cxx:43
-msgid "Definition of the ROI extracted"
+#: Code/Modules/otbViewerModuleGroup.cxx:425
+msgid "Upper quantile %:"
msgstr ""
-#: Code/Modules/otbExtractROIModuleGUI.cxx:47
-msgid "Start X"
+#: Code/Modules/otbViewerModuleGroup.cxx:431
+msgid "Lower quantile %:"
msgstr ""
-#: Code/Modules/otbExtractROIModuleGUI.cxx:50
-msgid "Start Y"
+#: Code/Modules/otbViewerModuleGroup.cxx:461
+msgid "Pixel description"
msgstr ""
-#: Code/Modules/otbExtractROIModuleGUI.cxx:63
-msgid "Input image size information"
+#: Code/Modules/otbViewerModuleGroup.cxx:549
+msgid "DEM Selection"
msgstr ""
-#: Code/Modules/otbSupervisedClassificationAppliGUI.cxx:101
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:162
-msgid "Save/Quit"
+#: Code/Modules/otbWriterModuleGUI.cxx:28
+msgid "Save dataset"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:49
-msgid "Addition"
+#: Code/Modules/otbKMeansModuleGUI.cxx:28
+msgid "KMeans setup"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:50
-msgid "Subtraction"
+#: Code/Modules/otbKMeansModuleGUI.cxx:51
+msgid "Sampling (0%)"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:51
-msgid "Multiplication"
+#: Code/Modules/otbKMeansModuleGUI.cxx:56
+msgid "Number of classes "
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:53
-msgid "Shift-Scale"
+#: Code/Modules/otbKMeansModuleGUI.cxx:59
+msgid "Number of samples"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:63
-msgid "First Image"
+#: Code/Modules/otbKMeansModuleGUI.cxx:70
+#, c-format
+msgid "0% of image (0 samples)"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:64
-msgid "Second Image"
+#: Code/Modules/otbKMeansModuleGUI.cxx:72
+msgid "Max. nb. of iterations "
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:78
-msgid "Band Math Module"
+#: Code/Modules/otbKMeansModuleGUI.cxx:76
+msgid "Convergence threshold "
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:84
-msgid "Operation type"
+#: Code/Application/Monteverdi.cxx:99
+msgid "File/Open dataset"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:85
-#: Code/Modules/otbAlgebraGroup.cxx:120
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:64
-msgid "Set the filter type"
+#: Code/Application/Monteverdi.cxx:100
+msgid "File/Save dataset"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:94
-msgid "Shift Scale Parameters : A*X + B"
+#: Code/Application/Monteverdi.cxx:101
+msgid "File/Save dataset (advanced)"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:100
-msgid "A :"
+#: Code/Application/Monteverdi.cxx:102
+msgid "File/Cache dataset"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:101
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:98
-msgid "Radius parameter for Frost image filter"
+#: Code/Application/Monteverdi.cxx:103
+msgid "File/Extract ROI from dataset"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:109
-msgid "B :"
+#: Code/Application/Monteverdi.cxx:104
+msgid "File/Concatenate images"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:110
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:105
-msgid "Deramp parameter for Frost image filter"
+#: Code/Application/Monteverdi.cxx:106
+msgid "Visualization/Viewer"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:119
-msgid "Choose Input : "
+#: Code/Application/Monteverdi.cxx:108
+msgid "Filtering/Band math"
msgstr ""
-#: Code/Modules/otbAlgebraGroup.cxx:131
-msgid "Save | Quit"
+#: Code/Application/Monteverdi.cxx:109
+msgid "Filtering/Threshold"
msgstr ""
-#: Code/Modules/otbWriterModuleGUI.cxx:28
-msgid "Save dataset"
+#: Code/Application/Monteverdi.cxx:110
+msgid "Filtering/Pansharpening"
msgstr ""
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:759
-msgid "Feature Parameters"
+#: Code/Application/Monteverdi.cxx:111
+msgid "Filtering/Mean shift clustering"
msgstr ""
-#: Code/Modules/otbFeatureExtractionViewGroup.cxx:1815
-msgid "Extract Feature"
+#: Code/Application/Monteverdi.cxx:112
+msgid "Filtering/Feature extraction"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:202
-#: Code/Modules/otbViewerModuleGroup.cxx:210
-msgid "Vector Datas Propreties"
+#: Code/Application/Monteverdi.cxx:113
+msgid "Filtering/Change detection"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:247
-msgid "Hide"
+#: Code/Application/Monteverdi.cxx:115
+msgid "SAR/Despeckle image"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:257
-msgid "Hide All"
+#: Code/Application/Monteverdi.cxx:116
+msgid "SAR/Compute intensity and log-intensity"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:273
-msgid "Display All"
+#: Code/Application/Monteverdi.cxx:118
+msgid "Learning/SVM classification"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:425
-msgid "Upper Quantile %:"
+#: Code/Application/Monteverdi.cxx:119
+msgid "Learning/KMeans clustering"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:431
-msgid "Lower Quantile %:"
+#: Code/Application/Monteverdi.cxx:121
+msgid "Geometry/Orthorectification"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:461
-msgid "PixelDescription"
+#: Code/Application/Monteverdi.cxx:122
+msgid "Geometry/Reproject image"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:471
-msgid "X:"
+#: Code/Application/Monteverdi.cxx:123
+msgid "Geometry/Superimpose two images"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:477
-msgid "Y:"
+#: Code/Application/Monteverdi.cxx:124
+msgid "Geometry/Homologous points extraction"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:496
-msgid "Quit "
+#: Code/Application/Monteverdi.cxx:125
+msgid "Geometry/GCP to sensor model"
msgstr ""
-#: Code/Modules/otbViewerModuleGroup.cxx:504
-msgid "Show"
+#: Code/Application/otbMonteverdiViewGUI.cxx:168
+msgid "File/Quit"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:35
-msgid "Frost"
+#: Code/Application/otbMonteverdiViewGUI.cxx:169
+msgid "?/Help"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:36
-msgid "Lee"
+#: Code/Application/otbMonteverdiViewGUI.cxx:182
+msgid "Datasets Browser"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:48
-msgid "SpeckleFilteringApplication"
+#: Code/Application/otbMonteverdiViewGUI.cxx:199
+msgid "Dataset"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:63
-msgid "Filter type"
+#: Code/Modules/HomologousPointExtraction/otbHomologousPointExtractionModule.cxx:46
+msgid "Fix image"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:74
-msgid "Lee filter parameters"
+#: Code/Modules/HomologousPointExtraction/otbHomologousPointExtractionModule.cxx:47
+msgid "Moving Image"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:83
-msgid "Radius parameter for Lee filter"
+#: Code/Modules/HomologousPointExtraction/otbHomologousPointExtractionModule.cxx:106
+msgid "Transformed moving image"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:91
-msgid "Frost filter parameters"
+#: Code/Modules/Algebra/otbAlgebraModule.cxx:211
+msgid "Result image"
msgstr ""
-#: Code/Modules/otbSpeckleFilteringViewGUI.cxx:104
-msgid "DeRamp"
+#: Code/Modules/GCPToSensorModel/otbGCPToSensorModelModule.cxx:100
+msgid "Input image with new keyword list"
msgstr ""
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:48
-#: Code/Modules/otbReaderModuleGUI.cxx:42
-msgid "Open dataset"
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:36
+msgid "Reference image for reprojection"
msgstr ""
-#: Code/Modules/otbSuperimpositionModuleGUI.cxx:87
-msgid "Elevation value "
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:38
+msgid "Image to reproject"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:78
-msgid "unsigned char"
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:159
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:182
+msgid "Image superimposable to reference"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:79
-msgid "short int"
+#: Code/Modules/Superimposition/otbSuperimpositionModule.cxx:193
+msgid "Choose the dataset dir..."
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:80
-msgid "int"
+#: Code/Modules/Caching/otbCachingModule.cxx:36
+#: Code/Modules/Writer/otbWriterModule.cxx:33
+#: Code/Modules/WriterMVC/otbWriterMVCModule.cxx:45
+msgid "Dataset to write"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:81
-msgid "float"
+#: Code/Modules/Caching/otbCachingModule.cxx:50
+msgid "Caching dataset (0%)"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:82
-msgid "double"
+#: Code/Modules/Caching/otbCachingModule.cxx:82
+msgid "Caching dataset"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:83
-msgid "unsigned short int"
+#: Code/Modules/Caching/otbCachingModule.cxx:176
+msgid "Cached data from"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:84
-msgid "unsigned int"
+#: Code/Modules/Writer/otbWriterModule.cxx:72
+msgid "Choose the dataset file..."
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:146
-msgid "Writer application"
+#: Code/Modules/Writer/otbWriterModule.cxx:96
+msgid "Writing dataset"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:177
-msgid "Output pixel type"
+#: Code/Modules/Reader/otbReaderModule.cxx:41
+msgid "Unknown"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:185
-msgid "Use scaling"
+#: Code/Modules/Reader/otbReaderModule.cxx:42
+msgid "Optical image"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:200
-msgid "Feature image list"
+#: Code/Modules/Reader/otbReaderModule.cxx:43
+msgid "SAR image"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:234
-msgid "Selected output channels"
+#: Code/Modules/Reader/otbReaderModule.cxx:44
+msgid "Vector"
msgstr ""
-#: Code/Modules/otbWriterViewGroup.cxx:311
-msgid "Band"
+#: Code/Modules/Orthorectification/otbOrthorectificationModule.cxx:34
+msgid "Image to apply OrthoRectification on"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:21
-msgid "Translation"
+#: Code/Modules/Orthorectification/otbOrthorectificationModule.cxx:84
+msgid "Orthorectified image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:22
-msgid "Affine"
+#: Code/Modules/Projection/otbProjectionModule.cxx:39
+msgid "Image to project"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:23
-msgid "Similarity2D"
+#: Code/Modules/Projection/otbProjectionModule.cxx:76
+msgid "Projected image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:98
-msgid "Homologous Point Extraction"
+#: Code/Modules/ExtractROI/otbExtractROIModule.cxx:31
+msgid "Image to read"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:109
-msgid "Transformation"
+#: Code/Modules/ExtractROI/otbExtractROIModule.cxx:213
+#: Code/Modules/ExtractROI/otbExtractROIModule.cxx:263
+msgid "Image extracted"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:119
-msgid "Transform Value"
+#: Code/Modules/Concatenate/otbConcatenateModule.cxx:30
+msgid "Image to concatenate"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:126
-msgid "Point Errors"
+#: Code/Modules/Concatenate/otbConcatenateModule.cxx:75
+msgid "Image concatenated"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:127
-msgid "Euclidean distances"
+#: Code/Modules/PanSharpening/otbPanSharpeningModule.cxx:31
+msgid "Panchromatic image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:138
-msgid "Mean Square Error:"
+#: Code/Modules/PanSharpening/otbPanSharpeningModule.cxx:32
+msgid "Multispectral image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:146
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:154
-msgid "Pixel Values"
+#: Code/Modules/PanSharpening/otbPanSharpeningModule.cxx:74
+msgid "Pansharpened image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:180
-msgid "Full fix"
+#: Code/Modules/Classification/otbSupervisedClassificationModule.cxx:34
+msgid "Image to apply Classification on"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:188
-msgid "Scroll fix"
+#: Code/Modules/Classification/otbSupervisedClassificationModule.cxx:88
+msgid "Classified image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:196
-msgid "Zoom fix"
+#: Code/Modules/Classification/otbSupervisedClassificationModule.cxx:114
+msgid "Vectors of classified image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:207
-msgid "Point List"
+#: Code/Modules/FeatureExtraction/otbFeatureExtractionModule.cxx:45
+msgid "Image to apply feature extraction"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:208
-msgid "Contains selected points"
+#: Code/Modules/FeatureExtraction/otbFeatureExtractionModule.cxx:88
+msgid "Feature image extraction"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:241
-msgid "Focus Point"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:38
+msgid "Image to cluster"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:242
-msgid "Focus on the selected point couple."
+#: Code/Modules/KMeans/otbKMeansModule.cxx:117
+msgid "Generating decision tree"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:252
-msgid "Evaluate"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:253
+msgid "Tree generated"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:253
-msgid "Quit Application (shortcut : Enter)"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:262
+msgid "Optimization ended"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:267
-msgid "X1"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:289
+msgid "The labeled image from kmeans classification"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:275
-msgid "Y1"
+#: Code/Modules/KMeans/otbKMeansModule.cxx:291
+msgid "The clustered image from kmeans classification"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:283
-msgid "X2"
+#: Code/Modules/MeanShift/otbMeanShiftModuleView.cxx:108
+msgid "Select an input image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:292
-msgid "Y2"
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:45
+msgid "Image to apply MeanShift on"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:302
-msgid "Clear Feature List (shortcut KP_Enter)"
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:107
+msgid "Result of the MeanShift filtering"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:313
-msgid "Focus Click"
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:113
+msgid "Result of the MeanShift clustering"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:314
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:326
-msgid "Focus on the last clicked point couple."
+#: Code/Modules/MeanShift/otbMeanShiftModule.cxx:119
+msgid "Result of the MeanShift labeling"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:325
-msgid "Guess"
+#: Code/Modules/Threshold/otbThresholdModule.cxx:104
+msgid "Image to threshold"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:343
-msgid "Full moving"
+#: Code/Modules/Threshold/otbThresholdModule.cxx:131
+#: Code/Modules/Viewer/otbViewerModule.cxx:251
+msgid "Generating QuickLook ..."
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:351
-msgid "Scroll moving"
+#: Code/Modules/Threshold/otbThresholdModule.cxx:303
+#: Code/Modules/Threshold/otbThresholdModule.cxx:307
+msgid "Thresholded image"
msgstr ""
-#: Code/Modules/otbHomologousPointExtractionViewGroup.cxx:359
-msgid "Zoom moving"
+#: Code/Modules/SARIntensity/otbSarIntensityModule.cxx:31
+msgid "Complex image to extract intensity from"
msgstr ""
-#: Code/Modules/otbReaderModuleGUI.cxx:58
-msgid "Open"
+#: Code/Modules/SARIntensity/otbSarIntensityModule.cxx:72
+msgid "Intensity of the complex image"
msgstr ""
-#: Code/Modules/otbReaderModuleGUI.cxx:82
-msgid "Data type "
+#: Code/Modules/SARIntensity/otbSarIntensityModule.cxx:73
+msgid "Log10-intensity of the complex image"
msgstr ""
-#: Code/Modules/otbReaderModuleGUI.cxx:91
-msgid "Name "
+#: Code/Modules/ChangeDetection/otbChangeDetectionModule.cxx:35
+msgid "Left image"
msgstr ""
-#: Code/Modules/otbOrthorectificationGUI.cxx:353
-msgid "otbOrthorectification"
+#: Code/Modules/ChangeDetection/otbChangeDetectionModule.cxx:36
+msgid "Right image"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:56
-msgid "MeanShift Module"
+#: Code/Modules/ChangeDetection/otbChangeDetectionModule.cxx:102
+msgid "Change image Label"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:87
-msgid "Set the MeanShift spatial radius"
+#: Code/Modules/Viewer/otbViewerModule.cxx:74
+msgid "Pixels"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:102
-msgid "Spectral Radius"
+#: Code/Modules/Viewer/otbViewerModule.cxx:75
+msgid "Frequency"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:103
-msgid "Set the MeanShift spectral radius"
+#: Code/Modules/Viewer/otbViewerModule.cxx:173
+msgid "Image to visualize"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:117
-msgid "Min Region Size"
+#: Code/Modules/Viewer/otbViewerModule.cxx:175
+msgid "VectorData to visualize"
msgstr ""
-#: Code/Modules/otbMeanShiftModuleViewGroup.cxx:118
-msgid "Set the MeanShift minimum region size"
+#: Code/Modules/Viewer/otbViewerModule.cxx:600
+msgid "Changed class color"
msgstr ""
-#: Code/Modules/otbCachingModuleGUI.cxx:7
-msgid "Caching Data"
+#: Code/Modules/Speckle/otbSpeckleFilteringModule.cxx:39
+msgid "Image to apply speckle filtering on"
msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:168
-msgid "SENSOR MODEL"
+#: Code/Modules/Speckle/otbSpeckleFilteringModule.cxx:75
+msgid "Speckle filtered image"
msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:435
-msgid "Splines"
+#: StarterKit/otbExampleModule.cxx:30
+msgid "This is my input"
msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:440
-msgid "otbProjection"
+#: StarterKit/otbExampleModule.cxx:36
+msgid "This is my optional input"
msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:471
-msgid "Input Image"
+#: StarterKit/otbExampleModule.cxx:39
+msgid "This is my multiple input"
msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:519
-msgid "Input Cartographic Coordinates"
+#: StarterKit/otbExampleModule.cxx:126
+msgid "This is my image output"
msgstr ""
-#: Code/Modules/otbProjectionGroup.cxx:590
-msgid "Input Map Projection"
+#: StarterKit/otbExampleModule.cxx:131
+msgid "These are my pointset outputs"
msgstr ""
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index fa2b1ef89ee75621ffe5a43a8ed35b3f56d66b84..b7b962b4f9aed2fa4769934f0f5e63078301b2df 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -6,11 +6,13 @@ PROJECT(OTBTesting)
# normal OTB build or as a stand-alone project. This design is useful
# for testing the installation tree of OTB.
-MAKE_DIRECTORY(${OTBTesting_BINARY_DIR}/Temporary)
+FILE(MAKE_DIRECTORY ${OTBTesting_BINARY_DIR}/Temporary)
IF(OTB_BINARY_DIR)
# We are building inside the tree.
- SUBDIRS(Code Fa Utilities)
+ ADD_SUBDIRECTORY(Code)
+ ADD_SUBDIRECTORY(Fa)
+ ADD_SUBDIRECTORY(Utilities)
ELSE(OTB_BINARY_DIR)
# We are building as a stand-alone project.
SET(LIBRARY_OUTPUT_PATH ${OTBTesting_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
@@ -41,8 +43,7 @@ ELSE(OTB_BINARY_DIR)
FIND_PACKAGE(OTB)
IF(OTB_FOUND)
INCLUDE(${OTB_USE_FILE})
-# SUBDIRS(Code Fa Utilities)
- SUBDIRS(Code)
+ ADD_SUBDIRECTORY(Code)
ELSE(OTB_FOUND)
MESSAGE("OTB not found. Please set OTB_DIR")
ENDIF(OTB_FOUND)
diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt
index 9033d6882932b0c2390480b0118a50bfce86821b..1ddf5486511cec3cb1c42e15e030ef75046e7baa 100644
--- a/Testing/Code/BasicFilters/CMakeLists.txt
+++ b/Testing/Code/BasicFilters/CMakeLists.txt
@@ -37,7 +37,7 @@ ADD_TEST(bfTvFiltreLee1CanalPoupees ${BASICFILTERS_TESTS1}
--compare-image ${EPSILON_7} ${BASELINE}/bfFiltreLee_05_05_04.tif
${TEMP}/bfFiltreLee_05_05_04.tif
otbLeeFilter
- ${INPUTDATA}/poupees_1canal.c1.hdr
+ ${INPUTDATA}/GomaAvant.png #poupees_1canal.c1.hdr
${TEMP}/bfFiltreLee_05_05_04.tif
05 05 4.0)
@@ -45,7 +45,7 @@ ADD_TEST(bfTvFiltreLee ${BASICFILTERS_TESTS1}
--compare-image ${EPSILON_7} ${BASELINE}/bfFiltreLee_05_05_12.tif
${TEMP}/bfFiltreLee_05_05_12.tif
otbLeeFilter
- ${INPUTDATA}/poupees.hdr
+ ${INPUTDATA}/GomaAvant.png #poupees.hdr
${TEMP}/bfFiltreLee_05_05_12.tif
05 05 12.0)
@@ -57,7 +57,7 @@ ADD_TEST(bfTvFiltreFrost ${BASICFILTERS_TESTS1}
--compare-image ${EPSILON_7} ${BASELINE}/bfFiltreFrost_poupees_05_05_01.tif
${TEMP}/bfFiltreFrost_poupees_05_05_01.tif
otbFrostFilter
- ${INPUTDATA}/poupees.hdr
+ ${INPUTDATA}/GomaAvant.png #poupees.hdr
${TEMP}/bfFiltreFrost_poupees_05_05_01.tif
05 05 0.1)
@@ -243,7 +243,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
IF(OTB_DATA_USE_LARGEINPUT)
ADD_TEST(bfTvImportGeoInformationImageFilterWithKeywordList ${BASICFILTERS_TESTS3}
--compare-ascii ${EPSILON_7}
- ${BASELINE_FILES}/ioOSSIMImageQuickbirdMetaDataReader.txt
+ ${BASELINE_FILES}/bfTvImportGeoInformationKeywordListOutput.txt
${TEMP}/bfTvImportGeoInformationKeywordListOutput.txt
otbImportGeoInformationImageFilterWithKeywordList
${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
index a771c78e31a4d9f5297a94f2b99e660f59162e41..b264f1d11cb56e85fd752e0a7de9ee8595e42ebd 100644
--- a/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
+++ b/Testing/Code/BasicFilters/otbBasicFiltersTests1.cxx
@@ -29,7 +29,6 @@ void RegisterTests()
{
REGISTER_TEST(otbLeeFilter);
REGISTER_TEST(otbFrostFilterNew);
- // REGISTER_TEST(otbFrostFilterTest);
REGISTER_TEST(otbFrostFilter);
REGISTER_TEST(otbImageToPointSetFilterTest);
REGISTER_TEST(otbOpeningClosingMorphologicalFilterNew);
diff --git a/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx b/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx
index 79558f7b18f4116ac85ff13bea5aa7e714a88658..49d87e44d2b6ef1c3fa2bc43b95fe67bda512b8c 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbBinaryImageDensityFunction.h"
diff --git a/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx b/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx
index 71e776563fe4d77226753d00c684d13d3703cb48..a29d352810fb8e0d23392ba881cd596dafe08527 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx
index 174e18cdf640feaf6b2289098b1aa05e5d936580..414967c9a83fa3098269c2fe5c4a57e5a586c3be 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx
index 9edc8d0214ffd09f50a8fa78378cf554321b061d..abafd3ffe68daf3025b30e992a74bb9b9aeb51e2 100644
--- a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx
index 32b99f06a0ce14995b87282a58f8b0e3f035047b..b6d952d824ebcd22c88a4841d2888deb5e498cb5 100644
--- a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom Bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx b/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx
index efe8c4799a2d004411d29659b46511498e884378..d179afed26f9a9d5f96dabbcdb3af8493054a230 100644
--- a/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx
index 3823b9d41f8b89e2d0eebeee56f83793e4e7b688..e3554c2b338a6541e6c9333af213bf4950c767ed 100644
--- a/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx
index e8d19692d77c5f5ac32a58116b038514651953b7..24bb4523556205048797040a1df05bee61643c25 100644
--- a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx
index 017e1aa92883715242f73b91d0c401d8b0814226..44d5ace38ee9208ea1886483a332772cfd624728 100644
--- a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImage.h"
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
index 4737c8a265d6f89f80c5f9877a485ba0d1b84c19..8154f35b7e5ba47ed09af5deccb56ae85762cc66 100644
--- a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
+++ b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.cxx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom Bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
index 5b148b430ab792424aff07c5ae2026844051c5ea..055558ddd4697c7121109904f72c73c3700a8448 100644
--- a/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
+++ b/Testing/Code/BasicFilters/otbEuclideanDistanceWithMissingValueNew.cxx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom Bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx
index c2a6640c6d9ec65619ae90752fd27e617f7370e7..37dd3d573f9c3c9d6c4af7c54aade2e0cc648f46 100644
--- a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx
+++ b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom Bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx
index e0b6a147c7ff1697e31ff29358ca9aaba7540bbd..94910f45d5df76c23f60e25b2fa5bbeb5a03c546 100644
--- a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx
+++ b/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom; Telecom Bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx
index b623c4ce737a11983fae74cb4a0dc35e511298fa..9388ee68ac65ac5ad210b3f7b04d6dab29ff8d98 100644
--- a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx
index a4b776c584d9889dccabdb08c9c31666a7c6628b..afbdc65d11ef8aeb8303520b8577bf9e6ac59d91 100644
--- a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx b/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx
index 55fa08a72c66b0896cfeeef65ef62077c9c675b4..b20d36b08c302065a69ec38790d4d0d616b4d0b3 100644
--- a/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx b/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
index 7265b24aebb0d7baa2de664be7bf8b4205f49827..09d41863f1dabc69be4cf87e6a317e318e0e4465 100644
--- a/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx
index 3547dbfaf07a2e5a730d4481ee0c6d5be1e3eb32..1087aa3759c4d7a87f820f0d492f5b5558914ddd 100644
--- a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx
index 430241e6e832f6ad094ae01c2c655652135bc0c2..4b8bf1f97b3f4ebbd6bc19e299d9372718edf389 100644
--- a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingShrinkImageFilter.cxx
index caa7350942936a1bef0fe381f0a6cd8014621e6c..cbb7b726ef48d662d93fbc7db2164b4f9149ca15 100644
--- a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingShrinkImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageFileReader.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx
index 5059da823cd7412c748162499c92c1d9f57e44b6..fcfbddb0f140bb8291a531651137274d72552594 100644
--- a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVectorImage.h"
diff --git a/Testing/Code/BasicFilters/otbVarianceImageFilter.cxx b/Testing/Code/BasicFilters/otbVarianceImageFilter.cxx
index b91b855a5e984258bdef69aa1dac4f2b7c2385f2..c45629f8a53bff0ba2396875dd585d390e7b9738 100644
--- a/Testing/Code/BasicFilters/otbVarianceImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVarianceImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVarianceImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx
index 076ed4dfab8cb655c13b2b36363be1fd5cb075ac..ec34bf2c1b024465eae75c9ec0b9b777be539f1f 100644
--- a/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVarianceImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.cxx b/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.cxx
index cb21d88f139b79bda617b5a9ef4697091732cfb1..fa41dd8bd08541a78bc37aed2daf57256902ddd5 100644
--- a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVectorImageToAmplitudeImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx
index 251d4b474a4869f83d5d3312992b6372643ed7e2..b93d8244b66198ea2954ae0fec24eaa33585dacb 100644
--- a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVectorImageToAmplitudeImageFilter.h"
diff --git a/Testing/Code/CMakeLists.txt b/Testing/Code/CMakeLists.txt
index c8cff58428b4b0f2d97d0c4e664c12d1cd552c98..09be4bd053bf4678f7d874dd2f278f2fa2325c86 100644
--- a/Testing/Code/CMakeLists.txt
+++ b/Testing/Code/CMakeLists.txt
@@ -1,28 +1,28 @@
# $Id$
-SUBDIRS(
-Common
-IO
-BasicFilters
-FeatureExtraction
-ChangeDetection
-Learning
-MultiScale
-DisparityMap
-SpatialReasoning
-Projections
-Radiometry
-Fusion
-Markov
-SARPolarimetry
-TestSystem
-)
+ADD_SUBDIRECTORY(Common)
+ADD_SUBDIRECTORY(IO)
+ADD_SUBDIRECTORY(BasicFilters)
+ADD_SUBDIRECTORY(FeatureExtraction)
+ADD_SUBDIRECTORY(ChangeDetection)
+ADD_SUBDIRECTORY(Learning)
+ADD_SUBDIRECTORY(MultiScale)
+ADD_SUBDIRECTORY(DisparityMap)
+ADD_SUBDIRECTORY(SpatialReasoning)
+ADD_SUBDIRECTORY(Projections)
+ADD_SUBDIRECTORY(Radiometry)
+ADD_SUBDIRECTORY(Fusion)
+ADD_SUBDIRECTORY(Markov)
+ADD_SUBDIRECTORY(SARPolarimetry)
+ADD_SUBDIRECTORY(TestSystem)
IF(OTB_USE_VISU_GUI)
- SUBDIRS(Visu Gui Visualization)
+ ADD_SUBDIRECTORY(Visu)
+ ADD_SUBDIRECTORY(Gui)
+ ADD_SUBDIRECTORY(Visualization)
ENDIF(OTB_USE_VISU_GUI)
IF(OTB_USE_PQXX)
- SUBDIRS(GeospatialAnalysis)
+ ADD_SUBDIRECTORY(GeospatialAnalysis)
ENDIF(OTB_USE_PQXX)
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 9e15a9592028444dd8bace7ca6d5493a19142660..f87f25590f8d63bfcbaf7ab1184b522444aabf9e 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -140,6 +140,16 @@ ADD_TEST(coTvExtractROI_RGB2 ${COMMON_TESTS2}
${TEMP}/coExtractROI_RGB_poupees_302_1_134_330.jpg
303 2 134 330 )
+ADD_TEST(coTvExtractROI_QB ${COMMON_TESTS2}
+ --compare-image ${NOTOL}
+ ${BASELINE}/coTvExtractROI_QB.png
+ ${TEMP}/coTvExtractROI_QB.png
+ otbExtractROI_RGB
+ ${INPUTDATA}/QB_Suburb.png
+ ${TEMP}/coTvExtractROI_QB.png
+ 0 0 70 70
+ )
+
# ------- otb::VectorDataExtractROI ------------------------------
ADD_TEST(coTuVectorDataExtractROINew ${COMMON_TESTS2}
otbVectorDataExtractROINew)
@@ -207,7 +217,6 @@ ADD_TEST(coTvMultiChannelROI_RGB2NG_PNG1 ${COMMON_TESTS2}
${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_1.png
-startX 300 -startY 10 -sizeX 250 -sizeY 50 -channels 1 )
-
ADD_TEST(coTvMultiChannelROI_RGB2NG_PNG2 ${COMMON_TESTS2}
--compare-image ${NOTOL} ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_2.png
${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_300_10_250_50_channel_2.png
@@ -259,6 +268,23 @@ ADD_TEST(coTvTestMultiExtractMultiUpdate ${COMMON_TESTS2}
3 # last channel
)
+ADD_TEST(coTvMultiChannelExtractROI_Romania ${COMMON_TESTS2}
+--compare-image ${NOTOL}
+ ${BASELINE}/coTvMultiChannelExtractROI_Romania.tif
+ ${TEMP}/coTvMultiChannelExtractROI_Romania.tif
+ otbTestMultiExtractMultiUpdate
+ ${INPUTDATA}/Romania_Extract.tif
+ ${TEMP}/coTvMultiChannelExtractROI_Romania.tif
+ 0 # startX
+ 0 # startY
+ 100 #sizeX
+ 100 #sizeY
+ 2 # first channel
+ 3 # last channel
+)
+
+
+
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbCommonTests3 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Testing/Code/Common/otbConfigurationTest.cxx b/Testing/Code/Common/otbConfigurationTest.cxx
index 7931da967c9cc8587e0ae9f9f3d85844a88bc559..1009b21cefe7d75e271b4c0a7f91df5a4713f3e5 100644
--- a/Testing/Code/Common/otbConfigurationTest.cxx
+++ b/Testing/Code/Common/otbConfigurationTest.cxx
@@ -33,7 +33,7 @@ int otbConfigurationTest(int argc, char * argv[])
std::cout << conf << std::endl;
- if (lang != "fr_FR.UTF-8" || lang != "en_EN.UTF-8")
+ if( lang.compare("fr_FR.UTF-8") != 0 && lang.compare("en_EN.UTF-8") !=0 )
{
std::cout << "Locale language " << lang << std::endl;
return EXIT_FAILURE;
diff --git a/Testing/Code/Common/otbMirrorBoundaryConditionTest.cxx b/Testing/Code/Common/otbMirrorBoundaryConditionTest.cxx
index ee2f9ea3a72696bd5e7d4c3577dbfa1eaf37e317..00dee11dff5341460823210bbe75a1c8f6bdcdd8 100644
--- a/Testing/Code/Common/otbMirrorBoundaryConditionTest.cxx
+++ b/Testing/Code/Common/otbMirrorBoundaryConditionTest.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMirrorBoundaryCondition.h"
diff --git a/Testing/Code/Common/otbVectorDataToImageFilterWorld.cxx b/Testing/Code/Common/otbVectorDataToImageFilterWorld.cxx
index 463358a6c8e0137af2116c162070c50eed540947..341d7585dfa1040759418a22e4c3b946a4bd6c3e 100644
--- a/Testing/Code/Common/otbVectorDataToImageFilterWorld.cxx
+++ b/Testing/Code/Common/otbVectorDataToImageFilterWorld.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt
index 98375e3ee3170a4b2751c211bc77fdc35e986373..5e10af3db0492cc32fa4892dc1b0405aafdafb4f 100644
--- a/Testing/Code/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Code/FeatureExtraction/CMakeLists.txt
@@ -300,6 +300,14 @@ ADD_TEST(feTvHarrisPoupee ${FEATUREEXTRACTION_TESTS4}
${TEMP}/feHarris_poupees.png
1.0 1.0 1.0)
+ADD_TEST(feTvHarrisImageQB ${FEATUREEXTRACTION_TESTS4}
+ --compare-image ${NOTOL} ${BASELINE}/feHarrisImage_QB.png
+ ${TEMP}/feHarrisImage_QB.png
+ otbHarrisImage
+ ${INPUTDATA}/QB_Suburb.png
+ ${TEMP}/feHarrisImage_QB.png
+ 1.0 1.0 1.0)
+
ADD_TEST(feTvMultiplyByScalarImage ${FEATUREEXTRACTION_TESTS4}
otbMultiplyByScalarImageFilterTest)
@@ -994,7 +1002,7 @@ ADD_TEST(feTvImageToFastSIFTKeyPointSetFilterSceneOutputDescriptorAscii ${FEATUR
)
ADD_TEST(feTvImageToFastSIFTKeyPointSetFilterSceneOutputInterestPointAscii ${FEATUREEXTRACTION_TESTS10}
---compare-ascii ${EPSILON_3}
+--ignore-order --compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx
index a6d8ebdc22c80dc957599ecdf4bdd61ffa3fa801..9c691fce60946524ff2a2c2cda14857da7d8acf2 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSiftFastImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
index fc95f06d9d27e3a4ba6423c0dc4fb2c08d886363..bb148bef7b638fc34400d58e18c2946d22978f66 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSiftFastImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
index 13b9df50d5e215b02e73fb09795935956b74aec5..c3484e683f5c629b32908391e24b436ea82cb3be 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSiftFastImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
index ffc58640da93d104be4776678d85a3cb507f6d4c..68154a444c1f855d6fa38fa6b82180897666cd57 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterNew.cxx
index 6493e918dc6c7b8014255f51790b451f008ab6a8..a6ee560bc5179668e2f9939ab6acda82c8dabe72 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageToSIFTKeyPointSetFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
index d4f8f19b45d944e516b78ad0c863365ac8a9c171..32c7ab296030b2f35140017728b4665357872175 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageToSIFTKeyPointSetFilter.h"
@@ -67,6 +67,7 @@ int otbImageToSIFTKeyPointSetFilterOutputAscii(int argc, char * argv[])
PointsIteratorType pIt = filter->GetOutput()->GetPoints()->Begin();
if (filter->GetOutput()->GetPointData() == NULL)
{
+ std::cerr << "No sift point found!" << std::endl;
return EXIT_FAILURE;//Avoid the subsequent segfault, but need to check if that what the test want to do
}
PointDataIteratorType pDataIt = filter->GetOutput()->GetPointData()->Begin();
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
index 37f9770e9ad0f07943ba1c8c42392db5649607c8..cdecd470e80c26338a28d268b185878406435293 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageToSIFTKeyPointSetFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx
index f3f4723183ca188de662a75a534b1253e66a071a..36e356c6c57bc8436a55a3b70e4314553cb6def9 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageToSIFTKeyPointSetFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
index 29b2cc142377bf38026ed3ac3896234b3b1f0ec6..d2bddeadc888e63e3f6f51e6eacea02c884ab9f7 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageToSIFTKeyPointSetFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
index 8caa1126545d938e142995c7b9fccdc58f251d2d..53d94003e76f6ef9775830e4d91d5c7f5995e116 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageToSURFKeyPointSetFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
index f6b517289e930b801b3f2e618236426ee60f6b27..4d97f09b413fd29a41cc213cbf4f49d0cb624a85 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
-See CSCopyright.txt for details.
+ See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageToSURFKeyPointSetFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilterNew.cxx b/Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilterNew.cxx
index 5cc04776d532e37e48596f34301cea23e3f8d8aa..e39b256563685691f458f6a3fabec978e3cb32a8 100644
--- a/Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkPointSet.h"
diff --git a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx
index ac63d1776671f18e77712260c7ca4e9c19bceabc..d070aabddf1850f43c5394af3e40928680b3b62b 100644
--- a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
index c29eb4d1845a96d23e7bcbea110e2c7c5ff30633..0439c4e892399ebdb4025c6965d261b67206c846 100644
--- a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 8b04f67289c500a0934e5fed29269b93426b4050..8a56a32f5d2e4b7b29a9eb507cd34d586adfd817 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -680,33 +680,31 @@ ADD_TEST(ioTvImageFileReaderRGB_Gdal_SPOT5TIF2PNG ${IO_TESTS7}
# ${INPUTDATA}/poupeesBIL
# ${TEMP}/ioImageFileReaderRGB_SPOT5TIF2PNG_poupeesBIL.png )
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTests8 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
# ------- otb::ImageFileWriter pour CAI ------------------------------
# Niveau de Gris
-ADD_TEST(ioTvImageFileWriterPNG2PNG ${IO_TESTS8}
+ADD_TEST(ioTvImageFileWriterPNG2PNG ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/cthead1.png
${TEMP}/ioImageFileWriterPNG2PNG_cthead1.png
otbImageFileWriterTest
${INPUTDATA}/cthead1.png
${TEMP}/ioImageFileWriterPNG2PNG_cthead1.png )
-ADD_TEST(ioTvImageFileWriterPNG2BSQ ${IO_TESTS8}
+ADD_TEST(ioTvImageFileWriterPNG2BSQ ${IO_TESTS7}
otbImageFileWriterTest
${INPUTDATA}/cthead1.png
${TEMP}/ioImageFileWriterPNG2BSQ_cthead1.hdr )
-ADD_TEST(ioTvImageFileReaderENVI2PNG ${IO_TESTS8}
+ADD_TEST(ioTvImageFileReaderENVI2PNG ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/cthead1.png
${TEMP}/ioImageFileWriterPNG2BSQ_cthead1_2.png
otbImageFileReaderTest
${TEMP}/ioImageFileWriterPNG2BSQ_cthead1.hdr
${TEMP}/ioImageFileWriterPNG2BSQ_cthead1_2.png )
-ADD_TEST(ioTvImageFileReaderPDS2TIFF ${IO_TESTS8}
+ADD_TEST(ioTvImageFileReaderPDS2TIFF ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/pdsImage.img
${TEMP}/ioTvImageFileReaderPDS2TIFF.tif
otbImageFileReaderTest
@@ -714,19 +712,19 @@ ADD_TEST(ioTvImageFileReaderPDS2TIFF ${IO_TESTS8}
${TEMP}/ioTvImageFileReaderPDS2TIFF.tif)
# RGB
-ADD_TEST(ioTvImageFileWriterRGB_PNG2PNG ${IO_TESTS8}
+ADD_TEST(ioTvImageFileWriterRGB_PNG2PNG ${IO_TESTS7}
--compare-image ${EPSILON_9} ${BASELINE}/ioImageFileWriterRGB_PNG2PNG.png
${TEMP}/ioImageFileWriterRGB_PNG2PNG.png
otbImageFileWriterRGBTest
${INPUTDATA}/couleurs_extrait.png
${TEMP}/ioImageFileWriterRGB_PNG2PNG.png )
-ADD_TEST(ioTvImageFileWriterRGB_PNG2BSQ ${IO_TESTS8}
+ADD_TEST(ioTvImageFileWriterRGB_PNG2BSQ ${IO_TESTS7}
otbImageFileWriterRGBTest
${INPUTDATA}/couleurs_extrait.png
${TEMP}/ioImageFileWriterRGB_PNG2BSQ.hdr )
-ADD_TEST(ioTvImageFileReaderRGB_BSQ2PNG_2 ${IO_TESTS8}
+ADD_TEST(ioTvImageFileReaderRGB_BSQ2PNG_2 ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/couleurs_extrait.png
${TEMP}/ioImageFileReaderRGB_PNG2BSQ_2.png
otbImageFileReaderRGBTest
@@ -734,7 +732,7 @@ ADD_TEST(ioTvImageFileReaderRGB_BSQ2PNG_2 ${IO_TESTS8}
${TEMP}/ioImageFileReaderRGB_PNG2BSQ_2.png )
# WRITER GDAL
-ADD_TEST(ioTvGDALImageFileWriterTIF2TIF ${IO_TESTS8}
+ADD_TEST(ioTvGDALImageFileWriterTIF2TIF ${IO_TESTS7}
otbImageFileWriterRGBTest
${INPUTDATA}/poupeesTIF/IMAGERY.TIF
${TEMP}/poupees.tiff )
@@ -744,26 +742,26 @@ ADD_TEST(ioTvGDALImageFileWriterTIF2TIF ${IO_TESTS8}
# ------- otb::ImageFileWriter pour GDAL ------------------------------
-ADD_TEST(ioTvImageReaderWriterRgbPNG2PNG ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbPNG2PNG ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees.png
${TEMP}/ioImageReaderWriterRgbPNG2PNG_poupees.png
otbImageFileReaderRGBTest
${INPUTDATA}/poupees.png
${TEMP}/ioImageReaderWriterRgbPNG2PNG_poupees.png )
-ADD_TEST(ioTvImageReaderWriterRgbPNG2TIF ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbPNG2TIF ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees.png
${TEMP}/ioImageReaderWriterRgbPNG2TIF_poupees.tif
otbImageFileReaderRGBTest
${INPUTDATA}/poupees.png
${TEMP}/ioImageReaderWriterRgbPNG2TIF_poupees.tif )
-ADD_TEST(ioTvImageReaderWriterRgbPNG2ENVI ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbPNG2ENVI ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees.png
${TEMP}/ioImageReaderWriterRgbPNG2ENVI_poupees
otbImageFileReaderRGBTest
${INPUTDATA}/poupees.png
${TEMP}/ioImageReaderWriterRgbPNG2ENVI_poupees.hdr )
-ADD_TEST(ioTvImageReaderWriterRgbPNG2JPEG ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbPNG2JPEG ${IO_TESTS7}
# THOMAS (provisoire) : Images OK mais erreur au DIFF ITK !!!
# --compare-image ${EPSILON_9} ${INPUTDATA}/poupees.png
# ${TEMP}/ioImageReaderWriterRgbPNG2JPEG_poupees.jpg
@@ -771,31 +769,58 @@ ADD_TEST(ioTvImageReaderWriterRgbPNG2JPEG ${IO_TESTS8}
${INPUTDATA}/poupees.png
${TEMP}/ioImageReaderWriterRgbPNG2JPEG_poupees.jpg )
-ADD_TEST(ioTvImageReaderWriterRgbTIF2PNG ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbTIF2PNG ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees.tif
${TEMP}/ioImageReaderWriterRgbTIF2PNG_poupees.png
otbImageFileReaderRGBTest
${INPUTDATA}/poupees.tif
${TEMP}/ioImageReaderWriterRgbTIF2PNG_poupees.png )
-ADD_TEST(ioTvImageReaderWriterRgbENVI2PNG ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbENVI2PNG ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees
${TEMP}/ioImageReaderWriterRgbENVI2PNG_poupees.png
otbImageFileReaderRGBTest
${INPUTDATA}/poupees
${TEMP}/ioImageReaderWriterRgbENVI2PNG_poupees.png )
-ADD_TEST(ioTvImageReaderWriterRgbJPEG2PNG ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbJPEG2PNG ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/couleurs.jpg
${TEMP}/ioImageReaderWriterRgbJPEG2PNG_couleurs.png
otbImageFileReaderRGBTest
${INPUTDATA}/couleurs.jpg
${TEMP}/ioImageReaderWriterRgbJPEG2PNG_couleurs.png )
-ADD_TEST(ioTvImageReaderWriterRgbJPEG2TIF ${IO_TESTS8}
+ADD_TEST(ioTvImageReaderWriterRgbJPEG2TIF ${IO_TESTS7}
--compare-image ${EPSILON_9} ${INPUTDATA}/couleurs.jpg
${TEMP}/ioImageReaderWriterRgbJPEG2TIF_couleurs.tif
otbImageFileReaderRGBTest
${INPUTDATA}/couleurs.jpg
${TEMP}/ioImageReaderWriterRgbJPEG2TIF_couleurs.tif )
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTests8 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+IF( OTB_USE_CURL )
+
+ADD_TEST(coTvCoordinateToNameTest ${IO_TESTS8}
+ --compare-ascii ${NOTOL}
+ ${BASELINE}/CoordinateToNameTest.txt
+ ${TEMP}/CoordinateToNameTest.txt
+ otbCoordinateToNameTest
+ 103.78 1.29
+ ${TEMP}/CoordinateToNameTest.txt
+)
+
+#this test intentionaly uses the same baseline as the previous one
+ADD_TEST(coTvCoordinateToNameMultithreadTest ${IO_TESTS8}
+ --compare-ascii ${NOTOL}
+ ${BASELINE}/CoordinateToNameTest.txt
+ ${TEMP}/CoordinateToNameMultithreadTest.txt
+ otbCoordinateToNameTest
+ 103.78 1.29
+ ${TEMP}/CoordinateToNameMultithreadTest.txt
+ 1
+)
+
+ENDIF( OTB_USE_CURL )
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ COMMON_TESTS2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1593,6 +1618,7 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
ENDIF(OTB_COMPILE_JPEG2000)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS14 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1634,6 +1660,7 @@ ADD_TEST(ioTvWritingComplexDataWithComplexImage ${IO_TESTS14}
)
ENDIF(OTB_DATA_USE_LARGEINPUT)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS15 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1742,9 +1769,11 @@ ADD_TEST(otbOGRVectorDataIOTestCanRead ${IO_TESTS15}
${INPUTDATA}/LOCALITY_POLYGON.tab)
# CanRead OGR PostGIS()
+IF(OTB_USE_PQXX)
ADD_TEST(otbOGRVectorDataIOTestCanRead ${IO_TESTS15}
otbOGRVectorDataIOTestCanRead
PG:"dbname='orfeotoolbox_test' host='localhost' port='5432' user='orfeotoolbox_test_user' password='Bidfeud0'")
+ENDIF(OTB_USE_PQXX)
# CanWrite OGR GML()
ADD_TEST(otbOGRVectorDataIOCanWrite ${IO_TESTS15}
@@ -1757,10 +1786,12 @@ ADD_TEST(otbOGRVectorDataIOCanWrite ${IO_TESTS15}
${INPUTDATA}/LOCALITY_POLYGON.tab)
# Canwrite OGR PostGIS()
+IF(OTB_USE_PQXX)
ADD_TEST(otbOGRVectorDataIOCanWrite ${IO_TESTS15}
otbOGRVectorDataIOCanWrite
PG:"dbname='orfeotoolbox_test' host='localhost' port='5432' user='orfeotoolbox_test_user' password='Bidfeud0'")
-
+ENDIF(OTB_USE_PQXX)
+
ADD_TEST(ioTuKMLVectorDataIO ${IO_TESTS15}
otbKMLVectorDataIONew )
@@ -1921,6 +1952,10 @@ ADD_TEST(ioTuQuickBirdImageMetadataInterfaceNew ${IO_TESTS17}
otbQuickBirdImageMetadataInterfaceNew
)
+ADD_TEST(ioTuTerraSarImageMetadataInterfaceNew ${IO_TESTS17}
+ otbTerraSarImageMetadataInterfaceNew
+)
+
IF(OTB_DATA_USE_LARGEINPUT)
ADD_TEST(ioTvImageMetadataInterfaceQBTest ${IO_TESTS17}
--compare-ascii ${NOTOL} ${BASELINE_FILES}/ioTvImageMetadataInterfaceQB.txt
@@ -1972,14 +2007,20 @@ ADD_TEST(ioTvImageMetadataInterfaceTest ${IO_TESTS17}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
IF(OTB_DATA_USE_LARGEINPUT)
-ADD_TEST(ioTvTerraSarImageMetadataInterface ${IO_TESTS18}
- --compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvTerraSarImageMetadataInterface.txt
- ${TEMP}/ioTvITerraSarImageMetadataInterface.txt
+ADD_TEST(ioTvTerraSarImageMetadataInterface_dims ${IO_TESTS18}
+ --compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvTerraSarImageMetadataInterface_dims.txt
+ ${TEMP}/ioTvTerraSarImageMetadataInterface_dims.txt
otbTerraSarImageMetadataInterface
${LARGEDATA}/TERRASARX/dims/TSX-1.SAR.L1B/TSX1_SAR__SSC/IMAGEDATA/IMAGE_HH_SRA_strip_011.cos
- ${TEMP}/ioTvTerraSarImageMetadataInterface.txt
+ ${TEMP}/ioTvTerraSarImageMetadataInterface_dims.txt
+)
+ADD_TEST(ioTvTerraSarImageMetadataInterface_TORONTO ${IO_TESTS18}
+ --compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioTvTerraSarImageMetadataInterface_TORONTO.txt
+ ${TEMP}/ioTvTerraSarImageMetadataInterface_TORONTO.txt
+ otbTerraSarImageMetadataInterface
+ ${LARGEDATA}/TERRASARX/TORONTO/TSX1_SAR__SSC/IMAGEDATA/IMAGE_HH_SRA_spot_074.cos
+ ${TEMP}/ioTvTerraSarImageMetadataInterface_TORONTO.txt
)
-
ADD_TEST(ioTvImageKeywordlistSpot5 ${IO_TESTS18}
--compare-n-ascii ${NOTOL} 2
@@ -2072,6 +2113,7 @@ ADD_TEST(ioTvImageKeywordlistRadarSat2 ${IO_TESTS18}
${TEMP}/ioTvImageKeywordlistRadarSat2.txt
${BASELINE_FILES}/ioTvImageKeywordlistRadarSat2.txt
${TEMP}/ioTvImageKeywordlistRadarSat2_saveState_loadState.txt
+ --ignore-lines-with 1 product_xml_filename
otbImageKeywordlist
${LARGEDATA}/RADARSAT2/ALTONA/Fine_Quad-Pol_Dataset/PK6621_DK406_FQ9_20080405_124900_HH_VV_HV_VH_SLC_Altona/product.xml
${TEMP}/ioTvImageKeywordlistRadarSat2.txt
@@ -2084,6 +2126,7 @@ ADD_TEST(ioTvImageKeywordlistTerraSarX ${IO_TESTS18}
${TEMP}/ioTvImageKeywordlistTerraSarX.txt
${BASELINE_FILES}/ioTvImageKeywordlistTerraSarX.txt
${TEMP}/ioTvImageKeywordlistTerraSarX_saveState_loadState.txt
+ --ignore-lines-with 1 product_xml_filename
otbImageKeywordlist
${LARGEDATA}/TERRASARX/dims/TSX-1.SAR.L1B/TSX1_SAR__SSC/TSX1_SAR__SSC.xml
${TEMP}/ioTvImageKeywordlistTerraSarX.txt
@@ -2096,6 +2139,7 @@ ADD_TEST(ioTvImageKeywordlistTerraSarX_Upsala ${IO_TESTS18}
${TEMP}/ioTvImageKeywordlistTerraSarX_Upsala.txt
${BASELINE_FILES}/ioTvImageKeywordlistTerraSarX_Upsala.txt
${TEMP}/ioTvImageKeywordlistTerraSarX_Upsala_saveState_loadState.txt
+ --ignore-lines-with 1 product_xml_filename
otbImageKeywordlist
${LARGEDATA}/TERRASARX/UPSALA_GLACIER/TSX1_SAR__MGD/TSX1_SAR__MGD.xml
${TEMP}/ioTvImageKeywordlistTerraSarX_Upsala.txt
@@ -2107,6 +2151,7 @@ ADD_TEST(ioTvImageKeywordlistTerraSarX_Toronto ${IO_TESTS18}
${TEMP}/ioTvImageKeywordlistTerraSarX_Toronto.txt
${BASELINE_FILES}/ioTvImageKeywordlistTerraSarX_Toronto.txt
${TEMP}/ioTvImageKeywordlistTerraSarX_Toronto_saveState_loadState.txt
+ --ignore-lines-with 1 product_xml_filename
otbImageKeywordlist
${LARGEDATA}/TERRASARX/TORONTO/TSX1_SAR__SSC/TSX1_SAR__SSC.xml
${TEMP}/ioTvImageKeywordlistTerraSarX_Toronto.txt
@@ -2181,13 +2226,12 @@ SET(BasicIO_SRCS7
otbIOTests7.cxx
otbImageFileReaderTest.cxx
otbImageFileReaderRGBTest.cxx
+otbImageFileWriterTest.cxx
+otbImageFileWriterRGBTest.cxx
)
SET(BasicIO_SRCS8
otbIOTests8.cxx
-otbImageFileWriterTest.cxx
-otbImageFileReaderTest.cxx
-otbImageFileReaderRGBTest.cxx
-otbImageFileWriterRGBTest.cxx
+otbCoordinateToNameTest.cxx
)
SET(BasicIO_SRCS9
otbIOTests9.cxx
@@ -2288,6 +2332,7 @@ otbPointSetFileReader2.cxx
otbSpotImageMetadataInterfaceNew.cxx
otbQuickBirdImageMetadataInterfaceNew.cxx
otbIkonosImageMetadataInterfaceNew.cxx
+otbTerraSarImageMetadataInterfaceNew.cxx
otbImageMetadataInterfaceTest.cxx
otbImageMetadataInterfaceTest2.cxx
)
diff --git a/Testing/Code/IO/otbCoordinateToNameTest.cxx b/Testing/Code/IO/otbCoordinateToNameTest.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..6e433447e9c7ebd141bd479348d33b9990d8224b
--- /dev/null
+++ b/Testing/Code/IO/otbCoordinateToNameTest.cxx
@@ -0,0 +1,71 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+
+#include <fstream>
+#include <cstdlib>
+#include <OpenThreads/Thread>
+
+#include "otbCoordinateToName.h"
+
+int otbCoordinateToNameTest( int argc, char* argv[] )
+{
+
+ if (argc < 4)
+ {
+ std::cout << argv[0] <<" <lon> <lat> <outputfile>"
+ << std::endl;
+
+ return EXIT_FAILURE;
+ }
+
+ const char * outFileName = argv[3];
+
+ otb::CoordinateToName::Pointer conv = otb::CoordinateToName::New();
+ conv->SetLon(atof(argv[1]));
+ conv->SetLat(atof(argv[2]));
+
+ if ((argc > 4) && atoi(argv[4]) == 1)
+ {
+ conv->MultithreadOn();
+ conv->Evaluate();
+ OpenThreads::Thread::microSleep(10000000);//Make sure that the web request has the time to complete
+ }
+ else
+ {
+ conv->MultithreadOff();
+ conv->Evaluate();
+ }
+
+ std::string name = conv->GetPlaceName();
+ std::string country = conv->GetCountryName();
+
+ std::cout << "Nearby place: " << name << std::endl;
+ std::cout << "Country: " << country << std::endl;
+
+ std::ofstream file;
+ file.open(outFileName);
+ file << "Nearby place: " << name << std::endl;
+ file << "Country: " << country << std::endl;
+ file.close();
+
+ return EXIT_SUCCESS;
+
+}
diff --git a/Testing/Code/IO/otbGDALDriverDoubleWritingTest.cxx b/Testing/Code/IO/otbGDALDriverDoubleWritingTest.cxx
index ad35b84c725d96c457eb8950f0774b6a053b57d3..e318bf02a2d3196e278b19137fe7c2e76f008d8d 100644
--- a/Testing/Code/IO/otbGDALDriverDoubleWritingTest.cxx
+++ b/Testing/Code/IO/otbGDALDriverDoubleWritingTest.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVectorImage.h"
diff --git a/Testing/Code/IO/otbIOTests17.cxx b/Testing/Code/IO/otbIOTests17.cxx
index ce4f010b3d5fb7b55a9983a51628d1b3d84fc36a..b9d0f8e03b7fb6622310616554fd3eada8d7d44c 100644
--- a/Testing/Code/IO/otbIOTests17.cxx
+++ b/Testing/Code/IO/otbIOTests17.cxx
@@ -34,6 +34,7 @@ REGISTER_TEST(otbPointSetFileReader2);
REGISTER_TEST(otbSpotImageMetadataInterfaceNew);
REGISTER_TEST(otbIkonosImageMetadataInterfaceNew);
REGISTER_TEST(otbQuickBirdImageMetadataInterfaceNew);
+REGISTER_TEST(otbTerraSarImageMetadataInterfaceNew);
REGISTER_TEST(otbImageMetadataInterfaceTest);
REGISTER_TEST(otbImageMetadataInterfaceTest2);
}
diff --git a/Testing/Code/IO/otbIOTests7.cxx b/Testing/Code/IO/otbIOTests7.cxx
index 86a469af233efd60e2e81abba819c1f747fe0f1a..588852243733feec8f4c0820240b31f52db6e245 100644
--- a/Testing/Code/IO/otbIOTests7.cxx
+++ b/Testing/Code/IO/otbIOTests7.cxx
@@ -30,4 +30,7 @@ void RegisterTests()
{
REGISTER_TEST(otbImageFileReaderTest);
REGISTER_TEST(otbImageFileReaderRGBTest);
+ REGISTER_TEST(otbImageFileWriterTest);
+ REGISTER_TEST(otbImageFileReaderRGBTest);
+ REGISTER_TEST(otbImageFileWriterRGBTest);
}
diff --git a/Testing/Code/IO/otbIOTests8.cxx b/Testing/Code/IO/otbIOTests8.cxx
index 27011d130f8f9d07cac81aa1ad08d065e47ce8f3..25dcf7f39ba7f3a5ecb11f22db0ab349c1db7113 100644
--- a/Testing/Code/IO/otbIOTests8.cxx
+++ b/Testing/Code/IO/otbIOTests8.cxx
@@ -28,9 +28,5 @@
void RegisterTests()
{
-
- REGISTER_TEST(otbImageFileWriterTest);
- REGISTER_TEST(otbImageFileReaderTest);
- REGISTER_TEST(otbImageFileReaderRGBTest);
- REGISTER_TEST(otbImageFileWriterRGBTest);
+ REGISTER_TEST(otbCoordinateToNameTest);
}
diff --git a/Testing/Code/IO/otbImageKeywordlist.cxx b/Testing/Code/IO/otbImageKeywordlist.cxx
index f9f13ced3125a41849ff0d855d12ee7765a7e9d4..da27e49e4f403f222cc0e4ded4803d0bcb1ab372 100644
--- a/Testing/Code/IO/otbImageKeywordlist.cxx
+++ b/Testing/Code/IO/otbImageKeywordlist.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#if defined(_MSC_VER)
diff --git a/Testing/Code/IO/otbImageMetadataInterfaceTest.cxx b/Testing/Code/IO/otbImageMetadataInterfaceTest.cxx
index f6366a16befb867ce0094012d5598443391c826a..efb8f58b58874fb7d6143d20c3624dea7f9f02be 100644
--- a/Testing/Code/IO/otbImageMetadataInterfaceTest.cxx
+++ b/Testing/Code/IO/otbImageMetadataInterfaceTest.cxx
@@ -46,6 +46,7 @@ int otbImageMetadataInterfaceTest (int argc, char* argv[])
std::ofstream file;
file.open(outputFilename);
+ std::cout<<lImageMetadata->GetSensorID(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
file<<"GetSensorID: "<<lImageMetadata->GetSensorID(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
file<<"GetPhysicalGain: "<<lImageMetadata->GetPhysicalGain(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
file<<"GetPhysicalBias: "<<lImageMetadata->GetPhysicalBias(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
diff --git a/Testing/Code/IO/otbOssimElevManagerTest4.cxx b/Testing/Code/IO/otbOssimElevManagerTest4.cxx
index 7b48526b5fe535d9f3d395c6cd7b9c61bb1781a5..1e1340ac31e3ff1469b889f758eb9899729ed9f4 100644
--- a/Testing/Code/IO/otbOssimElevManagerTest4.cxx
+++ b/Testing/Code/IO/otbOssimElevManagerTest4.cxx
@@ -50,8 +50,7 @@ int otbOssimElevManagerTest4(int argc,char* argv[])
size[1]= atoi(argv[8]);
double* image = new double[size[0]*size[1]];
-
-
+
ossimElevManager * elevManager = ossimElevManager::instance();
elevManager->openDirectory(srtmDir);
@@ -68,7 +67,7 @@ int otbOssimElevManagerTest4(int argc,char* argv[])
ossimWorldPoint.lon=point[0];
ossimWorldPoint.lat=point[1];
double height = elevManager->getHeightAboveMSL(ossimWorldPoint);
-
+
if (!ossim::isnan(height))
{
// Fill the image
@@ -83,9 +82,10 @@ int otbOssimElevManagerTest4(int argc,char* argv[])
}
std::ofstream file;
+ std::cout<<outfname<<std::endl;
file.open(outfname, ios::binary|ios::out);
- file.write(reinterpret_cast<char*>(image), sizeof(image)*size[0]*size[1]);
+ file.write(reinterpret_cast<char*>(image), sizeof(double)*size[0]*size[1]);
file.close();
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx b/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
index 52e5e06a108f7feb02d96902484fd078b081f3ea..e1238948bb7c13afbac13cf8278972631e250e26 100644
--- a/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
+++ b/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx b/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx
index c769ae3c561fd8730cc0d4c764a2712f3136daf3..3522c2e41eee1aba3efde6308e0f4e0c644b2b9c 100644
--- a/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx
+++ b/Testing/Code/IO/otbStreamingWithImageFileWriterTestCalculateNumberOfDivisions.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/IO/otbTerraSarImageMetadataInterface.cxx b/Testing/Code/IO/otbTerraSarImageMetadataInterface.cxx
index 346af06676d6525417d6b21a0cea5d356ae2cc1d..26f4652b52dcbd208faf572841ca2ea6d42b342f 100644
--- a/Testing/Code/IO/otbTerraSarImageMetadataInterface.cxx
+++ b/Testing/Code/IO/otbTerraSarImageMetadataInterface.cxx
@@ -45,15 +45,16 @@ int otbTerraSarImageMetadataInterface (int argc, char* argv[])
std::ofstream file;
file.open(outputFilename);
- file<<"GetSensorID: "<<lImageMetadata->GetSensorID(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetMinute: "<<lImageMetadata->GetMinute(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetHour: "<<lImageMetadata->GetHour(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetDay: "<<lImageMetadata->GetDay(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetMonth: "<<lImageMetadata->GetMonth(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetYear: "<<lImageMetadata->GetYear(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetProductionDay: "<<lImageMetadata->GetProductionDay(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetProductionMonth: "<<lImageMetadata->GetProductionMonth(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
- file<<"GetProductionYear: "<<lImageMetadata->GetProductionYear(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetSensorID: "<<lImageMetadata->GetSensorID(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetMinute: "<<lImageMetadata->GetMinute(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetHour: "<<lImageMetadata->GetHour(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetDay: "<<lImageMetadata->GetDay(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetMonth: "<<lImageMetadata->GetMonth(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetYear: "<<lImageMetadata->GetYear(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetProductionDay: "<<lImageMetadata->GetProductionDay(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetProductionMonth: "<<lImageMetadata->GetProductionMonth(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetProductionYear: "<<lImageMetadata->GetProductionYear(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
+ file<<"GetCalibrationFactor: "<<lImageMetadata->GetCalibrationFactor(reader->GetOutput()->GetMetaDataDictionary())<<std::endl;
file.close();
return EXIT_SUCCESS;
diff --git a/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx b/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b49f7c25cb1044b4e043a5b18df0e9ab9f302330
--- /dev/null
+++ b/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx
@@ -0,0 +1,38 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+
+#include "itkExceptionObject.h"
+
+#include <fstream>
+#include <iostream>
+#include "otbVectorImage.h"
+#include "otbImageFileReader.h"
+#include "otbTerraSarImageMetadataInterface.h"
+
+int otbTerraSarImageMetadataInterfaceNew (int argc, char* argv[])
+{
+
+ otb::TerraSarImageMetadataInterface::Pointer lImageMetadata = otb::TerraSarImageMetadataInterface::New();
+
+ return EXIT_SUCCESS;
+
+}
diff --git a/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx b/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
index 4d766e807146ac296946561433162f5db81fb0ac..a117b05f01515ee75e6f0c0505e1eff9b0f76d8b 100644
--- a/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
+++ b/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/Learning/otbKMeansImageClassificationFilter.cxx b/Testing/Code/Learning/otbKMeansImageClassificationFilter.cxx
index d752f2360dd204a05e7607a9c21984013d953ac3..0de49fa4ca3310e010b1133b34cda3517742916b 100644
--- a/Testing/Code/Learning/otbKMeansImageClassificationFilter.cxx
+++ b/Testing/Code/Learning/otbKMeansImageClassificationFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbKMeansImageClassificationFilter.h"
diff --git a/Testing/Code/Learning/otbKMeansImageClassificationFilterNew.cxx b/Testing/Code/Learning/otbKMeansImageClassificationFilterNew.cxx
index b6fdf1c7b05df9edf9d44eff1c63c109bbdce365..e3696ce388e7c8ecc44c1f84021d9ab2a6713de0 100644
--- a/Testing/Code/Learning/otbKMeansImageClassificationFilterNew.cxx
+++ b/Testing/Code/Learning/otbKMeansImageClassificationFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbKMeansImageClassificationFilter.h"
diff --git a/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx b/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx
index d50f730d4b4848a7357fe8ecacbcef2301fb9705..d630f810312f21e7de7719d85265b31eff29c295 100644
--- a/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx
+++ b/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSOMImageClassificationFilter.h"
diff --git a/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx b/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx
index aa09b66e92ecd59c670b7cefe1c711a1beff0ee7..b01fb3240aea4597e5c2cde73ca21ba8e1035d0d 100644
--- a/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx
+++ b/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSOMImageClassificationFilter.h"
diff --git a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
index a35922bf860bee336f54352e6cf909b2d799035c..d7b64ef193d9d73b6cb07f4ef0f4eeb6b091814d 100644
--- a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
+++ b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx b/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx
index 699bf6a998e984cb02b18398dfa570d77cfd7e2d..13c3c0cd77fd05381ea630a34bc8416916e3fe49 100644
--- a/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx
+++ b/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx
@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
-See ITCopyright.txt for details.
+ See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/Learning/otbSVMImageClassificationFilter.cxx b/Testing/Code/Learning/otbSVMImageClassificationFilter.cxx
index ab691cf8c46bee8368bfb3cbcb894f622910ad83..70b49f610de70a4ee3a22a63e2e6de28b3a3b9aa 100644
--- a/Testing/Code/Learning/otbSVMImageClassificationFilter.cxx
+++ b/Testing/Code/Learning/otbSVMImageClassificationFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSVMImageClassificationFilter.h"
diff --git a/Testing/Code/Learning/otbSVMImageClassificationFilterNew.cxx b/Testing/Code/Learning/otbSVMImageClassificationFilterNew.cxx
index 184d8de7ad323a5329cd866d9214fba40317e02b..b5a424b53237547ac022dce2c98adee79bcc87b8 100644
--- a/Testing/Code/Learning/otbSVMImageClassificationFilterNew.cxx
+++ b/Testing/Code/Learning/otbSVMImageClassificationFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSVMImageClassificationFilter.h"
diff --git a/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilter.cxx b/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilter.cxx
index 1df52d553abc0f38760185576181a8b54290de87..d5d2e2ac85b76fdae20b0f650db6abbfa3cda035 100644
--- a/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilter.cxx
+++ b/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbConvexOrConcaveClassificationFilter.h"
diff --git a/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilterNew.cxx b/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilterNew.cxx
index 3ad4bfd3296e23ab424eccffe8f091e9ae8520ac..393d47ec3d5304bfaeae99abdc7e0860000b5a5b 100644
--- a/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbConvexOrConcaveClassificationFilter.h"
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.cxx b/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.cxx
index 57e5307f9776123a3269cee359b41e6500282a9c..a7d69e1e1105be455bad24918b4c77315104e46f 100644
--- a/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.cxx
+++ b/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbGeodesicMorphologyDecompositionImageFilter.h"
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilterNew.cxx b/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
index 69955819fafae6d5743fb8f288e3ad539f28bf00..67f6ba0749d84219d36c8f971577a35835cd96c9 100644
--- a/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbGeodesicMorphologyDecompositionImageFilter.h"
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx b/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
index 5f61b63601727974736c713157109b9ef90fdb0a..a4e956e1bd7bf012465de33b6f0886cbb041ff19 100644
--- a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
+++ b/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx b/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
index a7cc8f74a952577112fa25d273c0b00e36ed034b..3d8fcf9ed08a73bd8fe3617d7f301aa600c4c4ff 100644
--- a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.h"
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.cxx b/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.cxx
index 9052a3df9d6caa915c2e6204ccc00ecc0ab41212..cf97c1fc97d7e6f231638537a78c4b1b2c9e85b1 100644
--- a/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.cxx
+++ b/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbGeodesicMorphologyLevelingFilter.h"
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilterNew.cxx b/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilterNew.cxx
index be022da65624b82772f64f2fae590635822b3f33..8aed9e29e2a6c85eb5f20a82199f33b70258ad4c 100644
--- a/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbGeodesicMorphologyLevelingFilter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilter.cxx
index 1229c3daff827250be0b15e71edda370218750e3..f41f22f1034b690e9c2d523c3407c1983f302996 100644
--- a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMorphologicalClosingProfileFilter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx
index 1d29e2909182f50311fd004a4008cffe64a0611e..bcf8817e27f2c88ae04708a53d600b1f7c2da56d 100644
--- a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMorphologicalClosingProfileFilter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilter.cxx
index f8744361216701d4321bb4a915ffd3ae47b61881..59d68d811d132ef331b6d0d75fe83ce1650c6229 100644
--- a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMorphologicalOpeningProfileFilter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx
index 7e8b89913992de8d905c567d32ac32150c437288..35971134764aaeeafd69a1441257e6919f26c1ff 100644
--- a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMorphologicalOpeningProfileFilter.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx
index 2a9dabd583a9296c66e0b2736c4223b4d0388986..0cb950f249bc72c8696043270faa486fe505fe1b 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx
index 98c0b9e63868b064858c21b82eee9a46c8f8739f..a9f7aebe0b7547d8504d49d278a17268137053f0 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx
index 540ba4f74ea19c428a798566ca2bd09992eafc49..b925c1b021d9b81c9307bb5527d097d76ec4a7e1 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx
index d8379f0d8e6a3fc4ab41ce75c3a66de7b41ae912..bb4b95859da0d6c00fce2f5565fac51aa12a98da 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx
index 42aeb10779f4485188890106b8f5b8b7048da4a2..1e38188ce9e45f8368d26edb4baa1f1a6459f559 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx
index 4a41b76ac0609c957e9783ae11590db2a238bb9e..e91ac767203ca68a2c7837bcac2b8baddeb41723 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx
index 116e5b59cc703ac89b01af6c2c8729ce0c5ed80f..48c3d94f6a84bbe5984afde528e5cab18120591b 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx
index 77a0a7940e1db86f0534d8c78c6f144265527a13..f11c98bb971df3f42cfa54092acb6977d57d687e 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx
index 5037126f0e161804539898adc1f55eb9d3f1ff76..e5a12d073380aeeb5787471c5cc77a187bf63a50 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx
index b6dca45ef9f8fadf95ccfaa10664ecc24ff2bc8f..471820ad0971e15aec058263c4200a167d8bd3df 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx
index cb728c028411515b2f6a0075c2bcfd7bbf9c08b8..c61a5cd85f73fc79c38f9a03e24f1b9b6ebb0d10 100644
--- a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.cxx b/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.cxx
index 1dfbe30595d4e9448c81c83ccc6dcdd40d5845e7..c2d5281a2e91351a38b9d6f803a27c9fa981badd 100644
--- a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.cxx
+++ b/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMorphologicalOpeningProfileFilter.h"
diff --git a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx b/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
index 48539976182b8172b2e40edda023d0d5c0a35ebc..6049e15141d6c75f45e24c43b6d997ed09b91b55 100644
--- a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkBinaryBallStructuringElement.h"
diff --git a/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx b/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx
index d39f34feda2efe91d1acafab109f155b99c07615..d94bcd2c09f7c62aae3eb6cd1a637dd9a4d7a03d 100644
--- a/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx
+++ b/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMorphologicalOpeningProfileFilter.h"
diff --git a/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx b/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
index c8ad81b4aee561a0ca1dfe4768487b2535c3bc2b..29ef23255ec79739c8bd529c2fb8a5daa95df488 100644
--- a/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.h"
diff --git a/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilter.cxx b/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilter.cxx
index 5fb7bec3c74fc68e7a420036d74cb4ffd5a692b8..bbe8a74fca0f73b87771254649d0baf97d679aa1 100644
--- a/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilter.cxx
+++ b/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMorphologicalOpeningProfileFilter.h"
diff --git a/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilterNew.cxx b/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilterNew.cxx
index 109f97afa482c1e0981d5cc94c7c18560c4163e9..4db9c93fde65f1b95ed2c99ab93bfc412f26841f 100644
--- a/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilterNew.cxx
+++ b/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbProfileToProfileDerivativeFilter.h"
diff --git a/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx b/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx
index d520b153ebb6019e06bc0c88f7cf53057a9d9ffd..311fc809d98fd688a18c7e61a748d9eb38567e2e 100644
--- a/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/MultiScale/otbWaveletInverseFilterBankNew.cxx b/Testing/Code/MultiScale/otbWaveletInverseFilterBankNew.cxx
index b2d3d7c6f8af8c14059d83621c0f06b3b30e2a3d..067533758a2e1f723e8dd706b5b55d588ddd42ea 100644
--- a/Testing/Code/MultiScale/otbWaveletInverseFilterBankNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletInverseFilterBankNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
index ac7bc2702d49c4fdfd5244cf873fd65767032cbc..5f5463249efb5032fb1cdc8e98416030b00814a2 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
index 681573ecc2e72e52daba7872dd93c1361f168db3..6da9ac140c4aeb80b346db6d506e3729d737acf5 100644
--- a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt
index 88834f8c5cefa66affb5b747c7adadd4ff54233b..e9357b851ff30ebe1a5f7c4b00d1218da451a352 100644
--- a/Testing/Code/Projections/CMakeLists.txt
+++ b/Testing/Code/Projections/CMakeLists.txt
@@ -233,6 +233,15 @@ ADD_TEST(prTvOrthoRectificationToulouse ${PROJECTIONS_TESTS2}
N
)
+ADD_TEST(prTvOrthoRectificationToulouseXS ${PROJECTIONS_TESTS2}
+ --compare-image ${EPSILON_4} ${BASELINE}/prTvOrthoRectificationToulouseXS_UTM.tif
+ ${TEMP}/prTvOrthoRectificationToulouseXS_UTM.tif
+ otbOrthoRectificationFilter
+ ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF
+ ${TEMP}/prTvOrthoRectificationToulouseXS_UTM.tif
+ 367319 4835740 300 300 2.5608 -2.8452 31 N
+ )
+
ADD_TEST(prTvOrthoRectificationCevennes ${PROJECTIONS_TESTS2}
--compare-image ${EPSILON_4} ${BASELINE}/prTvOrthoRectificationCevennes_UTM.tif
${TEMP}/prTvOrthoRectificationCevennes_UTM.tif
@@ -288,6 +297,9 @@ ADD_TEST(prTvOrthoRectificationCevennesWithDEM ${PROJECTIONS_TESTS2}
# ${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif
)
+
+
+
#========================= Ortho rectif SPOT5 ===============================
ADD_TEST(prTlOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2}
@@ -370,21 +382,23 @@ ENDIF(OTB_DATA_USE_LARGEINPUT)
ADD_TEST(prTuGenericMapProjectionNew ${PROJECTIONS_TESTS3} otbGenericMapProjectionNew )
ADD_TEST(prTvGenericMapProjection ${PROJECTIONS_TESTS3}
- --compare-ascii ${EPSILON_4} ${BASELINE_FILES}/prTvGenericMapProjection.txt
- ${TEMP}/prTvGenericMapProjection.txt
+ --compare-ascii ${EPSILON_4}
+ ${BASELINE_FILES}/prTvGenericMapProjection.txt
+ ${TEMP}/prTvGenericMapProjection.txt
otbGenericMapProjection
- ${TEMP}/prTvGenericMapProjection.txt
+ ${TEMP}/prTvGenericMapProjection.txt
)
ADD_TEST(prTuGenericRSTransformNew ${PROJECTIONS_TESTS3} otbGenericRSTransformNew )
-ADD_TEST(prTuGenericRSTransform ${PROJECTIONS_TESTS3} otbGenericRSTransform
- --compare-ascii ${EPSILON_4} ${BASELINE_FILES}/prTvGenericMapProjection.txt
- ${BASELINE_FILES}/prTvGenericRSTransform.txt
- ${TEMP}/prTvGenericRSTransform.txt
- 1.35617289802566
- 43.4876035537
- ${TEMP}/prTvGenericRSTransform.txt
+ADD_TEST(prTvGenericRSTransform ${PROJECTIONS_TESTS3}
+ --compare-ascii ${EPSILON_4}
+ ${BASELINE_FILES}/prTvGenericRSTransform.txt
+ ${TEMP}/prTvGenericRSTransform.txt
+ otbGenericRSTransform
+ 1.35617289802566
+ 43.4876035537
+ ${TEMP}/prTvGenericRSTransform.txt
)
ADD_TEST(prTuVectorDataProjectionFilterNew ${PROJECTIONS_TESTS3} otbVectorDataProjectionFilterNew )
@@ -460,6 +474,9 @@ ADD_TEST(prTvVectorDataExtractROIandProjection ${PROJECTIONS_TESTS3}
)
ENDIF(OTB_DATA_USE_LARGEINPUT)
+
+
+
#=======================================================================================
SET(Projections_SRCS1
otbProjectionsTests1.cxx
@@ -497,6 +514,7 @@ otbGeocentricTransform.cxx
otbVectorDataExtractROIandProjection.cxx
)
+
OTB_ADD_EXECUTABLE(otbProjectionsTests1 "${Projections_SRCS1}" "OTBProjections;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbProjectionsTests2 "${Projections_SRCS2}" "OTBProjections;OTBIO;OTBTesting")
OTB_ADD_EXECUTABLE(otbProjectionsTests3 "${Projections_SRCS3}" "OTBProjections;OTBIO;OTBTesting")
diff --git a/Testing/Code/Projections/otbGenericRSTransform.cxx b/Testing/Code/Projections/otbGenericRSTransform.cxx
index e95d6bc9803b7141c229fbdfd40b735b9f50134c..ae0ee24645eff7486e0b520db3863fefa671a860 100644
--- a/Testing/Code/Projections/otbGenericRSTransform.cxx
+++ b/Testing/Code/Projections/otbGenericRSTransform.cxx
@@ -144,8 +144,11 @@ int otbGenericRSTransform( int argc, char* argv[] )
ofstream ofs;
ofs.open(outfname);
- ofs<<"Testing geopoint: "<<geoPoint<<std::endl<<std::endl;
+ // Set floatfield to format writing properly
+ ofs.setf(ios::fixed, ios::floatfield);
+ ofs.precision(10);
+ ofs<<"Testing geopoint: "<<geoPoint<<std::endl<<std::endl;
ofs<<"Testing wgs84 to wgs84: "<<geoPoint<<" -> "<<wgs2wgs->TransformPoint(geoPoint)<<std::endl;
@@ -155,26 +158,41 @@ int otbGenericRSTransform( int argc, char* argv[] )
lambertPoint = wgs2lambert->TransformPoint(geoPoint);
tmtPoint = wgs2tmt->TransformPoint(geoPoint);
+ ofs.precision(3);
+
ofs<<"Testing utm 31 north to utm 31 north: "<<utmPoint<<" -> "<<utm2utm->TransformPoint(utmPoint)<<std::endl;
ofs<<"Testing lambert 2 to lambert 2: "<<lambertPoint<<" -> "<<lambert2lambert->TransformPoint(lambertPoint)<<std::endl;
ofs<<"Testing transmercator 31 north to transmercator: "<<tmtPoint<<" -> "<<tmt2tmt->TransformPoint(tmtPoint)<<std::endl;
-
ofs<<std::endl<<"Testing geo 2 carto ..."<<std::endl<<std::endl;
-
- ofs<<"Testing wgs84 to utm 31 north: "<<geoPoint<<" -> "<<utmPoint<<std::endl;
- ofs<<"Testing utm 31 north to wgs84: "<<utmPoint<<" -> "<<utm2wgs->TransformPoint(utmPoint)<<std::endl;
-
- ofs<<"Testing wgs84 to lambert 2: "<<geoPoint<<" -> "<<lambertPoint<<std::endl;
- ofs<<"Testing lambert 2 to wgs84: "<<lambertPoint<<" -> "<<lambert2wgs->TransformPoint(lambertPoint)<<std::endl;
+ ofs.precision(10);
+
+ ofs<<"Testing wgs84 to utm 31 north: "<<geoPoint;
+ ofs.precision(3);
+ ofs<<" -> "<<utmPoint<<std::endl;
+ ofs<<"Testing utm 31 north to wgs84: "<<utmPoint;
+ ofs.precision(10);
+ ofs<<" -> "<<utm2wgs->TransformPoint(utmPoint)<<std::endl;
+
+ ofs<<"Testing wgs84 to lambert 2: "<<geoPoint;
+ ofs.precision(3);
+ ofs<<" -> "<<lambertPoint<<std::endl;
+ ofs<<"Testing lambert 2 to wgs84: "<<lambertPoint;
+ ofs.precision(10);
+ ofs<<" -> "<<lambert2wgs->TransformPoint(lambertPoint)<<std::endl;
- ofs<<"Testing wgs84 to transmeractor: "<<geoPoint<<" -> "<<tmtPoint<<std::endl;
- ofs<<"Testing transmercator to wgs84: "<<tmtPoint<<" -> "<<tmt2wgs->TransformPoint(tmtPoint)<<std::endl;
+ ofs<<"Testing wgs84 to transmeractor: "<<geoPoint;
+ ofs.precision(3);
+ ofs<<" -> "<<tmtPoint<<std::endl;
+ ofs<<"Testing transmercator to wgs84: "<<tmtPoint;
+ ofs.precision(10);
+ ofs<<" -> "<<tmt2wgs->TransformPoint(tmtPoint)<<std::endl;
ofs<<std::endl<<"Testing cross geo ..."<<std::endl<<std::endl;
+ ofs.precision(3);
ofs<<"Testing lambert 2 to utm 31 north: "<<lambertPoint<<" -> "<<lambert2utm->TransformPoint(lambertPoint)<<std::endl;
ofs<<"Testing utm 31 north to lambert 2: "<<utmPoint<<" -> "<<utm2lambert->TransformPoint(utmPoint)<<std::endl;
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.cxx b/Testing/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.cxx
index d6a287a46e19053efbfecab8e48d9b336fb16e4d..94356ffbf37153039f0291619589e59c17996d69 100644
--- a/Testing/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.cxx
+++ b/Testing/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
index 66497d940de47616ed65cb63bc5086ef5d477892..cb6f1676b0743eb271f785193f3cdda5e30a0587 100644
--- a/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
index 956b356f44e91f762ea5e34d8e7cf0c78e9df3ac..d74a794d4dbc8f5fe42132c7b4d8db20c54eebff 100644
--- a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
index f5e7976b2fc4dd550ce73f383d7ef2b2ac6efeb8..5853448493c84fb24e2a5d42d0064a482b3ea7fd 100644
--- a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
index bbf2239ef328217e593a1785cb190fef15960db5..475eda52f22c9fd2b18b3e3e5c8520b629b5ca2b 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx
index d18d1e81a5d73e3ccca7f445b0f50866862aa029..67d696aa6c3efeb88fb93f2e66b222832bc6eb2c 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
index 7f1d0b7a578b61a7d040038c151f17f7c54b13ef..4850787d60589818146c96d5146e0906919ab912 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkExceptionObject.h"
diff --git a/Testing/Code/Visu/otbFixedSizeFullImageWidget.cxx b/Testing/Code/Visu/otbFixedSizeFullImageWidget.cxx
index e05041506cacd6426e3efd9fbfc163eb703861df..75a8e9d55ab066c6ee7a36b8b29a1c0b8a1d0d1f 100644
--- a/Testing/Code/Visu/otbFixedSizeFullImageWidget.cxx
+++ b/Testing/Code/Visu/otbFixedSizeFullImageWidget.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbFixedSizeFullImageWidget.h"
diff --git a/Testing/Code/Visu/otbFixedSizeFullImageWidgetNew.cxx b/Testing/Code/Visu/otbFixedSizeFullImageWidgetNew.cxx
index 9ce0c429331a67aea5da8482af1aa3aed5711723..708a37026c549a7aab22eeb24e59b0ed8eecc862 100644
--- a/Testing/Code/Visu/otbFixedSizeFullImageWidgetNew.cxx
+++ b/Testing/Code/Visu/otbFixedSizeFullImageWidgetNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbFixedSizeFullImageWidget.h"
diff --git a/Testing/Code/Visu/otbFullResolutionImageWidget.cxx b/Testing/Code/Visu/otbFullResolutionImageWidget.cxx
index c957103ac70aeba41eeec75dcaf59692df3f939b..41898b63a9a29c835fed8890706e95cff00bea0b 100644
--- a/Testing/Code/Visu/otbFullResolutionImageWidget.cxx
+++ b/Testing/Code/Visu/otbFullResolutionImageWidget.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbFullResolutionImageWidget.h"
diff --git a/Testing/Code/Visu/otbFullResolutionImageWidgetNew.cxx b/Testing/Code/Visu/otbFullResolutionImageWidgetNew.cxx
index 72afa61fef8fb3644cce90da92dd35723f04fc4e..0b0837ef6a8c3a10c5d6a28eb060fda66d1e1c82 100644
--- a/Testing/Code/Visu/otbFullResolutionImageWidgetNew.cxx
+++ b/Testing/Code/Visu/otbFullResolutionImageWidgetNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbFullResolutionImageWidget.h"
diff --git a/Testing/Code/Visu/otbHistogramAndTransferFunctionWidget.cxx b/Testing/Code/Visu/otbHistogramAndTransferFunctionWidget.cxx
index 82f887193d308ffb057f1b19faf2323400a518ef..9fbe2a95064856f36834ffc72f1b618dcda220cc 100644
--- a/Testing/Code/Visu/otbHistogramAndTransferFunctionWidget.cxx
+++ b/Testing/Code/Visu/otbHistogramAndTransferFunctionWidget.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbHistogramAndTransferFunctionWidget.h"
diff --git a/Testing/Code/Visu/otbHistogramAndTransferFunctionWidgetNew.cxx b/Testing/Code/Visu/otbHistogramAndTransferFunctionWidgetNew.cxx
index c7ba1eb2d90e00aaf59ff2b51daffcfbb5c4cf50..c18f61478fdd4fcf71ab1b746dd6e3af470c67c5 100644
--- a/Testing/Code/Visu/otbHistogramAndTransferFunctionWidgetNew.cxx
+++ b/Testing/Code/Visu/otbHistogramAndTransferFunctionWidgetNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "itkScalarImageToHistogramGenerator.h"
diff --git a/Testing/Code/Visu/otbImageWidgetBaseNew.cxx b/Testing/Code/Visu/otbImageWidgetBaseNew.cxx
index 243885dad60e8f58e10e9e21e7355814be372c3e..1fb9652669bf2b574ab4ef0e0a7a58285aee374d 100644
--- a/Testing/Code/Visu/otbImageWidgetBaseNew.cxx
+++ b/Testing/Code/Visu/otbImageWidgetBaseNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageWidgetBase.h"
diff --git a/Testing/Code/Visu/otbImageWidgetPolygonForm.cxx b/Testing/Code/Visu/otbImageWidgetPolygonForm.cxx
index 3d3b92f46255c702ce089f7dd26c0c29780cee0e..55ad8de9f3120a843237f46c922a243969d4e4a6 100644
--- a/Testing/Code/Visu/otbImageWidgetPolygonForm.cxx
+++ b/Testing/Code/Visu/otbImageWidgetPolygonForm.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbFullResolutionImageWidget.h"
diff --git a/Testing/Code/Visu/otbImageWidgetPolygonFormNew.cxx b/Testing/Code/Visu/otbImageWidgetPolygonFormNew.cxx
index d76e78bd7db5dffacea1e6e67d0ed64a2d4430e3..0c4f150f7e68c478d6ca54277157e49cf5e86b97 100644
--- a/Testing/Code/Visu/otbImageWidgetPolygonFormNew.cxx
+++ b/Testing/Code/Visu/otbImageWidgetPolygonFormNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbFullResolutionImageWidget.h"
diff --git a/Testing/Code/Visu/otbImageWidgetTransferFunctions.cxx b/Testing/Code/Visu/otbImageWidgetTransferFunctions.cxx
index 5b84e24c1d648f500bf2f7783861969903106442..a76b26f7db855e784f4952e10bc7bce9a5dd03f2 100644
--- a/Testing/Code/Visu/otbImageWidgetTransferFunctions.cxx
+++ b/Testing/Code/Visu/otbImageWidgetTransferFunctions.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageWidgetTransferFunction.h"
diff --git a/Testing/Code/Visu/otbImageWidgetTransferFunctionsNew.cxx b/Testing/Code/Visu/otbImageWidgetTransferFunctionsNew.cxx
index 0f02e50fdfdceccd6625cd5fe08cc5a72b89c14f..64f58afe8705ef493a235086e3a18ca509b7340a 100644
--- a/Testing/Code/Visu/otbImageWidgetTransferFunctionsNew.cxx
+++ b/Testing/Code/Visu/otbImageWidgetTransferFunctionsNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageWidgetTransferFunction.h"
diff --git a/Testing/Code/Visu/otbZoomableImageWidget.cxx b/Testing/Code/Visu/otbZoomableImageWidget.cxx
index 1138be0820637a360f28cd94e4ba854e99004d98..b0095324922882e0f8fa2f8f67e69be7623d2df1 100644
--- a/Testing/Code/Visu/otbZoomableImageWidget.cxx
+++ b/Testing/Code/Visu/otbZoomableImageWidget.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbZoomableImageWidget.h"
diff --git a/Testing/Code/Visu/otbZoomableImageWidgetNew.cxx b/Testing/Code/Visu/otbZoomableImageWidgetNew.cxx
index 00c11e15f74b51451d7e5c8a05c237ebbfd63e5b..f258a0de93162f5fe09185c4d295690db863590f 100644
--- a/Testing/Code/Visu/otbZoomableImageWidgetNew.cxx
+++ b/Testing/Code/Visu/otbZoomableImageWidgetNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbZoomableImageWidget.h"
diff --git a/Testing/Code/Visualization/otbBlendingImageFilter.cxx b/Testing/Code/Visualization/otbBlendingImageFilter.cxx
index 262782d61c86075613c0500002ea26ab4cd3c143..449f7deb78f75b9a48d1b111eb33db5a6829f9a2 100644
--- a/Testing/Code/Visualization/otbBlendingImageFilter.cxx
+++ b/Testing/Code/Visualization/otbBlendingImageFilter.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbBlendingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbBlendingImageFilterNew.cxx b/Testing/Code/Visualization/otbBlendingImageFilterNew.cxx
index 1081ffc25b73910f5b0bf18da329229e7c397778..eb428b6fa9804d9e6aa1f4f2f8435b3be29ac9ca 100644
--- a/Testing/Code/Visualization/otbBlendingImageFilterNew.cxx
+++ b/Testing/Code/Visualization/otbBlendingImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbBlendingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbCurves2DWidget.cxx b/Testing/Code/Visualization/otbCurves2DWidget.cxx
index 2f6075023fa102b0245cc5a800d87c9c9363bfcc..6d991ea7c1b180112122d647cdccc9a1367b28ea 100644
--- a/Testing/Code/Visualization/otbCurves2DWidget.cxx
+++ b/Testing/Code/Visualization/otbCurves2DWidget.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbCurves2DWidget.h"
diff --git a/Testing/Code/Visualization/otbCurves2DWidgetNew.cxx b/Testing/Code/Visualization/otbCurves2DWidgetNew.cxx
index a5c9265ef927425e3bea89514fa17a9ee6af9fa8..3e7c9b079fec94f54be5b05a8f77c017acf40d2c 100644
--- a/Testing/Code/Visualization/otbCurves2DWidgetNew.cxx
+++ b/Testing/Code/Visualization/otbCurves2DWidgetNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbCurves2DWidget.h"
diff --git a/Testing/Code/Visualization/otbCurves2DWidgetWithHistogram.cxx b/Testing/Code/Visualization/otbCurves2DWidgetWithHistogram.cxx
index 76a1d540f0d7a51ba2e3cbe73b3ee35363536273..0c3e612453f9c6c27712ea1d9ba65d1403cfd0bf 100644
--- a/Testing/Code/Visualization/otbCurves2DWidgetWithHistogram.cxx
+++ b/Testing/Code/Visualization/otbCurves2DWidgetWithHistogram.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbCurves2DWidget.h"
diff --git a/Testing/Code/Visualization/otbHistogramCurveNew.cxx b/Testing/Code/Visualization/otbHistogramCurveNew.cxx
index 8e851698a7376507f6daf422e9d348a7b52b86fa..a68acfdadf07b2bfafddb509c9e4ac7de8dad742 100644
--- a/Testing/Code/Visualization/otbHistogramCurveNew.cxx
+++ b/Testing/Code/Visualization/otbHistogramCurveNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbHistogramCurve.h"
diff --git a/Testing/Code/Visualization/otbImageLayerGeneratorNew.cxx b/Testing/Code/Visualization/otbImageLayerGeneratorNew.cxx
index 25c05baa4f8d83d3d55f77203380b33595def755..fb34f3904be2e93edf2ed3c08810a5071a98fe1c 100644
--- a/Testing/Code/Visualization/otbImageLayerGeneratorNew.cxx
+++ b/Testing/Code/Visualization/otbImageLayerGeneratorNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerGenerator.h"
diff --git a/Testing/Code/Visualization/otbImageLayerGeneratorScalar.cxx b/Testing/Code/Visualization/otbImageLayerGeneratorScalar.cxx
index 3be1abcdc16e60c326c1e0862b323a375635c821..c3f4538727163bced85039c5381da8b79d98ef8c 100644
--- a/Testing/Code/Visualization/otbImageLayerGeneratorScalar.cxx
+++ b/Testing/Code/Visualization/otbImageLayerGeneratorScalar.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerGenerator.h"
diff --git a/Testing/Code/Visualization/otbImageLayerGeneratorVector.cxx b/Testing/Code/Visualization/otbImageLayerGeneratorVector.cxx
index 4cf775061401277fbfd475504e2a05371b5283ed..dfcd2a8caa6fbb3a0d2870a2c8c5d7806155b066 100644
--- a/Testing/Code/Visualization/otbImageLayerGeneratorVector.cxx
+++ b/Testing/Code/Visualization/otbImageLayerGeneratorVector.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerGenerator.h"
diff --git a/Testing/Code/Visualization/otbImageLayerNew.cxx b/Testing/Code/Visualization/otbImageLayerNew.cxx
index a687e3ea01a4e9be1e9a6d9aec208321202aeb7b..6cb4119db07ebde6b63cdbe87079220e46e77a9f 100644
--- a/Testing/Code/Visualization/otbImageLayerNew.cxx
+++ b/Testing/Code/Visualization/otbImageLayerNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayer.h"
diff --git a/Testing/Code/Visualization/otbImageLayerRenderingModelNew.cxx b/Testing/Code/Visualization/otbImageLayerRenderingModelNew.cxx
index d86d3a04ca0d0731262bad39425481f1169c4e2b..657b87943201c32de5eecdd524ae219ea0bfc740 100644
--- a/Testing/Code/Visualization/otbImageLayerRenderingModelNew.cxx
+++ b/Testing/Code/Visualization/otbImageLayerRenderingModelNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerRenderingModel.h"
diff --git a/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx b/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx
index 3d5fa1d877985efc9bf912c4581e9661bc5d10d6..38be221bb663338faa827efb0f64626e2ad4cb36 100644
--- a/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx
+++ b/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerRenderingModel.h"
diff --git a/Testing/Code/Visualization/otbImageLayerScalar.cxx b/Testing/Code/Visualization/otbImageLayerScalar.cxx
index 4fbd80ab80bca4ff8661dfbb2a4dfe63ef3e56f6..6838d849e3079264dde2a3004b81eabb8bfe4bfc 100644
--- a/Testing/Code/Visualization/otbImageLayerScalar.cxx
+++ b/Testing/Code/Visualization/otbImageLayerScalar.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayer.h"
diff --git a/Testing/Code/Visualization/otbImageLayerVector.cxx b/Testing/Code/Visualization/otbImageLayerVector.cxx
index 4e4c900dd8a12434d14a53f82587bc248b4684e3..0fff055e0b80e030e2a5f74a265679cf94ecd9ee 100644
--- a/Testing/Code/Visualization/otbImageLayerVector.cxx
+++ b/Testing/Code/Visualization/otbImageLayerVector.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayer.h"
diff --git a/Testing/Code/Visualization/otbImageViewNew.cxx b/Testing/Code/Visualization/otbImageViewNew.cxx
index ba96cbdd51720723b667ba2a4db0dba05c07380f..9d8dd3c5bcc00df6e53e6d49fc1f3e02096cc701 100644
--- a/Testing/Code/Visualization/otbImageViewNew.cxx
+++ b/Testing/Code/Visualization/otbImageViewNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerRenderingModel.h"
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx
index 230ff4f490167e0a71edde259e9b53be525f8141..361974b8bb7309843097687e9d0758bb9ee7ce77 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayer.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerRenderingModel.h"
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx
index 260c5f9aab112388438627f97ebc01bad99359c8..f7e54340eff0a091b29d9d2643d73a12fa1577da 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndSingleLayerWithSelectAreaHandler.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerRenderingModel.h"
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx
index d85af12784d0011e6822a660b7b7c530027b51d5..9b0d133cc43e0d1c2911d58e4a7e232ec2e31899 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndTwoLayers.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerRenderingModel.h"
diff --git a/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx b/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx
index 3d8b7d169bf670604f0df5bf00d174bd2f3cd2b5..39822f901ba9c16386f0bfd7e599b2895c97ac79 100644
--- a/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx
+++ b/Testing/Code/Visualization/otbImageViewerEndToEndWithVectorData.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerRenderingModel.h"
diff --git a/Testing/Code/Visualization/otbImageWidget.cxx b/Testing/Code/Visualization/otbImageWidget.cxx
index 2f99b74a7b47fe78bc16ed4de372529379133fc6..03ea41d0ce6806d81f696ca3f0fdb92d5252f3b0 100644
--- a/Testing/Code/Visualization/otbImageWidget.cxx
+++ b/Testing/Code/Visualization/otbImageWidget.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#define OTB_DISABLE_GL_USE_ACCEL
diff --git a/Testing/Code/Visualization/otbImageWidgetActionHandlerNew.cxx b/Testing/Code/Visualization/otbImageWidgetActionHandlerNew.cxx
index 8830024a0102335aba01ba74cff37027a5495000..11ff5fd167c4eb3b080b97e4f7b850bacd9e77c6 100644
--- a/Testing/Code/Visualization/otbImageWidgetActionHandlerNew.cxx
+++ b/Testing/Code/Visualization/otbImageWidgetActionHandlerNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageWidgetActionHandler.h"
diff --git a/Testing/Code/Visualization/otbImageWidgetController.cxx b/Testing/Code/Visualization/otbImageWidgetController.cxx
index 7945238f3ad78f7e96f9f28136afea626cd82735..58e09875ef05a932d7d3acbd682bd6a5dfbd47b6 100644
--- a/Testing/Code/Visualization/otbImageWidgetController.cxx
+++ b/Testing/Code/Visualization/otbImageWidgetController.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageWidgetController.h"
diff --git a/Testing/Code/Visualization/otbImageWidgetControllerNew.cxx b/Testing/Code/Visualization/otbImageWidgetControllerNew.cxx
index 602688b75e16f4425fa83e80df198292cf18828a..2150634a4e428c674f137018824662b4ca0799b8 100644
--- a/Testing/Code/Visualization/otbImageWidgetControllerNew.cxx
+++ b/Testing/Code/Visualization/otbImageWidgetControllerNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageWidgetController.h"
diff --git a/Testing/Code/Visualization/otbImageWidgetNew.cxx b/Testing/Code/Visualization/otbImageWidgetNew.cxx
index d9dfd2caf1b7de33c248c2e82a993c7608a9ced5..5936d86a67c3b782821621035a9ef9716f3f60f5 100644
--- a/Testing/Code/Visualization/otbImageWidgetNew.cxx
+++ b/Testing/Code/Visualization/otbImageWidgetNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageWidget.h"
diff --git a/Testing/Code/Visualization/otbImageWidgetWithVectorDataGlComponent.cxx b/Testing/Code/Visualization/otbImageWidgetWithVectorDataGlComponent.cxx
index 37406081796165d7685f0eff3cfaf7261284111f..6d0351e18da00eabb9e7e6d16c36bf4502ec2712 100644
--- a/Testing/Code/Visualization/otbImageWidgetWithVectorDataGlComponent.cxx
+++ b/Testing/Code/Visualization/otbImageWidgetWithVectorDataGlComponent.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#define OTB_DISABLE_GL_USE_ACCEL
diff --git a/Testing/Code/Visualization/otbLayerBasedModelNew.cxx b/Testing/Code/Visualization/otbLayerBasedModelNew.cxx
index 7a371ccea443b2b7b50ad05d9a1e51350e0f9f14..2efd74519051679536e276516095400175c74c19 100644
--- a/Testing/Code/Visualization/otbLayerBasedModelNew.cxx
+++ b/Testing/Code/Visualization/otbLayerBasedModelNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbImageLayerBase.h"
diff --git a/Testing/Code/Visualization/otbMultiplyBlendingFunctionNew.cxx b/Testing/Code/Visualization/otbMultiplyBlendingFunctionNew.cxx
index 11e82eaa47c1bbeeeec3f430ca2bdd70194b55fa..0f79987b002b25cbe2e3f50742ce183e590e9b32 100644
--- a/Testing/Code/Visualization/otbMultiplyBlendingFunctionNew.cxx
+++ b/Testing/Code/Visualization/otbMultiplyBlendingFunctionNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbMultiplyBlendingFunction.h"
diff --git a/Testing/Code/Visualization/otbPackedWidgetManagerNew.cxx b/Testing/Code/Visualization/otbPackedWidgetManagerNew.cxx
index 7c24909d9baf87ebae789d8acabdd39fcee4cde5..4213d530b774d4274aefdcdb2ab70062e98b4b13 100644
--- a/Testing/Code/Visualization/otbPackedWidgetManagerNew.cxx
+++ b/Testing/Code/Visualization/otbPackedWidgetManagerNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbPackedWidgetManager.h"
diff --git a/Testing/Code/Visualization/otbPixelDescriptionModelNew.cxx b/Testing/Code/Visualization/otbPixelDescriptionModelNew.cxx
index 5e5e9dd9693e8c480af1f4ee83101325b29fa8bc..3db31ca7009f413e646c3daa08e0625072d12d48 100644
--- a/Testing/Code/Visualization/otbPixelDescriptionModelNew.cxx
+++ b/Testing/Code/Visualization/otbPixelDescriptionModelNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbPixelDescriptionModel.h"
diff --git a/Testing/Code/Visualization/otbPixelDescriptionModelSingleLayer.cxx b/Testing/Code/Visualization/otbPixelDescriptionModelSingleLayer.cxx
index 728f0487f0743464c42fa96ee78b3284744b89be..c00ef04d30a6080a2a624a7415d9050686357dd9 100644
--- a/Testing/Code/Visualization/otbPixelDescriptionModelSingleLayer.cxx
+++ b/Testing/Code/Visualization/otbPixelDescriptionModelSingleLayer.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbPixelDescriptionModel.h"
diff --git a/Testing/Code/Visualization/otbRenderingImageFilterAmplitude.cxx b/Testing/Code/Visualization/otbRenderingImageFilterAmplitude.cxx
index 11b652ae69ac28affb51a805c4a80ebab5bd0822..6c169192bcfc1a186dccec1d7ae5e49985ecb5cb 100644
--- a/Testing/Code/Visualization/otbRenderingImageFilterAmplitude.cxx
+++ b/Testing/Code/Visualization/otbRenderingImageFilterAmplitude.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbRenderingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbRenderingImageFilterNew.cxx b/Testing/Code/Visualization/otbRenderingImageFilterNew.cxx
index c4cb86bb6f714457907c8c8b18dd3d9438642880..b9c12c0a785e105974aba5eb84a3567116308866 100644
--- a/Testing/Code/Visualization/otbRenderingImageFilterNew.cxx
+++ b/Testing/Code/Visualization/otbRenderingImageFilterNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbRenderingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbRenderingImageFilterPhase.cxx b/Testing/Code/Visualization/otbRenderingImageFilterPhase.cxx
index c320041646235cd26debde7327fcfbbf505d68cf..53a22f48bcc80b3113a685ddd47892620a0c8f2d 100644
--- a/Testing/Code/Visualization/otbRenderingImageFilterPhase.cxx
+++ b/Testing/Code/Visualization/otbRenderingImageFilterPhase.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbRenderingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbRenderingImageFilterScalar.cxx b/Testing/Code/Visualization/otbRenderingImageFilterScalar.cxx
index 42cff0e3f94bac1ec8329b709cd60e35e74fbb04..48e6adf4506dfc5aa7ca610860dcf953555d0688 100644
--- a/Testing/Code/Visualization/otbRenderingImageFilterScalar.cxx
+++ b/Testing/Code/Visualization/otbRenderingImageFilterScalar.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbRenderingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbRenderingImageFilterVector.cxx b/Testing/Code/Visualization/otbRenderingImageFilterVector.cxx
index 4821a4bf97fff982cd72650b1387683257f8a8c4..01017da2b662f155aa3cb2c4578d1c56dc7f4d7f 100644
--- a/Testing/Code/Visualization/otbRenderingImageFilterVector.cxx
+++ b/Testing/Code/Visualization/otbRenderingImageFilterVector.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbRenderingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbRenderingImageFilterVectorWithExpNegativeTransfer.cxx b/Testing/Code/Visualization/otbRenderingImageFilterVectorWithExpNegativeTransfer.cxx
index 4ebedd85e69f5b6e1433fd20bfd4b5eb3cd4ccf6..2c074ee7f6537caa3f9bde8f698aed2c49a2f3bd 100644
--- a/Testing/Code/Visualization/otbRenderingImageFilterVectorWithExpNegativeTransfer.cxx
+++ b/Testing/Code/Visualization/otbRenderingImageFilterVectorWithExpNegativeTransfer.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbRenderingImageFilter.h"
diff --git a/Testing/Code/Visualization/otbSplittedWidgetManagerNew.cxx b/Testing/Code/Visualization/otbSplittedWidgetManagerNew.cxx
index 4fa7f81530658d8c0072bc5955f6b2425f0a2212..918d3ba39379e6c3b0f28047ce15bb7a076cdd49 100644
--- a/Testing/Code/Visualization/otbSplittedWidgetManagerNew.cxx
+++ b/Testing/Code/Visualization/otbSplittedWidgetManagerNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbSplittedWidgetManager.h"
diff --git a/Testing/Code/Visualization/otbStandardImageViewer.cxx b/Testing/Code/Visualization/otbStandardImageViewer.cxx
index e0f27bbff935d6b7e2fde9aef9c8d776f3e04b9d..58c062d69409a007e16da932f07c21c7fd243401 100644
--- a/Testing/Code/Visualization/otbStandardImageViewer.cxx
+++ b/Testing/Code/Visualization/otbStandardImageViewer.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbStandardImageViewer.h"
diff --git a/Testing/Code/Visualization/otbStandardImageViewerNew.cxx b/Testing/Code/Visualization/otbStandardImageViewerNew.cxx
index 48e4f830db61a490f4be68c99d4a85abffa79e21..d631cb5d261bba7d43f7d0c2d5e9b94fcf3226b2 100644
--- a/Testing/Code/Visualization/otbStandardImageViewerNew.cxx
+++ b/Testing/Code/Visualization/otbStandardImageViewerNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbStandardImageViewer.h"
diff --git a/Testing/Code/Visualization/otbStandardImageViewerRGBNew.cxx b/Testing/Code/Visualization/otbStandardImageViewerRGBNew.cxx
index 9f1b29cdfbc419fcccb6fad2697532ce1fd6f19d..1cacb3ec576dc13dbc6cd275515f877f3ab05f3e 100644
--- a/Testing/Code/Visualization/otbStandardImageViewerRGBNew.cxx
+++ b/Testing/Code/Visualization/otbStandardImageViewerRGBNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
diff --git a/Testing/Code/Visualization/otbStandardRenderingFunctionNew.cxx b/Testing/Code/Visualization/otbStandardRenderingFunctionNew.cxx
index d97b8809a4e2ff332a3e1ed54bb0f6072adf43e2..0933496d43ec4a19b98af1ca910d53ae309d8612 100644
--- a/Testing/Code/Visualization/otbStandardRenderingFunctionNew.cxx
+++ b/Testing/Code/Visualization/otbStandardRenderingFunctionNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbStandardRenderingFunction.h"
diff --git a/Testing/Code/Visualization/otbUniformAlphaBlendingFunctionNew.cxx b/Testing/Code/Visualization/otbUniformAlphaBlendingFunctionNew.cxx
index 1e140efc94e234ca01a9da5590b20e0bec335ebc..820853615419ecd415cf7ac51a2f027374654d4f 100644
--- a/Testing/Code/Visualization/otbUniformAlphaBlendingFunctionNew.cxx
+++ b/Testing/Code/Visualization/otbUniformAlphaBlendingFunctionNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbUniformAlphaBlendingFunction.h"
diff --git a/Testing/Code/Visualization/otbVectorDataGlComponentNew.cxx b/Testing/Code/Visualization/otbVectorDataGlComponentNew.cxx
index fe7ffc1660d08abb047208a5fc5a28255ac6ed0b..1a29ad6852231f204d67646c819435243b9333a1 100644
--- a/Testing/Code/Visualization/otbVectorDataGlComponentNew.cxx
+++ b/Testing/Code/Visualization/otbVectorDataGlComponentNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVectorData.h"
diff --git a/Testing/Code/Visualization/otbVerticalAsymptoteCurveNew.cxx b/Testing/Code/Visualization/otbVerticalAsymptoteCurveNew.cxx
index 6762903be141e6340951ff8ee068a3bf59339a2d..61ca16e53b89fb1c8ec79598e90506377ec73375 100644
--- a/Testing/Code/Visualization/otbVerticalAsymptoteCurveNew.cxx
+++ b/Testing/Code/Visualization/otbVerticalAsymptoteCurveNew.cxx
@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-See OTBCopyright.txt for details.
+ See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE, See the above copyright notices for more information.
+ PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#include "otbVerticalAsymptoteCurve.h"
diff --git a/Testing/Fa/0000132-jpg.cxx b/Testing/Fa/0000132-jpg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..e42e62c8909e0ee9414b9119c9386fcc5f70d36e
--- /dev/null
+++ b/Testing/Fa/0000132-jpg.cxx
@@ -0,0 +1,46 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#include "otbVectorImage.h"
+#include "otbImageFileReader.h"
+
+//Code adapted from submission from Jordi INGLADA
+// http://bugs.orfeo-toolbox.org/view.php?id=132
+
+int main( int argc, char *argv[] )
+{
+ if (argc < 1)
+ {
+ std::cout << "Usage : inputImage" << std::endl;
+ return EXIT_FAILURE;
+ }
+
+ char * filename = argv[1];
+
+ typedef double PixelType;
+ typedef otb::VectorImage< PixelType > ImageType;
+ typedef otb::ImageFileReader<ImageType> ReaderType;
+
+ // check for input images
+ ReaderType::Pointer reader = ReaderType::New();
+ reader->SetFileName(filename);
+ reader->UpdateOutputInformation();
+ std::cout << reader << std::endl;
+
+ return EXIT_SUCCESS;
+}
diff --git a/Testing/Fa/CMakeLists.txt b/Testing/Fa/CMakeLists.txt
index d2ba007f85b2a003d5670ed3b15ac8fccb1047ce..5ab0f97292423f4af96ae4bfec9b69c1b1de38d7 100644
--- a/Testing/Fa/CMakeLists.txt
+++ b/Testing/Fa/CMakeLists.txt
@@ -19,7 +19,7 @@ SET(TOL 0.0)
SET(COMMON_TESTS ${CXX_TEST_PATH}/otbCommonTests3)
SET(COMMON_TESTS2 ${CXX_TEST_PATH}/otbCommonTests2)
SET(IO_TESTS ${CXX_TEST_PATH}/otbIOTests9)
-SET(IO_TESTS2 ${CXX_TEST_PATH}/otbIOTests8)
+SET(IO_TESTS2 ${CXX_TEST_PATH}/otbIOTests7)
SET(VISU_TESTS ${CXX_TEST_PATH}/otbVisuTests1)
# ------- FAs traitees -----------------------------------
@@ -215,6 +215,12 @@ ADD_TEST(FA-0000041-mean_shift2 ${CXX_TEST_PATH}/0000041-mean_shift
${TEMP}/boundary_of_labelled_image2.tif
)
+IF(OTB_USE_VISU_GUI)
+ADD_TEST(FA-0000132-jpg ${CXX_TEST_PATH}/0000132-jpg
+ ${INPUTDATA}/toulouse_auat.jpg
+ )
+ENDIF(OTB_USE_VISU_GUI)
+
# ------- Vectorization issue -----------------------------------
# FIXME Desactivated until http://bugs.orfeo-toolbox.org/view.php?id=94
# has somebody working on it
@@ -236,6 +242,11 @@ TARGET_LINK_LIBRARIES(StreamingStat OTBFeatureExtraction OTBIO OTBCommon)
ADD_EXECUTABLE(0000041-mean_shift 0000041-mean_shift.cxx)
TARGET_LINK_LIBRARIES(0000041-mean_shift OTBIO OTBCommon OTBBasicFilters)
+IF(OTB_USE_VISU_GUI)
+ADD_EXECUTABLE(0000132-jpg 0000132-jpg.cxx )
+TARGET_LINK_LIBRARIES(0000132-jpg OTBIO OTBVisu)
+ENDIF(OTB_USE_VISU_GUI)
+
ADD_EXECUTABLE(PolygonsVectorization PolygonsVectorization.cxx)
TARGET_LINK_LIBRARIES(PolygonsVectorization OTBIO OTBCommon)
diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt
index db6615dafa1485ab5710530cbe71f14d5690cc73..60af30f912a38437d2db62ea9e899db014d4c359 100644
--- a/Testing/Utilities/CMakeLists.txt
+++ b/Testing/Utilities/CMakeLists.txt
@@ -30,16 +30,18 @@ SET(UTILITIES_TESTS ${CXX_TEST_PATH}/otbUtilitiesTests)
IF(OTB_DATA_USE_LARGEINPUT)
ADD_TEST(utTvOssimKeywordlistToulouseQuickBirdTest ${UTILITIES_TESTS}
---compare-list ${EPSILON_6} ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt
- ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
+--ignore-order --compare-ascii ${EPSILON_6}
+ ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt
+ ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
ossimKeywordlistTest
${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
${TEMP}/utOssimKeywordlistToulouseQuickBird.txt
)
ADD_TEST(utTvOssimKeywordlistBlossevilleIkonosTest ${UTILITIES_TESTS}
---compare-list ${NOTOL} ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt
- ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
+--ignore-order --compare-ascii ${NOTOL}
+ ${BASELINE_FILES}/utOssimKeywordlistBlossevilleIkonos.txt
+ ${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
ossimKeywordlistTest
${IMAGEDATA}/IKONOS/BLOSSEVILLE/po_2619900_grn_0000000.tif
${TEMP}/utOssimKeywordlistBlossevilleIkonos.txt
diff --git a/Testing/Utilities/ossimRadarSatSupport.cxx b/Testing/Utilities/ossimRadarSatSupport.cxx
index 6573d25ff9a730805a6ce456d992ae595bb7853e..36551afabb6cf93d87f4bdb57e281d0f12e01551 100644
--- a/Testing/Utilities/ossimRadarSatSupport.cxx
+++ b/Testing/Utilities/ossimRadarSatSupport.cxx
@@ -14,7 +14,7 @@
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-=========================================================================*/
+ =========================================================================*/
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
@@ -23,8 +23,8 @@
*
* PURPOSE:
*
- * Application pour projeter une r�gion d'une image en coordonn�es g�ographiques
- * en utilisant un Interpolator+regionextractor et un Iterator.
+ * Application to reproject a region of an image in geographic coordinates
+ * using an interpolation, a region extractor and an iterator.
*
*/
@@ -43,1095 +43,1121 @@
// #include "ossim/projection/ossimTerraSarModel.h"
#include "ossim/projection/ossimRadarSatModel.h"
-
-int ossimRadarSatSupport( int argc, char* argv[] )
+int ossimRadarSatSupport(int argc, char* argv[])
{
try
+ {
+ ossimInit::instance()->initialize(argc, argv);
+
+ if (argc < 2)
+ {
+ /*
+ * Verification que l'utilisateur passe bien un fichier en parametre de l'application
+ */
+ std::cout << argv[0] << " <input filename> " << std::endl;
+
+ return EXIT_FAILURE;
+ }
+
+ ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance());
+ /*
+ * Lecture du fichier passé en parametre
+ */
+ ossimImageHandler *handler = ossimImageHandlerRegistry::instance()->open(ossimFilename(argv[1]));
+ /*
+ * Verification que la lecture est effectuée
+ */
+ if (!handler)
+ {
+ std::cout << "Unable to open input image " << argv[1] << std::endl;
+ }
+
+ /*
+ * Recuperation des métadonnées
+ */
+ ossimKeywordlist geom;
+ std::cout << "Read ossim Keywordlist...";
+
+ bool hasMetaData = false;
+ ossimProjection* projection = handler->getImageGeometry()->getProjection();
+
+ if (projection)
+ {
+ hasMetaData = projection->saveState(geom);
+ }
+
+ if (!hasMetaData)
+ {
+ std::cout << "Bad metadata parsing " << std::endl;
+ return EXIT_FAILURE;
+ }
+
+ ossimGpt ossimGPoint(0, 0);
+ ossimDpt ossimDPoint;
+ std::cout << "Creating projection..." << std::endl;
+ ossimProjection * model = NULL;
+ /*
+ * Creation d'un modèle de projection à partir des métadonnées
+ */
+ model = ossimProjectionFactoryRegistry::instance()->createProjection(geom);
+
+ /*
+ * Verification de l'existence du modèle de projection
+ */
+ if (model == NULL)
+ {
+ std::cout << "Invalid Model * == NULL !";
+ }
+
+ /* std::cout<<"Creating RefPtr of projection...";
+ ossimRefPtr<ossimProjection> ptrmodel = model;
+ if( ptrmodel.valid() == false )
+ {
+ std::cout<<"Invalid Model pointer .valid() == false !";
+ }
+ */
+
+ const double RDR_DEUXPI = 6.28318530717958647693;
+
+ int numero_produit = 1; // RDS : 1 ; RDS appuis : 2 ; RDS SGF : 3
+ // generique 4 coins + centre TSX : 0
+ if (numero_produit == 1)
+ {
+ {
+ if (model != NULL)
+ {
+ int i = 2;
+ int j = 3;
+ // average height
+ const char* averageHeight_str = geom.find("terrain_height");
+ double averageHeight = atof(averageHeight_str);
+ std::cout << "Altitude moyenne :" << averageHeight << std::endl;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = averageHeight;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << std::endl;
+
+ model->lineSampleToWorld(image, world);
+ std::cout << "Loc directe par intersection du rayon de visee et MNT : " << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << " altitude : " << world.height()
+ << std::endl;
+ }
+ }
+ }
+
+ if (numero_produit == 3)
{
- ossimInit::instance()->initialize(argc, argv);
+ //8650 3062 43.282566 1.204279 211
+ /*
+ * Localisation du point d'appui
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 8650;
+ int j = 3062;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 211;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.282566, lon = 1.204279" << std::endl;
+ std::cout << " erreur lat =" << world.lat - 43.282566 << " , erreur lon =" << world.lon - 1.204279
+ << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ ossimGpt * groundGCP = new ossimGpt(43.282566, 1.204279, 211);
+ model->worldToLineSample(*groundGCP, imageret);
+ std::cout << "Loc inverse des vraies coords geo : " << std::endl;
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << std::endl;
+ }
+
+ //8139 3908 43.200920 1.067617 238
+
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 8139;
+ int j = 3908;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 238;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.200920, lon = 1.067617" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.200920 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - 1.067617 << std::endl;
+ std::cout << std::endl;
+ }
+
+ //5807 5474 43.096737 0.700934 365
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 5807;
+ int j = 5474;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 365;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.096737, lon = 0.700934" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.096737 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - 0.700934 << std::endl;
+ std::cout << std::endl;
+ }
+
+ //7718 5438 43.077911 0.967650 307
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 7718;
+ int j = 5438;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 307;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.077911, lon = 0.967650" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.077911 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - 0.967650 << std::endl;
+ std::cout << std::endl;
+ }
+ //6599 2800 43.319109 0.838037 275
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 6599;
+ int j = 2800;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 275;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.096737, lon = 0.700934" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.319109 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - 0.838037 << std::endl;
+ std::cout << std::endl;
+ }
+
+ //596 3476 43.456994 -0.087414 242
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 596;
+ int j = 3476;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 242;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.456994, lon = -0.087414" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.456994 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - -0.087414 << std::endl;
+ std::cout << std::endl;
+ }
+
+ /**************************************************************************/
+ /* test de la prise en compte de points d'appui */
+ /**************************************************************************/
+ std::cout << "*********** OPTIMISATION **********" << std::endl;
+
+ ossimRadarSatModel * RDSmodel = (ossimRadarSatModel *) model;
+ std::list<ossimGpt> listePtsSol;
+ std::list<ossimDpt> listePtsImage;
+
+ ossimDpt * imageGCP;
+ ossimGpt * groundGCP;
+
+ imageGCP = new ossimDpt(8650, 3062);
+ groundGCP = new ossimGpt(43.282566 * RDR_DEUXPI / 360.0, 1.204279 * RDR_DEUXPI / 360.0, 211);
+ listePtsSol.push_back(*groundGCP);
+ listePtsImage.push_back(*imageGCP);
+
+ RDSmodel->optimizeModel(listePtsSol, listePtsImage);
+
+ //8650 3062 43.282566 1.204279 211
+ /*
+ * Localisation du point d'appui
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 8650;
+ int j = 3062;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 211;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.282566, lon = 1.204279" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.282566 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - 1.204279 << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ ossimGpt * groundGCP = new ossimGpt(43.282566 * RDR_DEUXPI / 360.0, 1.204279 * RDR_DEUXPI / 360.0, 211);
+ model->worldToLineSample(*groundGCP, imageret);
+ std::cout << "Loc inverse des vraies coords geo : " << std::endl;
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << std::endl;
+ }
+
+ //8139 3908 43.200920 1.067617 238
+
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 8139;
+ int j = 3908;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 238;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.200920, lon = 1.067617" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.200920 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - 1.067617 << std::endl;
+ std::cout << std::endl;
+ }
+
+ //5807 5474 43.096737 0.700934 365
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 5807;
+ int j = 5474;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 365;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat * 360.0 / RDR_DEUXPI << " longitude = " << world.lon * 360.0
+ / RDR_DEUXPI << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.096737, lon = 0.700934" << std::endl;
+ std::cout << " erreur lat =" << world.lat * 360.0 / RDR_DEUXPI - 43.096737 << " , erreur lon =" << world.lon
+ * 360.0 / RDR_DEUXPI - 0.700934 << std::endl;
+ std::cout << std::endl;
+ }
+ }
- if(argc<2)
+ if (numero_produit == 2)
+ {
+ {
+ //5130 4283 43.734466 6.185295 506
+ /*
+ * Localisation du point d'appui
+ */
+ //if (argc = 4)
+ if (model != NULL)
{
- /*
- * Verification que l'utilisateur passe bien un fichier en parametre de l'application
- */
- std::cout << argv[0] <<" <input filename> " << std::endl;
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 5130;
+ int j = 4283;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 506;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.734466, lon = 6.185295" << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ ossimGpt * groundGCP = new ossimGpt(43.734466, 6.185295, 11);
+ model->worldToLineSample(*groundGCP, imageret);
+ std::cout << "Loc inverse des vraies coords geo : " << std::endl;
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << std::endl;
+ }
+
+ //2207 9685 43.551 5.565 340
- return EXIT_FAILURE;
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point central ****" << std::endl;
+
+ int j = 9658;
+ int i = 2207;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 340;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.551, lon = 5.565" << std::endl;
+ std::cout << std::endl;
}
- ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance());
- /*
- * Lecture du fichier passé en parametre
- */
- ossimImageHandler *handler = ossimImageHandlerRegistry::instance()->open(ossimFilename(argv[1]));
- /*
- * Verification que la lecture est effectuée
- */
- if(!handler)
+ //2063 9966 43.542 5.537 323
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
{
- std::cout<<"Unable to open input image "<<argv[1]<<std::endl;
+ std::cout << "**** loc point central ****" << std::endl;
+
+ int j = 9966;
+ int i = 2063;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 323;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.542, lon = 5.537" << std::endl;
+ std::cout << std::endl;
}
- /*
- * Recuperation des métadonnées
- */
- ossimKeywordlist geom;
- std::cout<<"Read ossim Keywordlist...";
- if (! handler->getImageGeometry()->getProjection()->saveState(geom)) {
- std::cout << "Bad metadata parsing "<< std::endl;
- return EXIT_FAILURE;
- }
-
- ossimGpt ossimGPoint(0,0);
- ossimDpt ossimDPoint;
- std::cout<<"Creating projection..."<<std::endl ;
- ossimProjection * model = NULL;
- /*
- * Creation d'un modèle de projection à partir des métadonnées
- */
- model = ossimProjectionFactoryRegistry::instance()->createProjection(geom);
-
- /*
- * Verification de l'existence du modèle de projection
- */
- if( model == NULL)
+ /**************************************************************************/
+ /* test de la prise en compte de points d'appui */
+ /**************************************************************************/
+ std::cout << "*********** OPTIMISATION **********" << std::endl;
+
+ ossimRadarSatModel * RDSmodel = (ossimRadarSatModel *) model;
+ std::list<ossimGpt> listePtsSol;
+ std::list<ossimDpt> listePtsImage;
+
+ ossimDpt * imageGCP;
+ ossimGpt * groundGCP;
+
+ imageGCP = new ossimDpt(5130, 4283);
+ groundGCP = new ossimGpt(43.734466, 6.185295, 506);
+ listePtsSol.push_back(*groundGCP);
+ listePtsImage.push_back(*imageGCP);
+
+ RDSmodel->optimizeModel(listePtsSol, listePtsImage);
+
+ //5130 4283 43.734466 6.185295 506
+
+ /*
+ * Localisation du point d'appui
+ */
+ //if (argc = 4)
+ if (model != NULL)
{
- std::cout<<"Invalid Model * == NULL !";
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ int i = 5130;
+ int j = 4283;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 506;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.734466, lon = 6.185295" << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ ossimGpt * groundGCP = new ossimGpt(43.734466, 6.185295, 11);
+ model->worldToLineSample(*groundGCP, imageret);
+ std::cout << "Loc inverse des vraies coords geo : " << std::endl;
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << std::endl;
}
- /* std::cout<<"Creating RefPtr of projection...";
- ossimRefPtr<ossimProjection> ptrmodel = model;
- if( ptrmodel.valid() == false )
+ //2207 9685 43.551 5.565 340
+
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
+ {
+ std::cout << "**** loc point central ****" << std::endl;
+
+ int j = 9658;
+ int i = 2207;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 340;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.551, lon = 5.565" << std::endl;
+ std::cout << std::endl;
+ }
+ //2063 9966 43.542 5.537 323
+ /*
+ * Localisation d'un point d'appui de validation
+ */
+ //if (argc = 4)
+ if (model != NULL)
{
- std::cout<<"Invalid Model pointer .valid() == false !";
+ std::cout << "**** loc point central ****" << std::endl;
+
+ int j = 9966;
+ int i = 2063;
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ double height = 323;
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = 43.542, lon = 5.537" << std::endl;
+ std::cout << std::endl;
}
- */
-
- const double RDR_DEUXPI = 6.28318530717958647693 ;
-
- int numero_produit = 1 ; // RDS : 1 ; RDS appuis : 2 ; RDS SGF : 3
- // generique 4 coins + centre TSX : 0
- if (numero_produit==1) {
- {
- if(model != NULL)
- {
- int i = 2;
- int j = 3;
- // average height
- const char* averageHeight_str = geom.find("terrain_height");
- double averageHeight = atof(averageHeight_str);
- std::cout<<"Altitude moyenne :"<<averageHeight<<std::endl ;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = averageHeight;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat<<" longitude = "<<world.lon<<std::endl;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<std::endl;
-
- model->lineSampleToWorld(image, world);
- std::cout<<"Loc directe par intersection du rayon de visee et MNT : "<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon << " altitude : " << world.height() <<std::endl;
- }
- }
- }
-
- if (numero_produit==3) {
-//8650 3062 43.282566 1.204279 211
- /*
- * Localisation du point d'appui
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 8650;
- int j = 3062;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 211 ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat<<" longitude = "<<world.lon<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.282566, lon = 1.204279"<<std::endl;
- std::cout<<" erreur lat =" << world.lat - 43.282566 <<" , erreur lon =" << world.lon - 1.204279<<std::endl;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- ossimGpt * groundGCP = new ossimGpt(43.282566,1.204279, 211);
- model->worldToLineSample(*groundGCP,imageret);
- std::cout<<"Loc inverse des vraies coords geo : "<<std::endl;
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<std::endl;
- }
-
-//8139 3908 43.200920 1.067617 238
-
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 8139;
- int j = 3908;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 238;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.200920, lon = 1.067617"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.200920 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - 1.067617<<std::endl;
- std::cout<<std::endl;
- }
-
-//5807 5474 43.096737 0.700934 365
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 5807;
- int j = 5474;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 365;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.096737, lon = 0.700934"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.096737 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - 0.700934<<std::endl;
- std::cout<<std::endl;
- }
-
-//7718 5438 43.077911 0.967650 307
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 7718;
- int j = 5438;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 307;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.077911, lon = 0.967650"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.077911 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - 0.967650<<std::endl;
- std::cout<<std::endl;
- }
-//6599 2800 43.319109 0.838037 275
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 6599;
- int j = 2800;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 275;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.096737, lon = 0.700934"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.319109 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - 0.838037<<std::endl;
- std::cout<<std::endl;
- }
-
-//596 3476 43.456994 -0.087414 242
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 596;
- int j = 3476;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 242;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.456994, lon = -0.087414"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.456994 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - -0.087414<<std::endl;
- std::cout<<std::endl;
- }
-
-
- /**************************************************************************/
- /* test de la prise en compte de points d'appui */
- /**************************************************************************/
- std::cout<<"*********** OPTIMISATION **********"<<std::endl;
-
- ossimRadarSatModel * RDSmodel = ( ossimRadarSatModel *) model ;
- std::list<ossimGpt> listePtsSol ;
- std::list<ossimDpt> listePtsImage ;
-
- ossimDpt * imageGCP;
- ossimGpt * groundGCP;
-
- imageGCP = new ossimDpt(8650,3062);
- groundGCP = new ossimGpt(43.282566*RDR_DEUXPI/360.0,1.204279*RDR_DEUXPI/360.0, 211);
- listePtsSol.push_back(*groundGCP) ;
- listePtsImage.push_back(*imageGCP) ;
-
- RDSmodel->optimizeModel(listePtsSol, listePtsImage) ;
-
-//8650 3062 43.282566 1.204279 211
- /*
- * Localisation du point d'appui
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 8650;
- int j = 3062;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 211 ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.282566, lon = 1.204279"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.282566 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - 1.204279<<std::endl;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- ossimGpt * groundGCP = new ossimGpt(43.282566*RDR_DEUXPI/360.0,1.204279*RDR_DEUXPI/360.0, 211);
- model->worldToLineSample(*groundGCP,imageret);
- std::cout<<"Loc inverse des vraies coords geo : "<<std::endl;
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<std::endl;
- }
-
-//8139 3908 43.200920 1.067617 238
-
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 8139;
- int j = 3908;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 238;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.200920, lon = 1.067617"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.200920 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - 1.067617<<std::endl;
- std::cout<<std::endl;
- }
-
-//5807 5474 43.096737 0.700934 365
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 5807;
- int j = 5474;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 365;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat*360.0/RDR_DEUXPI<<" longitude = "<<world.lon*360.0/RDR_DEUXPI<<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.096737, lon = 0.700934"<<std::endl;
- std::cout<<" erreur lat =" << world.lat*360.0/RDR_DEUXPI - 43.096737 <<" , erreur lon =" << world.lon*360.0/RDR_DEUXPI - 0.700934<<std::endl;
- std::cout<<std::endl;
- }
- }
-
- if (numero_produit==2) {
- {
-//5130 4283 43.734466 6.185295 506
- /*
- * Localisation du point d'appui
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 5130;
- int j = 4283;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 506 ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.734466, lon = 6.185295"<<std::endl;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- ossimGpt * groundGCP = new ossimGpt(43.734466 ,6.185295 , 11);
- model->worldToLineSample(*groundGCP,imageret);
- std::cout<<"Loc inverse des vraies coords geo : "<<std::endl;
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<std::endl;
- }
-
-//2207 9685 43.551 5.565 340
-
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point central ****"<<std::endl;
-
- int j = 9658;
- int i = 2207;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 340;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.551, lon = 5.565"<<std::endl;
- std::cout<<std::endl;
- }
-
-//2063 9966 43.542 5.537 323
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point central ****"<<std::endl;
-
- int j = 9966;
- int i = 2063;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 323;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.542, lon = 5.537"<<std::endl;
- std::cout<<std::endl;
- }
-
-
- /**************************************************************************/
- /* test de la prise en compte de points d'appui */
- /**************************************************************************/
- std::cout<<"*********** OPTIMISATION **********"<<std::endl;
-
- ossimRadarSatModel * RDSmodel = ( ossimRadarSatModel *) model ;
- std::list<ossimGpt> listePtsSol ;
- std::list<ossimDpt> listePtsImage ;
-
- ossimDpt * imageGCP;
- ossimGpt * groundGCP;
-
- imageGCP = new ossimDpt(5130,4283);
- groundGCP = new ossimGpt(43.734466 ,6.185295 , 506);
- listePtsSol.push_back(*groundGCP) ;
- listePtsImage.push_back(*imageGCP) ;
-
- RDSmodel->optimizeModel(listePtsSol, listePtsImage) ;
-
-//5130 4283 43.734466 6.185295 506
-
- /*
- * Localisation du point d'appui
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- int i = 5130;
- int j = 4283;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 506 ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.734466, lon = 6.185295"<<std::endl;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- ossimGpt * groundGCP = new ossimGpt(43.734466 ,6.185295 , 11);
- model->worldToLineSample(*groundGCP,imageret);
- std::cout<<"Loc inverse des vraies coords geo : "<<std::endl;
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<std::endl;
- }
-
-//2207 9685 43.551 5.565 340
-
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point central ****"<<std::endl;
-
- int j = 9658;
- int i = 2207;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 340;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.551, lon = 5.565"<<std::endl;
- std::cout<<std::endl;
- }
-//2063 9966 43.542 5.537 323
- /*
- * Localisation d'un point d'appui de validation
- */
- //if (argc = 4)
- if(model != NULL)
- {
- std::cout<<"**** loc point central ****"<<std::endl;
-
- int j = 9966;
- int i = 2063;
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- double height = 323;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = 43.542, lon = 5.537"<<std::endl;
- std::cout<<std::endl;
- }
- }
- }
-
-
- if (numero_produit==0) {
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol0");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin0");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon0");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat0");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- ossimGpt * groundGCP = new ossimGpt(lat ,lon , height);
- model->worldToLineSample(*groundGCP,imageret);
- std::cout<<"Loc inverse des vraies coords geo : "<<std::endl;
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<std::endl;
-
- model->lineSampleToWorld(image, world);
- std::cout<<"Loc directe par intersection du rayon de visee et MNT : "<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon << " altitude : " << world.height() <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol1");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin1");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon1");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat1");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol2");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin2");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon2");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat2");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol3");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin3");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon3");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat3");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol4");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin4");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon4");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat4");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
-
-
- /**************************************************************************/
- /* test de la prise en compte de points d'appui */
- /**************************************************************************/
- std::cout<<"*********** OPTIMISATION **********"<<std::endl;
-
- ossimRadarSatModel * RDSmodel = ( ossimRadarSatModel *) model ;
- std::list<ossimGpt> listePtsSol ;
- std::list<ossimDpt> listePtsImage ;
- // le point d'appui : le centre scène
- ossimDpt * imageGCP;
- ossimGpt * groundGCP;
- const char* i_str0 = geom.find("cornersCol0");
- int i0 = atoi(i_str0);
- const char* j_str0 = geom.find("cornersLin0");
- int j0 = atoi(j_str0);
- const char* lon_str0 = geom.find("cornersLon0");
- double lon0 = atof(lon_str0);
- const char* lat_str0 = geom.find("cornersLat0");
- double lat0 = atof(lat_str0);
- const char* height_str0 = geom.find("terrain_h");
- double height0 = atof(height_str0) ;
-
- imageGCP = new ossimDpt(i0,j0);
- groundGCP = new ossimGpt(lat0 ,lon0 , height0);
- listePtsSol.push_back(*groundGCP) ;
- listePtsImage.push_back(*imageGCP) ;
-
- RDSmodel->optimizeModel(listePtsSol, listePtsImage) ;
-
-/*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol0");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin0");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon0");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat0");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
-
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- ossimGpt * groundGCP = new ossimGpt(lat ,lon , height);
- model->worldToLineSample(*groundGCP,imageret);
- std::cout<<"Loc inverse des vraies coords geo : "<<std::endl;
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
- std::cout<<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol1");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin1");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon1");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat1");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol2");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin2");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon2");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat2");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol3");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin3");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon3");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat3");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
-
- /*
- * Localisation du point d'appui
- */
- if(model != NULL)
- {
- std::cout<<"**** loc point d'appui ****"<<std::endl;
-
- const char* i_str = geom.find("cornersCol4");
- int i = atoi(i_str);
- const char* j_str = geom.find("cornersLin4");
- int j = atoi(j_str);
- const char* lon_str = geom.find("cornersLon4");
- double lon = atof(lon_str);
- const char* lat_str = geom.find("cornersLat4");
- double lat = atof(lat_str);
-
- ossimDpt image(i,j);
- ossimDpt imageret;
- ossimGpt world;
- const char* height_str = geom.find("terrain_h");
- double height = atof(height_str) ;
- model->lineSampleHeightToWorld(image, height, world);
- std::cout<<"Coordonnees de depart : x = "<<i<<" y = "<<j<<std::endl;
- std::cout<<" latitude = "<<world.lat <<" longitude = "<<world.lon <<std::endl;
-
- std::cout << "altitude : " << world.height() << std::endl ;
- model->worldToLineSample(world,imageret);
- std::cout<<"x = "<<imageret.x<<" y = "<<imageret.y<<std::endl;
-
- std::cout<<"Resultat attendu : "<<std::endl;
- std::cout<<"lat = "<< lat <<", lon = " << lon <<std::endl;
- std::cout<<" erreur lat =" << world.lat - lat <<" , erreur lon =" << world.lon -lon <<std::endl;
- std::cout<<std::endl;
- }
- }
- {
-// // ouvertures
-// hid_t fileID, group_ID, attr_ID1, attr_ID2, attr_ID3, attr_ID4, attr_ID5, attr_ID6, attr_ID7, dataset_ID, mem_type_id ;
-// herr_t status ;
-// fileID = H5Fopen("D:\\locSAR\\exemple_CSKS\\hdf5_test.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
-// group_ID = H5Gopen(fileID, "/links/hard links" ) ;
-// dataset_ID = H5Dopen(group_ID, "Eskimo" ) ;
-// attr_ID1 = H5Aopen_name(dataset_ID , "IMAGE_TRANSPARENCY" ) ;
-// attr_ID2 = H5Aopen_name(dataset_ID , "IMAGE_MINMAXRANGE" ) ;
-// attr_ID3 = H5Aopen_name(dataset_ID , "CLASS" ) ;
-// attr_ID4 = H5Aopen_name(dataset_ID , "IMAGE_VERSION" ) ;
-// attr_ID5 = H5Aopen_name(dataset_ID , "ajoutVMN" ) ;
-// attr_ID6 = H5Aopen_name(dataset_ID , "ajoutVMN_tabInt" ) ;
-// attr_ID7 = H5Aopen_name(dataset_ID , "ajoutVMN_double" ) ;
-//
-// // lectures
-// mem_type_id = H5Aget_type(attr_ID1) ;
-// unsigned int buffer1[1];
-// status = H5Aread(attr_ID1, mem_type_id, buffer1 ) ;
-// std::cout << buffer1[0] << std::endl ;
-//
-// mem_type_id = H5Aget_type(attr_ID2) ;
-// unsigned char buffer2[2] ;
-// status = H5Aread(attr_ID2, mem_type_id, buffer2 ) ;
-// std::cout << (int) buffer2[0] << std::endl ;
-// std::cout << (int) buffer2[1] << std::endl ;
-//
-// mem_type_id = H5Aget_type(attr_ID3) ;
-// char buffer3[6] ;
-// status = H5Aread(attr_ID3, mem_type_id, buffer3 ) ;
-// char buffer4[10] ;
-// status = H5Aread(attr_ID3, mem_type_id, buffer4 ) ;
-// std::string classe(buffer4);
-// std::cout << classe << std::endl ;
-//
-// mem_type_id = H5Aget_type(attr_ID4) ;
-// float buffer5[1] ;
-// status = H5Aread(attr_ID4, mem_type_id, buffer5 ) ;
-// std::cout << buffer5[0] << std::endl ;
-//
-//mem_type_id = H5Aget_type(attr_ID5) ;
-// int buffer6[1] ;
-// status = H5Aread(attr_ID5, mem_type_id, buffer6 ) ;
-//std::cout << buffer6[0] << std::endl ;
-//
-//mem_type_id = H5Aget_type(attr_ID6) ;
-// int buffer7[2] ;
-// status = H5Aread(attr_ID6, mem_type_id, buffer7 ) ;
-//std::cout << buffer7[0] << std::endl ;
-//std::cout << buffer7[1] << std::endl ;
-//
-//mem_type_id = H5Aget_type(attr_ID7) ;
-// double buffer8[1] ;
-// status = H5Aread(attr_ID7, mem_type_id, buffer8 ) ;
-//std::cout << buffer8[0] << std::endl ;
-//
-// // fermeture
-// status = H5Aclose(attr_ID1) ;
-// status = H5Aclose(attr_ID2) ;
-// status = H5Aclose(attr_ID3) ;
-// status = H5Aclose(attr_ID4) ;
-// status = H5Dclose(dataset_ID) ;
-// status = H5Gclose(group_ID) ;
-// status = H5Fclose(fileID) ;
- }
-
- }
-
- catch( std::bad_alloc & err )
+ }
+ }
+
+ if (numero_produit == 0)
{
- std::cout << "Exception bad_alloc : "<<(char*)err.what()<< std::endl;
- return EXIT_FAILURE;
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol0");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin0");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon0");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat0");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ ossimGpt * groundGCP = new ossimGpt(lat, lon, height);
+ model->worldToLineSample(*groundGCP, imageret);
+ std::cout << "Loc inverse des vraies coords geo : " << std::endl;
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << std::endl;
+
+ model->lineSampleToWorld(image, world);
+ std::cout << "Loc directe par intersection du rayon de visee et MNT : " << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << " altitude : " << world.height()
+ << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol1");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin1");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon1");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat1");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol2");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin2");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon2");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat2");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol3");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin3");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon3");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat3");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol4");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin4");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon4");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat4");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
+
+ /**************************************************************************/
+ /* test de la prise en compte de points d'appui */
+ /**************************************************************************/
+ std::cout << "*********** OPTIMISATION **********" << std::endl;
+
+ ossimRadarSatModel * RDSmodel = (ossimRadarSatModel *) model;
+ std::list<ossimGpt> listePtsSol;
+ std::list<ossimDpt> listePtsImage;
+ // le point d'appui : le centre scène
+ ossimDpt * imageGCP;
+ ossimGpt * groundGCP;
+ const char* i_str0 = geom.find("cornersCol0");
+ int i0 = atoi(i_str0);
+ const char* j_str0 = geom.find("cornersLin0");
+ int j0 = atoi(j_str0);
+ const char* lon_str0 = geom.find("cornersLon0");
+ double lon0 = atof(lon_str0);
+ const char* lat_str0 = geom.find("cornersLat0");
+ double lat0 = atof(lat_str0);
+ const char* height_str0 = geom.find("terrain_h");
+ double height0 = atof(height_str0);
+
+ imageGCP = new ossimDpt(i0, j0);
+ groundGCP = new ossimGpt(lat0, lon0, height0);
+ listePtsSol.push_back(*groundGCP);
+ listePtsImage.push_back(*imageGCP);
+
+ RDSmodel->optimizeModel(listePtsSol, listePtsImage);
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol0");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin0");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon0");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat0");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ ossimGpt * groundGCP = new ossimGpt(lat, lon, height);
+ model->worldToLineSample(*groundGCP, imageret);
+ std::cout << "Loc inverse des vraies coords geo : " << std::endl;
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+ std::cout << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol1");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin1");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon1");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat1");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol2");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin2");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon2");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat2");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol3");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin3");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon3");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat3");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
+
+ /*
+ * Localisation du point d'appui
+ */
+ if (model != NULL)
+ {
+ std::cout << "**** loc point d'appui ****" << std::endl;
+
+ const char* i_str = geom.find("cornersCol4");
+ int i = atoi(i_str);
+ const char* j_str = geom.find("cornersLin4");
+ int j = atoi(j_str);
+ const char* lon_str = geom.find("cornersLon4");
+ double lon = atof(lon_str);
+ const char* lat_str = geom.find("cornersLat4");
+ double lat = atof(lat_str);
+
+ ossimDpt image(i, j);
+ ossimDpt imageret;
+ ossimGpt world;
+ const char* height_str = geom.find("terrain_h");
+ double height = atof(height_str);
+ model->lineSampleHeightToWorld(image, height, world);
+ std::cout << "Coordonnees de depart : x = " << i << " y = " << j << std::endl;
+ std::cout << " latitude = " << world.lat << " longitude = " << world.lon << std::endl;
+
+ std::cout << "altitude : " << world.height() << std::endl;
+ model->worldToLineSample(world, imageret);
+ std::cout << "x = " << imageret.x << " y = " << imageret.y << std::endl;
+
+ std::cout << "Resultat attendu : " << std::endl;
+ std::cout << "lat = " << lat << ", lon = " << lon << std::endl;
+ std::cout << " erreur lat =" << world.lat - lat << " , erreur lon =" << world.lon - lon << std::endl;
+ std::cout << std::endl;
+ }
}
- catch( ... )
{
+ // // ouvertures
+ // hid_t fileID, group_ID, attr_ID1, attr_ID2, attr_ID3, attr_ID4, attr_ID5, attr_ID6, attr_ID7, dataset_ID, mem_type_id ;
+ // herr_t status ;
+ // fileID = H5Fopen("D:\\locSAR\\exemple_CSKS\\hdf5_test.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
+ // group_ID = H5Gopen(fileID, "/links/hard links" ) ;
+ // dataset_ID = H5Dopen(group_ID, "Eskimo" ) ;
+ // attr_ID1 = H5Aopen_name(dataset_ID , "IMAGE_TRANSPARENCY" ) ;
+ // attr_ID2 = H5Aopen_name(dataset_ID , "IMAGE_MINMAXRANGE" ) ;
+ // attr_ID3 = H5Aopen_name(dataset_ID , "CLASS" ) ;
+ // attr_ID4 = H5Aopen_name(dataset_ID , "IMAGE_VERSION" ) ;
+ // attr_ID5 = H5Aopen_name(dataset_ID , "ajoutVMN" ) ;
+ // attr_ID6 = H5Aopen_name(dataset_ID , "ajoutVMN_tabInt" ) ;
+ // attr_ID7 = H5Aopen_name(dataset_ID , "ajoutVMN_double" ) ;
+ //
+ // // lectures
+ // mem_type_id = H5Aget_type(attr_ID1) ;
+ // unsigned int buffer1[1];
+ // status = H5Aread(attr_ID1, mem_type_id, buffer1 ) ;
+ // std::cout << buffer1[0] << std::endl ;
+ //
+ // mem_type_id = H5Aget_type(attr_ID2) ;
+ // unsigned char buffer2[2] ;
+ // status = H5Aread(attr_ID2, mem_type_id, buffer2 ) ;
+ // std::cout << (int) buffer2[0] << std::endl ;
+ // std::cout << (int) buffer2[1] << std::endl ;
+ //
+ // mem_type_id = H5Aget_type(attr_ID3) ;
+ // char buffer3[6] ;
+ // status = H5Aread(attr_ID3, mem_type_id, buffer3 ) ;
+ // char buffer4[10] ;
+ // status = H5Aread(attr_ID3, mem_type_id, buffer4 ) ;
+ // std::string classe(buffer4);
+ // std::cout << classe << std::endl ;
+ //
+ // mem_type_id = H5Aget_type(attr_ID4) ;
+ // float buffer5[1] ;
+ // status = H5Aread(attr_ID4, mem_type_id, buffer5 ) ;
+ // std::cout << buffer5[0] << std::endl ;
+ //
+ //mem_type_id = H5Aget_type(attr_ID5) ;
+ // int buffer6[1] ;
+ // status = H5Aread(attr_ID5, mem_type_id, buffer6 ) ;
+ //std::cout << buffer6[0] << std::endl ;
+ //
+ //mem_type_id = H5Aget_type(attr_ID6) ;
+ // int buffer7[2] ;
+ // status = H5Aread(attr_ID6, mem_type_id, buffer7 ) ;
+ //std::cout << buffer7[0] << std::endl ;
+ //std::cout << buffer7[1] << std::endl ;
+ //
+ //mem_type_id = H5Aget_type(attr_ID7) ;
+ // double buffer8[1] ;
+ // status = H5Aread(attr_ID7, mem_type_id, buffer8 ) ;
+ //std::cout << buffer8[0] << std::endl ;
+ //
+ // // fermeture
+ // status = H5Aclose(attr_ID1) ;
+ // status = H5Aclose(attr_ID2) ;
+ // status = H5Aclose(attr_ID3) ;
+ // status = H5Aclose(attr_ID4) ;
+ // status = H5Dclose(dataset_ID) ;
+ // status = H5Gclose(group_ID) ;
+ // status = H5Fclose(fileID) ;
+ }
+
+ }
+
+ catch (std::bad_alloc & err)
+ {
+ std::cout << "Exception bad_alloc : " << (char*) err.what() << std::endl;
+ return EXIT_FAILURE;
+ } catch (...)
+ {
std::cout << "Exception levee inconnue !" << std::endl;
return EXIT_FAILURE;
- }
+ }
return EXIT_SUCCESS;
- }//Fin main()
-
+}//Fin main()
diff --git a/Utilities/BGL/boost/assert.hpp b/Utilities/BGL/boost/assert.hpp
index 5619f29898eaf8b6425d4b664d509a658d57d396..ebc67ae9d8be86be0e99f3eabb81c47a86c20477 100644
--- a/Utilities/BGL/boost/assert.hpp
+++ b/Utilities/BGL/boost/assert.hpp
@@ -9,7 +9,7 @@
//
// Note: There are no include guards. This is intentional.
//
-// See http://www.boost.org/libs/utility/assert.html for documentation.
+// See http://www.boost.org/libs/butility/assert.html for documentation.
//
#undef BOOST_ASSERT
diff --git a/Utilities/BGL/boost/functional/detail/float_functions.hpp b/Utilities/BGL/boost/bfunctional/detail/float_functions.hpp
similarity index 100%
rename from Utilities/BGL/boost/functional/detail/float_functions.hpp
rename to Utilities/BGL/boost/bfunctional/detail/float_functions.hpp
diff --git a/Utilities/BGL/boost/functional/hash.hpp b/Utilities/BGL/boost/bfunctional/hash.hpp
similarity index 62%
rename from Utilities/BGL/boost/functional/hash.hpp
rename to Utilities/BGL/boost/bfunctional/hash.hpp
index ba81aa3375d94e09428a54df8240b104524d234d..0870ed2f53c4dd74f58dce678f76130960e88ee4 100644
--- a/Utilities/BGL/boost/functional/hash.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash.hpp
@@ -14,12 +14,12 @@
# pragma once
#endif
-#include <boost/functional/hash/hash.hpp>
-#include <boost/functional/hash/pair.hpp>
-#include <boost/functional/hash/vector.hpp>
-#include <boost/functional/hash/list.hpp>
-#include <boost/functional/hash/deque.hpp>
-#include <boost/functional/hash/set.hpp>
-#include <boost/functional/hash/map.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
+#include <boost/bfunctional/hash/pair.hpp>
+#include <boost/bfunctional/hash/vector.hpp>
+#include <boost/bfunctional/hash/list.hpp>
+#include <boost/bfunctional/hash/deque.hpp>
+#include <boost/bfunctional/hash/set.hpp>
+#include <boost/bfunctional/hash/map.hpp>
#endif
diff --git a/Utilities/BGL/boost/functional/hash/deque.hpp b/Utilities/BGL/boost/bfunctional/hash/deque.hpp
similarity index 96%
rename from Utilities/BGL/boost/functional/hash/deque.hpp
rename to Utilities/BGL/boost/bfunctional/hash/deque.hpp
index fda006e605238f56a76269430a1b01745cf98e83..cbbfd4dec6b3615205ffd7fd335801a514820016 100644
--- a/Utilities/BGL/boost/functional/hash/deque.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/deque.hpp
@@ -16,7 +16,7 @@
#include <boost/config.hpp>
#include <deque>
-#include <boost/functional/hash/hash.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/functional/hash/hash.hpp b/Utilities/BGL/boost/bfunctional/hash/hash.hpp
similarity index 99%
rename from Utilities/BGL/boost/functional/hash/hash.hpp
rename to Utilities/BGL/boost/bfunctional/hash/hash.hpp
index 0ff794eeefaff8e115b1842d7dfcfb758e7a35dc..24f06be34850db5782d6fa93a1869304020efb99 100644
--- a/Utilities/BGL/boost/functional/hash/hash.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/hash.hpp
@@ -22,7 +22,7 @@
#include <functional>
#include <errno.h>
#include <boost/limits.hpp>
-#include <boost/functional/detail/float_functions.hpp>
+#include <boost/bfunctional/detail/float_functions.hpp>
#include <boost/detail/workaround.hpp>
#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
diff --git a/Utilities/BGL/boost/functional/hash/list.hpp b/Utilities/BGL/boost/bfunctional/hash/list.hpp
similarity index 96%
rename from Utilities/BGL/boost/functional/hash/list.hpp
rename to Utilities/BGL/boost/bfunctional/hash/list.hpp
index ac1ed757f1a33468e0a0336c75c7a88d2ef20c2a..0a1904c6ba56334ff05dcb66247976fc90d69b02 100644
--- a/Utilities/BGL/boost/functional/hash/list.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/list.hpp
@@ -17,7 +17,7 @@
#include <boost/config.hpp>
#include <list>
-#include <boost/functional/hash/hash.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/functional/hash/map.hpp b/Utilities/BGL/boost/bfunctional/hash/map.hpp
similarity index 94%
rename from Utilities/BGL/boost/functional/hash/map.hpp
rename to Utilities/BGL/boost/bfunctional/hash/map.hpp
index d127f456e5184597f945e189f31f5e415f21459a..67290a017826e6aeb8ee566e24b633df868ac429 100644
--- a/Utilities/BGL/boost/functional/hash/map.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/map.hpp
@@ -17,8 +17,8 @@
#include <boost/config.hpp>
#include <map>
-#include <boost/functional/hash/hash.hpp>
-#include <boost/functional/hash/pair.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
+#include <boost/bfunctional/hash/pair.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/functional/hash/pair.hpp b/Utilities/BGL/boost/bfunctional/hash/pair.hpp
similarity index 96%
rename from Utilities/BGL/boost/functional/hash/pair.hpp
rename to Utilities/BGL/boost/bfunctional/hash/pair.hpp
index cbd9d6c3306d7656925a702ae1c0e51a776be6d3..bd45e557128e67f8168a015a9cce7c7d11addfb8 100644
--- a/Utilities/BGL/boost/functional/hash/pair.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/pair.hpp
@@ -17,7 +17,7 @@
#include <boost/config.hpp>
#include <utility>
-#include <boost/functional/hash/hash.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/functional/hash/set.hpp b/Utilities/BGL/boost/bfunctional/hash/set.hpp
similarity index 97%
rename from Utilities/BGL/boost/functional/hash/set.hpp
rename to Utilities/BGL/boost/bfunctional/hash/set.hpp
index 04ce71646600dddcc7df0096d66c4e8daa4be2da..e5941e8a2b71e3cfccfb7c8a41e67ab05725479a 100644
--- a/Utilities/BGL/boost/functional/hash/set.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/set.hpp
@@ -17,7 +17,7 @@
#include <boost/config.hpp>
#include <set>
-#include <boost/functional/hash/hash.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/functional/hash/vector.hpp b/Utilities/BGL/boost/bfunctional/hash/vector.hpp
similarity index 96%
rename from Utilities/BGL/boost/functional/hash/vector.hpp
rename to Utilities/BGL/boost/bfunctional/hash/vector.hpp
index 111bec5b4ade0e86be22afcecc1a5385982ca631..7a93fc26aff523cc1c436d169e89946ba3a6ca1f 100644
--- a/Utilities/BGL/boost/functional/hash/vector.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/vector.hpp
@@ -17,7 +17,7 @@
#include <boost/config.hpp>
#include <vector>
-#include <boost/functional/hash/hash.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/utility/addressof.hpp b/Utilities/BGL/boost/butility/addressof.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/addressof.hpp
rename to Utilities/BGL/boost/butility/addressof.hpp
diff --git a/Utilities/BGL/boost/utility/base_from_member.hpp b/Utilities/BGL/boost/butility/base_from_member.hpp
similarity index 97%
rename from Utilities/BGL/boost/utility/base_from_member.hpp
rename to Utilities/BGL/boost/butility/base_from_member.hpp
index 04aabb59e26ee92a21bfdfe53adb2a28198a4520..893133e6b51ab7292ff2c9322280ff8a5744cea4 100644
--- a/Utilities/BGL/boost/utility/base_from_member.hpp
+++ b/Utilities/BGL/boost/butility/base_from_member.hpp
@@ -5,7 +5,7 @@
// accompanying file LICENSE_1_0.txt or a copy at
// <http://www.boost.org/LICENSE_1_0.txt>.)
-// See <http://www.boost.org/libs/utility/> for the library's home page.
+// See <http://www.boost.org/libs/butility/> for the library's home page.
#ifndef BOOST_UTILITY_BASE_FROM_MEMBER_HPP
#define BOOST_UTILITY_BASE_FROM_MEMBER_HPP
diff --git a/Utilities/BGL/boost/utility/compare_pointees.hpp b/Utilities/BGL/boost/butility/compare_pointees.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/compare_pointees.hpp
rename to Utilities/BGL/boost/butility/compare_pointees.hpp
diff --git a/Utilities/BGL/boost/utility/detail/in_place_factory_prefix.hpp b/Utilities/BGL/boost/butility/detail/in_place_factory_prefix.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/detail/in_place_factory_prefix.hpp
rename to Utilities/BGL/boost/butility/detail/in_place_factory_prefix.hpp
diff --git a/Utilities/BGL/boost/utility/detail/in_place_factory_suffix.hpp b/Utilities/BGL/boost/butility/detail/in_place_factory_suffix.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/detail/in_place_factory_suffix.hpp
rename to Utilities/BGL/boost/butility/detail/in_place_factory_suffix.hpp
diff --git a/Utilities/BGL/boost/utility/detail/result_of_iterate.hpp b/Utilities/BGL/boost/butility/detail/result_of_iterate.hpp
similarity index 97%
rename from Utilities/BGL/boost/utility/detail/result_of_iterate.hpp
rename to Utilities/BGL/boost/butility/detail/result_of_iterate.hpp
index 5aa3a5ccda4306814881ed3e7901e647558a03d2..b2031e49a7b6d1b8ab5e46a93f6c9508d7c5d0e7 100644
--- a/Utilities/BGL/boost/utility/detail/result_of_iterate.hpp
+++ b/Utilities/BGL/boost/butility/detail/result_of_iterate.hpp
@@ -5,7 +5,7 @@
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-// For more information, see http://www.boost.org/libs/utility
+// For more information, see http://www.boost.org/libs/butility
#if !defined(BOOST_PP_IS_ITERATING)
# error Boost result_of - do not include this file!
#endif
diff --git a/Utilities/BGL/boost/utility/enable_if.hpp b/Utilities/BGL/boost/butility/enable_if.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/enable_if.hpp
rename to Utilities/BGL/boost/butility/enable_if.hpp
diff --git a/Utilities/BGL/boost/utility/in_place_factory.hpp b/Utilities/BGL/boost/butility/in_place_factory.hpp
similarity index 93%
rename from Utilities/BGL/boost/utility/in_place_factory.hpp
rename to Utilities/BGL/boost/butility/in_place_factory.hpp
index 612c9a3af614837c6a9384bc7c8083a7e7d886bc..99d181e9f259ec6c63322846f6609fa4f006c22b 100644
--- a/Utilities/BGL/boost/utility/in_place_factory.hpp
+++ b/Utilities/BGL/boost/butility/in_place_factory.hpp
@@ -12,7 +12,7 @@
#ifndef BOOST_UTILITY_INPLACE_FACTORY_25AGO2003_HPP
#define BOOST_UTILITY_INPLACE_FACTORY_25AGO2003_HPP
-#include <boost/utility/detail/in_place_factory_prefix.hpp>
+#include <boost/butility/detail/in_place_factory_prefix.hpp>
#include <boost/type.hpp>
@@ -52,7 +52,7 @@ BOOST_PP_REPEAT( BOOST_MAX_INPLACE_FACTORY_ARITY, BOOST_DEFINE_INPLACE_FACTORY_C
} // namespace boost
-#include <boost/utility/detail/in_place_factory_suffix.hpp>
+#include <boost/butility/detail/in_place_factory_suffix.hpp>
#endif
diff --git a/Utilities/BGL/boost/utility/result_of.hpp b/Utilities/BGL/boost/butility/result_of.hpp
similarity index 93%
rename from Utilities/BGL/boost/utility/result_of.hpp
rename to Utilities/BGL/boost/butility/result_of.hpp
index 668cb696cb3705996670fe1590d923d68030a279..4199a2743629a8c60349bbbd65937317aac67c7f 100644
--- a/Utilities/BGL/boost/utility/result_of.hpp
+++ b/Utilities/BGL/boost/butility/result_of.hpp
@@ -5,7 +5,7 @@
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-// For more information, see http://www.boost.org/libs/utility
+// For more information, see http://www.boost.org/libs/butility
#ifndef BOOST_RESULT_OF_HPP
#define BOOST_RESULT_OF_HPP
@@ -54,7 +54,7 @@ struct result_of : get_result_of<F, FArgs, (has_result_type<F>::value)> {};
} // end namespace detail
-#define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/utility/detail/result_of_iterate.hpp>))
+#define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/butility/detail/result_of_iterate.hpp>))
#include BOOST_PP_ITERATE()
#else
diff --git a/Utilities/BGL/boost/utility/typed_in_place_factory.hpp b/Utilities/BGL/boost/butility/typed_in_place_factory.hpp
similarity index 93%
rename from Utilities/BGL/boost/utility/typed_in_place_factory.hpp
rename to Utilities/BGL/boost/butility/typed_in_place_factory.hpp
index e19fb75df97313acfcc8dfafa12d2ad557a134db..f8df6f60e2a40143ebbffdda1368fb988281ee92 100644
--- a/Utilities/BGL/boost/utility/typed_in_place_factory.hpp
+++ b/Utilities/BGL/boost/butility/typed_in_place_factory.hpp
@@ -12,7 +12,7 @@
#ifndef BOOST_UTILITY_TYPED_INPLACE_FACTORY_25AGO2003_HPP
#define BOOST_UTILITY_TYPED_INPLACE_FACTORY_25AGO2003_HPP
-#include <boost/utility/detail/in_place_factory_prefix.hpp>
+#include <boost/butility/detail/in_place_factory_prefix.hpp>
namespace boost {
@@ -51,7 +51,7 @@ BOOST_PP_REPEAT( BOOST_MAX_INPLACE_FACTORY_ARITY, BOOST_DEFINE_TYPED_INPLACE_FAC
} // namespace boost
-#include <boost/utility/detail/in_place_factory_suffix.hpp>
+#include <boost/butility/detail/in_place_factory_suffix.hpp>
#endif
diff --git a/Utilities/BGL/boost/utility/value_init.hpp b/Utilities/BGL/boost/butility/value_init.hpp
similarity index 100%
rename from Utilities/BGL/boost/utility/value_init.hpp
rename to Utilities/BGL/boost/butility/value_init.hpp
diff --git a/Utilities/BGL/boost/call_traits.hpp b/Utilities/BGL/boost/call_traits.hpp
index 5253a6de587f7dc3e50d5be892cf592dc06d19aa..72c6474f5704b339b802f30b7ec4b86fad9e220e 100644
--- a/Utilities/BGL/boost/call_traits.hpp
+++ b/Utilities/BGL/boost/call_traits.hpp
@@ -3,7 +3,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
//
-// See http://www.boost.org/libs/utility for most recent version including documentation.
+// See http://www.boost.org/libs/butility for most recent version including documentation.
// See boost/detail/call_traits.hpp and boost/detail/ob_call_traits.hpp
// for full copyright notices.
diff --git a/Utilities/BGL/boost/checked_delete.hpp b/Utilities/BGL/boost/checked_delete.hpp
index 9bb84e8e1ba9f1aa8c349a34618877c7c2e3ccdf..5fd9ae8bbe65a5632c50e31653701a5b4a134503 100644
--- a/Utilities/BGL/boost/checked_delete.hpp
+++ b/Utilities/BGL/boost/checked_delete.hpp
@@ -18,7 +18,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
-// See http://www.boost.org/libs/utility/checked_delete.html for documentation.
+// See http://www.boost.org/libs/butility/checked_delete.html for documentation.
//
namespace boost
diff --git a/Utilities/BGL/boost/compressed_pair.hpp b/Utilities/BGL/boost/compressed_pair.hpp
index e6cd6a074a8952caeaa469a424cbe69018c757ce..24e157b1d4b887fdc97e1c614a25f9d71f17f96d 100644
--- a/Utilities/BGL/boost/compressed_pair.hpp
+++ b/Utilities/BGL/boost/compressed_pair.hpp
@@ -3,7 +3,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
//
-// See http://www.boost.org/libs/utility for most recent version including documentation.
+// See http://www.boost.org/libs/butility for most recent version including documentation.
// See boost/detail/compressed_pair.hpp and boost/detail/ob_compressed_pair.hpp
// for full copyright notices.
diff --git a/Utilities/BGL/boost/detail/call_traits.hpp b/Utilities/BGL/boost/detail/call_traits.hpp
index 0d9e99febf3b066b79f1dbfe233c9edbb05ca1c2..f330eb8d03b22e82aa6d1a2d348175dfcb4bcd04 100644
--- a/Utilities/BGL/boost/detail/call_traits.hpp
+++ b/Utilities/BGL/boost/detail/call_traits.hpp
@@ -3,10 +3,10 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
//
-// See http://www.boost.org/libs/utility for most recent version including documentation.
+// See http://www.boost.org/libs/butility for most recent version including documentation.
// call_traits: defines typedefs for function usage
-// (see libs/utility/call_traits.htm)
+// (see libs/butility/call_traits.htm)
/* Release notes:
23rd July 2000:
diff --git a/Utilities/BGL/boost/detail/compressed_pair.hpp b/Utilities/BGL/boost/detail/compressed_pair.hpp
index c45d20c599dc2c5207a2aa333974534bed6fa548..ddec0886187bcc009a6899283db4d5fe70f4f166 100644
--- a/Utilities/BGL/boost/detail/compressed_pair.hpp
+++ b/Utilities/BGL/boost/detail/compressed_pair.hpp
@@ -3,10 +3,10 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
//
-// See http://www.boost.org/libs/utility for most recent version including documentation.
+// See http://www.boost.org/libs/butility for most recent version including documentation.
// compressed_pair: pair that "compresses" empty members
-// (see libs/utility/compressed_pair.htm)
+// (see libs/butility/compressed_pair.htm)
//
// JM changes 25 Jan 2004:
// For the case where T1 == T2 and both are empty, then first() and second()
diff --git a/Utilities/BGL/boost/detail/ob_call_traits.hpp b/Utilities/BGL/boost/detail/ob_call_traits.hpp
index eb4df7a30f1969e0fb33d09578c83f4912f09e9a..42f12fdc6d5b3cb3742ee25e00748999647d8f98 100644
--- a/Utilities/BGL/boost/detail/ob_call_traits.hpp
+++ b/Utilities/BGL/boost/detail/ob_call_traits.hpp
@@ -3,10 +3,10 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
//
-// See http://www.boost.org/libs/utility for most recent version including documentation.
+// See http://www.boost.org/libs/butility for most recent version including documentation.
//
// Crippled version for crippled compilers:
-// see libs/utility/call_traits.htm
+// see libs/butility/call_traits.htm
//
/* Release notes:
diff --git a/Utilities/BGL/boost/detail/ob_compressed_pair.hpp b/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
index 727acab6da498aa212c3c7d20057f9f661e7063d..280fe43dd5a2d711d67870febdc190f22e9c4d56 100644
--- a/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
+++ b/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
@@ -3,8 +3,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt).
//
-// See http://www.boost.org/libs/utility for most recent version including documentation.
-// see libs/utility/compressed_pair.hpp
+// See http://www.boost.org/libs/butility for most recent version including documentation.
+// see libs/butility/compressed_pair.hpp
//
/* Release notes:
20 Jan 2001:
diff --git a/Utilities/BGL/boost/function/function_base.hpp b/Utilities/BGL/boost/function/function_base.hpp
index 30f691611d6d88263d728701ad9a654420701e93..ab039fe48d322a859166f47a0a93bcf56f0543d5 100644
--- a/Utilities/BGL/boost/function/function_base.hpp
+++ b/Utilities/BGL/boost/function/function_base.hpp
@@ -24,7 +24,7 @@
#include <boost/pending/ct_if.hpp>
#include <boost/detail/workaround.hpp>
#ifndef BOOST_NO_SFINAE
-# include "boost/utility/enable_if.hpp"
+# include "boost/butility/enable_if.hpp"
#else
# include "boost/mpl/bool.hpp"
#endif
diff --git a/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp b/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp
index 07b298d2c156a5357c30ceddfd9bd08e342f128a..42f8dae6e6edd224e03a7ea8ab26f8e15d73475d 100644
--- a/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp
+++ b/Utilities/BGL/boost/graph/detail/read_graphviz_spirit.hpp
@@ -30,10 +30,10 @@
#include <boost/spirit/iterator/multi_pass.hpp>
#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/distinct.hpp>
-#include <boost/spirit/utility/lists.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
+#include <boost/spirit/butility/confix.hpp>
+#include <boost/spirit/butility/distinct.hpp>
+#include <boost/spirit/butility/lists.hpp>
+#include <boost/spirit/butility/escape_char.hpp>
#include <boost/spirit/attribute.hpp>
#include <boost/spirit/dynamic.hpp>
#include <boost/spirit/actor.hpp>
diff --git a/Utilities/BGL/boost/graph/doc/AStarHeuristic.html b/Utilities/BGL/boost/graph/doc/AStarHeuristic.html
index 004bb64aaae1ea5fef2967651807be50a9bf0b02..626d23ab8d4c227fb66dd0c77f46240d3760e33a 100644
--- a/Utilities/BGL/boost/graph/doc/AStarHeuristic.html
+++ b/Utilities/BGL/boost/graph/doc/AStarHeuristic.html
@@ -39,7 +39,7 @@ href="./astar_search.html">astar_search()</a>.
<a href="http://www.sgi.com/tech/stl/UnaryFunction.html">Unary
Function</a> (must take a single argument -- a graph vertex -- and
return a cost value) and <a
-href="../../utility/CopyConstructible.html">Copy Constructible</a>
+href="../../butility/CopyConstructible.html">Copy Constructible</a>
(copying a heuristic should be a lightweight operation).
diff --git a/Utilities/BGL/boost/graph/doc/AStarVisitor.html b/Utilities/BGL/boost/graph/doc/AStarVisitor.html
index 60d3acab8dea31c71903ad6e19e7fb0bff1f6f11..5a65598a5ed45e63c9f40a69965710dea770641d 100644
--- a/Utilities/BGL/boost/graph/doc/AStarVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/AStarVisitor.html
@@ -29,7 +29,7 @@ taken during the graph search.
<h3>Refinement of</h3>
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
(copying a visitor should be a lightweight operation).
diff --git a/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html b/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html
index c902cd094296d966d71611ff9c2a4042b88f0100..38bde74f81592db49770d4ac62e9ad75f45bf108 100644
--- a/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html
+++ b/Utilities/BGL/boost/graph/doc/AdjacencyGraph.html
@@ -73,7 +73,7 @@ An adjacency iterator for a vertex <i>v</i> provides access to the
vertices adjacent to <i>v</i>. As such, the value type of an
adjacency iterator is the vertex descriptor type of its graph. An
adjacency iterator must meet the requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
</TD>
</TR>
diff --git a/Utilities/BGL/boost/graph/doc/BFSVisitor.html b/Utilities/BGL/boost/graph/doc/BFSVisitor.html
index 8b17cc8f69c3c039b69a45d31832e633e346fa46..6ab79592c3aeebca4cbd52e9850aa8ca1834da30 100644
--- a/Utilities/BGL/boost/graph/doc/BFSVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/BFSVisitor.html
@@ -29,7 +29,7 @@ augmenting the actions taken during the graph search.
<h3>Refinement of</h3>
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
(copying a visitor should be a lightweight operation).
diff --git a/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html b/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html
index addf198bebb3450db8d685a61f90577ce1bed5f2..1bc435bc8da15ec04127f1a4abf99f29984b4203 100644
--- a/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/BellmanFordVisitor.html
@@ -29,7 +29,7 @@ thereby augmenting the actions taken during the graph search.
<h3>Refinement of</h3>
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
(copying a visitor should be a lightweight operation).
<h3>Notation</h3>
diff --git a/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html b/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html
index d3b5fde202904e9d5a221075129e9c8275c7f2d6..56fdbd994f488ab920b44a169cf9e20a9c095759 100644
--- a/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html
+++ b/Utilities/BGL/boost/graph/doc/BidirectionalGraph.html
@@ -76,7 +76,7 @@ edges incident to the vertex.
An in-edge iterator for a vertex <i>v</i> provides access to the
in-edges of <i>v</i>. As such, the value type of an in-edge iterator
is the edge descriptor type of its graph. An in-edge iterator must
-meet the requirements of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+meet the requirements of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
</TD>
</TR>
diff --git a/Utilities/BGL/boost/graph/doc/DFSVisitor.html b/Utilities/BGL/boost/graph/doc/DFSVisitor.html
index 4058a6ab73367dd13c80de88fa96dc94a8be39c6..f2bbe2c4fa3075ad1f2f7b195127bcbd0e34dbf7 100644
--- a/Utilities/BGL/boost/graph/doc/DFSVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/DFSVisitor.html
@@ -29,7 +29,7 @@ augmenting the actions taken during the graph search.
<h3>Refinement of</h3>
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
(copying a visitor should be a lightweight operation).
<h3>Notation</h3>
diff --git a/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html b/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html
index 5f5586cc0fb627a6298def82df850007ca6c0fe1..191ef522ec38897f7d1c27d9e2d66ae38f5a72a5 100644
--- a/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/DijkstraVisitor.html
@@ -30,7 +30,7 @@ the search.
<h3>Refinement of</h3>
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
(copying a visitor should be a lightweight operation).
diff --git a/Utilities/BGL/boost/graph/doc/EdgeListGraph.html b/Utilities/BGL/boost/graph/doc/EdgeListGraph.html
index 68445af38d9029b08fe39df82b5ae2cbc6a54a72..fbc44ecb66541701aab528e4db2cdd08b718ccc1 100644
--- a/Utilities/BGL/boost/graph/doc/EdgeListGraph.html
+++ b/Utilities/BGL/boost/graph/doc/EdgeListGraph.html
@@ -69,7 +69,7 @@ edges in the graph.
An edge iterator (obtained via <TT>edges(g)</TT>) provides access to
all of the edges in a graph. An edge iterator type must meet the
requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>. The
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>. The
value type of the edge iterator must be the same as the edge
descriptor of the graph.
diff --git a/Utilities/BGL/boost/graph/doc/EventVisitor.html b/Utilities/BGL/boost/graph/doc/EventVisitor.html
index 4324e7b4195ced42fb09ea94a8eddfb3aa00c1ab..2899c2e2567b8bcee6bdf882304e8599430f8284 100644
--- a/Utilities/BGL/boost/graph/doc/EventVisitor.html
+++ b/Utilities/BGL/boost/graph/doc/EventVisitor.html
@@ -60,7 +60,7 @@ namespace boost {
<h3>Refinement of</h3>
-<a href="../../utility/CopyConstructible.html">Copy Constructible</a>
+<a href="../../butility/CopyConstructible.html">Copy Constructible</a>
(copying a visitor should be a lightweight operation).
<h3>Notation</h3>
diff --git a/Utilities/BGL/boost/graph/doc/IncidenceGraph.html b/Utilities/BGL/boost/graph/doc/IncidenceGraph.html
index 374207a4b418ba02e204df271ee68668d08c63d8..043bf1d30a8cfa1d8cbaa8930a5aad4d1e047f9e 100644
--- a/Utilities/BGL/boost/graph/doc/IncidenceGraph.html
+++ b/Utilities/BGL/boost/graph/doc/IncidenceGraph.html
@@ -74,7 +74,7 @@ An out-edge iterator for a vertex <i>v</i> provides access to the
out-edges of the vertex. As such, the value type of an out-edge
iterator is the edge descriptor type of its graph. An out-edge
iterator must meet the requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
</TD>
</TR>
diff --git a/Utilities/BGL/boost/graph/doc/Monoid.html b/Utilities/BGL/boost/graph/doc/Monoid.html
index 4a3e9453703b90452f366dfbe78b8ba79b8ae69c..be92272ea806ad96824c006721b2fcff83945dd1 100644
--- a/Utilities/BGL/boost/graph/doc/Monoid.html
+++ b/Utilities/BGL/boost/graph/doc/Monoid.html
@@ -34,8 +34,8 @@ and an object that represents the identity element.
<H3>Refinement of</H3>
The element type must be a model of <a
-href="../../utility/Assignable.html">Assignable</a> and <a
-href="../../utility/CopyConstructible.html">CopyConstructible</a>.
+href="../../butility/Assignable.html">Assignable</a> and <a
+href="../../butility/CopyConstructible.html">CopyConstructible</a>.
The function object type must be a model of <a
href="http://www.sgi.com/tech/stl/BinaryFunction.html">BinaryFunction</a>.
diff --git a/Utilities/BGL/boost/graph/doc/VertexListGraph.html b/Utilities/BGL/boost/graph/doc/VertexListGraph.html
index a2eca0b006ca51a0dcc3120ab687d3b91acdd46f..c1f7ac60e4c62efaf7395e649dda3fcf1018251d 100644
--- a/Utilities/BGL/boost/graph/doc/VertexListGraph.html
+++ b/Utilities/BGL/boost/graph/doc/VertexListGraph.html
@@ -47,7 +47,7 @@ efficient traversal of all the vertices in the graph.
A vertex iterator (obtained via <TT>vertices(g)</TT>) provides access
to all of the vertices in a graph. A vertex iterator type must meet
the requirements of <a
-href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>. The
+href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>. The
value type of the vertex iterator must be the vertex descriptor of the
graph.
</TD>
diff --git a/Utilities/BGL/boost/graph/doc/adjacency_iterator.html b/Utilities/BGL/boost/graph/doc/adjacency_iterator.html
index d1adc43817ed1dba988a8316033e34afebca77b4..7b128a71df3a7d146fd584a87c4234d727673a32 100644
--- a/Utilities/BGL/boost/graph/doc/adjacency_iterator.html
+++ b/Utilities/BGL/boost/graph/doc/adjacency_iterator.html
@@ -100,7 +100,7 @@ definition of the graph class, and in that context we can not use
The adjacency iterator adaptor (the type
<tt>adjacency_iterator_generator<...>::type</tt>) is a model of <a
-href="../../utility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
+href="../../butility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
</a>.
diff --git a/Utilities/BGL/boost/graph/doc/adjacency_list.html b/Utilities/BGL/boost/graph/doc/adjacency_list.html
index 3deed9793eacc71bfc3d39191e0792728bc1cacb..5f04b37884c90a3f7dc78d2fcba1d2c9198b4421 100644
--- a/Utilities/BGL/boost/graph/doc/adjacency_list.html
+++ b/Utilities/BGL/boost/graph/doc/adjacency_list.html
@@ -152,8 +152,8 @@ shows how to represent a family tree with a graph.
<P>
<a href="./VertexAndEdgeListGraph.html">VertexAndEdgeListGraph</a>,
<a href="./MutablePropertyGraph.html">MutablePropertyGraph</a>,
-<a href="../../utility/CopyConstructible.html">CopyConstructible</a>,
-and <a href="../../utility/Assignable.html">Assignable</a>.
+<a href="../../butility/CopyConstructible.html">CopyConstructible</a>,
+and <a href="../../butility/Assignable.html">Assignable</a>.
<P>
diff --git a/Utilities/BGL/boost/graph/doc/adjacency_matrix.html b/Utilities/BGL/boost/graph/doc/adjacency_matrix.html
index 5e58f0fea7c68db71f5294a17160133fad025868..da21e5ac38309309009d2b1154fb683768a73101 100644
--- a/Utilities/BGL/boost/graph/doc/adjacency_matrix.html
+++ b/Utilities/BGL/boost/graph/doc/adjacency_matrix.html
@@ -212,8 +212,8 @@ The output is:
<a href="./VertexAndEdgeListGraph.html">VertexAndEdgeListGraph</a>, <a
href="./AdjacencyMatrix.html">AdjacencyMatrix</a>, <a
href="./MutablePropertyGraph.html">MutablePropertyGraph</a>,
-<a href="../../utility/CopyConstructible.html">CopyConstructible</a>,
-and <a href="../../utility/Assignable.html">Assignable</a>.
+<a href="../../butility/CopyConstructible.html">CopyConstructible</a>,
+and <a href="../../butility/Assignable.html">Assignable</a>.
<h3>Associates Types</h3>
@@ -245,14 +245,14 @@ The type for the edge descriptors associated with the
<tt>graph_traits<adjacency_matrix>::edge_iterator</tt>
<br><br>
The type for the iterators returned by <tt>edges()</tt>. This
- iterator models <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.<br>
+ iterator models <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.<br>
(Required by <a href="EdgeListGraph.html">EdgeListGraph</a>.)
<hr>
<tt>graph_traits<adjacency_matrix>::out_edge_iterator</tt>
<br><br>
The type for the iterators returned by <tt>out_edges()</tt>. This
- iterator models <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>. <br>
+ iterator models <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>. <br>
(Required by <a href="IncidenceGraph.html">IncidenceGraph</a>.)
<hr>
diff --git a/Utilities/BGL/boost/graph/doc/filtered_graph.html b/Utilities/BGL/boost/graph/doc/filtered_graph.html
index b1d1a1bedcc3d61038df643f631b6b0cdd80501a..aacda4909f028952f55a016923d704f0b58a3d15 100644
--- a/Utilities/BGL/boost/graph/doc/filtered_graph.html
+++ b/Utilities/BGL/boost/graph/doc/filtered_graph.html
@@ -199,7 +199,7 @@ The type for the edge descriptors associated with the
<tt>graph_traits<filtered_graph>::vertex_iterator</tt>
<br><br>
The type for the iterators returned by <TT>vertices()</TT>.
-The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+The iterator is a model of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
<hr>
@@ -207,7 +207,7 @@ The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">M
<tt>graph_traits<filtered_graph>::edge_iterator</tt>
<br><br>
The type for the iterators returned by <TT>edges()</TT>.
-The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+The iterator is a model of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
<hr>
@@ -215,7 +215,7 @@ The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">M
<tt>graph_traits<filtered_graph>::out_edge_iterator</tt>
<br><br>
The type for the iterators returned by <TT>out_edges()</TT>.
-The iterator is a model of <a href="../../utility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
+The iterator is a model of <a href="../../butility/MultiPassInputIterator.html">MultiPassInputIterator</a>.
<hr>
diff --git a/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html b/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html
index be851a167625f85384cb37018b6fdae904c0376a..5d7a33f733969e5573a1f6142f3fb08f14d06f3b 100644
--- a/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html
+++ b/Utilities/BGL/boost/graph/doc/inv_adjacency_iterator.html
@@ -102,7 +102,7 @@ definition of the graph class, and in that context we can not use
The inverse adjacency iterator adaptor (the type
<tt>inv_adjacency_iterator_generator<...>::type</tt>) is a model of <a
-href="../../utility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
+href="../../butility/MultiPassInputIterator.html">Multi-Pass Input Iterator</a>
</a>.
diff --git a/Utilities/BGL/boost/graph/doc/using_adjacency_list.html b/Utilities/BGL/boost/graph/doc/using_adjacency_list.html
index ab607d9ef0364201a679f83a9976294e4a655836..6700b2a83da1cdac71732a6b1c201f5801c29a10 100644
--- a/Utilities/BGL/boost/graph/doc/using_adjacency_list.html
+++ b/Utilities/BGL/boost/graph/doc/using_adjacency_list.html
@@ -411,8 +411,8 @@ specifies the type of the property values. The type <tt>T</tt> must be
<a
href="http://www.sgi.com/tech/stl/DefaultConstructible.html">Default
Constructible</a>, <a
-href="../../utility/Assignable.html">Assignable</a>, and <a
-href="../../utility/CopyConstructible.html">Copy Constructible</a>.
+href="../../butility/Assignable.html">Assignable</a>, and <a
+href="../../butility/CopyConstructible.html">Copy Constructible</a>.
Like the containers of the C++ Standard Library, the property objects
of type <tt>T</tt> are held by-value inside of the graph.
diff --git a/Utilities/BGL/boost/graph/example/Jamfile b/Utilities/BGL/boost/graph/example/Jamfile
deleted file mode 100644
index 24b241321fbded4178255dc716ff3b2975d99d97..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/Jamfile
+++ /dev/null
@@ -1,136 +0,0 @@
-subproject libs/graph/example ;
-
-# Define SGB (stanford graph base top level directory) and
-# LEDA (also top level directory) at the command line of jam using -s
-
-rule graph-test ( sources + : requirements * )
-{
- unit-test $(sources[1]:S=) : $(sources) : $(requirements) <sysinclude>$(BOOST_ROOT) : debug <inlining>on ;
-}
-
-graph-test remove_edge_if_bidir.cpp ;
-graph-test undirected_dfs.cpp ;
-graph-test remove_edge_if_dir.cpp ;
-graph-test remove_edge_if_undir.cpp ;
-graph-test reverse-graph-eg.cpp ;
-graph-test scc.cpp <lib>../build/bgl-viz ;
-graph-test strong_components.cpp <lib>../build/bgl-viz ;
-graph-test strong-components.cpp ;
-graph-test subgraph.cpp ;
-graph-test subgraph_properties.cpp ;
-graph-test topo-sort1.cpp ;
-graph-test topo-sort2.cpp ;
-graph-test topo_sort.cpp ;
-graph-test topo-sort-file-dep2.cpp ;
-graph-test topo-sort-file-dep.cpp ;
-graph-test transitive_closure.cpp ;
-graph-test transpose-example.cpp ;
-graph-test undirected.cpp ;
-graph-test vector-as-graph.cpp ;
-graph-test vertex_basics.cpp ;
-graph-test vertex-name-property.cpp ;
-graph-test visitor.cpp ;
-graph-test accum-compile-times.cpp ;
-graph-test adjacency_list.cpp ;
-graph-test adjacency_list_io.cpp ;
-graph-test adjacency_matrix.cpp ;
-graph-test bellman-example.cpp ;
-graph-test bellman-ford-internet.cpp ;
-graph-test bfs.cpp ;
-graph-test bfs-example.cpp ;
-graph-test bfs-name-printer.cpp ;
-graph-test bfs_neighbor.cpp ;
-graph-test biconnected_components.cpp ;
-graph-test boost_web_graph.cpp ;
-graph-test bucket_sorter.cpp ;
-graph-test cc-internet.cpp <lib>../build/bgl-viz ;
-graph-test city_visitor.cpp ;
-graph-test components_on_edgelist.cpp ;
-graph-test connected_components.cpp ;
-graph-test connected-components.cpp ;
-graph-test container_gen.cpp ;
-graph-test copy-example.cpp ;
-graph-test cuthill_mckee_ordering.cpp ;
-graph-test cycle-file-dep2.cpp ;
-graph-test cycle-file-dep.cpp ;
-graph-test dag_shortest_paths.cpp ;
-graph-test dave.cpp ;
-graph-test default-constructor2.cpp ;
-graph-test default-constructor.cpp ;
-graph-test dfs.cpp ;
-graph-test dfs-example.cpp ;
-graph-test dfs_parenthesis.cpp <lib>../build/bgl-viz ;
-graph-test dfs-parenthesis.cpp <lib>../build/bgl-viz ;
-graph-test dijkstra-example.cpp ;
-graph-test edge_basics.cpp ;
-graph-test edge_connectivity.cpp ;
-graph-test edge-connectivity.cpp <lib>../build/bgl-viz ;
-graph-test edge-function.cpp ;
-graph-test edge_iterator_constructor.cpp ;
-graph-test edge-iter-constructor.cpp ;
-graph-test edge_property.cpp ;
-graph-test edmunds-karp-eg.cpp ;
-graph-test exterior_properties.cpp ;
-graph-test exterior_property_map.cpp ;
-graph-test family-tree-eg.cpp ;
-graph-test fibonacci_heap.cpp ;
-graph-test file_dependencies.cpp ;
-graph-test filtered_graph.cpp ;
-graph-test filtered_vec_as_graph.cpp ;
-graph-test gerdemann.cpp ;
-graph-test graph-assoc-types.cpp ;
-graph-test graph.cpp ;
-graph-test graph-property-iter-eg.cpp ;
-graph-test graphviz.cpp <lib>../build/bgl-viz ;
-graph-test incremental_components.cpp ;
-graph-test incremental-components-eg.cpp ;
-graph-test in_edges.cpp ;
-graph-test interior_property_map.cpp ;
-graph-test isomorphism.cpp ;
-graph-test iterator-property-map-eg.cpp ;
-graph-test johnson-eg.cpp <lib>../build/bgl-viz ;
-graph-test kevin-bacon.cpp ;
-graph-test knights-tour.cpp ;
-graph-test kruskal-example.cpp ;
-graph-test kruskal-telephone.cpp <lib>../build/bgl-viz ;
-graph-test last-mod-time.cpp ;
-graph-test loops_dfs.cpp <lib>../build/bgl-viz ;
-graph-test max_flow.cpp ;
-graph-test minimum_degree_ordering.cpp iohb.c ;
-graph-test min_max_paths.cpp ;
-graph-test modify_graph.cpp ;
-graph-test neighbor_bfs.cpp ;
-graph-test ordered_out_edges.cpp ;
-graph-test ospf-example.cpp <lib>../build/bgl-viz ;
-graph-test parallel-compile-time.cpp ;
-graph-test prim-example.cpp ;
-graph-test prim-telephone.cpp <lib>../build/bgl-viz ;
-graph-test print-adjacent-vertices.cpp ;
-graph-test print-edges.cpp ;
-graph-test print-in-edges.cpp ;
-graph-test print-out-edges.cpp ;
-graph-test property_iterator.cpp ;
-graph-test property-map-traits-eg.cpp ;
-graph-test push-relabel-eg.cpp ;
-graph-test put-get-helper-eg.cpp ;
-graph-test quick_tour.cpp ;
-graph-test quick-tour.cpp ;
-graph-test reachable-loop-head.cpp <lib>../build/bgl-viz ;
-graph-test reachable-loop-tail.cpp <lib>../build/bgl-viz ;
-graph-test roget_components.cpp :
- <include>$(SGB) <library-file>$(SGB)/libgb.a ;
-graph-test topo-sort-with-leda.cpp :
- <include>$(LEDA)/incl <library-file>$(LEDA)/libG.a
- <library-file>$(LEDA)/libL.a <library-file>$(LEDA)/libP.a ;
-graph-test topo-sort-with-sgb.cpp :
- <include>$(SGB) <library-file>$(SGB)/libgb.a ;
-graph-test leda-concept-check.cpp :
- <include>$(LEDA)/incl <library-file>$(LEDA)/libG.a <library-file>$(LEDA)/libL.a <library-file>$(LEDA)/libP.a ;
-graph-test leda-graph-eg.cpp :
- <include>$(LEDA)/incl <library-file>$(LEDA)/libG.a
- <library-file>$(LEDA)/libL.a <library-file>$(LEDA)/libP.a ;
-graph-test girth.cpp : <include>$(SGB)
- <library-file>$(SGB)/libgb.a ;
-graph-test miles_span.cpp : <include>$(SGB)
- <library-file>$(SGB)/libgb.a ;
-
diff --git a/Utilities/BGL/boost/graph/example/accum-compile-times.cpp b/Utilities/BGL/boost/graph/example/accum-compile-times.cpp
deleted file mode 100644
index 0cc66b60396470be481cd172d5dfa6bc80fde261..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/accum-compile-times.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include <numeric>
-#include <iterator>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/property_iter_range.hpp>
-
-namespace std
-{
- template < typename T >
- std::istream& operator >> (std::istream& in, std::pair < T, T > &p)
- {
- in >> p.first >> p.second;
- return in;
- }
-}
-
-namespace boost
-{
- enum vertex_compile_cost_t { vertex_compile_cost };
- BOOST_INSTALL_PROPERTY(vertex, compile_cost);
-}
-
-using namespace boost;
-
-typedef adjacency_list< listS, // Store out-edges of each vertex in a std::list
- listS, // Store vertex set in a std::list
- directedS, // The file dependency graph is directed
- // vertex properties
- property < vertex_name_t, std::string,
- property < vertex_compile_cost_t, float,
- property < vertex_distance_t, float,
- property < vertex_color_t, default_color_type > > > >,
- // an edge property
- property < edge_weight_t, float > >
- file_dep_graph2;
-
-typedef graph_traits<file_dep_graph2>::vertex_descriptor vertex_t;
-typedef graph_traits<file_dep_graph2>::edge_descriptor edge_t;
-
-int
-main()
-{
- std::ifstream file_in("makefile-dependencies.dat");
- typedef graph_traits<file_dep_graph2>::vertices_size_type size_type;
- size_type n_vertices;
- file_in >> n_vertices; // read in number of vertices
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // std::istream_iterator causes trouble with VC++
- std::vector<vertex_t> id2vertex;
- file_dep_graph2 g;
- for (std::size_t i = 0; i < n_vertices; ++i)
- id2vertex.push_back(add_vertex(g));
- std::pair<size_type, size_type> p;
- while (file_in >> p)
- add_edge(id2vertex[p.first], id2vertex[p.second], g);
-#else
- std::istream_iterator<std::pair<size_type, size_type> >
- input_begin(file_in), input_end;
- file_dep_graph2 g(input_begin, input_end, n_vertices);
-#endif
-
- typedef property_map < file_dep_graph2, vertex_name_t >::type name_map_t;
- typedef property_map < file_dep_graph2, vertex_compile_cost_t >::type
- compile_cost_map_t;
- typedef property_map <file_dep_graph2, vertex_distance_t >::type
- distance_map_t;
- typedef property_map <file_dep_graph2, vertex_color_t >::type
- color_map_t;
-
- name_map_t name_map = get(vertex_name, g);
- compile_cost_map_t compile_cost_map = get(vertex_compile_cost, g);
- distance_map_t distance_map = get(vertex_distance, g);
- color_map_t color_map = get(vertex_color, g);
-
- std::ifstream name_in("makefile-target-names.dat");
- std::ifstream compile_cost_in("target-compile-costs.dat");
- graph_traits < file_dep_graph2 >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- name_in >> name_map[*vi];
- compile_cost_in >> compile_cost_map[*vi];
- }
-
- graph_property_iter_range < file_dep_graph2,
- vertex_compile_cost_t >::iterator ci, ci_end;
- tie(ci, ci_end) = get_property_iter_range(g, vertex_compile_cost);
- std::cout << "total (sequential) compile time: "
- << std::accumulate(ci, ci_end, 0.0) << std::endl;
-
- return 0;
-}
-
diff --git a/Utilities/BGL/boost/graph/example/actor_clustering.cpp b/Utilities/BGL/boost/graph/example/actor_clustering.cpp
deleted file mode 100644
index a292564791b0d9419868d2c9664e993aa4652f9c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/actor_clustering.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2004 The Trustees of Indiana University.
-
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// Authors: Douglas Gregor
-// Andrew Lumsdaine
-
-// This program performs betweenness centrality (BC) clustering on the
-// actor collaboration graph available at
-// http://www.nd.edu/~networks/database/index.html and outputs the
-// result of clustering in Pajek format.
-//
-// This program mimics the BC clustering algorithm program implemented
-// by Shashikant Penumarthy for JUNG, so that we may compare results
-// and timings.
-#include <boost/graph/bc_clustering.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_traits.hpp>
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <boost/tokenizer.hpp>
-#include <boost/lexical_cast.hpp>
-#include <map>
-
-using namespace boost;
-
-struct Actor
-{
- Actor(int id = -1) : id(id) {}
-
- int id;
-};
-
-typedef adjacency_list<vecS, vecS, undirectedS, Actor,
- property<edge_centrality_t, double> > ActorGraph;
-typedef graph_traits<ActorGraph>::vertex_descriptor Vertex;
-typedef graph_traits<ActorGraph>::edge_descriptor Edge;
-
-void load_actor_graph(std::istream& in, ActorGraph& g)
-{
- std::map<int, Vertex> actors;
-
- std::string line;
- while (getline(in, line)) {
- std::vector<Vertex> actors_in_movie;
-
- // Map from the actor numbers on this line to the actor vertices
- typedef tokenizer<char_separator<char> > Tok;
- Tok tok(line, char_separator<char>(" "));
- for (Tok::iterator id = tok.begin(); id != tok.end(); ++id) {
- int actor_id = lexical_cast<int>(*id);
- std::map<int, Vertex>::iterator v = actors.find(actor_id);
- if (v == actors.end()) {
- Vertex new_vertex = add_vertex(Actor(actor_id), g);
- actors[actor_id] = new_vertex;
- actors_in_movie.push_back(new_vertex);
- } else {
- actors_in_movie.push_back(v->second);
- }
- }
-
- for (std::vector<Vertex>::iterator i = actors_in_movie.begin();
- i != actors_in_movie.end(); ++i) {
- for (std::vector<Vertex>::iterator j = i + 1;
- j != actors_in_movie.end(); ++j) {
- if (!edge(*i, *j, g).second) add_edge(*i, *j, g);
- }
- }
- }
-}
-
-template<typename Graph, typename VertexIndexMap, typename VertexNameMap>
-std::ostream&
-write_pajek_graph(std::ostream& out, const Graph& g,
- VertexIndexMap vertex_index, VertexNameMap vertex_name)
-{
- out << "*Vertices " << num_vertices(g) << '\n';
- typedef typename graph_traits<Graph>::vertex_iterator vertex_iterator;
- for (vertex_iterator v = vertices(g).first; v != vertices(g).second; ++v) {
- out << get(vertex_index, *v)+1 << " \"" << get(vertex_name, *v) << "\"\n";
- }
-
- out << "*Edges\n";
- typedef typename graph_traits<Graph>::edge_iterator edge_iterator;
- for (edge_iterator e = edges(g).first; e != edges(g).second; ++e) {
- out << get(vertex_index, source(*e, g))+1 << ' '
- << get(vertex_index, target(*e, g))+1 << " 1.0\n"; // HACK!
- }
- return out;
-}
-
-class actor_clustering_threshold : public bc_clustering_threshold<double>
-{
- typedef bc_clustering_threshold<double> inherited;
-
- public:
- actor_clustering_threshold(double threshold, const ActorGraph& g,
- bool normalize)
- : inherited(threshold, g, normalize), iter(1) { }
-
- bool operator()(double max_centrality, Edge e, const ActorGraph& g)
- {
- std::cout << "Iter: " << iter << " Max Centrality: "
- << (max_centrality / dividend) << std::endl;
- ++iter;
- return inherited::operator()(max_centrality, e, g);
- }
-
- private:
- unsigned int iter;
-};
-
-int main(int argc, char* argv[])
-{
- std::string in_file;
- std::string out_file;
- double threshold = -1.0;
- bool normalize = false;
-
- // Parse command-line options
- {
- int on_arg = 1;
- while (on_arg < argc) {
- std::string arg(argv[on_arg]);
- if (arg == "-in") {
- ++on_arg; assert(on_arg < argc);
- in_file = argv[on_arg];
- } else if (arg == "-out") {
- ++on_arg; assert(on_arg < argc);
- out_file = argv[on_arg];
- } else if (arg == "-threshold") {
- ++on_arg; assert(on_arg < argc);
- threshold = lexical_cast<double>(argv[on_arg]);
- } else if (arg == "-normalize") {
- normalize = true;
- } else {
- std::cerr << "Unrecognized parameter \"" << arg << "\".\n";
- return -1;
- }
- ++on_arg;
- }
-
- if (in_file.empty() || out_file.empty() || threshold < 0) {
- std::cerr << "error: syntax is actor_clustering [options]\n\n"
- << "options are:\n"
- << "\t-in <infile>\tInput file\n"
- << "\t-out <outfile>\tOutput file\n"
- << "\t-threshold <value>\tA threshold value\n"
- << "\t-normalize\tNormalize edge centrality scores\n";
- return -1;
- }
- }
-
- ActorGraph g;
-
- // Load the actor graph
- {
- std::cout << "Building graph." << std::endl;
- std::ifstream in(in_file.c_str());
- if (!in) {
- std::cerr << "Unable to open file \"" << in_file << "\" for input.\n";
- return -2;
- }
- load_actor_graph(in, g);
- }
-
- // Run the algorithm
- std::cout << "Clusting..." << std::endl;
- betweenness_centrality_clustering(g,
- actor_clustering_threshold(threshold, g, normalize),
- get(edge_centrality, g));
-
- // Output the graph
- {
- std::cout << "Writing graph to file: " << out_file << std::endl;
- std::ofstream out(out_file.c_str());
- if (!out) {
- std::cerr << "Unable to open file \"" << out_file << "\" for output.\n";
- return -3;
- }
- write_pajek_graph(out, g, get(vertex_index, g), get(&Actor::id, g));
- }
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/adj_list_ra_edgelist.cpp b/Utilities/BGL/boost/graph/example/adj_list_ra_edgelist.cpp
deleted file mode 100644
index 0c8dc032c136986b6855b459f5b2a2fed956c804..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/adj_list_ra_edgelist.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//=======================================================================
-// Copyright 2001 Indiana University.
-// Author: Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list<vecS, vecS, bidirectionalS, no_property,
- property<int, edge_weight_t>, no_property, vecS> Graph;
-
- const std::size_t n = 3;
- typedef std::pair<std::size_t, std::size_t> E;
- E edge_array[] = { E(0,1), E(0,2), E(0,1) };
- const std::size_t m = sizeof(edge_array) / sizeof(E);
- Graph g(edge_array, edge_array + m, n);
- for (std::size_t i = 0; i < m; ++i)
- std::cout << edges(g).first[i] << " ";
- std::cout << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/adjacency_list.cpp b/Utilities/BGL/boost/graph/example/adjacency_list.cpp
deleted file mode 100644
index 4d8c165def08faded4cea7df9e8176899d63af9e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/adjacency_list.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <utility>
-#include <string>
-
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/property_map.hpp>
-
-/*
- Sample Output
-
- graph name: foo
- 0 --joe--> 1
- 1 --joe--> 0 --curly--> 2 --dick--> 3
- 2 --curly--> 1 --tom--> 4
- 3 --dick--> 1 --harry--> 4
- 4 --tom--> 2 --harry--> 3
- (0,1) (1,2) (1,3) (2,4) (3,4)
-
- removing edge (1,3):
- 0 --joe--> 1
- 1 --joe--> 0 --curly--> 2
- 2 --curly--> 1 --tom--> 4
- 3 --harry--> 4
- 4 --tom--> 2 --harry--> 3
- (0,1) (1,2) (2,4) (3,4)
-
- */
-
-struct EdgeProperties {
- EdgeProperties(const std::string& n) : name(n) { }
- std::string name;
-};
-
-struct VertexProperties {
- std::size_t index;
- boost::default_color_type color;
-};
-
-
-int main(int , char* [])
-{
- using namespace boost;
- using namespace std;
-
- typedef adjacency_list<vecS, listS, undirectedS,
- VertexProperties, EdgeProperties> Graph;
-
- const int V = 5;
- Graph g(V);
-
- property_map<Graph, std::size_t VertexProperties::*>::type
- id = get(&VertexProperties::index, g);
- property_map<Graph, std::string EdgeProperties::*>::type
- name = get(&EdgeProperties::name, g);
-
- boost::graph_traits<Graph>::vertex_iterator vi, viend;
- int vnum = 0;
-
- for (boost::tie(vi,viend) = vertices(g); vi != viend; ++vi)
- id[*vi] = vnum++;
-
- add_edge(vertex(0, g), vertex(1, g), EdgeProperties("joe"), g);
- add_edge(vertex(1, g), vertex(2, g), EdgeProperties("curly"), g);
- add_edge(vertex(1, g), vertex(3, g), EdgeProperties("dick"), g);
- add_edge(vertex(2, g), vertex(4, g), EdgeProperties("tom"), g);
- add_edge(vertex(3, g), vertex(4, g), EdgeProperties("harry"), g);
-
- graph_traits<Graph>::vertex_iterator i, end;
- graph_traits<Graph>::out_edge_iterator ei, edge_end;
- for (boost::tie(i,end) = vertices(g); i != end; ++i) {
- cout << id[*i] << " ";
- for (boost::tie(ei,edge_end) = out_edges(*i, g); ei != edge_end; ++ei)
- cout << " --" << name[*ei] << "--> " << id[target(*ei, g)] << " ";
- cout << endl;
- }
- print_edges(g, id);
-
- cout << endl << "removing edge (1,3): " << endl;
- remove_edge(vertex(1, g), vertex(3, g), g);
-
- ei = out_edges(vertex(1, g), g).first;
- cout << "removing edge (" << id[source(*ei, g)]
- << "," << id[target(*ei, g)] << ")" << endl;
- remove_edge(ei, g);
-
- for(boost::tie(i,end) = vertices(g); i != end; ++i) {
- cout << id[*i] << " ";
- for (boost::tie(ei,edge_end) = out_edges(*i, g); ei != edge_end; ++ei)
- cout << " --" << name[*ei] << "--> " << id[target(*ei, g)] << " ";
- cout << endl;
- }
-
- print_edges(g, id);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/adjacency_list.expected b/Utilities/BGL/boost/graph/example/adjacency_list.expected
deleted file mode 100644
index f85d7549f0927642905ac84d2e3e68ce20a8b552..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/adjacency_list.expected
+++ /dev/null
@@ -1,15 +0,0 @@
-0 --joe--> 1
-1 --joe--> 0 --curly--> 2 --dick--> 3
-2 --curly--> 1 --tom--> 4
-3 --dick--> 1 --harry--> 4
-4 --tom--> 2 --harry--> 3
-(0,1) (1,2) (1,3) (2,4) (3,4)
-
-removing edge (1,3):
-removing edge (1,0)
-0
-1 --curly--> 2
-2 --curly--> 1 --tom--> 4
-3 --harry--> 4
-4 --tom--> 2 --harry--> 3
-(1,2) (2,4) (3,4)
diff --git a/Utilities/BGL/boost/graph/example/adjacency_list_io.cpp b/Utilities/BGL/boost/graph/example/adjacency_list_io.cpp
deleted file mode 100644
index 565d1bac8b11341148b43efeb3683ed2239826b4..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/adjacency_list_io.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// (C) Copyright François Faure 2001
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config.hpp>
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
-#error adjacency_list_io.hpp has not been ported to work with VC++
-#endif
-
-#include <boost/graph/adjacency_list_io.hpp>
-#include <fstream>
-
-using namespace boost;
-
-//======== my data structure
-struct MyStruct { double value; };
-std::ostream& operator << ( std::ostream& out, const MyStruct& s )
-{
- out << s.value << " ";
- return out;
-}
-std::istream& operator >> ( std::istream& in, MyStruct& s )
-{
- in >> s.value;
- return in;
-}
-
-//======== vertex properties
-struct n1_t { enum { num = 23063}; typedef vertex_property_tag kind; };
-struct n2_t { enum { num = 23062}; typedef vertex_property_tag kind; };
-struct n3_t { enum { num = 23061}; typedef vertex_property_tag kind; };
-typedef property< n1_t, int,
- property< n2_t, double,
- property< n3_t, MyStruct > > > VertexProperty;
-
-
-//====== edge properties
-struct e1_t { enum { num = 23064}; typedef edge_property_tag kind; };
-typedef property<e1_t, double> EdgeProperty;
-
-
-
-//===== graph types
-
-typedef
- adjacency_list<vecS, listS, directedS, no_property, no_property>
- Graph1;
-
-typedef
- adjacency_list<setS, setS, bidirectionalS, VertexProperty, EdgeProperty>
- Graph2;
-
-
-
-int
-main()
-{
- // read Graph1
- Graph1 g1;
- std::ifstream readFile1("data1.txt");
- readFile1 >> read( g1 );
- std::cout << "graph g1 from file data1.txt:\n"
- << write( g1 )
- << std::endl;
-
- // read Graph2 and all internal properties
- Graph2 g2;
- std::ifstream readFile2("data2.txt");
- readFile2 >> read( g2 );
- std::cout << "graph g2 from file data2.txt:\n"
- << write( g2 )
- << std::endl;
-
- // read Graph2, no property given. Write no property.
- Graph2 g21;
- std::ifstream readFile21("data1.txt");
- readFile21 >> read( g21, no_property(), no_property() );
- std::cout << "graph g21 from file data1.txt:\n"
- << write(g21, no_property(), no_property())
- << std::endl;
-
- // read Graph2, incomplete data in a different order. Write it diffently.
- Graph2 g31;
- std::ifstream readFile31("data3.txt");
- typedef property< n3_t, MyStruct, property< n1_t, int > > readNodeProp;
- readFile31 >> read( g31, readNodeProp() , EdgeProperty() );
- std::cout << "graph g31 from file data3.txt:\n"
- << write( g31, property<n3_t, MyStruct>(), EdgeProperty() )
- << std::endl;
-
-
- return 0;
-}
-
-
diff --git a/Utilities/BGL/boost/graph/example/adjacency_matrix.cpp b/Utilities/BGL/boost/graph/example/adjacency_matrix.cpp
deleted file mode 100644
index accbfca1eeeb4580b36717304db9350ecaadf61b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/adjacency_matrix.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Author: Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_matrix.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-
-int main()
-{
- using namespace boost;
- enum { A, B, C, D, E, F, N };
- const char* name = "ABCDEF";
-
- // A directed graph
-
- typedef adjacency_matrix<directedS> Graph;
- Graph g(N);
- add_edge(B, C, g);
- add_edge(B, F, g);
- add_edge(C, A, g);
- add_edge(C, C, g);
- add_edge(D, E, g);
- add_edge(E, D, g);
- add_edge(F, A, g);
-
- std::cout << "vertex set: ";
- print_vertices(g, name);
- std::cout << std::endl;
-
- std::cout << "edge set: ";
- print_edges(g, name);
- std::cout << std::endl;
-
- std::cout << "out-edges: " << std::endl;
- print_graph(g, name);
- std::cout << std::endl;
-
- // An undirected graph
-
- typedef adjacency_matrix<undirectedS> UGraph;
- UGraph ug(N);
- add_edge(B, C, ug);
- add_edge(B, F, ug);
- add_edge(C, A, ug);
- add_edge(D, E, ug);
- add_edge(F, A, ug);
-
- std::cout << "vertex set: ";
- print_vertices(ug, name);
- std::cout << std::endl;
-
- std::cout << "edge set: ";
- print_edges(ug, name);
- std::cout << std::endl;
-
- std::cout << "incident edges: " << std::endl;
- print_graph(ug, name);
- std::cout << std::endl;
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/astar-cities.cpp b/Utilities/BGL/boost/graph/example/astar-cities.cpp
deleted file mode 100644
index a2a115440bf2acbf2839d3827cf8fa92438247bf..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/astar-cities.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-
-
-//
-//=======================================================================
-// Copyright (c) 2004 Kristopher Beevers
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-//
-
-
-#include <boost/graph/astar_search.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/random.hpp>
-#include <boost/random.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <sys/time.h>
-#include <vector>
-#include <list>
-#include <iostream>
-#include <fstream>
-#include <math.h> // for sqrt
-
-using namespace boost;
-using namespace std;
-
-
-// auxiliary types
-struct location
-{
- float y, x; // lat, long
-};
-typedef float cost;
-
-template <class Name, class LocMap>
-class city_writer {
-public:
- city_writer(Name n, LocMap l, float _minx, float _maxx,
- float _miny, float _maxy,
- unsigned int _ptx, unsigned int _pty)
- : name(n), loc(l), minx(_minx), maxx(_maxx), miny(_miny),
- maxy(_maxy), ptx(_ptx), pty(_pty) {}
- template <class Vertex>
- void operator()(ostream& out, const Vertex& v) const {
- float px = 1 - (loc[v].x - minx) / (maxx - minx);
- float py = (loc[v].y - miny) / (maxy - miny);
- out << "[label=\"" << name[v] << "\", pos=\""
- << static_cast<unsigned int>(ptx * px) << ","
- << static_cast<unsigned int>(pty * py)
- << "\", fontsize=\"11\"]";
- }
-private:
- Name name;
- LocMap loc;
- float minx, maxx, miny, maxy;
- unsigned int ptx, pty;
-};
-
-template <class WeightMap>
-class time_writer {
-public:
- time_writer(WeightMap w) : wm(w) {}
- template <class Edge>
- void operator()(ostream &out, const Edge& e) const {
- out << "[label=\"" << wm[e] << "\", fontsize=\"11\"]";
- }
-private:
- WeightMap wm;
-};
-
-
-// euclidean distance heuristic
-template <class Graph, class CostType, class LocMap>
-class distance_heuristic : public astar_heuristic<Graph, CostType>
-{
-public:
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- distance_heuristic(LocMap l, Vertex goal)
- : m_location(l), m_goal(goal) {}
- CostType operator()(Vertex u)
- {
- CostType dx = m_location[m_goal].x - m_location[u].x;
- CostType dy = m_location[m_goal].y - m_location[u].y;
- return ::sqrt(dx * dx + dy * dy);
- }
-private:
- LocMap m_location;
- Vertex m_goal;
-};
-
-
-struct found_goal {}; // exception for termination
-
-// visitor that terminates when we find the goal
-template <class Vertex>
-class astar_goal_visitor : public boost::default_astar_visitor
-{
-public:
- astar_goal_visitor(Vertex goal) : m_goal(goal) {}
- template <class Graph>
- void examine_vertex(Vertex u, Graph& g) {
- if(u == m_goal)
- throw found_goal();
- }
-private:
- Vertex m_goal;
-};
-
-
-int main(int argc, char **argv)
-{
-
- // specify some types
- typedef adjacency_list<listS, vecS, undirectedS, no_property,
- property<edge_weight_t, cost> > mygraph_t;
- typedef property_map<mygraph_t, edge_weight_t>::type WeightMap;
- typedef mygraph_t::vertex_descriptor vertex;
- typedef mygraph_t::edge_descriptor edge_descriptor;
- typedef mygraph_t::vertex_iterator vertex_iterator;
- typedef std::pair<int, int> edge;
-
- // specify data
- enum nodes {
- Troy, LakePlacid, Plattsburgh, Massena, Watertown, Utica,
- Syracuse, Rochester, Buffalo, Ithaca, Binghamton, Woodstock,
- NewYork, N
- };
- const char *name[] = {
- "Troy", "Lake Placid", "Plattsburgh", "Massena",
- "Watertown", "Utica", "Syracuse", "Rochester", "Buffalo",
- "Ithaca", "Binghamton", "Woodstock", "New York"
- };
- location locations[] = { // lat/long
- {42.73, 73.68}, {44.28, 73.99}, {44.70, 73.46},
- {44.93, 74.89}, {43.97, 75.91}, {43.10, 75.23},
- {43.04, 76.14}, {43.17, 77.61}, {42.89, 78.86},
- {42.44, 76.50}, {42.10, 75.91}, {42.04, 74.11},
- {40.67, 73.94}
- };
- edge edge_array[] = {
- edge(Troy,Utica), edge(Troy,LakePlacid),
- edge(Troy,Plattsburgh), edge(LakePlacid,Plattsburgh),
- edge(Plattsburgh,Massena), edge(LakePlacid,Massena),
- edge(Massena,Watertown), edge(Watertown,Utica),
- edge(Watertown,Syracuse), edge(Utica,Syracuse),
- edge(Syracuse,Rochester), edge(Rochester,Buffalo),
- edge(Syracuse,Ithaca), edge(Ithaca,Binghamton),
- edge(Ithaca,Rochester), edge(Binghamton,Troy),
- edge(Binghamton,Woodstock), edge(Binghamton,NewYork),
- edge(Syracuse,Binghamton), edge(Woodstock,Troy),
- edge(Woodstock,NewYork)
- };
- unsigned int num_edges = sizeof(edge_array) / sizeof(edge);
- cost weights[] = { // estimated travel time (mins)
- 96, 134, 143, 65, 115, 133, 117, 116, 74, 56,
- 84, 73, 69, 70, 116, 147, 173, 183, 74, 71, 124
- };
-
-
- // create graph
- mygraph_t g(N);
- WeightMap weightmap = get(edge_weight, g);
- for(std::size_t j = 0; j < num_edges; ++j) {
- edge_descriptor e; bool inserted;
- tie(e, inserted) = add_edge(edge_array[j].first,
- edge_array[j].second, g);
- weightmap[e] = weights[j];
- }
-
-
- // pick random start/goal
- mt19937 gen(time(0));
- vertex start = random_vertex(g, gen);
- vertex goal = random_vertex(g, gen);
-
-
- cout << "Start vertex: " << name[start] << endl;
- cout << "Goal vertex: " << name[goal] << endl;
-
- ofstream dotfile;
- dotfile.open("test-astar-cities.dot");
- write_graphviz(dotfile, g,
- city_writer<const char **, location*>
- (name, locations, 73.46, 78.86, 40.67, 44.93,
- 480, 400),
- time_writer<WeightMap>(weightmap));
-
-
- vector<mygraph_t::vertex_descriptor> p(num_vertices(g));
- vector<cost> d(num_vertices(g));
- try {
- // call astar named parameter interface
- astar_search
- (g, start,
- distance_heuristic<mygraph_t, cost, location*>
- (locations, goal),
- predecessor_map(&p[0]).distance_map(&d[0]).
- visitor(astar_goal_visitor<vertex>(goal)));
-
-
- } catch(found_goal fg) { // found a path to the goal
- list<vertex> shortest_path;
- for(vertex v = goal;; v = p[v]) {
- shortest_path.push_front(v);
- if(p[v] == v)
- break;
- }
- cout << "Shortest path from " << name[start] << " to "
- << name[goal] << ": ";
- list<vertex>::iterator spi = shortest_path.begin();
- cout << name[start];
- for(++spi; spi != shortest_path.end(); ++spi)
- cout << " -> " << name[*spi];
- cout << endl << "Total travel time: " << d[goal] << endl;
- return 0;
- }
-
- cout << "Didn't find a path from " << name[start] << "to"
- << name[goal] << "!" << endl;
- return 0;
-
-}
diff --git a/Utilities/BGL/boost/graph/example/bcsstk01 b/Utilities/BGL/boost/graph/example/bcsstk01
deleted file mode 100644
index a99a2f430323d7052c57bc4a13871a20405b6100..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bcsstk01
+++ /dev/null
@@ -1,96 +0,0 @@
- 24
- 37
- 30
- 26
- 25
- 38
- 22
- 31
- 29
- 15
- 14
- 13
- 39
- 32
- 33
- 20
- 40
- 41
- 42
- 43
- 34
- 12
- 11
- 10
- 5
- 4
- 3
- 6
- 2
- 1
- 19
- 21
- 44
- 27
- 45
- 35
- 46
- 28
- 47
- 9
- 8
- 7
- 23
- 16
- 18
- 17
- 36
- 48
- 30
- 29
- 27
- 26
- 25
- 28
- 42
- 41
- 40
- 24
- 23
- 22
- 12
- 11
- 10
- 44
- 46
- 45
- 31
- 16
- 32
- 7
- 43
- 1
- 5
- 4
- 34
- 38
- 9
- 3
- 8
- 14
- 15
- 21
- 36
- 47
- 2
- 6
- 13
- 17
- 18
- 19
- 20
- 33
- 35
- 37
- 39
- 48
diff --git a/Utilities/BGL/boost/graph/example/bcsstk01.rsa b/Utilities/BGL/boost/graph/example/bcsstk01.rsa
deleted file mode 100644
index 3d420ed4720fa8a98742770d1189b308660e0dbe..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bcsstk01.rsa
+++ /dev/null
@@ -1,78 +0,0 @@
-1SYMMETRIC STIFFNESS MATRIX SMALL GENERALIZED EIGENVALUE PROBLEM BCSSTK01
- 74 4 14 56 0
-RSA 48 48 224 0
-(16I5) (16I5) (4E20.12)
- 1 9 17 25 31 37 43 49 55 62 66 70 75 85 95 104
- 112 120 127 132 136 141 144 146 149 154 158 161 164 167 169 173
- 178 183 185 188 191 196 201 205 208 211 213 216 219 221 222 224
- 225
- 1 5 6 7 11 19 25 30 2 4 6 8 10 20 24 26
- 3 4 5 9 21 23 27 28 4 8 10 22 27 28 5 7
- 11 21 23 29 6 12 20 24 25 30 7 11 12 13 31 36
- 8 10 12 14 18 32 9 10 11 15 17 33 34 10 16 33
- 34 11 15 17 35 12 14 18 31 36 13 17 18 19 23 37
- 42 43 47 48 14 15 16 18 20 22 38 44 45 46 15 16
- 17 21 39 40 44 45 46 16 20 22 39 40 44 45 46 17
- 18 19 23 41 43 47 48 18 24 37 42 43 47 48 19 23
- 24 43 48 20 22 24 44 21 22 23 45 46 22 45 46 23
- 47 24 43 48 25 29 30 31 35 26 28 32 34 27 28 33
- 28 32 34 29 31 35 30 36 31 35 36 37 32 34 36 38
- 42 33 34 35 39 41 34 40 35 39 41 36 38 42 37 41
- 42 43 47 38 40 42 44 46 39 40 41 45 40 44 46 41
- 43 47 42 48 43 47 48 44 45 46 45 46 46 47 48 48
- .283226851852E+07 .100000000000E+07 .208333333333E+07 -.333333333333E+04
- .100000000000E+07 -.280000000000E+07 -.289351851852E+05 .208333333333E+07
- .163544753086E+07 -.200000000000E+07 .555555555555E+07 -.666666666667E+04
- -.200000000000E+07 -.308641975309E+05 .555555555555E+07 -.159791666667E+07
- .172436728395E+07 -.208333333333E+07 -.277777777778E+07 -.168000000000E+07
- -.154320987654E+05 -.277777777778E+07 -.289351851852E+05 -.208333333333E+07
- .100333333333E+10 .200000000000E+07 .400000000000E+09 -.333333333333E+07
- .208333333333E+07 .100000000000E+09 .106750000000E+10 -.100000000000E+07
- .200000000000E+09 .277777777778E+07 .333333333333E+09 -.833333333333E+06
- .153533333333E+10 -.200000000000E+07 -.555555555555E+07 .666666666667E+09
- -.208333333333E+07 .100000000000E+09 .283226851852E+07 -.100000000000E+07
- .208333333333E+07 -.280000000000E+07 -.289351851852E+05 .208333333333E+07
- .163544753086E+07 .200000000000E+07 .555555555555E+07 -.308641975309E+05
- .555555555555E+07 -.159791666667E+07 .172436728395E+07 -.208333333333E+07
- -.277777777778E+07 -.154320987654E+05 -.277777777778E+07 -.289351851852E+05
- -.208333333333E+07 .100333333333E+10 -.333333333333E+07 .208333333333E+07
- .100000000000E+09 .106750000000E+10 .277777777778E+07 .333333333333E+09
- -.833333333333E+06 .153533333333E+10 -.555555555555E+07 .666666666667E+09
- -.208333333333E+07 .100000000000E+09 .283609946950E+07 -.214928529451E+07
- .235916180402E+07 -.333333333333E+04 -.100000000000E+07 -.289351851852E+05
- .208333333333E+07 -.383095098171E+04 -.114928529451E+07 .275828470683E+06
- .176741074446E+07 .517922131816E+06 .429857058902E+07 -.555555555555E+07
- -.666666666667E+04 .200000000000E+07 -.159791666667E+07 -.131963213599E+06
- -.517922131816E+06 .229857058902E+07 .389003806848E+07 -.263499027470E+07
- .277777777778E+07 -.168000000000E+07 -.289351851852E+05 -.208333333333E+07
- -.517922131816E+06 -.216567078453E+07 -.551656941367E+06 .197572063531E+10
- -.200000000000E+07 .400000000000E+09 .208333333333E+07 .100000000000E+09
- -.229857058902E+07 .551656941366E+06 .486193650990E+09 .152734651547E+10
- -.109779731332E+09 .100000000000E+07 .200000000000E+09 -.833333333333E+06
- .114928529451E+07 .229724661236E+09 -.557173510779E+08 .156411143711E+10
- -.200000000000E+07 -.208333333333E+07 .100000000000E+09 -.275828470683E+06
- -.557173510779E+08 .109411960038E+08 .283226851852E+07 .100000000000E+07
- .208333333333E+07 -.289351851852E+05 .208333333333E+07 .163544753086E+07
- -.200000000000E+07 -.555555555555E+07 -.159791666667E+07 .172436728395E+07
- -.208333333333E+07 .277777777778E+07 -.289351851852E+05 -.208333333333E+07
- .100333333333E+10 .208333333333E+07 .100000000000E+09 .106750000000E+10
- -.833333333333E+06 .153533333333E+10 -.208333333333E+07 .100000000000E+09
- .608796296296E+05 .125000000000E+07 .416666666667E+06 -.416666666667E+04
- .125000000000E+07 .337291666667E+07 -.250000000000E+07 -.833333333333E+04
- -.250000000000E+07 .241171296296E+07 -.416666666667E+06 -.235500000000E+07
- .150000000000E+10 .250000000000E+07 .500000000000E+09 .501833333333E+09
- -.125000000000E+07 .250000000000E+09 .502500000000E+09 -.250000000000E+07
- .398587962963E+07 -.125000000000E+07 .416666666667E+06 -.392500000000E+07
- .341149691358E+07 .250000000000E+07 .694444444444E+07 -.385802469136E+05
- .694444444445E+07 .243100308642E+07 -.416666666667E+06 -.347222222222E+07
- -.192901234568E+05 -.347222222222E+07 .150416666667E+10 -.416666666667E+07
- .133516666667E+10 .347222222222E+07 .416666666667E+09 .216916666667E+10
- -.694444444444E+07 .833333333333E+09 .398587962963E+07 -.125000000000E+07
- .416666666667E+06 -.416666666667E+04 -.125000000000E+07 .341149691358E+07
- .250000000000E+07 -.694444444445E+07 -.833333333333E+04 .250000000000E+07
- .243100308642E+07 -.416666666667E+06 .347222222222E+07 -.235500000000E+07
- .150416666667E+10 -.250000000000E+07 .500000000000E+09 .133516666667E+10
- .125000000000E+07 .250000000000E+09 .216916666667E+10 -.250000000000E+07
- .647105806113E+05 .239928529451E+07 .140838195984E+06 .350487988027E+07
- .517922131816E+06 -.479857058902E+07 .457738374749E+07 .134990274700E+06
- .247238730198E+10 .961679848804E+09 -.109779731332E+09 .531278103775E+09
diff --git a/Utilities/BGL/boost/graph/example/bellman-example.cpp b/Utilities/BGL/boost/graph/example/bellman-example.cpp
deleted file mode 100644
index 4e0b27d3f023b89ebe472e2a74319be57988d3ad..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bellman-example.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/bellman_ford_shortest_paths.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename ParentMap >
-struct edge_writer
-{
- edge_writer(const Graph & g, const ParentMap & p)
- : m_g(g), m_parent(p)
- {
- }
-
- template < typename Edge >
- void operator() (std::ostream & out, const Edge & e) const
- {
- out << "[label=\"" << get(edge_weight, m_g, e) << "\"";
- typename graph_traits < Graph >::vertex_descriptor
- u = source(e, m_g), v = target(e, m_g);
- if (m_parent[v] == u)
- out << ", color=\"black\"";
- else
- out << ", color=\"grey\"";
- out << "]";
- }
- const Graph & m_g;
- ParentMap m_parent;
-};
-template < typename Graph, typename Parent >
-edge_writer < Graph, Parent >
-make_edge_writer(const Graph & g, const Parent & p)
-{
- return edge_writer < Graph, Parent > (g, p);
-}
-
-struct EdgeProperties {
- int weight;
-};
-
-int
-main()
-{
- enum { u, v, x, y, z, N };
- char name[] = { 'u', 'v', 'x', 'y', 'z' };
- typedef std::pair < int, int >E;
- const int n_edges = 10;
- E edge_array[] = { E(u, y), E(u, x), E(u, v), E(v, u),
- E(x, y), E(x, v), E(y, v), E(y, z), E(z, u), E(z,x) };
- int weight[n_edges] = { -4, 8, 5, -2, 9, -3, 7, 2, 6, 7 };
-
- typedef adjacency_list < vecS, vecS, directedS,
- no_property, EdgeProperties> Graph;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- Graph g(N);
- for (std::size_t j = 0; j < n_edges; ++j)
- add_edge(edge_array[j].first, edge_array[j].second, g);
-#else
- Graph g(edge_array, edge_array + n_edges, N);
-#endif
- graph_traits < Graph >::edge_iterator ei, ei_end;
- property_map<Graph, int EdgeProperties::*>::type
- weight_pmap = get(&EdgeProperties::weight, g);
- int i = 0;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei, ++i)
- weight_pmap[*ei] = weight[i];
-
- std::vector<int> distance(N, (std::numeric_limits < short >::max)());
- std::vector<std::size_t> parent(N);
- for (i = 0; i < N; ++i)
- parent[i] = i;
- distance[z] = 0;
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- bool r = bellman_ford_shortest_paths
- (g, int(N), weight_pmap, &parent[0], &distance[0],
- closed_plus<int>(), std::less<int>(), default_bellman_visitor());
-#else
- bool r = bellman_ford_shortest_paths
- (g, int (N), weight_map(weight_pmap).distance_map(&distance[0]).
- predecessor_map(&parent[0]));
-#endif
-
- if (r)
- for (i = 0; i < N; ++i)
- std::cout << name[i] << ": " << std::setw(3) << distance[i]
- << " " << name[parent[i]] << std::endl;
- else
- std::cout << "negative cycle" << std::endl;
-
- std::ofstream dot_file("figs/bellman-eg.dot");
- dot_file << "digraph D {\n"
- << " rankdir=LR\n"
- << " size=\"5,3\"\n"
- << " ratio=\"fill\"\n"
- << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n";
-
- {
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
- graph_traits < Graph >::edge_descriptor e = *ei;
- graph_traits < Graph >::vertex_descriptor
- u = source(e, g), v = target(e, g);
- // VC++ doesn't like the 3-argument get function, so here
- // we workaround by using 2-nested get()'s.
- dot_file << name[u] << " -> " << name[v]
- << "[label=\"" << get(get(&EdgeProperties::weight, g), e) << "\"";
- if (parent[v] == u)
- dot_file << ", color=\"black\"";
- else
- dot_file << ", color=\"grey\"";
- dot_file << "]";
- }
- }
- dot_file << "}";
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/bellman-ford-internet.cpp b/Utilities/BGL/boost/graph/example/bellman-ford-internet.cpp
deleted file mode 100644
index 24bbfef4f0b4503ad1848cce8689eaac3b701ac6..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bellman-ford-internet.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <iostream>
-#include <boost/graph/edge_list.hpp>
-#include <boost/graph/bellman_ford_shortest_paths.hpp>
-
-int
-main()
-{
- using namespace boost;
- // ID numbers for the routers (vertices).
- enum
- { A, B, C, D, E, F, G, H, n_vertices };
- const int n_edges = 11;
- typedef std::pair < int, int >Edge;
-
- // The list of connections between routers stored in an array.
- Edge edges[] = {
- Edge(A, B), Edge(A, C),
- Edge(B, D), Edge(B, E), Edge(C, E), Edge(C, F), Edge(D, H),
- Edge(D, E), Edge(E, H), Edge(F, G), Edge(G, H)
- };
-
- // Specify the graph type and declare a graph object
- typedef edge_list < Edge*, Edge, std::ptrdiff_t, std::random_access_iterator_tag> Graph;
- Graph g(edges, edges + n_edges);
-
- // The transmission delay values for each edge.
- float delay[] =
- {5.0, 1.0, 1.3, 3.0, 10.0, 2.0, 6.3, 0.4, 1.3, 1.2, 0.5};
-
- // Declare some storage for some "external" vertex properties.
- char name[] = "ABCDEFGH";
- int parent[n_vertices];
- for (int i = 0; i < n_vertices; ++i)
- parent[i] = i;
- float distance[n_vertices];
- std::fill(distance, distance + n_vertices, (std::numeric_limits < float >::max)());
- // Specify A as the source vertex
- distance[A] = 0;
-
- bool r = bellman_ford_shortest_paths(g, int (n_vertices),
- weight_map(make_iterator_property_map
- (&delay[0],
- get(edge_index, g),
- delay[0])).
- distance_map(&distance[0]).
- predecessor_map(&parent[0]));
-
- if (r)
- for (int i = 0; i < n_vertices; ++i)
- std::cout << name[i] << ": " << distance[i]
- << " " << name[parent[i]] << std::endl;
- else
- std::cout << "negative cycle" << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/bellman_ford.expected b/Utilities/BGL/boost/graph/example/bellman_ford.expected
deleted file mode 100644
index 7d38857560f6f834337501e4b818cdfab28aa0da..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bellman_ford.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-u: 2 v
-v: 4 x
-x: 7 z
-y: -2 u
-z: 0 z
diff --git a/Utilities/BGL/boost/graph/example/bfs-example.cpp b/Utilities/BGL/boost/graph/example/bfs-example.cpp
deleted file mode 100644
index 20e3b8da935d49ecbc0a012c8abd287187d0ac34..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bfs-example.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/pending/indirect_cmp.hpp>
-#include <boost/pending/integer_range.hpp>
-
-#include <iostream>
-
-using namespace boost;
-template < typename TimeMap > class bfs_time_visitor:public default_bfs_visitor {
- typedef typename property_traits < TimeMap >::value_type T;
-public:
- bfs_time_visitor(TimeMap tmap, T & t):m_timemap(tmap), m_time(t) { }
- template < typename Vertex, typename Graph >
- void discover_vertex(Vertex u, const Graph & g) const
- {
- put(m_timemap, u, m_time++);
- }
- TimeMap m_timemap;
- T & m_time;
-};
-
-
-int
-main()
-{
- using namespace boost;
- // Select the graph type we wish to use
- typedef adjacency_list < vecS, vecS, undirectedS > graph_t;
- // Set up the vertex IDs and names
- enum { r, s, t, u, v, w, x, y, N };
- const char *name = "rstuvwxy";
- // Specify the edges in the graph
- typedef std::pair < int, int >E;
- E edge_array[] = { E(r, s), E(r, v), E(s, w), E(w, r), E(w, t),
- E(w, x), E(x, t), E(t, u), E(x, y), E(u, y)
- };
- // Create the graph object
- const int n_edges = sizeof(edge_array) / sizeof(E);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the edge iterator constructor
- graph_t g(N);
- for (std::size_t j = 0; j < n_edges; ++j)
- add_edge(edge_array[j].first, edge_array[j].second, g);
-#else
- typedef graph_traits<graph_t>::vertices_size_type v_size_t;
- graph_t g(edge_array, edge_array + n_edges, v_size_t(N));
-#endif
-
- // Typedefs
- typedef graph_traits < graph_t >::vertex_descriptor Vertex;
- typedef graph_traits < graph_t >::vertices_size_type Size;
- typedef Size* Iiter;
-
- // a vector to hold the discover time property for each vertex
- std::vector < Size > dtime(num_vertices(g));
-
- Size time = 0;
- bfs_time_visitor < Size * >vis(&dtime[0], time);
- breadth_first_search(g, vertex(s, g), visitor(vis));
-
- // Use std::sort to order the vertices by their discover time
- std::vector<graph_traits<graph_t>::vertices_size_type > discover_order(N);
- integer_range < int >range(0, N);
- std::copy(range.begin(), range.end(), discover_order.begin());
- std::sort(discover_order.begin(), discover_order.end(),
- indirect_cmp < Iiter, std::less < Size > >(&dtime[0]));
-
- std::cout << "order of discovery: ";
- for (int i = 0; i < N; ++i)
- std::cout << name[discover_order[i]] << " ";
- std::cout << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/bfs-example2.cpp b/Utilities/BGL/boost/graph/example/bfs-example2.cpp
deleted file mode 100644
index ca8e87748e089fb39ff9bc99daa2bb90d6e987aa..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bfs-example2.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/pending/indirect_cmp.hpp>
-#include <boost/pending/integer_range.hpp>
-
-#include <iostream>
-
-using namespace boost;
-template < typename TimeMap > class bfs_time_visitor:public default_bfs_visitor {
- typedef typename property_traits < TimeMap >::value_type T;
-public:
- bfs_time_visitor(TimeMap tmap, T & t):m_timemap(tmap), m_time(t) { }
- template < typename Vertex, typename Graph >
- void discover_vertex(Vertex u, const Graph & g) const
- {
- put(m_timemap, u, m_time++);
- }
- TimeMap m_timemap;
- T & m_time;
-};
-
-
-struct VertexProps {
- boost::default_color_type color;
- std::size_t discover_time;
-};
-
-int
-main()
-{
- using namespace boost;
- // Select the graph type we wish to use
- typedef adjacency_list < listS, listS, undirectedS,
- VertexProps> graph_t;
- // Set up the vertex IDs and names
- enum { r, s, t, u, v, w, x, y, N };
- const char *name = "rstuvwxy";
- // Specify the edges in the graph
- typedef std::pair < int, int >E;
- E edge_array[] = { E(r, s), E(r, v), E(s, w), E(w, r), E(w, t),
- E(w, x), E(x, t), E(t, u), E(x, y), E(u, y)
- };
- // Create the graph object
- const int n_edges = sizeof(edge_array) / sizeof(E);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the edge iterator constructor
- graph_t g;
- std::vector<graph_traits<graph_t>::vertex_descriptor> verts;
- for (std::size_t i = 0; i < N; ++i)
- verts.push_back(add_vertex(g));
- for (std::size_t j = 0; j < n_edges; ++j)
- add_edge(verts[edge_array[j].first], verts[edge_array[j].second], g);
-#else
- typedef graph_traits<graph_t>::vertices_size_type v_size_t;
- graph_t g(edge_array, edge_array + n_edges, v_size_t(N));
-#endif
-
- // Typedefs
- typedef graph_traits<graph_t>::vertex_descriptor Vertex;
- typedef graph_traits<graph_t>::vertices_size_type Size;
- typedef Size* Iiter;
-
- Size time = 0;
- typedef property_map<graph_t, std::size_t VertexProps::*>::type dtime_map_t;
- dtime_map_t dtime_map = get(&VertexProps::discover_time, g);
- bfs_time_visitor < dtime_map_t > vis(dtime_map, time);
- breadth_first_search(g, vertex(s, g), color_map(get(&VertexProps::color, g)).
- visitor(vis));
-
- // a vector to hold the discover time property for each vertex
- std::vector < Size > dtime(num_vertices(g));
- graph_traits<graph_t>::vertex_iterator vi, vi_end;
- std::size_t c = 0;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi, ++c)
- dtime[c] = dtime_map[*vi];
-
- // Use std::sort to order the vertices by their discover time
- std::vector<graph_traits<graph_t>::vertices_size_type > discover_order(N);
- integer_range < int >range(0, N);
- std::copy(range.begin(), range.end(), discover_order.begin());
- std::sort(discover_order.begin(), discover_order.end(),
- indirect_cmp < Iiter, std::less < Size > >(&dtime[0]));
-
- std::cout << "order of discovery: ";
- for (int i = 0; i < N; ++i)
- std::cout << name[discover_order[i]] << " ";
- std::cout << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/bfs-name-printer.cpp b/Utilities/BGL/boost/graph/example/bfs-name-printer.cpp
deleted file mode 100644
index eba6dc4327003dd23e5b494d1bfbcfd7454102fd..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bfs-name-printer.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-using namespace boost;
-
-template <typename Graph, typename VertexNameMap, typename TransDelayMap>
-void
-build_router_network(Graph & g, VertexNameMap name_map,
- TransDelayMap delay_map)
-{
- typename graph_traits < Graph >::vertex_descriptor a, b, c, d, e;
- a = add_vertex(g);
- name_map[a] = 'a';
- b = add_vertex(g);
- name_map[b] = 'b';
- c = add_vertex(g);
- name_map[c] = 'c';
- d = add_vertex(g);
- name_map[d] = 'd';
- e = add_vertex(g);
- name_map[e] = 'e';
-
- typename graph_traits<Graph>::edge_descriptor ed;
- bool inserted;
-
- tie(ed, inserted) = add_edge(a, b, g);
- delay_map[ed] = 1.2;
- tie(ed, inserted) = add_edge(a, d, g);
- delay_map[ed] = 4.5;
- tie(ed, inserted) = add_edge(b, d, g);
- delay_map[ed] = 1.8;
- tie(ed, inserted) = add_edge(c, a, g);
- delay_map[ed] = 2.6;
- tie(ed, inserted) = add_edge(c, e, g);
- delay_map[ed] = 5.2;
- tie(ed, inserted) = add_edge(d, c, g);
- delay_map[ed] = 0.4;
- tie(ed, inserted) = add_edge(d, e, g);
- delay_map[ed] = 3.3;
-}
-
-
-template <typename VertexNameMap>
-class bfs_name_printer : public default_bfs_visitor {
- // inherit default (empty) event point actions
-public:
- bfs_name_printer(VertexNameMap n_map) : m_name_map(n_map) {
- }
- template <typename Vertex, typename Graph>
- void discover_vertex(Vertex u, const Graph &) const
- {
- std::cout << get(m_name_map, u) << ' ';
- }
-private:
- VertexNameMap m_name_map;
-};
-
-struct VP {
- char name;
-};
-
-struct EP {
- double weight;
-};
-
-
-int
-main()
-{
- typedef adjacency_list < listS, vecS, directedS, VP, EP> graph_t;
- graph_t g;
-
- property_map<graph_t, char VP::*>::type name_map = get(&VP::name, g);
- property_map<graph_t, double EP::*>::type delay_map = get(&EP::weight, g);
-
- build_router_network(g, name_map, delay_map);
-
- typedef property_map<graph_t, char VP::*>::type VertexNameMap;
- graph_traits<graph_t>::vertex_descriptor a = *vertices(g).first;
- bfs_name_printer<VertexNameMap> vis(name_map);
- std::cout << "BFS vertex discover order: ";
- breadth_first_search(g, a, visitor(vis));
- std::cout << std::endl;
-
-}
diff --git a/Utilities/BGL/boost/graph/example/bfs.cpp b/Utilities/BGL/boost/graph/example/bfs.cpp
deleted file mode 100644
index 71b120084a64e9b86ad574d45786ad799465074a..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bfs.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-
-#include <algorithm>
-#include <vector>
-#include <utility>
-#include <iostream>
-
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/property_map.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-/*
-
- This examples shows how to use the breadth_first_search() GGCL
- algorithm, specifically the 3 argument variant of bfs that assumes
- the graph has a color property (property) stored internally.
-
- Two pre-defined visitors are used to record the distance of each
- vertex from the source vertex, and also to record the parent of each
- vertex. Any number of visitors can be layered and passed to a GGCL
- algorithm.
-
- The call to vertices(G) returns an STL-compatible container which
- contains all of the vertices in the graph. In this example we use
- the vertices container in the STL for_each() function.
-
- Sample Output:
-
- 0 --> 2
- 1 --> 1 3 4
- 2 --> 1 3 4
- 3 --> 1 4
- 4 --> 0 1
- 0 --> 2
- 1 --> 1 3 4
- 2 --> 1 3 4
- 3 --> 1 4
- 4 --> 0 1
- distances: 0 2 1 2 2
- parent[0] = 0
- parent[1] = 2
- parent[2] = 0
- parent[3] = 2
- parent[4] = 2
-
-*/
-
-template <class ParentDecorator>
-struct print_parent {
- print_parent(const ParentDecorator& p_) : p(p_) { }
- template <class Vertex>
- void operator()(const Vertex& v) const {
- std::cout << "parent[" << v << "] = " << p[v] << std::endl;
- }
- ParentDecorator p;
-};
-
-
-template <class NewGraph, class Tag>
-struct graph_copier
- : public boost::base_visitor<graph_copier<NewGraph, Tag> >
-{
- typedef Tag event_filter;
-
- graph_copier(NewGraph& graph) : new_g(graph) { }
-
- template <class Edge, class Graph>
- void operator()(Edge e, Graph& g) {
- boost::add_edge(boost::source(e, g), boost::target(e, g), new_g);
- }
-private:
- NewGraph& new_g;
-};
-
-template <class NewGraph, class Tag>
-inline graph_copier<NewGraph, Tag>
-copy_graph(NewGraph& g, Tag) {
- return graph_copier<NewGraph, Tag>(g);
-}
-
-int main(int , char* [])
-{
- typedef boost::adjacency_list<
- boost::mapS, boost::vecS, boost::bidirectionalS,
- boost::property<boost::vertex_color_t, boost::default_color_type,
- boost::property<boost::vertex_degree_t, int,
- boost::property<boost::vertex_in_degree_t, int,
- boost::property<boost::vertex_out_degree_t, int> > > >
- > Graph;
-
- Graph G(5);
- boost::add_edge(0, 2, G);
- boost::add_edge(1, 1, G);
- boost::add_edge(1, 3, G);
- boost::add_edge(1, 4, G);
- boost::add_edge(2, 1, G);
- boost::add_edge(2, 3, G);
- boost::add_edge(2, 4, G);
- boost::add_edge(3, 1, G);
- boost::add_edge(3, 4, G);
- boost::add_edge(4, 0, G);
- boost::add_edge(4, 1, G);
-
- typedef Graph::vertex_descriptor Vertex;
-
- Graph G_copy(5);
- // Array to store predecessor (parent) of each vertex. This will be
- // used as a Decorator (actually, its iterator will be).
- std::vector<Vertex> p(boost::num_vertices(G));
- // VC++ version of std::vector has no ::pointer, so
- // I use ::value_type* instead.
- typedef std::vector<Vertex>::value_type* Piter;
-
- // Array to store distances from the source to each vertex . We use
- // a built-in array here just for variety. This will also be used as
- // a Decorator.
- boost::graph_traits<Graph>::vertices_size_type d[5];
- std::fill_n(d, 5, 0);
-
- // The source vertex
- Vertex s = *(boost::vertices(G).first);
- p[s] = s;
- boost::breadth_first_search
- (G, s,
- boost::visitor(boost::make_bfs_visitor
- (std::make_pair(boost::record_distances(d, boost::on_tree_edge()),
- std::make_pair
- (boost::record_predecessors(&p[0],
- boost::on_tree_edge()),
- copy_graph(G_copy, boost::on_examine_edge())))) ));
-
- boost::print_graph(G);
- boost::print_graph(G_copy);
-
- if (boost::num_vertices(G) < 11) {
- std::cout << "distances: ";
-#ifdef BOOST_OLD_STREAM_ITERATORS
- std::copy(d, d + 5, std::ostream_iterator<int, char>(std::cout, " "));
-#else
- std::copy(d, d + 5, std::ostream_iterator<int>(std::cout, " "));
-#endif
- std::cout << std::endl;
-
- std::for_each(boost::vertices(G).first, boost::vertices(G).second,
- print_parent<Piter>(&p[0]));
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/bfs.expected b/Utilities/BGL/boost/graph/example/bfs.expected
deleted file mode 100644
index c58f0fb319e4b7ebe7496e6e297d1c236c9213c4..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bfs.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-0 --> 2
-1 --> 1 3 4
-2 --> 1 3 4
-3 --> 1 4
-4 --> 0 1
-0 --> 2
-1 --> 1 3 4
-2 --> 1 3 4
-3 --> 1 4
-4 --> 0 1
-distances: 0 2 1 2 2
-parent[0] = 0
-parent[1] = 2
-parent[2] = 0
-parent[3] = 2
-parent[4] = 2
diff --git a/Utilities/BGL/boost/graph/example/bfs_basics.expected b/Utilities/BGL/boost/graph/example/bfs_basics.expected
deleted file mode 100644
index 6fc6c2dbd7b5de21ac5272480c087840c1ba36c4..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bfs_basics.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-order of discovery: s r w v t x u y
-order of finish: s r w v t x u y
diff --git a/Utilities/BGL/boost/graph/example/bfs_neighbor.cpp b/Utilities/BGL/boost/graph/example/bfs_neighbor.cpp
deleted file mode 100644
index 5bac52b5ee55b5f2628f07b1a9bbfc33ec799a5c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bfs_neighbor.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-
-#include <algorithm>
-#include <vector>
-#include <utility>
-#include <iostream>
-
-#include <boost/graph/graph_utility.hpp>
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/neighbor_bfs.hpp>
-#include <boost/property_map.hpp>
-
-/*
-
- This examples shows how to use the breadth_first_search() GGCL
- algorithm, specifically the 3 argument variant of bfs that assumes
- the graph has a color property (property) stored internally.
-
- Two pre-defined visitors are used to record the distance of each
- vertex from the source vertex, and also to record the parent of each
- vertex. Any number of visitors can be layered and passed to a GGCL
- algorithm.
-
- The call to vertices(G) returns an STL-compatible container which
- contains all of the vertices in the graph. In this example we use
- the vertices container in the STL for_each() function.
-
- Sample Output:
-
- 0 --> 2
- 1 --> 1 3 4
- 2 --> 1 3 4
- 3 --> 1 4
- 4 --> 0 1
- distances: 1 2 1 2 0
- parent[0] = 4
- parent[1] = 2
- parent[2] = 0
- parent[3] = 2
- parent[4] = 0
-
-*/
-
-template <class ParentDecorator>
-struct print_parent {
- print_parent(const ParentDecorator& p_) : p(p_) { }
- template <class Vertex>
- void operator()(const Vertex& v) const {
- std::cout << "parent[" << v << "] = " << p[v] << std::endl;
- }
- ParentDecorator p;
-};
-
-
-template <class NewGraph, class Tag>
-struct graph_copier
- : public boost::base_visitor<graph_copier<NewGraph, Tag> >
-{
- typedef Tag event_filter;
-
- graph_copier(NewGraph& graph) : new_g(graph) { }
-
- template <class Edge, class Graph>
- void operator()(Edge e, Graph& g) {
- boost::add_edge(boost::source(e, g), boost::target(e, g), new_g);
- }
-private:
- NewGraph& new_g;
-};
-
-template <class NewGraph, class Tag>
-inline graph_copier<NewGraph, Tag>
-copy_graph(NewGraph& g, Tag) {
- return graph_copier<NewGraph, Tag>(g);
-}
-
-int main(int , char* [])
-{
- typedef boost::adjacency_list<
- boost::mapS, boost::vecS, boost::bidirectionalS,
- boost::property<boost::vertex_color_t, boost::default_color_type,
- boost::property<boost::vertex_degree_t, int,
- boost::property<boost::vertex_in_degree_t, int,
- boost::property<boost::vertex_out_degree_t, int> > > >
- > Graph;
-
- Graph G(5);
- boost::add_edge(0, 2, G);
- boost::add_edge(1, 1, G);
- boost::add_edge(1, 3, G);
- boost::add_edge(1, 4, G);
- boost::add_edge(2, 1, G);
- boost::add_edge(2, 3, G);
- boost::add_edge(2, 4, G);
- boost::add_edge(3, 1, G);
- boost::add_edge(3, 4, G);
- boost::add_edge(4, 0, G);
- boost::add_edge(4, 1, G);
-
- typedef Graph::vertex_descriptor Vertex;
-
- // Array to store predecessor (parent) of each vertex. This will be
- // used as a Decorator (actually, its iterator will be).
- std::vector<Vertex> p(boost::num_vertices(G));
- // VC++ version of std::vector has no ::pointer, so
- // I use ::value_type* instead.
- typedef std::vector<Vertex>::value_type* Piter;
-
- // Array to store distances from the source to each vertex . We use
- // a built-in array here just for variety. This will also be used as
- // a Decorator.
- boost::graph_traits<Graph>::vertices_size_type d[5];
- std::fill_n(d, 5, 0);
-
- // The source vertex
- Vertex s = *(boost::vertices(G).first);
- p[s] = s;
- boost::neighbor_breadth_first_search
- (G, s,
- boost::visitor(boost::make_neighbor_bfs_visitor
- (std::make_pair(boost::record_distances(d, boost::on_tree_edge()),
- boost::record_predecessors(&p[0],
- boost::on_tree_edge())))));
-
- boost::print_graph(G);
-
- if (boost::num_vertices(G) < 11) {
- std::cout << "distances: ";
-#ifdef BOOST_OLD_STREAM_ITERATORS
- std::copy(d, d + 5, std::ostream_iterator<int, char>(std::cout, " "));
-#else
- std::copy(d, d + 5, std::ostream_iterator<int>(std::cout, " "));
-#endif
- std::cout << std::endl;
-
- std::for_each(boost::vertices(G).first, boost::vertices(G).second,
- print_parent<Piter>(&p[0]));
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/biconnected_components.cpp b/Utilities/BGL/boost/graph/example/biconnected_components.cpp
deleted file mode 100644
index e05d32e3746cecf93e31f7e320f6205d61c7d581..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/biconnected_components.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <vector>
-#include <list>
-#include <boost/graph/biconnected_components.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <iterator>
-#include <iostream>
-
-namespace boost
-{
- struct edge_component_t
- {
- enum
- { num = 555 };
- typedef edge_property_tag kind;
- }
- edge_component;
-}
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < vecS, vecS, undirectedS,
- no_property, property < edge_component_t, std::size_t > >graph_t;
- typedef graph_traits < graph_t >::vertex_descriptor vertex_t;
- graph_t g(9);
- add_edge(0, 5, g);
- add_edge(0, 1, g);
- add_edge(0, 6, g);
- add_edge(1, 2, g);
- add_edge(1, 3, g);
- add_edge(1, 4, g);
- add_edge(2, 3, g);
- add_edge(4, 5, g);
- add_edge(6, 8, g);
- add_edge(6, 7, g);
- add_edge(7, 8, g);
-
- property_map < graph_t, edge_component_t >::type
- component = get(edge_component, g);
-
- std::size_t num_comps = biconnected_components(g, component);
- std::cerr << "Found " << num_comps << " biconnected components.\n";
-
- std::vector<vertex_t> art_points;
- articulation_points(g, std::back_inserter(art_points));
- std::cerr << "Found " << art_points.size() << " articulation points.\n";
-
- std::cout << "graph A {\n" << " node[shape=\"circle\"]\n";
-
- for (std::size_t i = 0; i < art_points.size(); ++i) {
- std::cout << (char)(art_points[i] + 'A')
- << " [ style=\"filled\", fillcolor=\"red\" ];"
- << std::endl;
- }
-
- graph_traits < graph_t >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
- std::cout << (char)(source(*ei, g) + 'A') << " -- "
- << (char)(target(*ei, g) + 'A')
- << "[label=\"" << component[*ei] << "\"]\n";
- std::cout << "}\n";
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/boost_web.dat b/Utilities/BGL/boost/graph/example/boost_web.dat
deleted file mode 100644
index b52a03198b757585416b5b73419210b931d6820b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/boost_web.dat
+++ /dev/null
@@ -1,34 +0,0 @@
-www.boost.org|Libraries|Boost Libraries
-www.boost.org|Home|www.boost.org
-www.boost.org|More|More Information
-www.boost.org|People|Boost People
-www.boost.org|FAQ|Frequently Asked Questions
-More Information|More|More Information
-More Information|Header Dependencies|Boost Header Dependencies
-More Information|Compiler Status|Compiler Status
-More Information|Library Formal Review Process|Formal Review Process
-More Information|Home|www.boost.org
-More Information|FAQ|Frequently Asked Questions
-More Information|People|Boost People
-More Information|Libraries|Boost Libraries
-Frequently Asked Questions|FAQ|Frequently Asked Questions
-Frequently Asked Questions|Home|www.boost.org
-Frequently Asked Questions|People|Boost People
-Frequently Asked Questions|Library Guidlines|Boost Library Requirements and Guidelines
-Frequently Asked Questions|License Requirements|Boost Library Requirements and Guidelines
-Frequently Asked Questions|More|More Information
-Frequently Asked Questions|Libraries|Boost Libraries
-Boost People|Dave Abrahams|Dave Abrahams
-Boost People|Darin Adler|Darin Adler
-Boost People|More|More Information
-Boost People|Home|www.boost.org
-Boost People|FAQ|Frequently Asked Questions
-Boost People|Libraries|Boost Libraries
-Boost People|People|Boost People
-Boost Libraries|call_traits|Call Traits
-Boost Libraries|compose|Compose Library
-Boost Libraries|graph|Boost Graph Library
-Boost Libraries|property_map|Property Map Library
-Boost Libraries|array|Array wrapper
-Boost Libraries|Libraries|Boost Libraries
-Boost Libraries|People|Boost Libraries
diff --git a/Utilities/BGL/boost/graph/example/boost_web_graph.cpp b/Utilities/BGL/boost/graph/example/boost_web_graph.cpp
deleted file mode 100644
index eec82184578216542109931dc1f9c5a6edf55c9c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/boost_web_graph.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <algorithm>
-#include <map>
-#include <boost/pending/stringtok.hpp>
-#include <boost/utility.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/depth_first_search.hpp>
-
-
-template <class Distance>
-class calc_distance_visitor : public boost::bfs_visitor<>
-{
-public:
- calc_distance_visitor(Distance d) : distance(d) { }
-
- template <class Graph>
- void tree_edge(typename boost::graph_traits<Graph>::edge_descriptor e,
- Graph& g)
- {
- typename boost::graph_traits<Graph>::vertex_descriptor u, v;
- u = boost::source(e, g);
- v = boost::target(e, g);
- distance[v] = distance[u] + 1;
- }
-private:
- Distance distance;
-};
-
-
-template <class VertexNameMap, class DistanceMap>
-class print_tree_visitor : public boost::dfs_visitor<>
-{
-public:
- print_tree_visitor(VertexNameMap n, DistanceMap d) : name(n), distance(d) { }
- template <class Graph>
- void
- discover_vertex(typename boost::graph_traits<Graph>::vertex_descriptor v,
- Graph&)
- {
- typedef typename boost::property_traits<DistanceMap>::value_type Dist;
- // indentation based on depth
- for (Dist i = 0; i < distance[v]; ++i)
- std::cout << " ";
- std::cout << name[v] << std::endl;
- }
-
- template <class Graph>
- void tree_edge(typename boost::graph_traits<Graph>::edge_descriptor e,
- Graph& g)
- {
- distance[boost::target(e, g)] = distance[boost::source(e, g)] + 1;
- }
-
-private:
- VertexNameMap name;
- DistanceMap distance;
-};
-
-int
-main()
-{
- using namespace boost;
-
- std::ifstream datafile("./boost_web.dat");
- if (!datafile) {
- std::cerr << "No ./boost_web.dat file" << std::endl;
- return -1;
- }
-
- //===========================================================================
- // Declare the graph type and object, and some property maps.
-
- typedef adjacency_list<vecS, vecS, directedS,
- property<vertex_name_t, std::string,
- property<vertex_color_t, default_color_type> >,
- property<edge_name_t, std::string, property<edge_weight_t, int> >
- > Graph;
-
- typedef graph_traits<Graph> Traits;
- typedef Traits::vertex_descriptor Vertex;
- typedef Traits::edge_descriptor Edge;
-
- typedef std::map<std::string, Vertex> NameVertexMap;
- NameVertexMap name2vertex;
- Graph g;
-
- typedef property_map<Graph, vertex_name_t>::type NameMap;
- NameMap node_name = get(vertex_name, g);
- property_map<Graph, edge_name_t>::type link_name = get(edge_name, g);
-
- //===========================================================================
- // Read the data file and construct the graph.
-
- std::string line;
- while (std::getline(datafile,line)) {
-
- std::list<std::string> line_toks;
- boost::stringtok(line_toks, line, "|");
-
- NameVertexMap::iterator pos;
- bool inserted;
- Vertex u, v;
-
- std::list<std::string>::iterator i = line_toks.begin();
-
- tie(pos, inserted) = name2vertex.insert(std::make_pair(*i, Vertex()));
- if (inserted) {
- u = add_vertex(g);
- put(node_name, u, *i);
- pos->second = u;
- } else
- u = pos->second;
- ++i;
-
- std::string hyperlink_name = *i++;
-
- tie(pos, inserted) = name2vertex.insert(std::make_pair(*i, Vertex()));
- if (inserted) {
- v = add_vertex(g);
- put(node_name, v, *i);
- pos->second = v;
- } else
- v = pos->second;
-
- Edge e;
- tie(e, inserted) = add_edge(u, v, g);
- if (inserted) {
- put(link_name, e, hyperlink_name);
- }
- }
-
- //===========================================================================
- // Calculate the diameter of the graph.
-
- typedef Traits::vertices_size_type size_type;
- typedef std::vector<size_type> IntVector;
- // Create N x N matrix for storing the shortest distances
- // between each vertex. Initialize all distances to zero.
- std::vector<IntVector> d_matrix(num_vertices(g),
- IntVector(num_vertices(g), 0));
-
- size_type i;
- for (i = 0; i < num_vertices(g); ++i) {
- calc_distance_visitor<size_type*> vis(&d_matrix[i][0]);
- Traits::vertex_descriptor src = vertices(g).first[i];
- breadth_first_search(g, src, boost::visitor(vis));
- }
-
- size_type diameter = 0;
- BOOST_USING_STD_MAX();
- for (i = 0; i < num_vertices(g); ++i)
- diameter = max BOOST_PREVENT_MACRO_SUBSTITUTION(diameter, *std::max_element(d_matrix[i].begin(),
- d_matrix[i].end()));
-
- std::cout << "The diameter of the boost web-site graph is " << diameter
- << std::endl << std::endl;
-
- std::cout << "Number of clicks from the home page: " << std::endl;
- Traits::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- std::cout << d_matrix[0][*vi] << "\t" << node_name[*vi] << std::endl;
- std::cout << std::endl;
-
- //===========================================================================
- // Print out the breadth-first search tree starting at the home page
-
- // Create storage for a mapping from vertices to their parents
- std::vector<Traits::vertex_descriptor> parent(num_vertices(g));
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- parent[*vi] = *vi;
-
- // Do a BFS starting at the home page, recording the parent of each
- // vertex (where parent is with respect to the search tree).
- Traits::vertex_descriptor src = vertices(g).first[0];
- breadth_first_search
- (g, src,
- boost::visitor(make_bfs_visitor(record_predecessors(&parent[0],
- on_tree_edge()))));
-
- // Add all the search tree edges into a new graph
- Graph search_tree(num_vertices(g));
- tie(vi, vi_end) = vertices(g);
- ++vi;
- for (; vi != vi_end; ++vi)
- add_edge(parent[*vi], *vi, search_tree);
-
- std::cout << "The breadth-first search tree:" << std::endl;
-
- // Print out the search tree. We use DFS because it visits
- // the tree nodes in the order that we want to print out:
- // a directory-structure like format.
- std::vector<size_type> dfs_distances(num_vertices(g), 0);
- print_tree_visitor<NameMap, size_type*>
- tree_printer(node_name, &dfs_distances[0]);
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- get(vertex_color, g)[*vi] = white_color;
- depth_first_visit(search_tree, src, tree_printer, get(vertex_color, g));
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/boost_web_graph.expected b/Utilities/BGL/boost/graph/example/boost_web_graph.expected
deleted file mode 100644
index b79bbf47dcebd552f44fe5da0a82aced79a60cc7..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/boost_web_graph.expected
+++ /dev/null
@@ -1,37 +0,0 @@
-The diameter of the boost web-site graph is 2
-
-Number of clicks from the home page:
-0 www.boost.org
-1 Boost Libraries
-1 More Information
-1 Boost People
-1 Frequently Asked Questions
-2 Boost Header Dependencies
-2 Compiler Status
-2 Formal Review Process
-2 Boost Library Requirements and Guidelines
-2 Dave Abrahams
-2 Darin Adler
-2 Call Traits
-2 Compose Library
-2 Boost Graph Library
-2 Property Map Library
-2 Array wrapper
-
-The breadth-first search tree:
-www.boost.org
- Boost Libraries
- Call Traits
- Compose Library
- Boost Graph Library
- Property Map Library
- Array wrapper
- More Information
- Boost Header Dependencies
- Compiler Status
- Formal Review Process
- Boost People
- Dave Abrahams
- Darin Adler
- Frequently Asked Questions
- Boost Library Requirements and Guidelines
diff --git a/Utilities/BGL/boost/graph/example/bucket_sorter.cpp b/Utilities/BGL/boost/graph/example/bucket_sorter.cpp
deleted file mode 100644
index 0b5ca055d05d820575ba674eab52770c0a3e035e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/bucket_sorter.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <vector>
-#include <iostream>
-
-#include <stdlib.h>
-#include <boost/pending/bucket_sorter.hpp>
-
-template <class Integral>
-struct trivial_id {
- std::size_t operator[](Integral i) {
- return i;
- }
- std::size_t operator[](Integral i) const {
- return i;
- }
-};
-
-
-int main() {
- using namespace std;
- using boost::bucket_sorter;
-
- const std::size_t N = 10;
-
- vector<std::size_t> bucket(N);
- for (std::size_t i=0; i<N; i++) {
- bucket[i] = rand() % N;
- cout.width(6);
- cout << "Number " << i << " has its bucket " << bucket[i] << endl;
- }
-
- typedef trivial_id<int> ID;
- typedef bucket_sorter<std::size_t, int,
- vector<std::size_t>::iterator, ID> BS;
- BS my_bucket_sorter(N, N, bucket.begin());
-
- for (std::size_t ii=0; ii<N; ii++)
- my_bucket_sorter.push(ii);
-
- std::size_t j;
- for (j=0; j<N; j++) {
- cout << "The bucket " << j;
- if ( ! my_bucket_sorter[j].empty() ) {
- cout << " has number ";
- do {
- int v = my_bucket_sorter[j].top();
- my_bucket_sorter[j].pop();
- cout << v << " ";
- } while ( ! my_bucket_sorter[j].empty() );
- cout << endl;
- } else {
- cout << " has no number associated with." << endl;
- }
- }
-
- for (std::size_t k=0; k<N; k++)
- my_bucket_sorter.push(k);
-
- my_bucket_sorter.remove(5);
- my_bucket_sorter.remove(7);
-
- cout << "Afer remove number 5 and 7, check correctness again." << endl;
-
- for (j=0; j<N; j++) {
- cout << "The bucket " << j;
- if ( ! my_bucket_sorter[j].empty() ) {
- cout << " has number ";
- do {
- int v = my_bucket_sorter[j].top();
- my_bucket_sorter[j].pop();
- cout << v << " ";
- } while ( ! my_bucket_sorter[j].empty() );
- cout << endl;
- } else {
- cout << " has no number associated with." << endl;
- }
- }
-
- std::size_t iii;
- for (iii=0; iii<N; iii++) {
- std::size_t current = rand() % N;
- if ( ! my_bucket_sorter[current].empty() ) {
- int v = my_bucket_sorter[current].top();
- my_bucket_sorter[current].pop();
- bucket[v] = rand() % N;
- my_bucket_sorter.push(v);
- }
- }
-
- for (iii=0; iii<N; iii++) {
- std::size_t current = rand() % N;
- if ( ! my_bucket_sorter[current].empty() ) {
- int v = my_bucket_sorter[current].top();
- bucket[v] = rand() % N;
- my_bucket_sorter.update(v);
- }
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/cc-internet.cpp b/Utilities/BGL/boost/graph/example/cc-internet.cpp
deleted file mode 100644
index dbd29f0e5929a066d1f015e7a466dff913384beb..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/cc-internet.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <vector>
-#include <string>
-#include <boost/graph/connected_components.hpp>
-#include <boost/graph/graphviz.hpp>
-
-int
-main()
-{
- using namespace boost;
- GraphvizGraph g;
- read_graphviz("figs/cc-internet.dot", g);
-
- std::vector<int> component(num_vertices(g));
-
- connected_components
- (g, make_iterator_property_map(component.begin(),
- get(vertex_index, g), component[0]));
-
- property_map < GraphvizGraph, vertex_attribute_t >::type
- vertex_attr_map = get(vertex_attribute, g);
- std::string color[] = {
- "white", "gray", "black", "lightgray"};
- graph_traits < GraphvizGraph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- vertex_attr_map[*vi]["color"] = color[component[*vi]];
- vertex_attr_map[*vi]["style"] = "filled";
- if (vertex_attr_map[*vi]["color"] == "black")
- vertex_attr_map[*vi]["fontcolor"] = "white";
- }
- write_graphviz("figs/cc-internet-out.dot", g);
-
-}
diff --git a/Utilities/BGL/boost/graph/example/city_visitor.cpp b/Utilities/BGL/boost/graph/example/city_visitor.cpp
deleted file mode 100644
index 44a4a09c3f7b435776b35646821b702904004718..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/city_visitor.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-//
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/property_map.hpp>
-#include <boost/graph/graph_utility.hpp> // for boost::make_list
-
-
-/*
- Example of using a visitor with the depth first search
- and breadth first search algorithm
-
- Sacramento ---- Reno ---- Salt Lake City
- |
- San Francisco
- |
- San Jose ---- Fresno
- |
- Los Angeles ---- Las Vegas ---- Phoenix
- |
- San Diego
-
-
- The visitor has three main functions:
-
- discover_vertex(u,g) is invoked when the algorithm first arrives at the
- vertex u. This will happen in the depth first or breadth first
- order depending on which algorithm you use.
-
- examine_edge(e,g) is invoked when the algorithm first checks an edge to see
- whether it has already been there. Whether using BFS or DFS, all
- the edges of vertex u are examined immediately after the call to
- visit(u).
-
- finish_vertex(u,g) is called when after all the vertices reachable from vertex
- u have already been visited.
-
- */
-
-using namespace std;
-using namespace boost;
-
-
-struct city_arrival : public base_visitor<city_arrival>
-{
- city_arrival(string* n) : names(n) { }
- typedef on_discover_vertex event_filter;
- template <class Vertex, class Graph>
- inline void operator()(Vertex u, Graph&) {
- cout << endl << "arriving at " << names[u] << endl
- << " neighboring cities are: ";
- }
- string* names;
-};
-
-struct neighbor_cities : public base_visitor<neighbor_cities>
-{
- neighbor_cities(string* n) : names(n) { }
- typedef on_examine_edge event_filter;
- template <class Edge, class Graph>
- inline void operator()(Edge e, Graph& g) {
- cout << names[ target(e, g) ] << ", ";
- }
- string* names;
-};
-
-struct finish_city : public base_visitor<finish_city>
-{
- finish_city(string* n) : names(n) { }
- typedef on_finish_vertex event_filter;
- template <class Vertex, class Graph>
- inline void operator()(Vertex u, Graph&) {
- cout << endl << "finished with " << names[u] << endl;
- }
- string* names;
-};
-
-int main(int, char*[])
-{
-
- enum { SanJose, SanFran, LA, SanDiego, Fresno, LasVegas, Reno,
- Sacramento, SaltLake, Phoenix, N };
-
- string names[] = { "San Jose", "San Francisco", "Los Angeles", "San Diego",
- "Fresno", "Las Vegas", "Reno", "Sacramento",
- "Salt Lake City", "Phoenix" };
-
- typedef std::pair<int,int> E;
- E edge_array[] = { E(Sacramento, Reno), E(Sacramento, SanFran),
- E(Reno, SaltLake),
- E(SanFran, SanJose),
- E(SanJose, Fresno), E(SanJose, LA),
- E(LA, LasVegas), E(LA, SanDiego),
- E(LasVegas, Phoenix) };
-
- /* Create the graph type we want. */
- typedef adjacency_list<vecS, vecS, undirectedS> Graph;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the edge iterator constructor
- Graph G(N);
- for (std::size_t j = 0; j < sizeof(edge_array)/sizeof(E); ++j)
- add_edge(edge_array[j].first, edge_array[j].second, G);
-#else
- Graph G(edge_array, edge_array + sizeof(edge_array)/sizeof(E), N);
-#endif
-
- cout << "*** Depth First ***" << endl;
- depth_first_search
- (G,
- visitor(make_dfs_visitor(boost::make_list(city_arrival(names),
- neighbor_cities(names),
- finish_city(names)))));
- cout << endl;
-
- /* Get the source vertex */
- boost::graph_traits<Graph>::vertex_descriptor
- s = vertex(SanJose,G);
-
- cout << "*** Breadth First ***" << endl;
- breadth_first_search
- (G, s, visitor(make_bfs_visitor(boost::make_list(city_arrival(names),
- neighbor_cities(names),
- finish_city(names)))));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/components_on_edgelist.cpp b/Utilities/BGL/boost/graph/example/components_on_edgelist.cpp
deleted file mode 100644
index 1d76fc0e4678d9a4b39f0626ab4f984efd844140..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/components_on_edgelist.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <iterator>
-#include <vector>
-#include <algorithm>
-#include <utility>
-#include <boost/graph/edge_list.hpp>
-#include <boost/graph/incremental_components.hpp>
-#include <boost/pending/disjoint_sets.hpp>
-#include <boost/utility.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-/*
-
- This example demonstrates the usage of the
- connected_components_on_edgelist algorithm. This differs from the
- connect_components algorithm in that the graph object
- only needs to provide access to the "list" of edges (via the
- edges() function).
-
- The example graphs come from "Introduction to
- Algorithms", Cormen, Leiserson, and Rivest p. 87 (though we number
- the vertices from zero instead of one).
-
- Sample output:
-
- An undirected graph (edge list):
- (0,1) (1,4) (4,0) (2,5)
- Total number of components: 3
- Vertex 0 is in the component who's representative is 1
- Vertex 1 is in the component who's representative is 1
- Vertex 2 is in the component who's representative is 5
- Vertex 3 is in the component who's representative is 3
- Vertex 4 is in the component who's representative is 1
- Vertex 5 is in the component who's representative is 5
-
- component 0 contains: 4 1 0
- component 1 contains: 3
- component 2 contains: 5 2
-
- */
-
-
-using namespace std;
-using boost::tie;
-
-int main(int , char* [])
-{
- using namespace boost;
- typedef int Index; // ID of a Vertex
- typedef pair<Index,Index> Edge;
- const int N = 6;
- const int E = 4;
- Edge edgelist[] = { Edge(0, 1), Edge(1, 4), Edge(4, 0), Edge(2, 5) };
-
-
-
- edge_list<Edge*,Edge,ptrdiff_t,std::random_access_iterator_tag> g(edgelist, edgelist + E);
- cout << "An undirected graph (edge list):" << endl;
- print_edges(g, identity_property_map());
- cout << endl;
-
- disjoint_sets_with_storage<> ds;
- incremental_components(g, ds);
-
- component_index<int> components(&ds.parents()[0],
- &ds.parents()[0] + ds.parents().size());
-
- cout << "Total number of components: " << components.size() << endl;
- for (int k = 0; k != N; ++k)
- cout << "Vertex " << k << " is in the component who's representative is "
- << ds.find_set(k) << endl;
- cout << endl;
-
- for (component_index<int>::size_type i = 0; i < components.size(); ++i) {
- cout << "component " << i << " contains: ";
- component_index<int>::value_type::iterator
- j = components[i].begin(),
- jend = components[i].end();
- for ( ; j != jend; ++j)
- cout << *j << " ";
- cout << endl;
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/components_on_edgelist.expected b/Utilities/BGL/boost/graph/example/components_on_edgelist.expected
deleted file mode 100644
index bb12dd332499735ad5b4cfc3745aa85f03248a43..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/components_on_edgelist.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-An undirected graph (edge list):
-(0,1) (1,4) (4,0) (2,5)
-
-Total number of components: 3
-Vertex 0 is in the component who's representative is 1
-Vertex 1 is in the component who's representative is 1
-Vertex 2 is in the component who's representative is 5
-Vertex 3 is in the component who's representative is 3
-Vertex 4 is in the component who's representative is 1
-Vertex 5 is in the component who's representative is 5
-
-component 0 contains: 4 1 0
-component 1 contains: 3
-component 2 contains: 5 2
diff --git a/Utilities/BGL/boost/graph/example/concept_checks.expected b/Utilities/BGL/boost/graph/example/concept_checks.expected
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Utilities/BGL/boost/graph/example/connected-components.cpp b/Utilities/BGL/boost/graph/example/connected-components.cpp
deleted file mode 100644
index b07f3db033ee69b2b631d6df4375c4737d107fd4..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/connected-components.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <boost/graph/connected_components.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < vecS, vecS, undirectedS > Graph;
- typedef graph_traits < Graph >::vertex_descriptor Vertex;
-
- const int N = 6;
- Graph G(N);
- add_edge(0, 1, G);
- add_edge(1, 4, G);
- add_edge(4, 0, G);
- add_edge(2, 5, G);
-
- std::vector<int> c(num_vertices(G));
- int num = connected_components
- (G, make_iterator_property_map(c.begin(), get(vertex_index, G), c[0]));
-
- std::cout << std::endl;
- std::vector < int >::iterator i;
- std::cout << "Total number of components: " << num << std::endl;
- for (i = c.begin(); i != c.end(); ++i)
- std::cout << "Vertex " << i - c.begin()
- << " is in component " << *i << std::endl;
- std::cout << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/connected_components.cpp b/Utilities/BGL/boost/graph/example/connected_components.cpp
deleted file mode 100644
index 0d9102bb92d1d30ce0a0a63c7c67dc2febafd8b9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/connected_components.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <utility>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/connected_components.hpp>
-
-/*
-
- This example demonstrates the usage of the connected_components
- algorithm on a undirected graph. The example graphs come from
- "Introduction to Algorithms", Cormen, Leiserson, and Rivest p. 87
- (though we number the vertices from zero instead of one).
-
- Sample output:
-
- Total number of components: 3
- Vertex 0 is in component 0
- Vertex 1 is in component 0
- Vertex 2 is in component 1
- Vertex 3 is in component 2
- Vertex 4 is in component 0
- Vertex 5 is in component 1
-
- */
-
-using namespace std;
-
-int main(int , char* [])
-{
- using namespace boost;
- {
- typedef adjacency_list <vecS, vecS, undirectedS> Graph;
-
- Graph G;
- add_edge(0, 1, G);
- add_edge(1, 4, G);
- add_edge(4, 0, G);
- add_edge(2, 5, G);
-
- std::vector<int> component(num_vertices(G));
- int num = connected_components(G, &component[0]);
-
- std::vector<int>::size_type i;
- cout << "Total number of components: " << num << endl;
- for (i = 0; i != component.size(); ++i)
- cout << "Vertex " << i <<" is in component " << component[i] << endl;
- cout << endl;
- }
- return 0;
-}
-
diff --git a/Utilities/BGL/boost/graph/example/connected_components.expected b/Utilities/BGL/boost/graph/example/connected_components.expected
deleted file mode 100644
index 862d934754b4d8272e59ca3886c0fc285b3fa16a..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/connected_components.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-Total number of components: 3
-Vertex 0 is in component 0
-Vertex 1 is in component 0
-Vertex 2 is in component 1
-Vertex 3 is in component 2
-Vertex 4 is in component 0
-Vertex 5 is in component 1
-
diff --git a/Utilities/BGL/boost/graph/example/container_gen.cpp b/Utilities/BGL/boost/graph/example/container_gen.cpp
deleted file mode 100644
index 298e3a62f13e06e424d110f4cd9b12483a97d01d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/container_gen.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/adjacency_list.hpp>
-
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ALLOCATOR)
-
-template <class Allocator>
-struct list_with_allocatorS { };
-
-namespace boost {
- template <class Alloc, class ValueType>
- struct container_gen<list_with_allocatorS<Alloc>, ValueType> {
- typedef typename Alloc::template rebind<ValueType>::other Allocator;
- typedef std::list<ValueType, Allocator> type;
- };
- template <class Alloc>
- struct parallel_edge_traits< list_with_allocatorS<Alloc> > {
- typedef allow_parallel_edge_tag type;
- };
-
-}
-
-// now you can define a graph using std::list and a specific allocator
-typedef boost::adjacency_list< list_with_allocatorS< std::allocator<int> >,
- boost::vecS, boost::directedS> MyGraph;
-
-int main(int, char*[])
-{
- MyGraph g(5);
-
- return 0;
-}
-
-#else
-
-int main(int, char*[])
-{
- return 0;
-}
-
-#endif
diff --git a/Utilities/BGL/boost/graph/example/container_gen.expected b/Utilities/BGL/boost/graph/example/container_gen.expected
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Utilities/BGL/boost/graph/example/copy-example.cpp b/Utilities/BGL/boost/graph/example/copy-example.cpp
deleted file mode 100644
index b2af240efcd10d3132c98d25fd3f487b67667eb3..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/copy-example.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/copy.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef int weight_t;
- typedef adjacency_list < vecS, vecS, directedS,
- property < vertex_name_t, char > > graph_t;
-
- enum
- { a, b, c, d, e, f, g, N };
- graph_t G(N);
- property_map < graph_t, vertex_name_t >::type
- name_map = get(vertex_name, G);
- char name = 'a';
- graph_traits < graph_t >::vertex_iterator v, v_end;
- for (tie(v, v_end) = vertices(G); v != v_end; ++v, ++name)
- name_map[*v] = name;
-
- typedef std::pair < int, int >E;
- E edges[] = { E(a, c), E(a, d), E(b, a), E(b, d), E(c, f),
- E(d, c), E(d, e), E(d, f), E(e, b), E(e, g), E(f, e), E(f, g)
- };
- for (int i = 0; i < 12; ++i)
- add_edge(edges[i].first, edges[i].second, G);
-
- print_graph(G, name_map);
- std::cout << std::endl;
-
- graph_t G_copy;
- copy_graph(G, G_copy);
-
- print_graph(G_copy, name_map);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/cuthill_mckee_ordering.cpp b/Utilities/BGL/boost/graph/example/cuthill_mckee_ordering.cpp
deleted file mode 100644
index 11a6de36d556a1b96c5ee2cd88bb56aa0789cae8..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/cuthill_mckee_ordering.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-// Doug Gregor, D. Kevin McGrath
-//
-// This file is part of the Boost Graph Library
-//
-// You should have received a copy of the License Agreement for the
-// Boost Graph Library along with the software; see the file LICENSE.
-// If not, contact Office of Research, University of Notre Dame, Notre
-// Dame, IN 46556.
-//
-// Permission to modify the code and to distribute modified code is
-// granted, provided the text of this NOTICE is retained, a notice that
-// the code was modified is included with the above COPYRIGHT NOTICE and
-// with the COPYRIGHT NOTICE in the LICENSE file, and that the LICENSE
-// file is distributed with the modified code.
-//
-// LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
-// By way of example, but not limitation, Licensor MAKES NO
-// REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
-// PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE COMPONENTS
-// OR DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS
-// OR OTHER RIGHTS.
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <vector>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/cuthill_mckee_ordering.hpp>
-#include <boost/graph/properties.hpp>
-#include <boost/graph/bandwidth.hpp>
-
-/*
- Sample Output
- original bandwidth: 8
- Reverse Cuthill-McKee ordering starting at: 6
- 8 3 0 9 2 5 1 4 7 6
- bandwidth: 4
- Reverse Cuthill-McKee ordering starting at: 0
- 9 1 4 6 7 2 8 5 3 0
- bandwidth: 4
- Reverse Cuthill-McKee ordering:
- 0 8 5 7 3 6 4 2 1 9
- bandwidth: 4
- */
-int main(int , char* [])
-{
- using namespace boost;
- using namespace std;
- typedef adjacency_list<vecS, vecS, undirectedS,
- property<vertex_color_t, default_color_type,
- property<vertex_degree_t,int> > > Graph;
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::vertices_size_type size_type;
-
- typedef std::pair<std::size_t, std::size_t> Pair;
- Pair edges[14] = { Pair(0,3), //a-d
- Pair(0,5), //a-f
- Pair(1,2), //b-c
- Pair(1,4), //b-e
- Pair(1,6), //b-g
- Pair(1,9), //b-j
- Pair(2,3), //c-d
- Pair(2,4), //c-e
- Pair(3,5), //d-f
- Pair(3,8), //d-i
- Pair(4,6), //e-g
- Pair(5,6), //f-g
- Pair(5,7), //f-h
- Pair(6,7) }; //g-h
-
- Graph G(10);
- for (int i = 0; i < 14; ++i)
- add_edge(edges[i].first, edges[i].second, G);
-
- graph_traits<Graph>::vertex_iterator ui, ui_end;
-
- property_map<Graph,vertex_degree_t>::type deg = get(vertex_degree, G);
- for (boost::tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui)
- deg[*ui] = degree(*ui, G);
-
- property_map<Graph, vertex_index_t>::type
- index_map = get(vertex_index, G);
-
- std::cout << "original bandwidth: " << bandwidth(G) << std::endl;
-
- std::vector<Vertex> inv_perm(num_vertices(G));
- std::vector<size_type> perm(num_vertices(G));
- {
- Vertex s = vertex(6, G);
- //reverse cuthill_mckee_ordering
- cuthill_mckee_ordering(G, s, inv_perm.rbegin(), get(vertex_color, G),
- get(vertex_degree, G));
- cout << "Reverse Cuthill-McKee ordering starting at: " << s << endl;
- cout << " ";
- for (std::vector<Vertex>::const_iterator i = inv_perm.begin();
- i != inv_perm.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != inv_perm.size(); ++c)
- perm[index_map[inv_perm[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
- {
- Vertex s = vertex(0, G);
- //reverse cuthill_mckee_ordering
- cuthill_mckee_ordering(G, s, inv_perm.rbegin(), get(vertex_color, G),
- get(vertex_degree, G));
- cout << "Reverse Cuthill-McKee ordering starting at: " << s << endl;
- cout << " ";
- for (std::vector<Vertex>::const_iterator i=inv_perm.begin();
- i != inv_perm.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != inv_perm.size(); ++c)
- perm[index_map[inv_perm[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
-
- {
- //reverse cuthill_mckee_ordering
- cuthill_mckee_ordering(G, inv_perm.rbegin(), get(vertex_color, G),
- make_degree_map(G));
-
- cout << "Reverse Cuthill-McKee ordering:" << endl;
- cout << " ";
- for (std::vector<Vertex>::const_iterator i=inv_perm.begin();
- i != inv_perm.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != inv_perm.size(); ++c)
- perm[index_map[inv_perm[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/cuthill_mckee_ordering.expected b/Utilities/BGL/boost/graph/example/cuthill_mckee_ordering.expected
deleted file mode 100644
index 42fc655a3c58cfe31b6e9b27a00f38da1d743579..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/cuthill_mckee_ordering.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-degree:
-2 4 3 4 3 4 4 2 1 1
-Reverse Cuthill-McKee ordering starting at :6
-8 3 0 9 2 5 1 4 7 6
-Reverse Cuthill-McKee ordering starting at :0
-9 1 4 6 7 2 8 5 3 0
-Reverse Cuthill-McKee ordering:
-0 8 5 7 3 6 4 2 1 9
diff --git a/Utilities/BGL/boost/graph/example/cycle-file-dep.cpp b/Utilities/BGL/boost/graph/example/cycle-file-dep.cpp
deleted file mode 100644
index 210cb80d638e294cf5e288888abf041dbe9a9a12..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/cycle-file-dep.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-using namespace boost;
-
-namespace std
-{
- template < typename T >
- std::istream & operator >> (std::istream & in, std::pair < T, T > &p)
- {
- in >> p.first >> p.second;
- return in;
- }
-}
-
-typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS // The file dependency graph is directed
-> file_dep_graph;
-
-typedef graph_traits < file_dep_graph >::vertex_descriptor vertex_t;
-typedef graph_traits < file_dep_graph >::edge_descriptor edge_t;
-
-bool
-has_cycle_dfs(const file_dep_graph & g, vertex_t u,
- default_color_type * color)
-{
- color[u] = gray_color;
- graph_traits < file_dep_graph >::adjacency_iterator vi, vi_end;
- for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi)
- if (color[*vi] == white_color)
- if (has_cycle_dfs(g, *vi, color))
- return true; // cycle detected, return immediately
- else if (color[*vi] == gray_color) // *vi is an ancestor!
- return true;
- color[u] = black_color;
- return false;
-}
-
-bool
-has_cycle(const file_dep_graph & g)
-{
- std::vector < default_color_type > color(num_vertices(g), white_color);
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- if (color[*vi] == white_color)
- if (has_cycle_dfs(g, *vi, &color[0]))
- return true;
- return false;
-}
-
-
-int
-main()
-{
- std::ifstream file_in("makefile-dependencies.dat");
- typedef graph_traits < file_dep_graph >::vertices_size_type size_type;
- size_type n_vertices;
- file_in >> n_vertices; // read in number of vertices
- std::istream_iterator < std::pair < size_type,
- size_type > > input_begin(file_in), input_end;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the edge iterator constructor
- file_dep_graph g(n_vertices);
- while (input_begin != input_end) {
- size_type i, j;
- tie(i, j) = *input_begin++;
- add_edge(i, j, g);
- }
-#else
- file_dep_graph g(input_begin, input_end, n_vertices);
-#endif
-
- std::vector < std::string > name(num_vertices(g));
- std::ifstream name_in("makefile-target-names.dat");
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- name_in >> name[*vi];
-
- assert(has_cycle(g) == false);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/cycle-file-dep2.cpp b/Utilities/BGL/boost/graph/example/cycle-file-dep2.cpp
deleted file mode 100644
index 4f55da15df1e71b30ea368e34d3745f69ea14c2c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/cycle-file-dep2.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-// can't do using namespace boost because then
-// we get conflict with boost::default_dfs_visitor.
-using namespace boost;
-
-namespace std {
- template <typename T >
- std::istream& operator >> (std::istream & in, std::pair < T, T > &p)
- {
- in >> p.first >> p.second;
- return
- in;
- }
-}
-
-typedef adjacency_list<
- listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS // The file dependency graph is directed
- > file_dep_graph;
-
-typedef graph_traits<file_dep_graph>::vertex_descriptor vertex_t;
-typedef graph_traits<file_dep_graph>::edge_descriptor edge_t;
-
-template < typename Visitor > void
-dfs_v1(const file_dep_graph & g, vertex_t u, default_color_type * color,
- Visitor vis)
-{
- color[u] = gray_color;
- vis.discover_vertex(u, g);
- graph_traits < file_dep_graph >::out_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) {
- if (color[target(*ei, g)] == white_color) {
- vis.tree_edge(*ei, g);
- dfs_v1(g, target(*ei, g), color, vis);
- } else if (color[target(*ei, g)] == gray_color)
- vis.back_edge(*ei, g);
- else
- vis.forward_or_cross_edge(*ei, g);
- }
- color[u] = black_color;
- vis.finish_vertex(u, g);
-}
-
-template < typename Visitor > void
-generic_dfs_v1(const file_dep_graph & g, Visitor vis)
-{
- std::vector < default_color_type > color(num_vertices(g), white_color);
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- if (color[*vi] == white_color)
- dfs_v1(g, *vi, &color[0], vis);
- }
-}
-
-struct dfs_visitor_default
-{
- template <typename V, typename G > void
- discover_vertex(V, const G &)
- {
- }
-
- template <typename E, typename G > void
- tree_edge(E, const G &)
- {
- }
-
- template < typename E, typename G > void
- back_edge(E, const G &)
- {
- }
-
- template < typename E, typename G > void
- forward_or_cross_edge(E, const G &)
- {
- }
-
- template < typename V, typename G > void
- finish_vertex(V, const G &)
- {
- }
-};
-
-struct cycle_detector : public dfs_visitor_default
-{
- cycle_detector(bool & cycle):
- has_cycle(cycle)
- {
- }
- void
- back_edge(edge_t, const file_dep_graph &)
- {
- has_cycle = true;
- }
- bool & has_cycle;
-};
-
-bool
-has_cycle(const file_dep_graph & g)
-{
- bool has_cycle = false;
- cycle_detector vis(has_cycle);
- generic_dfs_v1(g, vis);
- return has_cycle;
-}
-
-
-int
-main()
-{
- std::ifstream file_in("makefile-dependencies.dat");
- typedef graph_traits <file_dep_graph >::vertices_size_type size_type;
- size_type n_vertices;
- file_in >> n_vertices; // read in number of vertices
- std::istream_iterator < std::pair < size_type,
- size_type > >input_begin(file_in), input_end;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the edge iterator constructor
- file_dep_graph g(n_vertices);
- while (input_begin != input_end) {
- size_type i, j;
- tie(i, j) = *input_begin++;
- add_edge(i, j, g);
- }
-#else
- file_dep_graph g(input_begin, input_end, n_vertices);
-#endif
-
- std::vector < std::string > name(num_vertices(g));
- std::ifstream name_in("makefile-target-names.dat");
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- name_in >> name[*vi];
-
- assert(has_cycle(g) == false);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/dag_shortest_paths.cpp b/Utilities/BGL/boost/graph/example/dag_shortest_paths.cpp
deleted file mode 100644
index b86896f10e3401a1f668902b0e4156fbe8b89c0e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dag_shortest_paths.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/graph/dag_shortest_paths.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-#include <iostream>
-
-// Example from Introduction to Algorithms by Cormen, et all p.537.
-
-// Sample output:
-// r: inifinity
-// s: 0
-// t: 2
-// u: 6
-// v: 5
-// x: 3
-
-int main()
-{
- using namespace boost;
- typedef adjacency_list<vecS, vecS, directedS,
- property<vertex_distance_t, int>, property<edge_weight_t, int> > graph_t;
- graph_t g(6);
- enum verts { r, s, t, u, v, x };
- char name[] = "rstuvx";
- add_edge(r, s, 5, g);
- add_edge(r, t, 3, g);
- add_edge(s, t, 2, g);
- add_edge(s, u, 6, g);
- add_edge(t, u, 7, g);
- add_edge(t, v, 4, g);
- add_edge(t, x, 2, g);
- add_edge(u, v, -1, g);
- add_edge(u, x, 1, g);
- add_edge(v, x, -2, g);
-
- property_map<graph_t, vertex_distance_t>::type
- d_map = get(vertex_distance, g);
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the named-parameter mechanism, so
- // we make a direct call to the underlying implementation function.
- std::vector<default_color_type> color(num_vertices(g));
- std::vector<std::size_t> pred(num_vertices(g));
- default_dijkstra_visitor vis;
- std::less<int> compare;
- closed_plus<int> combine;
- property_map<graph_t, edge_weight_t>::type w_map = get(edge_weight, g);
- dag_shortest_paths(g, s, d_map, w_map, &color[0], &pred[0],
- vis, compare, combine, (std::numeric_limits<int>::max)(), 0);
-#else
- dag_shortest_paths(g, s, distance_map(d_map));
-#endif
-
- graph_traits<graph_t>::vertex_iterator vi , vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- if (d_map[*vi] == (std::numeric_limits<int>::max)())
- std::cout << name[*vi] << ": inifinity\n";
- else
- std::cout << name[*vi] << ": " << d_map[*vi] << '\n';
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/data1.txt b/Utilities/BGL/boost/graph/example/data1.txt
deleted file mode 100644
index 502e66eb64124ee761bd78013322e2feada06c3f..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/data1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# five vertices
-n 5
-# the edges
-e
-1 2
-0 1
-2 0
diff --git a/Utilities/BGL/boost/graph/example/data2.txt b/Utilities/BGL/boost/graph/example/data2.txt
deleted file mode 100644
index 5c3d75a8d6e13fda4eb41c88f567a5d5f875429c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/data2.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# vertices
-v
-0 0.5 4.1 #
-1 1.5 5.1 # second vertex
-2 2.5 6.1
-
-# the edges
-e
-1 2 0.1
-0 1 0.2
-1 0 0.3
diff --git a/Utilities/BGL/boost/graph/example/data3.txt b/Utilities/BGL/boost/graph/example/data3.txt
deleted file mode 100644
index 76cd7b77e09191f1a5e0ed7558f0431bf9eb670e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/data3.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# vertices and edges can be interleaved
-v 3.14 0
-v 3.15 1
-e 0 1 0.1
-e 1 0 1.0
-v 3.16 2
-e 1 2 1.2
diff --git a/Utilities/BGL/boost/graph/example/dave.cpp b/Utilities/BGL/boost/graph/example/dave.cpp
deleted file mode 100644
index 04c69f888a31079eb75bd3a6562805e316fcece9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dave.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <iterator>
-#include <vector>
-#include <list>
-// Use boost::queue instead of std::queue because std::queue doesn't
-// model Buffer; it has to top() function. -Jeremy
-#include <boost/pending/queue.hpp>
-
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/dijkstra_shortest_paths.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-using namespace std;
-using namespace boost;
-/*
- This example does a best-first-search (using dijkstra's) and
- simultaneously makes a copy of the graph (assuming the graph is
- connected).
-
- Example Graph: (p. 90 "Data Structures and Network Algorithms", Tarjan)
-
- g
- 3+ +2
- / 1 \
- e+----f
- |+0 5++
- | \ / |
- 10| d |12
- |8++\7|
- +/ | +|
- b 4| c
- \ | +
- 6+|/3
- a
-
- Sample Output:
-a --> c d
-b --> a d
-c --> f
-d --> c e f
-e --> b g
-f --> e g
-g -->
-Starting graph:
-a(32767); c d
-c(32767); f
-d(32767); c e f
-f(32767); e g
-e(32767); b g
-g(32767);
-b(32767); a d
-Result:
-a(0); d c
-d(4); f e c
-c(3); f
-f(9); g e
-e(4); g b
-g(7);
-b(14); d a
-
-*/
-
-typedef property<vertex_color_t, default_color_type,
- property<vertex_distance_t,int> > VProperty;
-typedef int weight_t;
-typedef property<edge_weight_t,weight_t> EProperty;
-
-typedef adjacency_list<vecS, vecS, directedS, VProperty, EProperty > Graph;
-
-
-
-template <class Tag>
-struct endl_printer
- : public boost::base_visitor< endl_printer<Tag> >
-{
- typedef Tag event_filter;
- endl_printer(std::ostream& os) : m_os(os) { }
- template <class T, class Graph>
- void operator()(T, Graph&) { m_os << std::endl; }
- std::ostream& m_os;
-};
-template <class Tag>
-endl_printer<Tag> print_endl(std::ostream& os, Tag) {
- return endl_printer<Tag>(os);
-}
-
-template <class PA, class Tag>
-struct edge_printer
- : public boost::base_visitor< edge_printer<PA, Tag> >
-{
- typedef Tag event_filter;
-
- edge_printer(PA pa, std::ostream& os) : m_pa(pa), m_os(os) { }
-
- template <class T, class Graph>
- void operator()(T x, Graph& g) {
- m_os << "(" << get(m_pa, source(x, g)) << ","
- << get(m_pa, target(x, g)) << ") ";
- }
- PA m_pa;
- std::ostream& m_os;
-};
-template <class PA, class Tag>
-edge_printer<PA, Tag>
-print_edge(PA pa, std::ostream& os, Tag) {
- return edge_printer<PA, Tag>(pa, os);
-}
-
-
-template <class NewGraph, class Tag>
-struct graph_copier
- : public boost::base_visitor<graph_copier<NewGraph, Tag> >
-{
- typedef Tag event_filter;
-
- graph_copier(NewGraph& graph) : new_g(graph) { }
-
- template <class Edge, class Graph>
- void operator()(Edge e, Graph& g) {
- add_edge(source(e, g), target(e, g), new_g);
- }
-private:
- NewGraph& new_g;
-};
-template <class NewGraph, class Tag>
-inline graph_copier<NewGraph, Tag>
-copy_graph(NewGraph& g, Tag) {
- return graph_copier<NewGraph, Tag>(g);
-}
-
-template <class Graph, class Name>
-void print(Graph& G, Name name)
-{
- typename boost::graph_traits<Graph>::vertex_iterator ui, uiend;
- for (boost::tie(ui, uiend) = vertices(G); ui != uiend; ++ui) {
- cout << name[*ui] << " --> ";
- typename boost::graph_traits<Graph>::adjacency_iterator vi, viend;
- for(boost::tie(vi, viend) = adjacent_vertices(*ui, G); vi != viend; ++vi)
- cout << name[*vi] << " ";
- cout << endl;
- }
-
-}
-
-
-int
-main(int , char* [])
-{
- // Name and ID numbers for the vertices
- char name[] = "abcdefg";
- enum { a, b, c, d, e, f, g, N};
-
- Graph G(N);
- boost::property_map<Graph, vertex_index_t>::type
- vertex_id = get(vertex_index, G);
-
- std::vector<weight_t> distance(N, (numeric_limits<weight_t>::max)());
- typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
- std::vector<Vertex> parent(N);
-
- typedef std::pair<int,int> E;
-
- E edges[] = { E(a,c), E(a,d),
- E(b,a), E(b,d),
- E(c,f),
- E(d,c), E(d,e), E(d,f),
- E(e,b), E(e,g),
- E(f,e), E(f,g) };
-
- int weight[] = { 3, 4,
- 6, 8,
- 12,
- 7, 0, 5,
- 10, 3,
- 1, 2 };
-
- for (int i = 0; i < 12; ++i)
- add_edge(edges[i].first, edges[i].second, weight[i], G);
-
- print(G, name);
-
- adjacency_list<listS, vecS, directedS,
- property<vertex_color_t, default_color_type> > G_copy(N);
-
- cout << "Starting graph:" << endl;
-
- std::ostream_iterator<int> cout_int(std::cout, " ");
- std::ostream_iterator<char> cout_char(std::cout, " ");
-
- boost::queue<Vertex> Q;
- boost::breadth_first_search
- (G, vertex(a, G), Q,
- make_bfs_visitor(
- boost::make_list
- (write_property(make_iterator_property_map(name, vertex_id,
- name[0]),
- cout_char, on_examine_vertex()),
- write_property(make_iterator_property_map(distance.begin(),
- vertex_id,
- distance[0]),
- cout_int, on_examine_vertex()),
- print_edge(make_iterator_property_map(name, vertex_id,
- name[0]),
- std::cout, on_examine_edge()),
- print_endl(std::cout, on_finish_vertex()))),
- get(vertex_color, G));
-
- std::cout << "about to call dijkstra's" << std::endl;
-
- parent[vertex(a, G)] = vertex(a, G);
- boost::dijkstra_shortest_paths
- (G, vertex(a, G),
- distance_map(make_iterator_property_map(distance.begin(), vertex_id,
- distance[0])).
- predecessor_map(make_iterator_property_map(parent.begin(), vertex_id,
- parent[0])).
- visitor(make_dijkstra_visitor(copy_graph(G_copy, on_examine_edge()))));
-
- cout << endl;
- cout << "Result:" << endl;
- boost::breadth_first_search
- (G, vertex(a, G),
- visitor(make_bfs_visitor(
- boost::make_list
- (write_property(make_iterator_property_map(name, vertex_id,
- name[0]),
- cout_char, on_examine_vertex()),
- write_property(make_iterator_property_map(distance.begin(),
- vertex_id,
- distance[0]),
- cout_int, on_examine_vertex()),
- print_edge(make_iterator_property_map(name, vertex_id,
- name[0]),
- std::cout, on_examine_edge()),
- print_endl(std::cout, on_finish_vertex())))));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/dave.expected b/Utilities/BGL/boost/graph/example/dave.expected
deleted file mode 100644
index 65efe7b4b06c4b57d764bc198e6fd2c4a799275d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dave.expected
+++ /dev/null
@@ -1,24 +0,0 @@
-a --> c d
-b --> a d
-c --> f
-d --> c e f
-e --> b g
-f --> e g
-g -->
-Starting graph:
-a 2147483647 (a,c) (a,d)
-c 2147483647 (c,f)
-d 2147483647 (d,c) (d,e) (d,f)
-f 2147483647 (f,e) (f,g)
-e 2147483647 (e,b) (e,g)
-g 2147483647
-b 2147483647 (b,a) (b,d)
-
-Result:
-a 0 (a,c) (a,d)
-c 3 (c,f)
-d 4 (d,c) (d,e) (d,f)
-f 9 (f,e) (f,g)
-e 4 (e,b) (e,g)
-g 7
-b 14 (b,a) (b,d)
diff --git a/Utilities/BGL/boost/graph/example/default-constructor.cpp b/Utilities/BGL/boost/graph/example/default-constructor.cpp
deleted file mode 100644
index 9d9f41a2dd1eb7797c2904084bb5925aeadc08b1..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/default-constructor.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph > void
-read_graph_file(std::istream & in, Graph & g)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) // Add n vertices to the graph
- add_vertex(g);
- size_type u, v;
- while (in >> u) // Read in pairs of integers as edges
- if (in >> v)
- add_edge(u, v, g);
- else
- break;
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS // The graph is directed
- > graph_type;
-
- graph_type g; // use default constructor to create empty graph
- std::ifstream file_in("makefile-dependencies.dat");
- read_graph_file(file_in, g);
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/default-constructor2.cpp b/Utilities/BGL/boost/graph/example/default-constructor2.cpp
deleted file mode 100644
index 173f10bfdb122fcb827cba176e07259c5263393c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/default-constructor2.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph > void
-read_graph_file(std::istream & in, Graph & g)
-{
- typedef typename graph_traits < Graph >::vertex_descriptor Vertex;
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- in >> n_vertices; // read in number of vertices
- std::vector < Vertex > vertex_set(n_vertices);
- for (size_type i = 0; i < n_vertices; ++i)
- vertex_set[i] = add_vertex(g);
-
- size_type u, v;
- while (in >> u)
- if (in >> v)
- add_edge(vertex_set[u], vertex_set[v], g);
- else
- break;
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS // The graph is directed
- > graph_type;
-
- graph_type g; // use default constructor to create empty graph
- std::ifstream file_in("makefile-dependencies.dat");
- read_graph_file(file_in, g);
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/dfs-example.cpp b/Utilities/BGL/boost/graph/example/dfs-example.cpp
deleted file mode 100644
index 017053de7b47b98014ea9512bab1f05f98ee883d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dfs-example.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/pending/integer_range.hpp>
-#include <boost/pending/indirect_cmp.hpp>
-
-#include <iostream>
-
-using namespace boost;
-template < typename TimeMap > class dfs_time_visitor:public default_dfs_visitor {
- typedef typename property_traits < TimeMap >::value_type T;
-public:
- dfs_time_visitor(TimeMap dmap, TimeMap fmap, T & t)
-: m_dtimemap(dmap), m_ftimemap(fmap), m_time(t) {
- }
- template < typename Vertex, typename Graph >
- void discover_vertex(Vertex u, const Graph & g) const
- {
- put(m_dtimemap, u, m_time++);
- }
- template < typename Vertex, typename Graph >
- void finish_vertex(Vertex u, const Graph & g) const
- {
- put(m_ftimemap, u, m_time++);
- }
- TimeMap m_dtimemap;
- TimeMap m_ftimemap;
- T & m_time;
-};
-
-
-int
-main()
-{
- // Select the graph type we wish to use
- typedef adjacency_list < vecS, vecS, directedS > graph_t;
- typedef graph_traits < graph_t >::vertices_size_type size_type;
- // Set up the vertex names
- enum
- { u, v, w, x, y, z, N };
- char name[] = { 'u', 'v', 'w', 'x', 'y', 'z' };
- // Specify the edges in the graph
- typedef std::pair < int, int >E;
- E edge_array[] = { E(u, v), E(u, x), E(x, v), E(y, x),
- E(v, y), E(w, y), E(w, z), E(z, z)
- };
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- graph_t g(N);
- for (std::size_t j = 0; j < sizeof(edge_array) / sizeof(E); ++j)
- add_edge(edge_array[j].first, edge_array[j].second, g);
-#else
- graph_t g(edge_array, edge_array + sizeof(edge_array) / sizeof(E), N);
-#endif
-
- // Typedefs
- typedef boost::graph_traits < graph_t >::vertex_descriptor Vertex;
- typedef size_type* Iiter;
-
- // discover time and finish time properties
- std::vector < size_type > dtime(num_vertices(g));
- std::vector < size_type > ftime(num_vertices(g));
- size_type t = 0;
- dfs_time_visitor < size_type * >vis(&dtime[0], &ftime[0], t);
-
- depth_first_search(g, visitor(vis));
-
- // use std::sort to order the vertices by their discover time
- std::vector < size_type > discover_order(N);
- integer_range < size_type > r(0, N);
- std::copy(r.begin(), r.end(), discover_order.begin());
- std::sort(discover_order.begin(), discover_order.end(),
- indirect_cmp < Iiter, std::less < size_type > >(&dtime[0]));
- std::cout << "order of discovery: ";
- int i;
- for (i = 0; i < N; ++i)
- std::cout << name[discover_order[i]] << " ";
-
- std::vector < size_type > finish_order(N);
- std::copy(r.begin(), r.end(), finish_order.begin());
- std::sort(finish_order.begin(), finish_order.end(),
- indirect_cmp < Iiter, std::less < size_type > >(&ftime[0]));
- std::cout << std::endl << "order of finish: ";
- for (i = 0; i < N; ++i)
- std::cout << name[finish_order[i]] << " ";
- std::cout << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/dfs-parenthesis.cpp b/Utilities/BGL/boost/graph/example/dfs-parenthesis.cpp
deleted file mode 100644
index e342641758c2f17ebbec1c2de64fa57c037f64d8..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dfs-parenthesis.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/depth_first_search.hpp>
-
-char name[] = "abcdefghij";
-
-struct parenthesis_visitor : public boost::default_dfs_visitor
-{
- template <class Vertex, class Graph> void
- start_vertex(Vertex v, const Graph &)
- {
- std::cout << ' ';
- }
- template <class Vertex, class Graph> void
- discover_vertex(Vertex v, const Graph &)
- {
- std::cout << "(" << name[v] << ' ';
- }
- template <class Vertex, class Graph> void
- finish_vertex(Vertex v, const Graph &)
- {
- std::cout << ' ' << name[v] << ")";
- }
-};
-
-int
-main()
-{
- using namespace boost;
- GraphvizGraph g;
- read_graphviz("figs/dfs-example.dot", g);
- graph_traits < GraphvizGraph >::edge_iterator e, e_end;
- for (tie(e, e_end) = edges(g); e != e_end; ++e)
- std::cout << '(' << name[source(*e, g)] << ' '
- << name[target(*e, g)] << ')' << std::endl;
- parenthesis_visitor
- paren_vis;
- depth_first_search(g, visitor(paren_vis));
- std::cout << std::endl;
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/dfs.cpp b/Utilities/BGL/boost/graph/example/dfs.cpp
deleted file mode 100644
index 9dd13da8cb8ce04f8b57a6bc1198fe6dbb43d1f7..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dfs.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <assert.h>
-#include <iostream>
-
-#include <vector>
-#include <algorithm>
-#include <utility>
-
-
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/graph/visitors.hpp>
-
-/*
- This calculates the discover finishing time.
-
- Sample Output
-
- Tree edge: 0 --> 2
- Tree edge: 2 --> 1
- Back edge: 1 --> 1
- Tree edge: 1 --> 3
- Back edge: 3 --> 1
- Tree edge: 3 --> 4
- Back edge: 4 --> 0
- Back edge: 4 --> 1
- Forward or cross edge: 2 --> 3
- 1 10
- 3 8
- 2 9
- 4 7
- 5 6
-
- */
-
-using namespace boost;
-using namespace std;
-
-
-template <class VisitorList>
-struct edge_categorizer : public dfs_visitor<VisitorList> {
- typedef dfs_visitor<VisitorList> Base;
-
- edge_categorizer(const VisitorList& v = null_visitor()) : Base(v) { }
-
- template <class Edge, class Graph>
- void tree_edge(Edge e, Graph& G) {
- cout << "Tree edge: " << source(e, G) <<
- " --> " << target(e, G) << endl;
- Base::tree_edge(e, G);
- }
- template <class Edge, class Graph>
- void back_edge(Edge e, Graph& G) {
- cout << "Back edge: " << source(e, G)
- << " --> " << target(e, G) << endl;
- Base::back_edge(e, G);
- }
- template <class Edge, class Graph>
- void forward_or_cross_edge(Edge e, Graph& G) {
- cout << "Forward or cross edge: " << source(e, G)
- << " --> " << target(e, G) << endl;
- Base::forward_or_cross_edge(e, G);
- }
-};
-template <class VisitorList>
-edge_categorizer<VisitorList>
-categorize_edges(const VisitorList& v) {
- return edge_categorizer<VisitorList>(v);
-}
-
-int
-main(int , char* [])
-{
-
- using namespace boost;
-
- typedef adjacency_list<> Graph;
-
- Graph G(5);
- add_edge(0, 2, G);
- add_edge(1, 1, G);
- add_edge(1, 3, G);
- add_edge(2, 1, G);
- add_edge(2, 3, G);
- add_edge(3, 1, G);
- add_edge(3, 4, G);
- add_edge(4, 0, G);
- add_edge(4, 1, G);
-
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::vertices_size_type size_type;
-
- std::vector<size_type> d(num_vertices(G));
- std::vector<size_type> f(num_vertices(G));
- int t = 0;
- depth_first_search(G, visitor(categorize_edges(
- make_pair(stamp_times(&d[0], t, on_discover_vertex()),
- stamp_times(&f[0], t, on_finish_vertex())))));
-
- std::vector<size_type>::iterator i, j;
- for (i = d.begin(), j = f.begin(); i != d.end(); ++i, ++j)
- cout << *i << " " << *j << endl;
-
- return 0;
-}
-
diff --git a/Utilities/BGL/boost/graph/example/dfs.expected b/Utilities/BGL/boost/graph/example/dfs.expected
deleted file mode 100644
index 84aa0c456bed62d40c7ab1014a835cca8cc45573..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dfs.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-Tree edge: 0 --> 2
-Tree edge: 2 --> 1
-Back edge: 1 --> 1
-Tree edge: 1 --> 3
-Back edge: 3 --> 1
-Tree edge: 3 --> 4
-Back edge: 4 --> 0
-Back edge: 4 --> 1
-Forward or cross edge: 2 --> 3
-1 10
-3 8
-2 9
-4 7
-5 6
diff --git a/Utilities/BGL/boost/graph/example/dfs_basics.expected b/Utilities/BGL/boost/graph/example/dfs_basics.expected
deleted file mode 100644
index a9e90d7009c5524b9a6864f1cd26177d14111d3a..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dfs_basics.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-order of discovery: u v y x w z
-order of finish: x y v u z w
diff --git a/Utilities/BGL/boost/graph/example/dfs_parenthesis.cpp b/Utilities/BGL/boost/graph/example/dfs_parenthesis.cpp
deleted file mode 100644
index 5bf04c41230a94c8b766a4301aba050bde8acb58..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dfs_parenthesis.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-//
-// Sample output
-// DFS parenthesis:
-// (0(2(3(4(11)4)3)2)0)
-
-#include <boost/config.hpp>
-#include <assert.h>
-#include <iostream>
-
-#include <vector>
-#include <algorithm>
-#include <utility>
-
-#include "boost/graph/visitors.hpp"
-#include "boost/graph/adjacency_list.hpp"
-#include "boost/graph/breadth_first_search.hpp"
-#include "boost/graph/depth_first_search.hpp"
-
-using namespace boost;
-using namespace std;
-
-struct open_paren : public base_visitor<open_paren> {
- typedef on_discover_vertex event_filter;
- template <class Vertex, class Graph>
- void operator()(Vertex v, Graph&) {
- std::cout << "(" << v;
- }
-};
-struct close_paren : public base_visitor<close_paren> {
- typedef on_finish_vertex event_filter;
- template <class Vertex, class Graph>
- void operator()(Vertex v, Graph&) {
- std::cout << v << ")";
- }
-};
-
-
-int
-main(int, char*[])
-{
-
- using namespace boost;
-
- typedef adjacency_list<> Graph;
- typedef std::pair<int,int> E;
- E edge_array[] = { E(0, 2),
- E(1, 1), E(1, 3),
- E(2, 1), E(2, 3),
- E(3, 1), E(3, 4),
- E(4, 0), E(4, 1) };
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- Graph G(5);
- for (std::size_t j = 0; j < sizeof(edge_array) / sizeof(E); ++j)
- add_edge(edge_array[j].first, edge_array[j].second, G);
-#else
- Graph G(edge_array, edge_array + sizeof(edge_array)/sizeof(E), 5);
-#endif
-
- typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
- typedef boost::graph_traits<Graph>::vertices_size_type size_type;
-
- std::cout << "DFS parenthesis:" << std::endl;
- depth_first_search(G, visitor(make_dfs_visitor(std::make_pair(open_paren(),
- close_paren()))));
- std::cout << std::endl;
- return 0;
-}
-
diff --git a/Utilities/BGL/boost/graph/example/dfs_parenthesis.expected b/Utilities/BGL/boost/graph/example/dfs_parenthesis.expected
deleted file mode 100644
index 9d71af7324fed955674fc59ea427ce2020b7fefb..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dfs_parenthesis.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-DFS parenthesis:
-(0(2(1(3(44)3)1)2)0)
diff --git a/Utilities/BGL/boost/graph/example/dijkstra-example-listS.cpp b/Utilities/BGL/boost/graph/example/dijkstra-example-listS.cpp
deleted file mode 100644
index 775bcc2e6ad34fb2e3e791c51ab193c3c8c67648..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dijkstra-example-listS.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-
-#include <boost/graph/graph_traits.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/dijkstra_shortest_paths.hpp>
-
-using namespace boost;
-
-int
-main(int, char *[])
-{
- typedef adjacency_list_traits<listS, listS,
- directedS>::vertex_descriptor vertex_descriptor;
- typedef adjacency_list < listS, listS, directedS,
- property<vertex_index_t, int,
- property<vertex_name_t, char,
- property<vertex_distance_t, int,
- property<vertex_predecessor_t, vertex_descriptor> > > >,
- property<edge_weight_t, int> > graph_t;
- typedef graph_traits<graph_t>::edge_descriptor edge_descriptor;
- typedef std::pair<int, int> Edge;
-
- const int num_nodes = 5;
- enum nodes { A, B, C, D, E };
- Edge edge_array[] = { Edge(A, C), Edge(B, B), Edge(B, D), Edge(B, E),
- Edge(C, B), Edge(C, D), Edge(D, E), Edge(E, A), Edge(E, B)
- };
- int weights[] = { 1, 2, 1, 2, 7, 3, 1, 1, 1 };
- int num_arcs = sizeof(edge_array) / sizeof(Edge);
- graph_traits<graph_t>::vertex_iterator i, iend;
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- graph_t g(num_nodes);
- property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, g);
-
- std::vector<vertex_descriptor> msvc_vertices;
- for (tie(i, iend) = vertices(g); i != iend; ++i)
- msvc_vertices.push_back(*i);
-
- for (std::size_t j = 0; j < num_arcs; ++j) {
- edge_descriptor e; bool inserted;
- tie(e, inserted) = add_edge(msvc_vertices[edge_array[j].first],
- msvc_vertices[edge_array[j].second], g);
- weightmap[e] = weights[j];
- }
-
-#else
- graph_t g(edge_array, edge_array + num_arcs, weights, num_nodes);
- property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, g);
-#endif
-
- // Manually intialize the vertex index and name maps
- property_map<graph_t, vertex_index_t>::type indexmap = get(vertex_index, g);
- property_map<graph_t, vertex_name_t>::type name = get(vertex_name, g);
- int c = 0;
- for (tie(i, iend) = vertices(g); i != iend; ++i, ++c) {
- indexmap[*i] = c;
- name[*i] = 'A' + c;
- }
-
- vertex_descriptor s = vertex(A, g);
-
- property_map<graph_t, vertex_distance_t>::type
- d = get(vertex_distance, g);
- property_map<graph_t, vertex_predecessor_t>::type
- p = get(vertex_predecessor, g);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the named parameters mechanism
- property_map<graph_t, vertex_index_t>::type indexmap = get(vertex_index, g);
- dijkstra_shortest_paths(g, s, p, d, weightmap, indexmap,
- std::less<int>(), closed_plus<int>(),
- (std::numeric_limits<int>::max)(), 0,
- default_dijkstra_visitor());
-#else
- dijkstra_shortest_paths(g, s, predecessor_map(p).distance_map(d));
-#endif
-
- std::cout << "distances and parents:" << std::endl;
- graph_traits < graph_t >::vertex_iterator vi, vend;
- for (tie(vi, vend) = vertices(g); vi != vend; ++vi) {
- std::cout << "distance(" << name[*vi] << ") = " << d[*vi] << ", ";
- std::cout << "parent(" << name[*vi] << ") = " << name[p[*vi]] << std::
- endl;
- }
- std::cout << std::endl;
-
- std::ofstream dot_file("figs/dijkstra-eg.dot");
- dot_file << "digraph D {\n"
- << " rankdir=LR\n"
- << " size=\"4,3\"\n"
- << " ratio=\"fill\"\n"
- << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n";
-
- graph_traits < graph_t >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
- graph_traits < graph_t >::edge_descriptor e = *ei;
- graph_traits < graph_t >::vertex_descriptor
- u = source(e, g), v = target(e, g);
- dot_file << name[u] << " -> " << name[v]
- << "[label=\"" << get(weightmap, e) << "\"";
- if (p[v] == u)
- dot_file << ", color=\"black\"";
- else
- dot_file << ", color=\"grey\"";
- dot_file << "]";
- }
- dot_file << "}";
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/dijkstra-example.cpp b/Utilities/BGL/boost/graph/example/dijkstra-example.cpp
deleted file mode 100644
index f1a34d5a1ef28963d29cffc816cc89189f6f47e9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dijkstra-example.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-
-#include <boost/graph/graph_traits.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/dijkstra_shortest_paths.hpp>
-
-using namespace boost;
-
-int
-main(int, char *[])
-{
- typedef adjacency_list < listS, vecS, directedS,
- no_property, property < edge_weight_t, int > > graph_t;
- typedef graph_traits < graph_t >::vertex_descriptor vertex_descriptor;
- typedef graph_traits < graph_t >::edge_descriptor edge_descriptor;
- typedef std::pair<int, int> Edge;
-
- const int num_nodes = 5;
- enum nodes { A, B, C, D, E };
- char name[] = "ABCDE";
- Edge edge_array[] = { Edge(A, C), Edge(B, B), Edge(B, D), Edge(B, E),
- Edge(C, B), Edge(C, D), Edge(D, E), Edge(E, A), Edge(E, B)
- };
- int weights[] = { 1, 2, 1, 2, 7, 3, 1, 1, 1 };
- int num_arcs = sizeof(edge_array) / sizeof(Edge);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- graph_t g(num_nodes);
- property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, g);
- for (std::size_t j = 0; j < num_arcs; ++j) {
- edge_descriptor e; bool inserted;
- tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g);
- weightmap[e] = weights[j];
- }
-#else
- graph_t g(edge_array, edge_array + num_arcs, weights, num_nodes);
- property_map<graph_t, edge_weight_t>::type weightmap = get(edge_weight, g);
-#endif
- std::vector<vertex_descriptor> p(num_vertices(g));
- std::vector<int> d(num_vertices(g));
- vertex_descriptor s = vertex(A, g);
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the named parameters mechanism
- property_map<graph_t, vertex_index_t>::type indexmap = get(vertex_index, g);
- dijkstra_shortest_paths(g, s, &p[0], &d[0], weightmap, indexmap,
- std::less<int>(), closed_plus<int>(),
- (std::numeric_limits<int>::max)(), 0,
- default_dijkstra_visitor());
-#else
- dijkstra_shortest_paths(g, s, predecessor_map(&p[0]).distance_map(&d[0]));
-#endif
-
- std::cout << "distances and parents:" << std::endl;
- graph_traits < graph_t >::vertex_iterator vi, vend;
- for (tie(vi, vend) = vertices(g); vi != vend; ++vi) {
- std::cout << "distance(" << name[*vi] << ") = " << d[*vi] << ", ";
- std::cout << "parent(" << name[*vi] << ") = " << name[p[*vi]] << std::
- endl;
- }
- std::cout << std::endl;
-
- std::ofstream dot_file("figs/dijkstra-eg.dot");
-
- dot_file << "digraph D {\n"
- << " rankdir=LR\n"
- << " size=\"4,3\"\n"
- << " ratio=\"fill\"\n"
- << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n";
-
- graph_traits < graph_t >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
- graph_traits < graph_t >::edge_descriptor e = *ei;
- graph_traits < graph_t >::vertex_descriptor
- u = source(e, g), v = target(e, g);
- dot_file << name[u] << " -> " << name[v]
- << "[label=\"" << get(weightmap, e) << "\"";
- if (p[v] == u)
- dot_file << ", color=\"black\"";
- else
- dot_file << ", color=\"grey\"";
- dot_file << "]";
- }
- dot_file << "}";
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/dijkstra.expected b/Utilities/BGL/boost/graph/example/dijkstra.expected
deleted file mode 100644
index 0f73cbdf8e110e01e3ee5c0cb43e9a91cac955a0..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/dijkstra.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-distances from start vertex:
-distance(0) = 0
-distance(1) = 6
-distance(2) = 1
-distance(3) = 4
-distance(4) = 5
-
-shortest paths tree
-0 --> 2
-1 -->
-2 --> 3
-3 --> 4
-4 --> 1
diff --git a/Utilities/BGL/boost/graph/example/edge-connectivity.cpp b/Utilities/BGL/boost/graph/example/edge-connectivity.cpp
deleted file mode 100644
index 87cc00a8b6d7dcd9c29781919bea59be04afe43f..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge-connectivity.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <algorithm>
-#include <utility>
-#include <boost/graph/edmunds_karp_max_flow.hpp>
-#include <boost/graph/push_relabel_max_flow.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graphviz.hpp>
-
-namespace boost
-{
- template < typename Graph >
- std::pair < typename graph_traits < Graph >::vertex_descriptor,
- typename graph_traits < Graph >::degree_size_type >
- min_degree_vertex(Graph & g)
- {
- typename graph_traits < Graph >::vertex_descriptor p;
- typedef typename graph_traits < Graph >::degree_size_type size_type;
- size_type delta = (std::numeric_limits < size_type >::max)();
- typename graph_traits < Graph >::vertex_iterator i, iend;
- for (tie(i, iend) = vertices(g); i != iend; ++i)
- if (degree(*i, g) < delta)
- {
- delta = degree(*i, g);
- p = *i;
- }
- return std::make_pair(p, delta);
- }
-
- template < typename Graph, typename OutputIterator >
- void neighbors(const Graph & g,
- typename graph_traits < Graph >::vertex_descriptor u,
- OutputIterator result)
- {
- typename graph_traits < Graph >::adjacency_iterator ai, aend;
- for (tie(ai, aend) = adjacent_vertices(u, g); ai != aend; ++ai)
- *result++ = *ai;
- }
- template < typename Graph, typename VertexIterator,
- typename OutputIterator > void neighbors(const Graph & g,
- VertexIterator first,
- VertexIterator last,
- OutputIterator result)
- {
- for (; first != last; ++first)
- neighbors(g, *first, result);
- }
-
- template < typename VertexListGraph, typename OutputIterator >
- typename graph_traits < VertexListGraph >::degree_size_type
- edge_connectivity(VertexListGraph & g, OutputIterator disconnecting_set)
- {
- typedef typename graph_traits <
- VertexListGraph >::vertex_descriptor vertex_descriptor;
- typedef typename graph_traits <
- VertexListGraph >::degree_size_type degree_size_type;
- typedef color_traits < default_color_type > Color;
- typedef typename adjacency_list_traits < vecS, vecS,
- directedS >::edge_descriptor edge_descriptor;
- typedef adjacency_list < vecS, vecS, directedS, no_property,
- property < edge_capacity_t, degree_size_type,
- property < edge_residual_capacity_t, degree_size_type,
- property < edge_reverse_t, edge_descriptor > > > > FlowGraph;
-
- vertex_descriptor u, v, p, k;
- edge_descriptor e1, e2;
- bool inserted;
- typename graph_traits < VertexListGraph >::vertex_iterator vi, vi_end;
- degree_size_type delta, alpha_star, alpha_S_k;
- std::set < vertex_descriptor > S, neighbor_S;
- std::vector < vertex_descriptor > S_star, nonneighbor_S;
- std::vector < default_color_type > color(num_vertices(g));
- std::vector < edge_descriptor > pred(num_vertices(g));
-
- FlowGraph flow_g(num_vertices(g));
- typename property_map < FlowGraph, edge_capacity_t >::type
- cap = get(edge_capacity, flow_g);
- typename property_map < FlowGraph, edge_residual_capacity_t >::type
- res_cap = get(edge_residual_capacity, flow_g);
- typename property_map < FlowGraph, edge_reverse_t >::type
- rev_edge = get(edge_reverse, flow_g);
-
- typename graph_traits < VertexListGraph >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
- u = source(*ei, g), v = target(*ei, g);
- tie(e1, inserted) = add_edge(u, v, flow_g);
- cap[e1] = 1;
- tie(e2, inserted) = add_edge(v, u, flow_g);
- cap[e2] = 1;
- rev_edge[e1] = e2;
- rev_edge[e2] = e1;
- }
-
- tie(p, delta) = min_degree_vertex(g);
- S_star.push_back(p);
- alpha_star = delta;
- S.insert(p);
- neighbor_S.insert(p);
- neighbors(g, S.begin(), S.end(),
- std::inserter(neighbor_S, neighbor_S.begin()));
- std::set_difference(vertices(g).first, vertices(g).second,
- neighbor_S.begin(), neighbor_S.end(),
- std::back_inserter(nonneighbor_S));
-
- while (!nonneighbor_S.empty()) {
- k = nonneighbor_S.front();
- alpha_S_k = edmunds_karp_max_flow
- (flow_g, p, k, cap, res_cap, rev_edge, &color[0], &pred[0]);
- if (alpha_S_k < alpha_star) {
- alpha_star = alpha_S_k;
- S_star.clear();
- for (tie(vi, vi_end) = vertices(flow_g); vi != vi_end; ++vi)
- if (color[*vi] != Color::white())
- S_star.push_back(*vi);
- }
- S.insert(k);
- neighbor_S.insert(k);
- neighbors(g, k, std::inserter(neighbor_S, neighbor_S.begin()));
- nonneighbor_S.clear();
- std::set_difference(vertices(g).first, vertices(g).second,
- neighbor_S.begin(), neighbor_S.end(),
- std::back_inserter(nonneighbor_S));
- }
-
- std::vector < bool > in_S_star(num_vertices(g), false);
- typename std::vector < vertex_descriptor >::iterator si;
- for (si = S_star.begin(); si != S_star.end(); ++si)
- in_S_star[*si] = true;
- degree_size_type c = 0;
- for (si = S_star.begin(); si != S_star.end(); ++si) {
- typename graph_traits < VertexListGraph >::out_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = out_edges(*si, g); ei != ei_end; ++ei)
- if (!in_S_star[target(*ei, g)]) {
- *disconnecting_set++ = *ei;
- ++c;
- }
- }
-
- return c;
- }
-
-}
-
-int
-main()
-{
- using namespace boost;
- GraphvizGraph g;
- read_graphviz("figs/edge-connectivity.dot", g);
-
- typedef graph_traits < GraphvizGraph >::edge_descriptor edge_descriptor;
- typedef graph_traits < GraphvizGraph >::degree_size_type degree_size_type;
- std::vector < edge_descriptor > disconnecting_set;
- degree_size_type c =
- edge_connectivity(g, std::back_inserter(disconnecting_set));
-
- std::cout << "The edge connectivity is " << c << "." << std::endl;
-
- property_map < GraphvizGraph, vertex_attribute_t >::type
- attr_map = get(vertex_attribute, g);
-
- std::cout << "The disconnecting set is {";
- for (std::vector < edge_descriptor >::iterator i =
- disconnecting_set.begin(); i != disconnecting_set.end(); ++i)
- std::
- cout << "(" << attr_map[source(*i, g)]["label"] << "," <<
- attr_map[target(*i, g)]["label"] << ") ";
- std::cout << "}." << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/edge-function.cpp b/Utilities/BGL/boost/graph/example/edge-function.cpp
deleted file mode 100644
index 48a0667b36474bbc70584d2f3b75c0d7905fb2ad..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge-function.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename VertexNamePropertyMap > void
-read_graph_file(std::istream & graph_in, std::istream & name_in,
- Graph & g, VertexNamePropertyMap name_map)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- typename graph_traits < Graph >::vertex_descriptor u;
- typename property_traits < VertexNamePropertyMap >::value_type name;
-
- graph_in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) { // Add n vertices to the graph
- u = add_vertex(g);
- name_in >> name;
- put(name_map, u, name); // ** Attach name property to vertex u **
- }
- size_type src, targ;
- while (graph_in >> src) // Read in edges
- if (graph_in >> targ)
- add_edge(src, targ, g); // add an edge to the graph
- else
- break;
-}
-
-template < typename Graph, typename VertexNameMap > void
-output_adjacent_vertices(std::ostream & out,
- typename graph_traits < Graph >::vertex_descriptor u,
- const Graph & g, VertexNameMap name_map)
-{
- typename graph_traits < Graph >::adjacency_iterator vi, vi_end;
- out << get(name_map, u) << " -> { ";
- for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi)
- out << get(name_map, *vi) << " ";
- out << "}" << std::endl;
-}
-
-template < typename NameMap > class name_equals_t {
-public:
- name_equals_t(const std::string & n, NameMap map)
- : m_name(n), m_name_map(map)
- {
- }
- template < typename Vertex > bool operator()(Vertex u) const
- {
- return get(m_name_map, u) == m_name;
- }
-private:
- std::string m_name;
- NameMap m_name_map;
-};
-
-// object generator function
-template < typename NameMap >
- inline name_equals_t < NameMap >
-name_equals(const std::string & str, NameMap name)
-{
- return name_equals_t < NameMap > (str, name);
-}
-
-
-int
-main()
-{
- typedef adjacency_list<listS,// Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS, // The graph is directed
- property < vertex_name_t, std::string > // Add a vertex property
- >graph_type;
-
- graph_type g; // use default constructor to create empty graph
- const char* dep_file_name = "makefile-dependencies.dat";
- const char* target_file_name = "makefile-target-names.dat";
-
- std::ifstream file_in(dep_file_name), name_in(target_file_name);
- if (!file_in) {
- std::cerr << "** Error: could not open file " << dep_file_name
- << std::endl;
- return -1;
- }
- if (!name_in) {
- std::cerr << "** Error: could not open file " << target_file_name
- << std::endl;
- return -1;
- }
-
- // Obtain internal property map from the graph
- property_map < graph_type, vertex_name_t >::type name_map =
- get(vertex_name, g);
- read_graph_file(file_in, name_in, g, name_map);
-
- graph_traits < graph_type >::vertex_descriptor yow, zag, bar;
- // Get vertex name property map from the graph
- typedef property_map < graph_type, vertex_name_t >::type name_map_t;
- name_map_t name = get(vertex_name, g);
- // Get iterators for the vertex set
- graph_traits < graph_type >::vertex_iterator i, end;
- tie(i, end) = vertices(g);
- // Find yow.h
- name_equals_t < name_map_t > predicate1("yow.h", name);
- yow = *std::find_if(i, end, predicate1);
- // Find zag.o
- name_equals_t < name_map_t > predicate2("zag.o", name);
- zag = *std::find_if(i, end, predicate2);
- // Find bar.o
- name_equals_t < name_map_t > predicate3("bar.o", name);
- bar = *std::find_if(i, end, predicate3);
-
- graph_traits < graph_type >::edge_descriptor e1, e2;
- bool exists;
-
- // Get the edge connecting yow.h to zag.o
- tie(e1, exists) = edge(yow, zag, g);
- assert(exists == true);
- assert(source(e1, g) == yow);
- assert(target(e1, g) == zag);
-
- // Discover that there is no edge connecting zag.o to bar.o
- tie(e2, exists) = edge(zag, bar, g);
- assert(exists == false);
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/edge-iter-constructor.cpp b/Utilities/BGL/boost/graph/example/edge-iter-constructor.cpp
deleted file mode 100644
index d9f616aa6c55823da6005f70f631d55ceb005525..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge-iter-constructor.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-using namespace boost;
-
-template < typename T >
- std::istream & operator >> (std::istream & in, std::pair < T, T > &p) {
- in >> p.first >> p.second;
- return in;
-}
-
-
-int
-main()
-{
- typedef adjacency_list <
- listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS // The graph is directed
- > graph_type;
-
- std::ifstream file_in("makefile-dependencies.dat");
- typedef graph_traits < graph_type >::vertices_size_type size_type;
- size_type n_vertices;
- file_in >> n_vertices; // read in number of vertices
-
- graph_type
- g(n_vertices); // create graph with n vertices
-
- // Read in edges
- graph_traits < graph_type >::vertices_size_type u, v;
- while (file_in >> u)
- if (file_in >> v)
- add_edge(u, v, g);
- else
- break;
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/edge_basics.cpp b/Utilities/BGL/boost/graph/example/edge_basics.cpp
deleted file mode 100644
index 0d1d1152d476241fe48f3f26e2b8bbb680d1ae16..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge_basics.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <algorithm>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace std;
-using namespace boost;
-
-
-/*
- Edge Basics
-
- This example demonstrates the GGCL Edge interface
-
- There is not much to the Edge interface. Basically just two
- functions to access the source and target vertex:
-
- source(e)
- target(e)
-
- and one associated type for the vertex type:
-
- edge_traits<Edge>::vertex_type
-
- Sample output:
-
- (0,1) (0,2) (0,3) (0,4) (2,0) (2,4) (3,0) (3,1)
-
- */
-
-
-
-template <class Graph>
-struct exercise_edge {
- exercise_edge(Graph& g) : G(g) {}
-
- typedef typename boost::graph_traits<Graph>::edge_descriptor Edge;
- typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
- void operator()(Edge e) const
- {
- //begin
- // Get the associated vertex type out of the edge using the
- // edge_traits class
- // Use the source() and target() functions to access the vertices
- // that belong to Edge e
- Vertex src = source(e, G);
- Vertex targ = target(e, G);
-
- // print out the vertex id's just because
- cout << "(" << src << "," << targ << ") ";
- //end
- }
-
- Graph& G;
-};
-
-
-int
-main()
-{
- typedef adjacency_list<> MyGraph;
-
- typedef pair<int,int> Pair;
- Pair edge_array[8] = { Pair(0,1), Pair(0,2), Pair(0,3), Pair(0,4),
- Pair(2,0), Pair(3,0), Pair(2,4), Pair(3,1) };
-
- // Construct a graph using the edge_array (passing in pointers
- // (iterators) to the beginning and end of the array), and
- // specifying the number of vertices as 5
- MyGraph G(5);
- for (int i=0; i<8; ++i)
- add_edge(edge_array[i].first, edge_array[i].second, G);
-
- // Use the STL for_each algorithm to "exercise" all of the edges in
- // the graph
- for_each(edges(G).first, edges(G).second, exercise_edge<MyGraph>(G));
- cout << endl;
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/edge_basics.expected b/Utilities/BGL/boost/graph/example/edge_basics.expected
deleted file mode 100644
index 684dc15f1a192a789382d1cda0baf941c1402644..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge_basics.expected
+++ /dev/null
@@ -1 +0,0 @@
-(0,1) (0,2) (0,3) (0,4) (2,0) (2,4) (3,0) (3,1)
diff --git a/Utilities/BGL/boost/graph/example/edge_connectivity.cpp b/Utilities/BGL/boost/graph/example/edge_connectivity.cpp
deleted file mode 100644
index 1e7535a28d109296e6e24debb0cdbfb9bf31732d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge_connectivity.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//=======================================================================
-// Copyright 2000 University of Notre Dame.
-// Authors: Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-
-#include <boost/config.hpp>
-#include <set>
-#include <iostream>
-#include <iterator>
-#include <algorithm>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/edge_connectivity.hpp>
-
-using namespace boost;
-
-int
-main()
-{
- const int N = 8;
- typedef adjacency_list<vecS, vecS, undirectedS> UndirectedGraph;
- UndirectedGraph g(N);
-
- add_edge(0, 1, g);
- add_edge(0, 2, g);
- add_edge(0, 3, g);
- add_edge(1, 2, g);
- add_edge(1, 3, g);
- add_edge(2, 3, g);
- add_edge(3, 4, g);
- add_edge(3, 7, g);
- add_edge(4, 5, g);
- add_edge(4, 6, g);
- add_edge(4, 7, g);
- add_edge(5, 6, g);
- add_edge(5, 7, g);
- add_edge(6, 7, g);
-
- typedef graph_traits<UndirectedGraph>::edge_descriptor edge_descriptor;
- typedef graph_traits<UndirectedGraph>::degree_size_type degree_size_type;
- std::vector<edge_descriptor> disconnecting_set;
-
- degree_size_type c = edge_connectivity(g, std::back_inserter(disconnecting_set));
-
- std::cout << "The edge connectivity is " << c << "." << std::endl;
- std::cout << "The disconnecting set is {";
-
- std::copy(disconnecting_set.begin(), disconnecting_set.end(),
- std::ostream_iterator<edge_descriptor>(std::cout, " "));
- std::cout << "}." << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/edge_iterator_constructor.cpp b/Utilities/BGL/boost/graph/example/edge_iterator_constructor.cpp
deleted file mode 100644
index 2fb6c3b36ba099f53e412acfe5a3a7c2ba0ba3a9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge_iterator_constructor.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-/*
- Sample data (edge_iterator_constructor.dat):
- 5
- 10
- 0 1
- 1 2
- 1 3
- 2 4
- 3 4
- 1 0
- 2 1
- 3 1
- 4 2
- 4 3
-
- Sample output:
-
- 0 --> 1
- 1 --> 2 3 0
- 2 --> 4 1
- 3 --> 4 1
- 4 --> 2 3
-
- */
-
-#include <boost/config.hpp>
-#include <utility>
-#include <iostream>
-#include <fstream>
-
-#include <iterator>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-class edge_stream_iterator {
-public:
- typedef std::input_iterator_tag iterator_category;
- typedef std::pair<int,int> value_type;
- typedef std::ptrdiff_t difference_type;
- typedef const value_type* pointer;
- typedef const value_type& reference;
-
- edge_stream_iterator() : m_stream(0), m_end_marker(false) {}
- edge_stream_iterator(std::istream& s) : m_stream(&s) { m_read(); }
- reference operator*() const { return m_edge; }
- edge_stream_iterator& operator++() {
- m_read();
- return *this;
- }
- edge_stream_iterator operator++(int) {
- edge_stream_iterator tmp = *this;
- m_read();
- return tmp;
- }
-protected:
- std::istream* m_stream;
- value_type m_edge;
- bool m_end_marker;
- void m_read() {
- m_end_marker = (*m_stream) ? true : false;
- if (m_end_marker) {
- *m_stream >> m_edge.first >> m_edge.second;
- }
- m_end_marker = (*m_stream) ? true : false;
- }
- friend bool operator==(const edge_stream_iterator& x,
- const edge_stream_iterator& y);
-
-};
-bool operator==(const edge_stream_iterator& x,
- const edge_stream_iterator& y)
-{
- return (x.m_stream == y.m_stream && x.m_end_marker == y.m_end_marker)
- || x.m_end_marker == false && y.m_end_marker == false;
-}
-bool operator!=(const edge_stream_iterator& x,
- const edge_stream_iterator& y)
-{
- return !(x == y);
-}
-
-
-
-int
-main()
-{
- typedef boost::adjacency_list<> IteratorConstructibleGraph;
- typedef boost::graph_traits<IteratorConstructibleGraph> Traits;
- Traits::vertices_size_type size_V;
- Traits::edges_size_type size_E;
-
- std::ifstream f("edge_iterator_constructor.dat");
- f >> size_V >> size_E;
-
- edge_stream_iterator edge_iter(f), end;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- IteratorConstructibleGraph G(size_V);
- while (edge_iter != end) {
- int i, j;
- boost::tie(i, j) = *edge_iter++;
- boost::add_edge(i, j, G);
- }
-#else
- IteratorConstructibleGraph G(edge_iter, end, size_V);
-#endif
- boost::print_graph(G);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/edge_iterator_constructor.dat b/Utilities/BGL/boost/graph/example/edge_iterator_constructor.dat
deleted file mode 100644
index 4218e3f18629ea7d5b0f8d6878fe5d90aeafd7f4..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge_iterator_constructor.dat
+++ /dev/null
@@ -1,12 +0,0 @@
-5
-10
-0 1
-1 2
-1 3
-2 4
-3 4
-1 0
-2 1
-3 1
-4 2
-4 3
diff --git a/Utilities/BGL/boost/graph/example/edge_property.cpp b/Utilities/BGL/boost/graph/example/edge_property.cpp
deleted file mode 100644
index bcd60357ba96e13926eab50abde84a1187f2719e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge_property.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-//
-// Sample output:
-//
-// 0 --(8, 10)--> 1
-//
-// 1 --(12, 20)--> 4 --(12, 40)--> 3
-// <--(8,10)-- 0 <--(16,20)-- 2
-// 2 --(16, 20)--> 1
-// <--(16,20)-- 5
-// 3 --(12, 40)--> 6
-// <--(12,40)-- 1
-// 4 --(12, 20)--> 7
-// <--(12,20)-- 1
-// 5 --(16, 20)--> 2
-// <--(16,20)-- 6
-// 6 --(16, 20)--> 5 --(8, 10)--> 8
-// <--(12,20)-- 7 <--(12,40)-- 3
-// 7 --(12, 20)--> 6
-// <--(12,20)-- 4
-// 8
-// <--(8,10)-- 6
-//
-//
-// 0 --(8, 1)--> 1
-//
-// 1 --(12, 2)--> 4 --(12, 3)--> 3
-// <--(8,1)-- 0 <--(16,4)-- 2
-// 2 --(16, 4)--> 1
-// <--(16,7)-- 5
-// 3 --(12, 5)--> 6
-// <--(12,3)-- 1
-// 4 --(12, 6)--> 7
-// <--(12,2)-- 1
-// 5 --(16, 7)--> 2
-// <--(16,8)-- 6
-// 6 --(16, 8)--> 5
-// <--(12,10)-- 7 <--(12,5)-- 3
-// 7 --(12, 10)--> 6
-// <--(12,6)-- 4
-// 8
-//
-
-#include <boost/config.hpp>
-#include <iostream>
-
-#include <boost/utility.hpp>
-#include <boost/property_map.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-
-using namespace boost;
-using namespace std;
-
-
-enum edge_myflow_t { edge_myflow };
-enum edge_mycapacity_t { edge_mycapacity };
-
-namespace boost {
- BOOST_INSTALL_PROPERTY(edge, myflow);
- BOOST_INSTALL_PROPERTY(edge, mycapacity);
-}
-
-
-template <class Graph>
-void print_network(const Graph& G)
-{
- typedef typename boost::graph_traits<Graph>::vertex_iterator Viter;
- typedef typename boost::graph_traits<Graph>::out_edge_iterator OutEdgeIter;
- typedef typename boost::graph_traits<Graph>::in_edge_iterator InEdgeIter;
-
- typename property_map<Graph, edge_mycapacity_t>::const_type
- capacity = get(edge_mycapacity, G);
- typename property_map<Graph, edge_myflow_t>::const_type
- flow = get(edge_myflow, G);
-
- Viter ui, uiend;
- boost::tie(ui, uiend) = vertices(G);
-
- for (; ui != uiend; ++ui) {
- OutEdgeIter out, out_end;
- cout << *ui << "\t";
-
- boost::tie(out, out_end) = out_edges(*ui, G);
- for(; out != out_end; ++out)
- cout << "--(" << capacity[*out] << ", " << flow[*out] << ")--> "
- << target(*out,G) << "\t";
-
- InEdgeIter in, in_end;
- cout << endl << "\t";
- boost::tie(in, in_end) = in_edges(*ui, G);
- for(; in != in_end; ++in)
- cout << "<--(" << capacity[*in] << "," << flow[*in] << ")-- "
- << source(*in,G) << "\t";
-
- cout << endl;
- }
-}
-
-
-int main(int , char* [])
-{
- typedef property<edge_mycapacity_t, int> Cap;
- typedef property<edge_myflow_t, int, Cap> Flow;
- typedef adjacency_list<vecS, vecS, bidirectionalS,
- no_property, Flow> Graph;
-
- const int num_vertices = 9;
- Graph G(num_vertices);
-
- /* 2<----5
- / ^
- / \
- V \
- 0 ---->1---->3----->6--->8
- \ ^
- \ /
- V /
- 4----->7
- */
-
- add_edge(0, 1, Flow(10, Cap(8)), G);
-
- add_edge(1, 4, Flow(20, Cap(12)), G);
- add_edge(4, 7, Flow(20, Cap(12)), G);
- add_edge(7, 6, Flow(20, Cap(12)), G);
-
- add_edge(1, 3, Flow(40, Cap(12)), G);
- add_edge(3, 6, Flow(40, Cap(12)), G);
-
- add_edge(6, 5, Flow(20, Cap(16)), G);
- add_edge(5, 2, Flow(20, Cap(16)), G);
- add_edge(2, 1, Flow(20, Cap(16)), G);
-
- add_edge(6, 8, Flow(10, Cap(8)), G);
-
- typedef boost::graph_traits<Graph>::edge_descriptor Edge;
-
- print_network(G);
-
- property_map<Graph, edge_myflow_t>::type
- flow = get(edge_myflow, G);
-
- boost::graph_traits<Graph>::vertex_iterator v, v_end;
- boost::graph_traits<Graph>::out_edge_iterator e, e_end;
- int f = 0;
- for (tie(v, v_end) = vertices(G); v != v_end; ++v)
- for (tie(e, e_end) = out_edges(*v, G); e != e_end; ++e)
- flow[*e] = ++f;
- cout << endl << endl;
-
- remove_edge(6, 8, G);
-
- print_network(G);
-
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/edge_property.expected b/Utilities/BGL/boost/graph/example/edge_property.expected
deleted file mode 100644
index 6c71be14c267248949841a51c06467a0e9fa1029..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edge_property.expected
+++ /dev/null
@@ -1,38 +0,0 @@
-0 --(8, 10)--> 1
-
-1 --(12, 20)--> 4 --(12, 40)--> 3
- <--(8,10)-- 0 <--(16,20)-- 2
-2 --(16, 20)--> 1
- <--(16,20)-- 5
-3 --(12, 40)--> 6
- <--(12,40)-- 1
-4 --(12, 20)--> 7
- <--(12,20)-- 1
-5 --(16, 20)--> 2
- <--(16,20)-- 6
-6 --(16, 20)--> 5 --(8, 10)--> 8
- <--(12,20)-- 7 <--(12,40)-- 3
-7 --(12, 20)--> 6
- <--(12,20)-- 4
-8
- <--(8,10)-- 6
-
-
-0 --(8, 1)--> 1
-
-1 --(12, 2)--> 4 --(12, 3)--> 3
- <--(8,1)-- 0 <--(16,4)-- 2
-2 --(16, 4)--> 1
- <--(16,7)-- 5
-3 --(12, 5)--> 6
- <--(12,3)-- 1
-4 --(12, 6)--> 7
- <--(12,2)-- 1
-5 --(16, 7)--> 2
- <--(16,8)-- 6
-6 --(16, 8)--> 5
- <--(12,10)-- 7 <--(12,5)-- 3
-7 --(12, 10)--> 6
- <--(12,6)-- 4
-8
-
diff --git a/Utilities/BGL/boost/graph/example/edmunds-karp-eg.cpp b/Utilities/BGL/boost/graph/example/edmunds-karp-eg.cpp
deleted file mode 100644
index f6cd199558f58b548fad35e1bcedb76a88afbeb1..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/edmunds-karp-eg.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <string>
-#include <boost/graph/edmunds_karp_max_flow.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/read_dimacs.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-// Use a DIMACS network flow file as stdin.
-// edmunds-karp-eg < max_flow.dat
-//
-// Sample output:
-// c The total flow:
-// s 13
-//
-// c flow values:
-// f 0 6 3
-// f 0 1 6
-// f 0 2 4
-// f 1 5 1
-// f 1 0 0
-// f 1 3 5
-// f 2 4 4
-// f 2 3 0
-// f 2 0 0
-// f 3 7 5
-// f 3 2 0
-// f 3 1 0
-// f 4 5 4
-// f 4 6 0
-// f 5 4 0
-// f 5 7 5
-// f 6 7 3
-// f 6 4 0
-// f 7 6 0
-// f 7 5 0
-
-int
-main()
-{
- using namespace boost;
-
- typedef adjacency_list_traits < vecS, vecS, directedS > Traits;
- typedef adjacency_list < listS, vecS, directedS,
- property < vertex_name_t, std::string >,
- property < edge_capacity_t, long,
- property < edge_residual_capacity_t, long,
- property < edge_reverse_t, Traits::edge_descriptor > > > > Graph;
-
- Graph g;
-
- property_map < Graph, edge_capacity_t >::type
- capacity = get(edge_capacity, g);
- property_map < Graph, edge_reverse_t >::type rev = get(edge_reverse, g);
- property_map < Graph, edge_residual_capacity_t >::type
- residual_capacity = get(edge_residual_capacity, g);
-
- Traits::vertex_descriptor s, t;
- read_dimacs_max_flow(g, capacity, rev, s, t);
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- std::vector<default_color_type> color(num_vertices(g));
- std::vector<Traits::edge_descriptor> pred(num_vertices(g));
- long flow = edmunds_karp_max_flow
- (g, s, t, capacity, residual_capacity, rev, &color[0], &pred[0]);
-#else
- long flow = edmunds_karp_max_flow(g, s, t);
-#endif
-
- std::cout << "c The total flow:" << std::endl;
- std::cout << "s " << flow << std::endl << std::endl;
-
- std::cout << "c flow values:" << std::endl;
- graph_traits < Graph >::vertex_iterator u_iter, u_end;
- graph_traits < Graph >::out_edge_iterator ei, e_end;
- for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter)
- for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei)
- if (capacity[*ei] > 0)
- std::cout << "f " << *u_iter << " " << target(*ei, g) << " "
- << (capacity[*ei] - residual_capacity[*ei]) << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/exterior_properties.cpp b/Utilities/BGL/boost/graph/example/exterior_properties.cpp
deleted file mode 100644
index 5e4539795941147857bf9894770fb633a6d49d74..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/exterior_properties.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-//
-// This example is similar to the one in edge_property.cpp.
-// The only difference is that this example uses exterior
-// property storage instead of interior (properties).
-//
-// Sample output:
-//
-// 0 --(10, 8)--> 1
-//
-// 1 --(20, 12)--> 4 --(40, 12)--> 3
-// <--(10,8)-- 0 <--(20,16)-- 2
-// 2 --(20, 16)--> 1
-// <--(20,16)-- 5
-// 3 --(40, 12)--> 6
-// <--(40,12)-- 1
-// 4 --(20, 12)--> 7
-// <--(20,12)-- 1
-// 5 --(20, 16)--> 2
-// <--(20,16)-- 6
-// 6 --(20, 16)--> 5 --(10, 8)--> 8
-// <--(20,12)-- 7 <--(40,12)-- 3
-// 7 --(20, 12)--> 6
-// <--(20,12)-- 4
-// 8
-// <--(10,8)-- 6
-
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
-
-template <class Graph, class Capacity, class Flow>
-void print_network(Graph& G, Capacity capacity, Flow flow)
-{
- typedef typename boost::graph_traits<Graph>::vertex_iterator Viter;
- typedef typename boost::graph_traits<Graph>::out_edge_iterator OutEdgeIter;
- typedef typename boost::graph_traits<Graph>::in_edge_iterator InEdgeIter;
-
- Viter ui, uiend;
- for (boost::tie(ui, uiend) = boost::vertices(G); ui != uiend; ++ui) {
- OutEdgeIter out, out_end;
- std::cout << *ui << "\t";
-
- for(boost::tie(out, out_end) = boost::out_edges(*ui, G); out != out_end; ++out)
- std::cout << "--(" << boost::get(capacity, *out) << ", "
- << boost::get(flow, *out) << ")--> " << boost::target(*out,G) << "\t";
- std::cout << std::endl << "\t";
-
- InEdgeIter in, in_end;
- for(boost::tie(in, in_end) = boost::in_edges(*ui, G); in != in_end; ++in)
- std::cout << "<--(" << boost::get(capacity, *in) << "," << boost::get(flow, *in) << ")-- "
- << boost::source(*in, G) << "\t";
- std::cout << std::endl;
- }
-}
-
-
-int main(int , char* []) {
-
- typedef boost::adjacency_list<boost::vecS, boost::vecS,
- boost::bidirectionalS, boost::no_property,
- boost::property<boost::edge_index_t, std::size_t> > Graph;
-
- const int num_vertices = 9;
- Graph G(num_vertices);
-
- /* 2<----5
- / ^
- / \
- V \
- 0 ---->1---->3----->6--->8
- \ ^
- \ /
- V /
- 4----->7
- */
-
- int capacity[] = { 10, 20, 20, 20, 40, 40, 20, 20, 20, 10 };
- int flow[] = { 8, 12, 12, 12, 12, 12, 16, 16, 16, 8 };
-
- // insert edges into the graph, and assign each edge an ID number
- // to index into the property arrays
- boost::add_edge(0, 1, 0, G);
-
- boost::add_edge(1, 4, 1, G);
- boost::add_edge(4, 7, 2, G);
- boost::add_edge(7, 6, 3, G);
-
- boost::add_edge(1, 3, 4, G);
- boost::add_edge(3, 6, 5, G);
-
- boost::add_edge(6, 5, 6, G);
- boost::add_edge(5, 2, 7, G);
- boost::add_edge(2, 1, 8, G);
-
- boost::add_edge(6, 8, 9, G);
-
- typedef boost::property_map<Graph, boost::edge_index_t>::type EdgeIndexMap;
- EdgeIndexMap edge_id = boost::get(boost::edge_index, G);
-
- typedef boost::iterator_property_map<int*, EdgeIndexMap, int, int&> IterMap;
-
- print_network(G, IterMap(capacity, edge_id), IterMap(flow, edge_id));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/exterior_properties.expected b/Utilities/BGL/boost/graph/example/exterior_properties.expected
deleted file mode 100644
index 863e00601911a8a645b089733a68fcc17600ee60..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/exterior_properties.expected
+++ /dev/null
@@ -1,18 +0,0 @@
-0 --(10, 8)--> 1
-
-1 --(20, 12)--> 4 --(40, 12)--> 3
- <--(10,8)-- 0 <--(20,16)-- 2
-2 --(20, 16)--> 1
- <--(20,16)-- 5
-3 --(40, 12)--> 6
- <--(40,12)-- 1
-4 --(20, 12)--> 7
- <--(20,12)-- 1
-5 --(20, 16)--> 2
- <--(20,16)-- 6
-6 --(20, 16)--> 5 --(10, 8)--> 8
- <--(20,12)-- 7 <--(40,12)-- 3
-7 --(20, 12)--> 6
- <--(20,12)-- 4
-8
- <--(10,8)-- 6
diff --git a/Utilities/BGL/boost/graph/example/exterior_property_map.cpp b/Utilities/BGL/boost/graph/example/exterior_property_map.cpp
deleted file mode 100644
index 8917c7f7464a48c8e3f88b87ab93bd17a8944edc..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/exterior_property_map.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <algorithm>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
-
-using namespace std;
-using namespace boost;
-
-/*
- Exterior Decorator Basics
-
- An exterior decorator is a way of associating properties with the
- vertices or edges of a graph. The "exterior" part means that the
- properties are not stored inside the graph object (see
- internal_decorator_basics.cc). Instead they are stored
- separately, and passed as an extra argument to any
- algorithm they are needed in. There are several standard
- decorator types such a color and weight that are used
- in the GGCL algorithms.
-
- The main responsibility of a decorator is to provide an operator[]
- that maps a vertex (or vertex ID) to the property value for that
- vertex. It just so happens that a normal array provides this. In
- addition, a decorator must provide access to the property type
- through the decorator_traits class. For convenience, GGCL
- already defines a decorator_triats class for pointer and
- array types.
-
- Sample Output
-
- Jeremy owes Rich some money
- Jeremy owes Andrew some money
- Jeremy owes Jeff some money
- Jeremy owes Kinis some money
- Andrew owes Jeremy some money
- Andrew owes Kinis some money
- Jeff owes Jeremy some money
- Jeff owes Rich some money
- Jeff owes Kinis some money
- Kinis owes Jeremy some money
- Kinis owes Rich some money
-
- */
-
-template <class EdgeIter, class Graph, class Name>
-void who_owes_who(EdgeIter first, EdgeIter last, const Graph& G,
- Name name)
-{
- while (first != last) {
-
- cout << name[source(*first,G)] << " owes "
- << name[target(*first,G)] << " some money" << endl;
- ++first;
- }
-}
-
-int
-main(int, char*[])
-{
- /* The property will be "names" attached to the vertices */
-
- string* names = new string[5];
- names[0] = "Jeremy";
- names[1] = "Rich";
- names[2] = "Andrew";
- names[3] = "Jeff";
- names[4] = "Kinis";
-
- typedef adjacency_list<> MyGraphType;
-
- typedef pair<int,int> Pair;
- Pair edge_array[11] = { Pair(0,1), Pair(0,2), Pair(0,3), Pair(0,4),
- Pair(2,0), Pair(3,0), Pair(2,4), Pair(3,1),
- Pair(3,4), Pair(4,0), Pair(4,1) };
-
- MyGraphType G(5);
- for (int i=0; i<11; ++i)
- add_edge(edge_array[i].first, edge_array[i].second, G);
-
- who_owes_who(edges(G).first, edges(G).second, G, names);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/exterior_property_map.expected b/Utilities/BGL/boost/graph/example/exterior_property_map.expected
deleted file mode 100644
index 6fb19310fdd7753f8208dd8f07b18b22db1b1d13..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/exterior_property_map.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-Jeremy owes Rich some money
-Jeremy owes Andrew some money
-Jeremy owes Jeff some money
-Jeremy owes Kinis some money
-Andrew owes Jeremy some money
-Andrew owes Kinis some money
-Jeff owes Jeremy some money
-Jeff owes Rich some money
-Jeff owes Kinis some money
-Kinis owes Jeremy some money
-Kinis owes Rich some money
diff --git a/Utilities/BGL/boost/graph/example/family-tree-eg.cpp b/Utilities/BGL/boost/graph/example/family-tree-eg.cpp
deleted file mode 100644
index ab2b0bccb58941389d89647b0270b64d66232e5b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/family-tree-eg.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/tuple/tuple.hpp>
-enum family
-{ Jeanie, Debbie, Rick, John, Amanda, Margaret, Benjamin, N };
-int
-main()
-{
- using namespace boost;
- const char *name[] = { "Jeanie", "Debbie", "Rick", "John", "Amanda",
- "Margaret", "Benjamin"
- };
-
- adjacency_list <> g(N);
- add_edge(Jeanie, Debbie, g);
- add_edge(Jeanie, Rick, g);
- add_edge(Jeanie, John, g);
- add_edge(Debbie, Amanda, g);
- add_edge(Rick, Margaret, g);
- add_edge(John, Benjamin, g);
-
- graph_traits < adjacency_list <> >::vertex_iterator i, end;
- graph_traits < adjacency_list <> >::adjacency_iterator ai, a_end;
- property_map < adjacency_list <>, vertex_index_t >::type
- index_map = get(vertex_index, g);
-
- for (tie(i, end) = vertices(g); i != end; ++i) {
- std::cout << name[get(index_map, *i)];
- tie(ai, a_end) = adjacent_vertices(*i, g);
- if (ai == a_end)
- std::cout << " has no children";
- else
- std::cout << " is the parent of ";
- for (; ai != a_end; ++ai) {
- std::cout << name[get(index_map, *ai)];
- if (boost::next(ai) != a_end)
- std::cout << ", ";
- }
- std::cout << std::endl;
- }
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/family_tree.expected b/Utilities/BGL/boost/graph/example/family_tree.expected
deleted file mode 100644
index b3e6d61a7b2e1f0d524d6fa36a5be112abb2fa9d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/family_tree.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-Jeanie is the parent of Debbie Rick John
-Debbie is the parent of Amanda
-Rick is the parent of Margaret
-John is the parent of Benjamin
-Amanda has no children
-Margaret has no children
-Benjamin has no children
diff --git a/Utilities/BGL/boost/graph/example/fibonacci_heap.cpp b/Utilities/BGL/boost/graph/example/fibonacci_heap.cpp
deleted file mode 100644
index 3dbdc5c9e0f4099555f01021e9721a6452b1a8e7..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/fibonacci_heap.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <boost/graph/random.hpp>
-#include <boost/random/mersenne_twister.hpp>
-#include <algorithm>
-#include <boost/pending/fibonacci_heap.hpp>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/pending/indirect_cmp.hpp>
-
-using namespace boost;
-
-int
-main()
-{
- typedef indirect_cmp<float*,std::less<float> > ICmp;
- int i;
- boost::mt19937 gen;
- for (int N = 2; N < 200; ++N) {
- uniform_int<> distrib(0, N-1);
- variate_generator<boost::mt19937&, uniform_int<> > rand_gen(gen, distrib);
- for (int t = 0; t < 10; ++t) {
- std::vector<float> v, w(N);
-
- ICmp cmp(&w[0], std::less<float>());
- fibonacci_heap<int, ICmp> Q(N, cmp);
-
- for (int c = 0; c < w.size(); ++c)
- w[c] = c;
- std::random_shuffle(w.begin(), w.end());
-
- for (i = 0; i < N; ++i)
- Q.push(i);
-
- for (i = 0; i < N; ++i) {
- int u = rand_gen();
- float r = rand_gen(); r /= 2.0;
- w[u] = w[u] - r;
- Q.update(u);
- }
-
- for (i = 0; i < N; ++i) {
- v.push_back(w[Q.top()]);
- Q.pop();
- }
- std::sort(w.begin(), w.end());
-
- if (! std::equal(v.begin(), v.end(), w.begin())) {
- std::cout << std::endl << "heap sorted: ";
- std::copy(v.begin(), v.end(),
- std::ostream_iterator<float>(std::cout," "));
- std::cout << std::endl << "correct: ";
- std::copy(w.begin(), w.end(),
- std::ostream_iterator<float>(std::cout," "));
- std::cout << std::endl;
- return -1;
- }
- }
- }
- std::cout << "fibonacci heap passed test" << std::endl;
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/fibonacci_heap.expected b/Utilities/BGL/boost/graph/example/fibonacci_heap.expected
deleted file mode 100644
index a11d7ad1d0323cfb216a957f2275aaa8f91bc437..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/fibonacci_heap.expected
+++ /dev/null
@@ -1 +0,0 @@
-fibonacci heap passed test
diff --git a/Utilities/BGL/boost/graph/example/figs/cc-internet.dot b/Utilities/BGL/boost/graph/example/figs/cc-internet.dot
deleted file mode 100644
index a49fda738bcab80056d43211dca7ed831a29a1f7..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/figs/cc-internet.dot
+++ /dev/null
@@ -1,67 +0,0 @@
-graph G {
-rankdir="LR";
-size="5.625,7.75";
-ratio="fill";
-subgraph cluster0 {
-color="white"
-"engr-fe21.gw.nd.edu"
-"radole.lcs.mit.edu"
-"shub-e27.gw.nd.edu"
-"ihtfp.mit.edu"
-"core1-ord1-oc48.ord2.above.net"
-"albnxg1.ip.tele.dk"
-}
-subgraph cluster1 {
-color="white"
-"nycmny1-cr1.bbnplanet.net"
-"ccn-nerif35.Berkeley.EDU"
-"rip.Berkeley.EDU"
-"chicago1-nbr1.bbnplanet.net"
-"ccngw-ner-cc.Berkeley.EDU"
-"above-bbn-45Mbps.ord.above.net"
-}
-subgraph cluster2 {
-color="white"
-"gw-dkuug.oeb.tdk.ne"
-"vabi1-gige-1-1.google.com"
-}
-subgraph cluster3 {
-color="white"
-"boston1-br1.bbnplanet.net"
-"cambridge1-nbr2.bbnplanet.net"
-"helios.ee.lbl.gov"
-"lilac-dmc.Berkeley.EDU"
-"teledk.bbnplanet.net"
-"albnxg1.ip.tele.dk"
-}
-
-edge[style="bold"];
-
-"engr-fe21.gw.nd.edu" -- "shub-e27.gw.nd.edu"
-"shub-e27.gw.nd.edu" -- "chicago1-nbr1.bbnplanet.net"
-"shub-e27.gw.nd.edu" -- "core1-ord1-oc48.ord2.above.net"
-"chicago1-nbr1.bbnplanet.net" -- "above-bbn-45Mbps.ord.above.net"
-"above-bbn-45Mbps.ord.above.net" -- "engr-fe21.gw.nd.edu"
-"above-bbn-45Mbps.ord.above.net" -- "core1-ord1-oc48.ord2.above.net"
-"core1-ord1-oc48.ord2.above.net" -- "vabi1-gige-1-1.google.com"
-"vabi1-gige-1-1.google.com" -- "chicago1-nbr1.bbnplanet.net"
-
-"cambridge1-nbr2.bbnplanet.net" -- "boston1-br1.bbnplanet.net"
-"ihtfp.mit.edu" -- "boston1-br1.bbnplanet.net"
-"cambridge1-nbr2.bbnplanet.net" -- "radole.lcs.mit.edu"
-"ihtfp.mit.edu" -- "radole.lcs.mit.edu"
-
-"helios.ee.lbl.gov" -- "lilac-dmc.Berkeley.EDU"
-"lilac-dmc.Berkeley.EDU" -- "ccngw-ner-cc.Berkeley.EDU"
-"ccngw-ner-cc.Berkeley.EDU" -- "ccn-nerif35.Berkeley.EDU"
-"ccn-nerif35.Berkeley.EDU" -- "rip.Berkeley.EDU"
-"helios.ee.lbl.gov" -- "ccn-nerif35.Berkeley.EDU"
-"lilac-dmc.Berkeley.EDU" -- "rip.Berkeley.EDU"
-
-"nycmny1-cr1.bbnplanet.net" -- "teledk.bbnplanet.net"
-"teledk.bbnplanet.net" -- "albnxg1.ip.tele.dk"
-"albnxg1.ip.tele.dk" -- "gw-dkuug.oeb.tdk.ne"
-"nycmny1-cr1.bbnplanet.net" -- "gw-dkuug.oeb.tdk.ne"
-"nycmny1-cr1.bbnplanet.net" -- "albnxg1.ip.tele.dk"
-
-}
diff --git a/Utilities/BGL/boost/graph/example/figs/dfs-example.dot b/Utilities/BGL/boost/graph/example/figs/dfs-example.dot
deleted file mode 100644
index 06e2663954be8d6bd84b0a1aa65d54bc4508276a..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/figs/dfs-example.dot
+++ /dev/null
@@ -1,28 +0,0 @@
-graph G {
- size="3,3"
- ratio="fill"
- node[shape="circle"]
- edge[style="bold"]
- a;
- b;
- c;
- d;
- e;
- f;
- g;
- h;
- i;
- j;
-
- c -- a[label="1"]
- a -- b[color="gray",style="bold",weight=0]
- f -- c[label="2"]
- g -- f[label="3"]
- f -- h[label="7"]
- g -- d[label="4"]
- b -- e[label="6"]
- b -- d[label="5"]
- e -- d[color="gray",style="bold",weight=0]
-
- i -- j[label="8"]
-}
diff --git a/Utilities/BGL/boost/graph/example/figs/edge-connectivity.dot b/Utilities/BGL/boost/graph/example/figs/edge-connectivity.dot
deleted file mode 100644
index f9dbadabe9d2972d283ab9409ebb35e4356896c1..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/figs/edge-connectivity.dot
+++ /dev/null
@@ -1,21 +0,0 @@
-graph G {
- rankdir="LR"
- size="5,3"
- ratio="fill"
- node[shape="circle"]
- A B C D E F G H
- A -- B
- A -- C
- A -- D
- B -- C
- B -- D
- C -- D
- D -- E
- D -- H
- E -- F
- E -- G
- E -- H
- F -- G
- F -- H
- G -- H
-}
diff --git a/Utilities/BGL/boost/graph/example/figs/ospf-graph.dot b/Utilities/BGL/boost/graph/example/figs/ospf-graph.dot
deleted file mode 100644
index d4fcee7ad12495fb18d08134254fa2f0430bce19..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/figs/ospf-graph.dot
+++ /dev/null
@@ -1,96 +0,0 @@
-digraph G {
- ratio="fill"
- size="4,6"
- edge[style="bold"]
-
- RT1
- RT2
- RT3
- RT4
- RT5
- RT6
- RT7
- RT8
- RT9
- RT10
- RT11
- RT12
-
- N1
- N2
- N3
- N4
- N6
- N7
- N8
- N9
- N10
- N11
- N12
- N13
- N14
- N15
- H1
-
- RT1 -> N1[label="3"]
- RT1 -> N3[label="1"]
-
- RT2 -> N2[label="3"]
- RT2 -> N3[label="1"]
-
- RT3 -> RT6[label="8"]
- RT3 -> N3[label="1"]
- RT3 -> N4[label="2"]
-
- RT4 -> N3[label="1"]
- RT4 -> RT5[label="8"]
-
- RT5 -> RT4[label="8"]
- RT5 -> RT6[label="7"]
- RT5 -> RT7[label="6"]
- RT5 -> N12[label="8"]
- RT5 -> N13[label="8"]
- RT5 -> N14[label="8"]
-
- RT6 -> RT3[label="6"]
- RT6 -> RT5[label="6"]
- RT6 -> RT10[label="7"]
-
- RT7 -> RT5[label="6"]
- RT7 -> N6[label="1"]
- RT7 -> N12[label="2"]
- RT7 -> N15[label="9"]
-
- RT8 -> N6[label="1"]
- RT8 -> N7[label="4"]
-
- RT9 -> N9[label="1"]
- RT9 -> N11[label="3"]
-
- RT10 -> RT6[label="5"]
- RT10 -> N6[label="1"]
- RT10 -> N8[label="3"]
-
- RT11 -> N8[label="2"]
- RT11 -> N9[label="1"]
-
- RT12 -> N9[label="1"]
- RT12 -> N10[label="2"]
- RT12 -> H1[label="10"]
-
- N3 -> RT1[label="0"]
- N3 -> RT2[label="0"]
- N3 -> RT3[label="0"]
- N3 -> RT4[label="0"]
-
- N6 -> RT7[label="0"]
- N6 -> RT8[label="0"]
- N6 -> RT10[label="0"]
-
- N8 -> RT10[label="0"]
- N8 -> RT11[label="0"]
-
- N9 -> RT9[label="0"]
- N9 -> RT11[label="0"]
- N9 -> RT12[label="0"]
-}
diff --git a/Utilities/BGL/boost/graph/example/figs/scc.dot b/Utilities/BGL/boost/graph/example/figs/scc.dot
deleted file mode 100644
index 66d0fc84488fa128a8d6771e7df8bc1e3c9826ff..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/figs/scc.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-digraph SCC {
- size="3,4"
- ratio="fill"
- edge[style="bold"]
- "www.boost.org"
- "www.yahoogroups.com"
- "weather.yahoo.com"
- "nytimes.com"
- "www.boston.com"
- "sourceforge.net"
- "www.hp.com"
- "anubis.dkuug.dk"
- "www.lsc.nd.edu"
- "www.lam-mpi.org"
-
- "www.boost.org" -> "www.yahoogroups.com"
- "www.boost.org" -> "sourceforge.net"
- "www.boost.org" -> "anubis.dkuug.dk"
- "www.yahoogroups.com" -> "weather.yahoo.com"
- "www.yahoogroups.com" -> "www.boost.org"
- "weather.yahoo.com" -> "nytimes.com"
- "weather.yahoo.com" -> "www.yahoogroups.com"
- "nytimes.com" -> "www.boston.com"
- "www.boston.com" -> "nytimes.com"
- "sourceforge.net" -> "www.hp.com"
- "www.hp.com" -> "sourceforge.net"
- "www.hp.com" -> "nytimes.com"
- "anubis.dkuug.dk" -> "www.lsc.nd.edu"
- "www.lsc.nd.edu" -> "anubis.dkuug.dk"
- "www.lsc.nd.edu" -> "www.lam-mpi.org"
- "www.lsc.nd.edu" -> "www.boston.com"
- "www.lsc.nd.edu" -> "weather.yahoo.com"
-}
diff --git a/Utilities/BGL/boost/graph/example/figs/telephone-network.dot b/Utilities/BGL/boost/graph/example/figs/telephone-network.dot
deleted file mode 100644
index 4187d5127f22f904d944cbc3838cdad602a90994..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/figs/telephone-network.dot
+++ /dev/null
@@ -1,42 +0,0 @@
-graph G {
- size="5,5.3"
- ratio="fill"
- edge[style="bold"]
- Nobel
- McKellar
- "Parry Sound"
- "Horseshoe Lake"
- Rosseau
- Mactier
- "Bent River"
- Dunchurch
- Magnetawan
- Kearny
- "Glen Orchard"
- Sprucedale
- Novar
- Huntsville
- Bracebridge
-
- Nobel -- McKellar[label="9", weight="9"]
- Nobel -- "Parry Sound"[label="3", weight="3"]
- McKellar -- Dunchurch[label="11", weight="11"]
- Dunchurch -- Magnetawan[label="12", weight="12"]
- McKellar -- Magnetawan[label="30", weight="30"]
- Magnetawan -- Kearny[label="20", weight="20"]
- Magnetawan -- Sprucedale[label="20", weight="20"]
- Kearny -- Sprucedale[label="13", weight="13"]
- Sprucedale -- Novar[label="18", weight="18"]
- Sprucedale -- Huntsville[label="15", weight="15"]
- Kearny -- Novar[label="8", weight="11"]
- Novar -- Huntsville[label="5", weight="5"]
- Huntsville -- Bracebridge[label="30", weight="30"]
- Huntsville -- "Bent River"[label="30", weight="30"]
- Rosseau -- "Bent River"[label="8", weight="8"]
- Rosseau -- "Horseshoe Lake"[label="8", weight="8"]
- Mactier -- "Horseshoe Lake"[label="14", weight="14"]
- "Parry Sound" -- "Horseshoe Lake"[label="10", weight="10"]
- "Parry Sound" -- Dunchurch[label="20", weight="20"]
- Mactier -- "Glen Orchard"[label="9", weight="9"]
- "Glen Orchard" -- Bracebridge[label="15", weight="15"]
-}
diff --git a/Utilities/BGL/boost/graph/example/file_dependencies.cpp b/Utilities/BGL/boost/graph/example/file_dependencies.cpp
deleted file mode 100644
index 78a684a16cf9c9a569708c2cec6ca1f136dd4c61..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/file_dependencies.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-/*
-
- Paul Moore's request:
-
- As an example of a practical problem which is not restricted to graph
- "experts", consider file dependencies. It's basically graph construction,
- plus topological sort, but it might make a nice "tutorial" example. Build a
- dependency graph of files, then use the algorithms to do things like
-
- 1. Produce a full recompilation order (topological sort, by modified date)
- 2. Produce a "parallel" recompilation order (same as above, but group files
- which can be built in parallel)
- 3. Change analysis (if I change file x, which others need recompiling)
- 4. Dependency changes (if I add a dependency between file x and file y, what
- are the effects)
-
-*/
-
-#include <boost/config.hpp> // put this first to suppress some VC++ warnings
-
-#include <iostream>
-#include <iterator>
-#include <algorithm>
-#include <time.h>
-
-#include <boost/utility.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/topological_sort.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/graph/dijkstra_shortest_paths.hpp>
-#include <boost/graph/visitors.hpp>
-
-using namespace std;
-using namespace boost;
-
-enum files_e { dax_h, yow_h, boz_h, zow_h, foo_cpp,
- foo_o, bar_cpp, bar_o, libfoobar_a,
- zig_cpp, zig_o, zag_cpp, zag_o,
- libzigzag_a, killerapp, N };
-const char* name[] = { "dax.h", "yow.h", "boz.h", "zow.h", "foo.cpp",
- "foo.o", "bar.cpp", "bar.o", "libfoobar.a",
- "zig.cpp", "zig.o", "zag.cpp", "zag.o",
- "libzigzag.a", "killerapp" };
-
-
-struct print_visitor : public bfs_visitor<> {
- template <class Vertex, class Graph>
- void discover_vertex(Vertex v, Graph&) {
- cout << name[v] << " ";
- }
-};
-
-
-struct cycle_detector : public dfs_visitor<>
-{
- cycle_detector(bool& has_cycle)
- : m_has_cycle(has_cycle) { }
-
- template <class Edge, class Graph>
- void back_edge(Edge, Graph&) { m_has_cycle = true; }
-protected:
- bool& m_has_cycle;
-};
-
-
-
-
-int main(int,char*[])
-{
-
- typedef pair<int,int> Edge;
- Edge used_by[] = {
- Edge(dax_h, foo_cpp), Edge(dax_h, bar_cpp), Edge(dax_h, yow_h),
- Edge(yow_h, bar_cpp), Edge(yow_h, zag_cpp),
- Edge(boz_h, bar_cpp), Edge(boz_h, zig_cpp), Edge(boz_h, zag_cpp),
- Edge(zow_h, foo_cpp),
- Edge(foo_cpp, foo_o),
- Edge(foo_o, libfoobar_a),
- Edge(bar_cpp, bar_o),
- Edge(bar_o, libfoobar_a),
- Edge(libfoobar_a, libzigzag_a),
- Edge(zig_cpp, zig_o),
- Edge(zig_o, libzigzag_a),
- Edge(zag_cpp, zag_o),
- Edge(zag_o, libzigzag_a),
- Edge(libzigzag_a, killerapp)
- };
- const std::size_t nedges = sizeof(used_by)/sizeof(Edge);
- int weights[nedges];
- std::fill(weights, weights + nedges, 1);
-
- typedef adjacency_list<vecS, vecS, directedS,
- property<vertex_color_t, default_color_type>,
- property<edge_weight_t, int>
- > Graph;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- Graph g(N);
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, g);
- for (std::size_t j = 0; j < nedges; ++j) {
- graph_traits<Graph>::edge_descriptor e; bool inserted;
- tie(e, inserted) = add_edge(used_by[j].first, used_by[j].second, g);
- weightmap[e] = weights[j];
- }
-#else
- Graph g(used_by, used_by + nedges, weights, N);
-#endif
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
-
- // Determine ordering for a full recompilation
- {
- typedef list<Vertex> MakeOrder;
- MakeOrder make_order;
- topological_sort(g, std::front_inserter(make_order));
-
- cout << "make ordering: ";
- for (MakeOrder::iterator i = make_order.begin();
- i != make_order.end(); ++i)
- cout << name[*i] << " ";
- cout << endl;
- }
- cout << endl;
-
- // Recompilation order with files that can be compiled in parallel
- // grouped together
- {
- // Set up the necessary graph properties.
- vector<int> time(N);
- typedef vector<int>::iterator Time;
- property_map<Graph, edge_weight_t>::type weight = get(edge_weight, g);
-
- // Calculate the in_degree for each vertex.
- vector<int> in_degree(N, 0);
- graph_traits<Graph>::vertex_iterator i, iend;
- graph_traits<Graph>::out_edge_iterator j, jend;
- for (tie(i, iend) = vertices(g); i != iend; ++i)
- for (tie(j, jend) = out_edges(*i,g); j != jend; ++j)
- in_degree[target(*j,g)] += 1;
-
- std::greater<int> compare;
- closed_plus<int> combine;
-
- // Run best-first-search from each vertex with zero in-degree.
- for (tie(i, iend) = vertices(g); i != iend; ++i) {
- if (in_degree[*i] == 0) {
- std::vector<graph_traits<Graph>::vertex_descriptor>
- pred(num_vertices(g));
- property_map<Graph, vertex_index_t>::type
- indexmap = get(vertex_index, g);
- dijkstra_shortest_paths_no_init
- (g, *i, &pred[0], &time[0], weight, indexmap,
- compare, combine, 0, // Since we are using > instead of >, we
- (std::numeric_limits<int>::max)(), // flip 0 and inf.
- default_dijkstra_visitor());
- }
- }
-
- cout << "parallel make ordering, " << endl
- << "vertices with same group number can be made in parallel" << endl;
- for (tie(i,iend) = vertices(g); i != iend; ++i)
- cout << "time_slot[" << name[*i] << "] = " << time[*i] << endl;
- }
- cout << endl;
-
- // if I change yow.h what files need to be re-made?
- {
- cout << "A change to yow.h will cause what to be re-made?" << endl;
- print_visitor vis;
- breadth_first_search(g, vertex(yow_h, g), visitor(vis));
- cout << endl;
- }
- cout << endl;
-
- // are there any cycles in the graph?
- {
- bool has_cycle = false;
- cycle_detector vis(has_cycle);
- depth_first_search(g, visitor(vis));
- cout << "The graph has a cycle? " << has_cycle << endl;
- }
- cout << endl;
-
- // add a dependency going from bar.cpp to dax.h
- {
- cout << "adding edge bar_cpp -> dax_h" << endl;
- add_edge(bar_cpp, dax_h, g);
- }
- cout << endl;
-
- // are there any cycles in the graph?
- {
- bool has_cycle = false;
- cycle_detector vis(has_cycle);
- depth_first_search(g, visitor(vis));
- cout << "The graph has a cycle now? " << has_cycle << endl;
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/file_dependencies.expected b/Utilities/BGL/boost/graph/example/file_dependencies.expected
deleted file mode 100644
index 9f004a7acc4166a50ea4ebff1d504544efc54d04..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/file_dependencies.expected
+++ /dev/null
@@ -1,28 +0,0 @@
-make ordering: zow.h boz.h zig.cpp zig.o dax.h yow.h zag.cpp zag.o bar.cpp bar.o foo.cpp foo.o libfoobar.a libzigzag.a killerapp
-
-parallel make ordering,
-vertices with same group number can be made in parallel
-time_slot[dax.h] = 0
-time_slot[yow.h] = 1
-time_slot[boz.h] = 0
-time_slot[zow.h] = 0
-time_slot[foo.cpp] = 1
-time_slot[foo.o] = 2
-time_slot[bar.cpp] = 2
-time_slot[bar.o] = 3
-time_slot[libfoobar.a] = 4
-time_slot[zig.cpp] = 1
-time_slot[zig.o] = 2
-time_slot[zag.cpp] = 2
-time_slot[zag.o] = 3
-time_slot[libzigzag.a] = 5
-time_slot[killerapp] = 6
-
-A change to yow.h will cause what to be re-made?
-yow.h bar.cpp zag.cpp bar.o zag.o libfoobar.a libzigzag.a killerapp
-
-The graph has a cycle? 0
-
-adding edge bar_cpp -> dax_h
-
-The graph has a cycle now? 1
diff --git a/Utilities/BGL/boost/graph/example/filtered-copy-example.cpp b/Utilities/BGL/boost/graph/example/filtered-copy-example.cpp
deleted file mode 100644
index f1ee142b7af8d5f376e77b3fc9dccbbde09de03c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/filtered-copy-example.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/copy.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/filtered_graph.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-template <typename Graph>
-struct non_zero_degree {
- non_zero_degree() { } // has to have a default constructor!
-
- non_zero_degree(const Graph& g) : g(&g) { }
-
- bool operator()(typename boost::graph_traits<Graph>::vertex_descriptor v) const
- {
- return degree(v, *g) != 0;
- }
- const Graph* g;
-};
-
-int
-main()
-{
- using namespace boost;
- typedef int weight_t;
- typedef adjacency_list < vecS, vecS, bidirectionalS,
- property < vertex_name_t, char > > graph_t;
-
- enum { a, b, c, d, e, f, g, N };
- graph_t G(N);
- property_map < graph_t, vertex_name_t >::type
- name_map = get(vertex_name, G);
- char name = 'a';
- graph_traits < graph_t >::vertex_iterator v, v_end;
- for (tie(v, v_end) = vertices(G); v != v_end; ++v, ++name)
- name_map[*v] = name;
-
- typedef std::pair < int, int >E;
- E edges[] = { E(a, c), E(a, d), E(b, a), E(b, d), E(c, f),
- E(d, c), E(d, e), E(d, f), E(e, b), E(e, g), E(f, e), E(f, g)
- };
- for (int i = 0; i < 12; ++i)
- add_edge(edges[i].first, edges[i].second, G);
-
- print_graph(G, name_map);
- std::cout << std::endl;
-
- clear_vertex(b, G);
- clear_vertex(d, G);
-
- graph_t G_copy;
- copy_graph(make_filtered_graph(G, keep_all(), non_zero_degree<graph_t>(G)), G_copy);
-
- print_graph(G_copy, get(vertex_name, G_copy));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/filtered_graph.cpp b/Utilities/BGL/boost/graph/example/filtered_graph.cpp
deleted file mode 100644
index e325b5f83313fdd6fe58875e90c73e6890134bc1..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/filtered_graph.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//=======================================================================
-// Copyright 2001 University of Notre Dame.
-// Author: Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-/*
- Sample output:
-
- filtered edge set: (A,B) (C,D) (D,B)
- filtered out-edges:
- A --> B
- B -->
- C --> D
- D --> B
- E -->
- */
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/filtered_graph.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-template <typename EdgeWeightMap>
-struct positive_edge_weight {
- positive_edge_weight() { }
- positive_edge_weight(EdgeWeightMap weight) : m_weight(weight) { }
- template <typename Edge>
- bool operator()(const Edge& e) const {
- return 0 < boost::get(m_weight, e);
- }
- EdgeWeightMap m_weight;
-};
-
-
-int main()
-{
- using namespace boost;
-
- typedef adjacency_list<vecS, vecS, directedS,
- no_property, property<edge_weight_t, int> > Graph;
- typedef property_map<Graph, edge_weight_t>::type EdgeWeightMap;
-
- enum { A, B, C, D, E, N };
- const char* name = "ABCDE";
- Graph g(N);
- add_edge(A, B, 2, g);
- add_edge(A, C, 0, g);
- add_edge(C, D, 1, g);
- add_edge(C, E, 0, g);
- add_edge(D, B, 3, g);
- add_edge(E, C, 0, g);
-
- positive_edge_weight<EdgeWeightMap> filter(get(edge_weight, g));
- filtered_graph<Graph, positive_edge_weight<EdgeWeightMap> >
- fg(g, filter);
-
- std::cout << "filtered edge set: ";
- print_edges(fg, name);
-
- std::cout << "filtered out-edges:" << std::endl;
- print_graph(fg, name);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/filtered_graph.expected b/Utilities/BGL/boost/graph/example/filtered_graph.expected
deleted file mode 100644
index d2a8e504a8f1aa92d50e1af11b47a6949660117a..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/filtered_graph.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-filtered edge set: (A,B) (C,D) (D,B)
-filtered out-edges:
-A --> B
-B -->
-C --> D
-D --> B
-E -->
diff --git a/Utilities/BGL/boost/graph/example/filtered_graph_edge_range.cpp b/Utilities/BGL/boost/graph/example/filtered_graph_edge_range.cpp
deleted file mode 100644
index 6a00789db4d753c5a6ddd60e5e3d260a875efa90..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/filtered_graph_edge_range.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//=======================================================================
-// Copyright 2001 University of Notre Dame.
-// Author: Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-/*
- Sample output:
-
- filtered edge set: (A,B) (C,D) (D,B)
- filtered out-edges:
- A --> B
- B -->
- C --> D
- D --> B
- E -->
- */
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/filtered_graph.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-template <typename EdgeWeightMap>
-struct positive_edge_weight {
- positive_edge_weight() { }
- positive_edge_weight(EdgeWeightMap weight) : m_weight(weight) { }
- template <typename Edge>
- bool operator()(const Edge& e) const {
- return 0 < boost::get(m_weight, e);
- }
- EdgeWeightMap m_weight;
-};
-
-
-int main()
-{
- using namespace boost;
-
- typedef adjacency_list<multisetS, vecS, directedS,
- no_property, property<edge_weight_t, int> > Graph;
- typedef property_map<Graph, edge_weight_t>::type EdgeWeightMap;
-
- enum { A, B, C, D, E, N };
- const char* name = "ABCDE";
- Graph g(N);
- add_edge(A, B, 2, g);
- add_edge(A, C, 0, g);
- add_edge(C, D, 1, g);
- add_edge(C, D, 0, g);
- add_edge(C, D, 3, g);
- add_edge(C, E, 0, g);
- add_edge(D, B, 3, g);
- add_edge(E, C, 0, g);
-
- EdgeWeightMap weight = get(edge_weight, g);
-
- std::cout << "unfiltered edge_range(C,D)\n";
- graph_traits<Graph>::out_edge_iterator f, l;
- for (tie(f, l) = edge_range(C, D, g); f != l; ++f)
- std::cout << name[source(*f, g)] << " --" << weight[*f]
- << "-> " << name[target(*f, g)] << "\n";
-
- positive_edge_weight<EdgeWeightMap> filter(weight);
- typedef filtered_graph<Graph, positive_edge_weight<EdgeWeightMap> > FGraph;
- FGraph fg(g, filter);
-
- std::cout << "filtered edge_range(C,D)\n";
- graph_traits<FGraph>::out_edge_iterator first, last;
- for (tie(first, last) = edge_range(C, D, fg); first != last; ++first)
- std::cout << name[source(*first, fg)] << " --" << weight[*first]
- << "-> " << name[target(*first, fg)] << "\n";
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/filtered_vec_as_graph.cpp b/Utilities/BGL/boost/graph/example/filtered_vec_as_graph.cpp
deleted file mode 100644
index 2d976a0efb7865cfdead96a792a35e68e9d18ae2..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/filtered_vec_as_graph.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//=======================================================================
-// Copyright 2001 University of Notre Dame.
-// Author: Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-/*
- Sample output:
-
- filtered out-edges:
- A -->
- B -->
- C --> E
- D --> E
- E -->
- */
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/vector_as_graph.hpp>
-#include <boost/graph/filtered_graph.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-struct constant_target {
- constant_target() { }
- constant_target(int t) : target(t) { }
- bool operator()(const std::pair<int,int>& e) const {
- return e.second == target;
- }
- int target;
-};
-
-
-int main()
-{
- using namespace boost;
-
- enum { A, B, C, D, E, N };
- const char* name = "ABCDE";
- typedef std::vector < std::list < int > > Graph;
- Graph g(N);
- g[A].push_back(B);
- g[A].push_back(C);
- g[C].push_back(D);
- g[C].push_back(E);
- g[D].push_back(E);
- g[E].push_back(C);
-
- constant_target filter(E);
- filtered_graph<Graph, constant_target> fg(g, filter);
-
- std::cout << "filtered out-edges:" << std::endl;
- print_graph(fg, name);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/fr_layout.cpp b/Utilities/BGL/boost/graph/example/fr_layout.cpp
deleted file mode 100644
index aa0612a84b5332736c00c198066a0e5a6f9299c9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/fr_layout.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2004 The Trustees of Indiana University.
-
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// Authors: Douglas Gregor
-// Andrew Lumsdaine
-#include <boost/graph/fruchterman_reingold.hpp>
-#include <boost/graph/random_layout.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/simple_point.hpp>
-#include <boost/lexical_cast.hpp>
-#include <string>
-#include <iostream>
-#include <map>
-#include <vector>
-#include <boost/random/linear_congruential.hpp>
-#include <boost/progress.hpp>
-#include <boost/shared_ptr.hpp>
-
-using namespace boost;
-
-void usage()
-{
- std::cerr << "Usage: fr_layout [options] <width> <height>\n"
- << "Arguments:\n"
- << "\t<width>\tWidth of the display area (floating point)\n"
- << "\t<Height>\tHeight of the display area (floating point)\n\n"
- << "Options:\n"
- << "\t--iterations n\tNumber of iterations to execute.\n"
- << "\t\t\tThe default value is 100.\n"
- << "Input:\n"
- << " Input is read from standard input as a list of edges, one per line.\n"
- << " Each edge contains two string labels (the endpoints) separated by a space.\n\n"
- << "Output:\n"
- << " Vertices and their positions are written to standard output with the label,\n x-position, and y-position of a vertex on each line, separated by spaces.\n";
-}
-
-typedef adjacency_list<listS, vecS, undirectedS,
- property<vertex_name_t, std::string> > Graph;
-
-typedef graph_traits<Graph>::vertex_descriptor Vertex;
-
-typedef std::map<std::string, Vertex> NameToVertex;
-
-Vertex get_vertex(const std::string& name, Graph& g, NameToVertex& names)
-{
- NameToVertex::iterator i = names.find(name);
- if (i == names.end())
- i = names.insert(std::make_pair(name, add_vertex(name, g))).first;
- return i->second;
-}
-
-class progress_cooling : public linear_cooling<double>
-{
- typedef linear_cooling<double> inherited;
-
- public:
- explicit progress_cooling(std::size_t iterations) : inherited(iterations)
- {
- display.reset(new progress_display(iterations + 1, std::cerr));
- }
-
- double operator()()
- {
- ++(*display);
- return inherited::operator()();
- }
-
- private:
- shared_ptr<boost::progress_display> display;
-};
-
-int main(int argc, char* argv[])
-{
- int iterations = 100;
-
- if (argc < 3) { usage(); return -1; }
-
- double width = 0;
- double height = 0;
-
- for (int arg_idx = 1; arg_idx < argc; ++arg_idx) {
- std::string arg = argv[arg_idx];
- if (arg == "--iterations") {
- ++arg_idx;
- if (arg_idx >= argc) { usage(); return -1; }
- iterations = lexical_cast<int>(argv[arg_idx]);
- } else {
- if (width == 0.0) width = lexical_cast<double>(arg);
- else if (height == 0.0) height = lexical_cast<double>(arg);
- else {
- usage();
- return -1;
- }
- }
- }
-
- if (width == 0.0 || height == 0.0) {
- usage();
- return -1;
- }
-
- Graph g;
- NameToVertex names;
-
- std::string source, target;
- while (std::cin >> source >> target) {
- add_edge(get_vertex(source, g, names), get_vertex(target, g, names), g);
- }
-
- typedef std::vector<simple_point<double> > PositionVec;
- PositionVec position_vec(num_vertices(g));
- typedef iterator_property_map<PositionVec::iterator,
- property_map<Graph, vertex_index_t>::type>
- PositionMap;
- PositionMap position(position_vec.begin(), get(vertex_index, g));
-
- minstd_rand gen;
- random_graph_layout(g, position, -width/2, width/2, -height/2, height/2, gen);
- fruchterman_reingold_force_directed_layout
- (g, position, width, height,
- cooling(progress_cooling(iterations)));
-
- graph_traits<Graph>::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- std::cout << get(vertex_name, g, *vi) << '\t'
- << position[*vi].x << '\t' << position[*vi].y << std::endl;
- }
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/gerdemann.cpp b/Utilities/BGL/boost/graph/example/gerdemann.cpp
deleted file mode 100644
index d4b9fbafc11024e8b1f2a81025c7c5042db31a13..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/gerdemann.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- c++ -*-
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-
-#include <boost/graph/adjacency_list.hpp>
-
-/*
- Thanks to Dale Gerdemann for this example, which inspired some
- changes to adjacency_list to make this work properly.
- */
-
-/*
- Sample output:
-
- 0 --c--> 1 --j--> 1 --c--> 2 --x--> 2
- 1 --c--> 2 --d--> 3
- 2 --t--> 4
- 3 --h--> 4
- 4
-
- merging vertex 1 into vertex 0
-
- 0 --c--> 0 --j--> 0 --c--> 1 --x--> 1 --d--> 2
- 1 --t--> 3
- 2 --h--> 3
- 3
- */
-
-// merge_vertex(u,v,g):
-// incoming/outgoing edges for v become incoming/outgoing edges for u
-// v is deleted
-template <class Graph, class GetEdgeProperties>
-void merge_vertex
- (typename boost::graph_traits<Graph>::vertex_descriptor u,
- typename boost::graph_traits<Graph>::vertex_descriptor v,
- Graph& g, GetEdgeProperties getp)
-{
- typedef boost::graph_traits<Graph> Traits;
- typename Traits::edge_descriptor e;
- typename Traits::out_edge_iterator out_i, out_end;
- for (tie(out_i, out_end) = out_edges(v, g); out_i != out_end; ++out_i) {
- e = *out_i;
- typename Traits::vertex_descriptor targ = target(e, g);
- add_edge(u, targ, getp(e), g);
- }
- typename Traits::in_edge_iterator in_i, in_end;
- for (tie(in_i, in_end) = in_edges(v, g); in_i != in_end; ++in_i) {
- e = *in_i;
- typename Traits::vertex_descriptor src = source(e, g);
- add_edge(src, u, getp(e), g);
- }
- clear_vertex(v, g);
- remove_vertex(v, g);
-}
-
-template <class StoredEdge>
-struct order_by_name
- : public std::binary_function<StoredEdge,StoredEdge,bool>
-{
- bool operator()(const StoredEdge& e1, const StoredEdge& e2) const {
- // Using std::pair operator< as an easy way to get lexicographical
- // compare over tuples.
- return std::make_pair(e1.get_target(), boost::get(boost::edge_name, e1))
- < std::make_pair(e2.get_target(), boost::get(boost::edge_name, e2));
- }
-};
-struct ordered_set_by_nameS { };
-
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-namespace boost {
- template <class ValueType>
- struct container_gen<ordered_set_by_nameS, ValueType> {
- typedef std::set<ValueType, order_by_name<ValueType> > type;
- };
- template <>
- struct parallel_edge_traits<ordered_set_by_nameS> {
- typedef allow_parallel_edge_tag type;
- };
-}
-#endif
-
-template <class Graph>
-struct get_edge_name {
- get_edge_name(const Graph& g_) : g(g_) { }
-
- template <class Edge>
- boost::property<boost::edge_name_t, char> operator()(Edge e) const {
- return boost::property<boost::edge_name_t, char>(boost::get(boost::edge_name, g, e));
- }
- const Graph& g;
-};
-
-int
-main()
-{
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
- std::cout << "This program requires partial specialization." << std::endl;
-#else
- using namespace boost;
- typedef property<edge_name_t, char> EdgeProperty;
- typedef adjacency_list<ordered_set_by_nameS, vecS, bidirectionalS,
- no_property, EdgeProperty> graph_type;
-
- graph_type g;
-
- add_edge(0, 1, EdgeProperty('j'), g);
- add_edge(0, 2, EdgeProperty('c'), g);
- add_edge(0, 2, EdgeProperty('x'), g);
- add_edge(1, 3, EdgeProperty('d'), g);
- add_edge(1, 2, EdgeProperty('c'), g);
- add_edge(1, 3, EdgeProperty('d'), g);
- add_edge(2, 4, EdgeProperty('t'), g);
- add_edge(3, 4, EdgeProperty('h'), g);
- add_edge(0, 1, EdgeProperty('c'), g);
-
- property_map<graph_type, vertex_index_t>::type id = get(vertex_index, g);
- property_map<graph_type, edge_name_t>::type name = get(edge_name, g);
-
- graph_traits<graph_type>::vertex_iterator i, end;
- graph_traits<graph_type>::out_edge_iterator ei, edge_end;
-
- for (boost::tie(i, end) = vertices(g); i != end; ++i) {
- std::cout << id[*i] << " ";
- for (boost::tie(ei, edge_end) = out_edges(*i, g); ei != edge_end; ++ei)
- std::cout << " --" << name[*ei] << "--> " << id[target(*ei, g)] << " ";
- std::cout << std::endl;
- }
- std::cout << std::endl;
-
- std::cout << "merging vertex 1 into vertex 0" << std::endl << std::endl;
- merge_vertex(0, 1, g, get_edge_name<graph_type>(g));
-
- for (boost::tie(i, end) = vertices(g); i != end; ++i) {
- std::cout << id[*i] << " ";
- for (boost::tie(ei, edge_end) = out_edges(*i, g); ei != edge_end; ++ei)
- std::cout << " --" << name[*ei] << "--> " << id[target(*ei, g)] << " ";
- std::cout << std::endl;
- }
- std::cout << std::endl;
-#endif
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/gerdemann.expected b/Utilities/BGL/boost/graph/example/gerdemann.expected
deleted file mode 100644
index bc5bdda65f2b5633154fe5aba72fc0548d9cb00e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/gerdemann.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-0 --c--> 1 --j--> 1 --c--> 2 --x--> 2
-1 --c--> 2 --d--> 3
-2 --t--> 4
-3 --h--> 4
-4
-
-merging vertex 1 into vertex 0
-
-0 --c--> 0 --j--> 0 --c--> 1 --x--> 1 --d--> 2
-1 --t--> 3
-2 --h--> 3
-3
-
diff --git a/Utilities/BGL/boost/graph/example/girth.cpp b/Utilities/BGL/boost/graph/example/girth.cpp
deleted file mode 100644
index 9c9cc23cc22fd1e9823737269052e2954794f06b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/girth.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-//=======================================================================
-// Copyright 2002 Indiana University.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-/*
- Adapted from the GIRTH program of the Stanford GraphBase.
-
- Sample output:
-
- This program explores the girth and diameter of Ramanujan graphs.
- The bipartite graphs have q^3-q vertices, and the non-bipartite
- graphs have half that number. Each vertex has degree p+1.
- Both p and q should be odd prime numbers;
- or you can try p = 2 with q = 17 or 43.
-
- Choose a branching factor, p: 2
- Ok, now choose the cube root of graph size, q: 17
- Starting at any given vertex, there are
- 3 vertices at distance 1,
- 6 vertices at distance 2,
- 12 vertices at distance 3,
- 24 vertices at distance 4,
- 46 vertices at distance 5,
- 90 vertices at distance 6,
- 169 vertices at distance 7,
- 290 vertices at distance 8,
- 497 vertices at distance 9,
- 634 vertices at distance 10,
- 521 vertices at distance 11,
- 138 vertices at distance 12,
- 13 vertices at distance 13,
- 3 vertices at distance 14,
- 1 vertices at distance 15.
- So the diameter is 15, and the girth is 9.
-
- */
-
-#include <boost/config.hpp>
-#include <vector>
-#include <list>
-#include <iostream>
-#include <boost/limits.hpp>
-#include <boost/graph/stanford_graph.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-typedef boost::graph_traits<Graph*> Traits;
-typedef Traits::vertex_descriptor vertex_descriptor;
-typedef Traits::edge_descriptor edge_descriptor;
-typedef Traits::vertex_iterator vertex_iterator;
-
-std::vector<std::size_t> distance_list;
-
-typedef boost::v_property<long> dist_t;
-boost::property_map<Graph*, dist_t>::type d_map;
-
-typedef boost::u_property<vertex_descriptor> pred_t;
-boost::property_map<Graph*, pred_t>::type p_map;
-
-typedef boost::w_property<long> color_t;
-boost::property_map<Graph*, color_t>::type c_map;
-
-class diameter_and_girth_visitor : public boost::bfs_visitor<>
-{
-public:
- diameter_and_girth_visitor(std::size_t& k_, std::size_t& girth_)
- : k(k_), girth(girth_) { }
-
- void tree_edge(edge_descriptor e, Graph* g) {
- vertex_descriptor u = source(e, g), v = target(e, g);
- k = d_map[u] + 1;
- d_map[v] = k;
- ++distance_list[k];
- p_map[v] = u;
- }
- void non_tree_edge(edge_descriptor e, Graph* g) {
- vertex_descriptor u = source(e, g), v = target(e, g);
- k = d_map[u] + 1;
- if (d_map[v] + k < girth && v != p_map[u])
- girth = d_map[v]+ k;
- }
-private:
- std::size_t& k;
- std::size_t& girth;
-};
-
-
-int
-main()
-{
- std::cout <<
- "This program explores the girth and diameter of Ramanujan graphs."
- << std::endl;
- std::cout <<
- "The bipartite graphs have q^3-q vertices, and the non-bipartite"
- << std::endl;
- std::cout <<
- "graphs have half that number. Each vertex has degree p+1."
- << std::endl;
- std::cout << "Both p and q should be odd prime numbers;" << std::endl;
- std::cout << " or you can try p = 2 with q = 17 or 43." << std::endl;
-
- while (1) {
-
- std::cout << std::endl
- << "Choose a branching factor, p: ";
- long p = 0, q = 0;
- std::cin >> p;
- if (p == 0)
- break;
- std::cout << "Ok, now choose the cube root of graph size, q: ";
- std::cin >> q;
- if (q == 0)
- break;
-
- Graph* g;
- g = raman(p, q, 0L, 0L);
- if (g == 0) {
- std::cerr << " Sorry, I couldn't make that graph (error code "
- << panic_code << ")" << std::endl;
- continue;
- }
- distance_list.clear();
- distance_list.resize(boost::num_vertices(g), 0);
-
- // obtain property maps
- d_map = get(dist_t(), g);
- p_map = get(pred_t(), g);
- c_map = get(color_t(), g);
-
- vertex_iterator i, end;
- for (boost::tie(i, end) = boost::vertices(g); i != end; ++i)
- d_map[*i] = 0;
-
- std::size_t k = 0;
- std::size_t girth = (std::numeric_limits<std::size_t>::max)();
- diameter_and_girth_visitor vis(k, girth);
-
- vertex_descriptor s = *boost::vertices(g).first;
-
- boost::breadth_first_search(g, s, visitor(vis).color_map(c_map));
-
- std::cout << "Starting at any given vertex, there are" << std::endl;
-
- for (long d = 1; distance_list[d] != 0; ++d)
- std::cout << distance_list[d] << " vertices at distance " << d
- << (distance_list[d+1] != 0 ? "," : ".") << std::endl;
-
- std::cout << "So the diameter is " << k - 1
- << ", and the girth is " << girth
- << "." << std::endl;
- } // end while
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/graph-assoc-types.cpp b/Utilities/BGL/boost/graph/example/graph-assoc-types.cpp
deleted file mode 100644
index 8838cffb874d5012a4f502b76c6f0722d842cea9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graph-assoc-types.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/graph_traits.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph > void
-generic_foo(Graph & g)
-{
- // Access descriptor types
- typedef typename graph_traits < Graph >::vertex_descriptor Vertex;
- typedef typename graph_traits < Graph >::edge_descriptor Edge;
- // Access category types
- typedef typename graph_traits < Graph >::directed_category Dir;
- typedef typename graph_traits < Graph >::edge_parallel_category Par;
- // Access iterator types...
- // Access size types...
- // Now do something useful...
-}
-
-template < typename Graph > void
-generic_bar(Graph & g)
-{
- // Declare some vertex and edge descriptor variables
- typename graph_traits < Graph >::vertex_descriptor u, v;
- typename graph_traits < Graph >::edge_descriptor e1, e2;
- // Set u and e1 to valid descriptors...
- v = u; // Make v a handle to the same vertex as u.
- e2 = e1; // Make e2 a handle to the same edge as e1.
- assert(u == v); // Do u and v identify the same vertex? Yes
- assert(!(u != v)); // Do u and v identify different vertices? No
- assert(e1 == e2); // Do e1 and e2 identify the same edge? Yes
- assert(!(e1 != e2)); // Do e1 and e2 identify different edges? No
-}
-
-// This version of foo gets called when g is directed
-template < typename Graph > void
-foo_dispatch(Graph & g, boost::directed_tag)
-{
- //...
-}
-
-// This version of foo gets called when g is undirected
-template < typename Graph > void
-foo_dispatch(Graph & g, boost::undirected_tag)
-{
- //...
-}
-
-template < typename Graph > void
-foo(Graph & g)
-{
- typedef typename boost::graph_traits < Graph >::directed_category Cat;
- foo_dispatch(g, Cat());
-}
-
-template < typename Digraph > void
-foo(Digraph & digraph,
- typename graph_traits < Digraph >::vertex_descriptor u,
- typename graph_traits < Digraph >::vertex_descriptor v)
-{
- typedef typename graph_traits < Digraph >::edge_descriptor edge_t;
- std::pair<edge_t, bool> e1, e2;
- e1 = edge(u, v, digraph);
- e2 = edge(v, u, digraph);
- assert(e1.first != e2.first);
-}
-template < typename Undigraph > void
-bar(Undigraph & undigraph,
- typename graph_traits < Undigraph >::vertex_descriptor u,
- typename graph_traits < Undigraph >::vertex_descriptor v)
-{
- typedef typename graph_traits < Undigraph >::edge_descriptor edge_t;
- std::pair<edge_t, bool> e1, e2;
- e1 = edge(u, v, undigraph);
- e2 = edge(v, u, undigraph);
- assert(e1.first == e2.first);
-}
-
-
-int
-main()
-{
-
- boost::adjacency_list < vecS, vecS, directedS > g(2);
- add_edge(0, 1, g);
- add_edge(1, 0, g);
- generic_foo(g);
- generic_bar(g);
- foo(g);
- foo(g, vertex(0, g), vertex(1, g));
-
- boost::adjacency_list < vecS, vecS, undirectedS > ug(2);
- add_edge(0, 1, g);
- bar(ug, vertex(0, g), vertex(1, g));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/graph-property-iter-eg.cpp b/Utilities/BGL/boost/graph/example/graph-property-iter-eg.cpp
deleted file mode 100644
index f471b0e061f6c853047cb0fb3d8798a809959d1e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graph-property-iter-eg.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <string>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/property_iter_range.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < listS, vecS, directedS,
- property < vertex_name_t, std::string > >graph_t;
- graph_t g(3);
-
- const char *vertex_names[] = { "Kubrick", "Clark", "Hal" };
- int i = 0;
- graph_property_iter_range < graph_t, vertex_name_t >::iterator v, v_end;
- for (tie(v, v_end) = get_property_iter_range(g, vertex_name);
- v != v_end; ++v, ++i)
- *v = vertex_names[i];
-
- tie(v, v_end) = get_property_iter_range(g, vertex_name);
- std::copy(v, v_end, std::ostream_iterator < std::string > (std::cout, " "));
- std::cout << std::endl;
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/graph.cpp b/Utilities/BGL/boost/graph/example/graph.cpp
deleted file mode 100644
index 035b0d71e7245fdf580ba12122856b82b67eb18b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graph.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <utility>
-#include <algorithm>
-
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-using namespace std;
-
-typedef property<vertex_color_t, default_color_type,
- property<vertex_distance_t,int,
- property<vertex_degree_t,int,
- property<vertex_in_degree_t, int,
- property<vertex_out_degree_t,int> > > > > VertexProperty;
-typedef property<edge_weight_t,int> EdgeProperty;
-typedef adjacency_list<vecS, vecS, bidirectionalS,
- VertexProperty, EdgeProperty> Graph;
-
-template <class Graph>
-void print(Graph& g) {
- typename Graph::vertex_iterator i, end;
- typename Graph::out_edge_iterator ei, edge_end;
- for(boost::tie(i,end) = vertices(g); i != end; ++i) {
- cout << *i << " --> ";
- for (boost::tie(ei,edge_end) = out_edges(*i, g); ei != edge_end; ++ei)
- cout << target(*ei, g) << " ";
- cout << endl;
- }
-}
-
-std::size_t myrand(std::size_t N) {
- std::size_t ret = rand() % N;
- // cout << "N = " << N << " rand = " << ret << endl;
- return ret;
-}
-
-template <class Graph>
-bool check_edge(Graph& g, std::size_t a, std::size_t b) {
- typedef typename Graph::vertex_descriptor Vertex;
- typename Graph::adjacency_iterator vi, viend, found;
- boost::tie(vi, viend) = adjacent_vertices(vertex(a,g), g);
-
- found = find(vi, viend, vertex(b, g));
- if ( found == viend )
- return false;
-
- return true;
-}
-
-int main(int, char*[])
-{
- std::size_t N = 5;
-
- Graph g(N);
- int i;
-
- bool is_failed = false;
-
- for (i=0; i<6; ++i) {
- std::size_t a = myrand(N), b = myrand(N);
- while ( a == b ) b = myrand(N);
- cout << "edge edge (" << a << "," << b <<")" << endl;
- //add edges
- add_edge(a, b, g);
- is_failed = is_failed || (! check_edge(g, a, b) );
- }
-
- if ( is_failed )
- cerr << " Failed."<< endl;
- else
- cerr << " Passed."<< endl;
-
- print(g);
-
- //remove_edge
- for (i = 0; i<2; ++i) {
- std::size_t a = myrand(N), b = myrand(N);
- while ( a == b ) b = myrand(N);
- cout << "remove edge (" << a << "," << b <<")" << endl;
- remove_edge(a, b, g);
- is_failed = is_failed || check_edge(g, a, b);
- }
- if ( is_failed )
- cerr << " Failed."<< endl;
- else
- cerr << " Passed."<< endl;
-
- print(g);
-
- //add_vertex
- is_failed = false;
- std::size_t old_N = N;
- std::size_t vid = add_vertex(g);
- std::size_t vidp1 = add_vertex(g);
-
- N = num_vertices(g);
- if ( (N - 2) != old_N )
- cerr << " Failed."<< endl;
- else
- cerr << " Passed."<< endl;
-
- is_failed = false;
- for (i=0; i<2; ++i) {
- std::size_t a = myrand(N), b = myrand(N);
- while ( a == vid ) a = myrand(N);
- while ( b == vidp1 ) b = myrand(N);
- cout << "add edge (" << vid << "," << a <<")" << endl;
- cout << "add edge (" << vid << "," << vidp1 <<")" << endl;
- add_edge(vid, a, g);
- add_edge(b, vidp1, g);
- is_failed = is_failed || ! check_edge(g, vid, a);
- is_failed = is_failed || ! check_edge(g, b, vidp1);
- }
- if ( is_failed )
- cerr << " Failed."<< endl;
- else
- cerr << " Passed."<< endl;
- print(g);
-
- // clear_vertex
- std::size_t c = myrand(N);
- is_failed = false;
- clear_vertex(c, g);
-
- if ( out_degree(c, g) != 0 )
- is_failed = true;
-
- cout << "Removing vertex " << c << endl;
- remove_vertex(c, g);
-
- old_N = N;
- N = num_vertices(g);
-
- if ( (N + 1) != old_N )
- is_failed = true;
-
- if ( is_failed )
- cerr << " Failed."<< endl;
- else
- cerr << " Passed."<< endl;
-
- print(g);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/graph_as_tree.cpp b/Utilities/BGL/boost/graph/example/graph_as_tree.cpp
deleted file mode 100644
index 4201d3698390defdd28de3228572608432d6fd4b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graph_as_tree.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//=======================================================================
-// Copyright 2002 Indiana University.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/graph/graph_as_tree.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/cstdlib.hpp>
-
-class tree_printer {
-public:
- template <typename Node, typename Tree>
- void preorder(Node, Tree&) {
- std::cout << "(";
- }
- template <typename Node, typename Tree>
- void inorder(Node n, Tree& t)
- {
- std::cout << get(boost::vertex_name, t)[n];
- }
- template <typename Node, typename Tree>
- void postorder(Node, Tree&) {
- std::cout << ")";
- }
-
-};
-
-int main()
-{
- using namespace boost;
- typedef adjacency_list<vecS, vecS, directedS,
- property<vertex_name_t, std::string> > graph_t;
- typedef graph_traits<graph_t>::vertex_descriptor vertex_t;
-
- graph_t g;
-
- vertex_t a = add_vertex(g),
- b = add_vertex(g),
- c = add_vertex(g);
-
- add_edge(a, b, g);
- add_edge(a, c, g);
-
- typedef property_map<graph_t, vertex_name_t>::type vertex_name_map_t;
- vertex_name_map_t name = get(vertex_name, g);
- name[a] = "A";
- name[b] = "B";
- name[c] = "C";
-
- typedef iterator_property_map<std::vector<vertex_t>::iterator,
- property_map<graph_t, vertex_index_t>::type> parent_map_t;
- std::vector<vertex_t> parent(num_vertices(g));
- typedef graph_as_tree<graph_t, parent_map_t> tree_t;
- tree_t t(g, a, make_iterator_property_map(parent.begin(),
- get(vertex_index, g)));
-
- tree_printer vis;
- traverse_tree(a, t, vis);
-
- return exit_success;
-}
diff --git a/Utilities/BGL/boost/graph/example/graph_property.cpp b/Utilities/BGL/boost/graph/example/graph_property.cpp
deleted file mode 100644
index ceb71c47f55c4c998e4c57021594e11bad768fa9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graph_property.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// (C) Copyright Jeremy Siek 2004
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#include <string>
-#include <iostream>
-#include <boost/cstdlib.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/subgraph.hpp>
-
-int
-main()
-{
- using namespace boost;
- using std::string;
-
- typedef adjacency_list<vecS, vecS, directedS,no_property,
- property<edge_index_t, int>,
- property<graph_name_t, string> > graph_t;
-
- graph_t g;
- get_property(g, graph_name) = "graph";
-
- std::cout << "name: " << get_property(g, graph_name) << std::endl;
-
- typedef subgraph<graph_t> subgraph_t;
-
- subgraph_t sg;
- get_property(sg, graph_name) = "subgraph";
-
- std::cout << "name: " << get_property(sg, graph_name) << std::endl;
-
- return exit_success;
-}
diff --git a/Utilities/BGL/boost/graph/example/graphviz.cpp b/Utilities/BGL/boost/graph/example/graphviz.cpp
deleted file mode 100644
index e3ac9b8f28cf77f427b46f9488934dd5c2c24439..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graphviz.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2005 Trustees of Indiana University
-
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// Author: Douglas Gregor
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/test/minimal.hpp>
-#include <string>
-#include <fstream>
-#include <boost/graph/iteration_macros.hpp>
-
-using namespace boost;
-
-typedef boost::adjacency_list<vecS, vecS, directedS,
- property<vertex_name_t, std::string>,
- property<edge_weight_t, double> > Digraph;
-
-typedef boost::adjacency_list<vecS, vecS, undirectedS,
- property<vertex_name_t, std::string>,
- property<edge_weight_t, double> > Graph;
-
-void test_graph_read_write(const std::string& filename)
-{
- std::ifstream in(filename.c_str());
- BOOST_REQUIRE(in);
-
- Graph g;
- dynamic_properties dp;
- dp.property("id", get(vertex_name, g));
- dp.property("weight", get(edge_weight, g));
- BOOST_CHECK(read_graphviz(in, g, dp, "id"));
-
- BOOST_CHECK(num_vertices(g) == 4);
- BOOST_CHECK(num_edges(g) == 4);
-
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
-
- std::map<std::string, Vertex> name_to_vertex;
- BGL_FORALL_VERTICES(v, g, Graph)
- name_to_vertex[get(vertex_name, g, v)] = v;
-
- // Check vertices
- BOOST_CHECK(name_to_vertex.find("0") != name_to_vertex.end());
- BOOST_CHECK(name_to_vertex.find("1") != name_to_vertex.end());
- BOOST_CHECK(name_to_vertex.find("foo") != name_to_vertex.end());
- BOOST_CHECK(name_to_vertex.find("bar") != name_to_vertex.end());
-
- // Check edges
- BOOST_CHECK(edge(name_to_vertex["0"], name_to_vertex["1"], g).second);
- BOOST_CHECK(edge(name_to_vertex["1"], name_to_vertex["foo"], g).second);
- BOOST_CHECK(edge(name_to_vertex["foo"], name_to_vertex["bar"], g).second);
- BOOST_CHECK(edge(name_to_vertex["1"], name_to_vertex["bar"], g).second);
-
- BOOST_CHECK(get(edge_weight, g,
- edge(name_to_vertex["0"], name_to_vertex["1"], g).first)
- == 3.14159);
- BOOST_CHECK(get(edge_weight, g,
- edge(name_to_vertex["1"], name_to_vertex["foo"], g).first)
- == 2.71828);
- BOOST_CHECK(get(edge_weight, g,
- edge(name_to_vertex["foo"], name_to_vertex["bar"], g).first)
- == 10.0);
- BOOST_CHECK(get(edge_weight, g,
- edge(name_to_vertex["1"], name_to_vertex["bar"], g).first)
- == 10.0);
-
- // Write out the graph
- write_graphviz(std::cout, g, dp, std::string("id"));
-}
-
-int test_main(int, char*[])
-{
- test_graph_read_write("graphviz_example.dot");
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/graphviz_example.dot b/Utilities/BGL/boost/graph/example/graphviz_example.dot
deleted file mode 100644
index 775824795aed24e3db90a7e4624f7ca61400c661..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graphviz_example.dot
+++ /dev/null
@@ -1,7 +0,0 @@
-graph foo {
- edge [weight="10"];
- 0 -- 1 [weight="3.14159"];
- 1 -- foo [weight="2.71828"];
- foo -- bar;
- bar -- 1;
-}
diff --git a/Utilities/BGL/boost/graph/example/graphviz_test.dot b/Utilities/BGL/boost/graph/example/graphviz_test.dot
deleted file mode 100644
index c7eb4b5bdebe48568e8b8581de7cb1d0cfbf522a..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/graphviz_test.dot
+++ /dev/null
@@ -1,39 +0,0 @@
-digraph G {
-
- subgraph cluster0 { //subgraph<Graph>
- node [style=filled color=white];
- style = filled;
- bgcolor = lightgrey;
-
- subgraph inner { //subgraph<Graph> or subgraph of subgraph
- node [color = green];
- a1 -> a2 -> a3
-
- };
-
- a0 -> subgraph inner;
-
- label = "process #1";
- }
-
- subgraph cluster1 {
- node [style=filled color=white];
- b0 -> b1 -> b2 -> b3;
- label = "process #2";
- bgcolor = lightgrey
- }
-
- subgraph cluster1 -> subgraph cluster0 [style=dashed color=red]
-
- start -> subgraph inner[style=dotted];
-
- start -> a0;
- start -> b0;
- a1 -> b3;
- b2 -> a3;
- a3 -> end;
- b3 -> end;
-
- start [shape=Mdiamond];
- end [shape=Msquare];
-}
diff --git a/Utilities/BGL/boost/graph/example/in_edges.cpp b/Utilities/BGL/boost/graph/example/in_edges.cpp
deleted file mode 100644
index cceb5538e03fc3a79a671fbe065281c311734c98..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/in_edges.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <utility>
-
-#include <boost/graph/adjacency_list.hpp>
-
-/*
- Sample Output
-
- 0 <--
- 1 <-- 0
- 2 <-- 1
- 3 <-- 1
- 4 <-- 2 3
-
- */
-
-int main(int , char* [])
-{
- using namespace boost;
- using namespace std;
- using namespace boost;
-
- typedef adjacency_list<listS,vecS,bidirectionalS> Graph;
- const int num_vertices = 5;
- Graph g(num_vertices);
-
- add_edge(0, 1, g);
- add_edge(1, 2, g);
- add_edge(1, 3, g);
- add_edge(2, 4, g);
- add_edge(3, 4, g);
-
- boost::graph_traits<Graph>::vertex_iterator i, end;
- boost::graph_traits<Graph>::in_edge_iterator ei, edge_end;
-
- for(tie(i,end) = vertices(g); i != end; ++i) {
- cout << *i << " <-- ";
- for (tie(ei,edge_end) = in_edges(*i, g); ei != edge_end; ++ei)
- cout << source(*ei, g) << " ";
- cout << endl;
- }
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/in_edges.expected b/Utilities/BGL/boost/graph/example/in_edges.expected
deleted file mode 100644
index b7ed0a68ef364a33493bd34ba3ef78426269fa20..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/in_edges.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-0 <--
-1 <-- 0
-2 <-- 1
-3 <-- 1
-4 <-- 2 3
diff --git a/Utilities/BGL/boost/graph/example/incremental-components-eg.cpp b/Utilities/BGL/boost/graph/example/incremental-components-eg.cpp
deleted file mode 100644
index 521963ff843d03d84d83b0e5869637dd3986a087..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/incremental-components-eg.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <utility>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/pending/disjoint_sets.hpp>
-#include <boost/graph/incremental_components.hpp>
-
-int
-main(int, char *[])
-{
- using namespace boost;
- // Create a graph
- typedef adjacency_list < vecS, vecS, undirectedS > Graph;
- typedef graph_traits < Graph >::vertex_descriptor Vertex;
- const int N = 6;
- Graph G(N);
- add_edge(0, 1, G);
- add_edge(1, 4, G);
- // create the disjoint-sets object, which requires rank and parent vertex properties
- std::vector < Vertex > rank(num_vertices(G));
- std::vector < Vertex > parent(num_vertices(G));
- typedef graph_traits<Graph>::vertices_size_type* Rank;
- typedef Vertex* Parent;
- disjoint_sets < Rank, Parent > ds(&rank[0], &parent[0]);
-
- // determine the connected components, storing the results in the disjoint-sets object
- initialize_incremental_components(G, ds);
- incremental_components(G, ds);
-
- // Add a couple more edges and update the disjoint-sets
- graph_traits < Graph >::edge_descriptor e;
- bool flag;
- tie(e, flag) = add_edge(4, 0, G);
- ds.union_set(4, 0);
- tie(e, flag) = add_edge(2, 5, G);
- ds.union_set(2, 5);
-
- graph_traits < Graph >::vertex_iterator iter, end;
- for (tie(iter, end) = vertices(G); iter != end; ++iter)
- std::cout << "representative[" << *iter << "] = " <<
- ds.find_set(*iter) << std::endl;;
- std::cout << std::endl;
-
- typedef component_index < unsigned int >Components;
- Components components(parent.begin(), parent.end());
- for (Components::size_type i = 0; i < components.size(); ++i) {
- std::cout << "component " << i << " contains: ";
- for (Components::value_type::iterator j = components[i].begin();
- j != components[i].end(); ++j)
- std::cout << *j << " ";
- std::cout << std::endl;
- }
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/incremental_components.cpp b/Utilities/BGL/boost/graph/example/incremental_components.cpp
deleted file mode 100644
index 9e235d2cd92fc94308553cf7f6453199eefd761f..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/incremental_components.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <utility>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/pending/disjoint_sets.hpp>
-#include <boost/graph/incremental_components.hpp>
-
-/*
-
- This example shows how to use the disjoint set data structure
- to compute the connected components of an undirected, changing
- graph.
-
- Sample output:
-
- An undirected graph:
- 0 <--> 1 4
- 1 <--> 0 4
- 2 <--> 5
- 3 <-->
- 4 <--> 1 0
- 5 <--> 2
-
- representative[0] = 1
- representative[1] = 1
- representative[2] = 5
- representative[3] = 3
- representative[4] = 1
- representative[5] = 5
-
- component 0 contains: 4 1 0
- component 1 contains: 3
- component 2 contains: 5 2
-
- */
-
-using namespace std;
-
-int main(int , char* [])
-{
- using namespace boost;
- typedef adjacency_list <vecS, vecS, undirectedS> Graph;
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::vertices_size_type size_type;
-
- const int N = 6;
- Graph G(N);
-
- std::vector<size_type> rank(num_vertices(G));
- std::vector<Vertex> parent(num_vertices(G));
- typedef size_type* Rank;
- typedef Vertex* Parent;
- disjoint_sets<Rank, Parent> ds(&rank[0], &parent[0]);
-
- initialize_incremental_components(G, ds);
- incremental_components(G, ds);
-
- graph_traits<Graph>::edge_descriptor e;
- bool flag;
- boost::tie(e,flag) = add_edge(0, 1, G);
- ds.union_set(0,1);
-
- boost::tie(e,flag) = add_edge(1, 4, G);
- ds.union_set(1,4);
-
- boost::tie(e,flag) = add_edge(4, 0, G);
- ds.union_set(4,0);
-
- boost::tie(e,flag) = add_edge(2, 5, G);
- ds.union_set(2,5);
-
- cout << "An undirected graph:" << endl;
- print_graph(G, get(vertex_index, G));
- cout << endl;
-
- graph_traits<Graph>::vertex_iterator i,end;
- for (boost::tie(i, end) = vertices(G); i != end; ++i)
- cout << "representative[" << *i << "] = " <<
- ds.find_set(*i) << endl;;
- cout << endl;
-
- typedef component_index<unsigned int> Components;
- Components components(&parent[0], &parent[0] + parent.size());
-
- for (Components::size_type c = 0; c < components.size(); ++c) {
- cout << "component " << c << " contains: ";
- Components::value_type::iterator
- j = components[c].begin(),
- jend = components[c].end();
- for ( ; j != jend; ++j)
- cout << *j << " ";
- cout << endl;
- }
-
- return 0;
-}
-
diff --git a/Utilities/BGL/boost/graph/example/incremental_components.expected b/Utilities/BGL/boost/graph/example/incremental_components.expected
deleted file mode 100644
index c1e0b510686b2209ed8929dc94d02cb940eecc04..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/incremental_components.expected
+++ /dev/null
@@ -1,18 +0,0 @@
-An undirected graph:
-0 <--> 1 4
-1 <--> 0 4
-2 <--> 5
-3 <-->
-4 <--> 1 0
-5 <--> 2
-
-representative[0] = 1
-representative[1] = 1
-representative[2] = 5
-representative[3] = 3
-representative[4] = 1
-representative[5] = 5
-
-component 0 contains: 4 1 0
-component 1 contains: 3
-component 2 contains: 5 2
diff --git a/Utilities/BGL/boost/graph/example/interior_pmap_bundled.cpp b/Utilities/BGL/boost/graph/example/interior_pmap_bundled.cpp
deleted file mode 100644
index 09cd8dec2d66bcfc15e6177566342c5c316a1847..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/interior_pmap_bundled.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Copyright 2004 Trustees of Indiana University
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek, Douglas Gregor
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <algorithm>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
-#include <string>
-
-using namespace std;
-using namespace boost;
-
-/*
- Interior Property Map Basics
-
- An interior property map is a way of associating properties
- with the vertices or edges of a graph. The "interior" part means
- that the properties are stored inside the graph object. This can be
- convenient when the need for the properties is somewhat permanent,
- and when the properties will be with a graph for the duration of its
- lifetime. A "distance from source vertex" property is often of this
- kind.
-
- Sample Output
-
- Jeremy owes Rich some money
- Jeremy owes Andrew some money
- Jeremy owes Jeff some money
- Jeremy owes Kinis some money
- Andrew owes Jeremy some money
- Andrew owes Kinis some money
- Jeff owes Jeremy some money
- Jeff owes Rich some money
- Jeff owes Kinis some money
- Kinis owes Jeremy some money
- Kinis owes Rich some money
-
- */
-
-template <class EdgeIter, class Graph>
-void who_owes_who(EdgeIter first, EdgeIter last, const Graph& G)
-{
- while (first != last) {
- cout << G[source(*first, G)].first_name << " owes "
- << G[target(*first, G)].first_name << " some money" << endl;
- ++first;
- }
-}
-
-struct VertexData
-{
- string first_name;
-};
-
-int
-main()
-{
- {
- // Create the graph, and specify that we will use std::string to
- // store the first name's.
- typedef adjacency_list<vecS, vecS, directedS, VertexData> MyGraphType;
-
- typedef pair<int,int> Pair;
- Pair edge_array[11] = { Pair(0,1), Pair(0,2), Pair(0,3), Pair(0,4),
- Pair(2,0), Pair(3,0), Pair(2,4), Pair(3,1),
- Pair(3,4), Pair(4,0), Pair(4,1) };
-
- MyGraphType G(5);
- for (int i=0; i<11; ++i)
- add_edge(edge_array[i].first, edge_array[i].second, G);
-
- G[0].first_name = "Jeremy";
- G[1].first_name = "Rich";
- G[2].first_name = "Andrew";
- G[3].first_name = "Jeff";
- G[4].first_name = "Doug";
-
- who_owes_who(edges(G).first, edges(G).second, G);
- }
-
- cout << endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/interior_property_map.cpp b/Utilities/BGL/boost/graph/example/interior_property_map.cpp
deleted file mode 100644
index dde734d93a6c2ff397e338bc6a5ca211ebeb5ead..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/interior_property_map.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <algorithm>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/property_map.hpp>
-#include <string>
-
-using namespace std;
-using namespace boost;
-
-/*
- Interior Property Map Basics
-
- An interior property map is a way of associating properties
- with the vertices or edges of a graph. The "interior" part means
- that the properties are stored inside the graph object. This can be
- convenient when the need for the properties is somewhat permanent,
- and when the properties will be with a graph for the duration of its
- lifetime. A "distance from source vertex" property is often of this
- kind.
-
- Sample Output
-
- Jeremy owes Rich some money
- Jeremy owes Andrew some money
- Jeremy owes Jeff some money
- Jeremy owes Kinis some money
- Andrew owes Jeremy some money
- Andrew owes Kinis some money
- Jeff owes Jeremy some money
- Jeff owes Rich some money
- Jeff owes Kinis some money
- Kinis owes Jeremy some money
- Kinis owes Rich some money
-
- */
-
-// create a tag for our new property
-
-enum vertex_first_name_t { vertex_first_name };
-namespace boost {
- BOOST_INSTALL_PROPERTY(vertex, first_name);
-}
-
-template <class EdgeIter, class Graph>
-void who_owes_who(EdgeIter first, EdgeIter last, const Graph& G)
-{
- // Access the propety acessor type for this graph
- typedef typename property_map<Graph, vertex_first_name_t>
- ::const_type NamePA;
- NamePA name = get(vertex_first_name, G);
-
- typedef typename boost::property_traits<NamePA>::value_type NameType;
-
- NameType src_name, targ_name;
-
- while (first != last) {
- src_name = boost::get(name, source(*first,G));
- targ_name = boost::get(name, target(*first,G));
- cout << src_name << " owes "
- << targ_name << " some money" << endl;
- ++first;
- }
-}
-
-int
-main()
-{
- {
- // Create the graph, and specify that we will use std::string to
- // store the first name's.
- typedef adjacency_list<vecS, vecS, directedS,
- property<vertex_first_name_t, std::string> > MyGraphType;
-
- typedef pair<int,int> Pair;
- Pair edge_array[11] = { Pair(0,1), Pair(0,2), Pair(0,3), Pair(0,4),
- Pair(2,0), Pair(3,0), Pair(2,4), Pair(3,1),
- Pair(3,4), Pair(4,0), Pair(4,1) };
-
- MyGraphType G(5);
- for (int i=0; i<11; ++i)
- add_edge(edge_array[i].first, edge_array[i].second, G);
-
- property_map<MyGraphType, vertex_first_name_t>::type name
- = get(vertex_first_name, G);
-
- boost::put(name, 0, "Jeremy");
- boost::put(name, 1, "Rich");
- boost::put(name, 2, "Andrew");
- boost::put(name, 3, "Jeff");
- name[4] = "Kinis"; // you can use operator[] too
-
- who_owes_who(edges(G).first, edges(G).second, G);
- }
-
- cout << endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/interior_property_map.expected b/Utilities/BGL/boost/graph/example/interior_property_map.expected
deleted file mode 100644
index 5148599f0e3c25c012884ee270c3eefc58108111..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/interior_property_map.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-Jeremy owes Rich some money
-Jeremy owes Andrew some money
-Jeremy owes Jeff some money
-Jeremy owes Kinis some money
-Andrew owes Jeremy some money
-Andrew owes Kinis some money
-Jeff owes Jeremy some money
-Jeff owes Rich some money
-Jeff owes Kinis some money
-Kinis owes Jeremy some money
-Kinis owes Rich some money
-
diff --git a/Utilities/BGL/boost/graph/example/iohb.c b/Utilities/BGL/boost/graph/example/iohb.c
deleted file mode 100644
index d0001621db734b191718430a89a5cbc756f40f6d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/iohb.c
+++ /dev/null
@@ -1,1610 +0,0 @@
-// (C) Copyright Jeremy Siek 2004
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-/*
-Fri Aug 15 16:29:47 EDT 1997
-
- Harwell-Boeing File I/O in C
- V. 1.0
-
- National Institute of Standards and Technology, MD.
- K.A. Remington
-
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- NOTICE
-
- Permission to use, copy, modify, and distribute this software and
- its documentation for any purpose and without fee is hereby granted
- provided that the above copyright notice appear in all copies and
- that both the copyright notice and this permission notice appear in
- supporting documentation.
-
- Neither the Author nor the Institution (National Institute of Standards
- and Technology) make any representations about the suitability of this
- software for any purpose. This software is provided "as is" without
- expressed or implied warranty.
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
- ---------------------
- INTERFACE DESCRIPTION
- ---------------------
- ---------------
- QUERY FUNCTIONS
- ---------------
-
- FUNCTION:
-
- int readHB_info(const char *filename, int *M, int *N, int *nz,
- char **Type, int *Nrhs)
-
- DESCRIPTION:
-
- The readHB_info function opens and reads the header information from
- the specified Harwell-Boeing file, and reports back the number of rows
- and columns in the stored matrix (M and N), the number of nonzeros in
- the matrix (nz), the 3-character matrix type(Type), and the number of
- right-hand-sides stored along with the matrix (Nrhs). This function
- is designed to retrieve basic size information which can be used to
- allocate arrays.
-
- FUNCTION:
-
- int readHB_header(FILE* in_file, char* Title, char* Key, char* Type,
- int* Nrow, int* Ncol, int* Nnzero, int* Nrhs,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- int* Ptrcrd, int* Indcrd, int* Valcrd, int* Rhscrd,
- char *Rhstype)
-
- DESCRIPTION:
-
- More detailed than the readHB_info function, readHB_header() reads from
- the specified Harwell-Boeing file all of the header information.
-
-
- ------------------------------
- DOUBLE PRECISION I/O FUNCTIONS
- ------------------------------
- FUNCTION:
-
- int readHB_newmat_double(const char *filename, int *M, int *N, *int nz,
- int **colptr, int **rowind, double**val)
-
- int readHB_mat_double(const char *filename, int *colptr, int *rowind,
- double*val)
-
-
- DESCRIPTION:
-
- This function opens and reads the specified file, interpreting its
- contents as a sparse matrix stored in the Harwell/Boeing standard
- format. (See readHB_aux_double to read auxillary vectors.)
- -- Values are interpreted as double precision numbers. --
-
- The "mat" function uses _pre-allocated_ vectors to hold the index and
- nonzero value information.
-
- The "newmat" function allocates vectors to hold the index and nonzero
- value information, and returns pointers to these vectors along with
- matrix dimension and number of nonzeros.
-
- FUNCTION:
-
- int readHB_aux_double(const char* filename, const char AuxType, double b[])
-
- int readHB_newaux_double(const char* filename, const char AuxType, double** b)
-
- DESCRIPTION:
-
- This function opens and reads from the specified file auxillary vector(s).
- The char argument Auxtype determines which type of auxillary vector(s)
- will be read (if present in the file).
-
- AuxType = 'F' right-hand-side
- AuxType = 'G' initial estimate (Guess)
- AuxType = 'X' eXact solution
-
- If Nrhs > 1, all of the Nrhs vectors of the given type are read and
- stored in column-major order in the vector b.
-
- The "newaux" function allocates a vector to hold the values retrieved.
- The "mat" function uses a _pre-allocated_ vector to hold the values.
-
- FUNCTION:
-
- int writeHB_mat_double(const char* filename, int M, int N,
- int nz, const int colptr[], const int rowind[],
- const double val[], int Nrhs, const double rhs[],
- const double guess[], const double exact[],
- const char* Title, const char* Key, const char* Type,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- const char* Rhstype)
-
- DESCRIPTION:
-
- The writeHB_mat_double function opens the named file and writes the specified
- matrix and optional auxillary vector(s) to that file in Harwell-Boeing
- format. The format arguments (Ptrfmt,Indfmt,Valfmt, and Rhsfmt) are
- character strings specifying "Fortran-style" output formats -- as they
- would appear in a Harwell-Boeing file. They are used to produce output
- which is as close as possible to what would be produced by Fortran code,
- but note that "D" and "P" edit descriptors are not supported.
- If NULL, the following defaults will be used:
- Ptrfmt = Indfmt = "(8I10)"
- Valfmt = Rhsfmt = "(4E20.13)"
-
- -----------------------
- CHARACTER I/O FUNCTIONS
- -----------------------
- FUNCTION:
-
- int readHB_mat_char(const char* filename, int colptr[], int rowind[],
- char val[], char* Valfmt)
- int readHB_newmat_char(const char* filename, int* M, int* N, int* nonzeros,
- int** colptr, int** rowind, char** val, char** Valfmt)
-
- DESCRIPTION:
-
- This function opens and reads the specified file, interpreting its
- contents as a sparse matrix stored in the Harwell/Boeing standard
- format. (See readHB_aux_char to read auxillary vectors.)
- -- Values are interpreted as char strings. --
- (Used to translate exact values from the file into a new storage format.)
-
- The "mat" function uses _pre-allocated_ arrays to hold the index and
- nonzero value information.
-
- The "newmat" function allocates char arrays to hold the index
- and nonzero value information, and returns pointers to these arrays
- along with matrix dimension and number of nonzeros.
-
- FUNCTION:
-
- int readHB_aux_char(const char* filename, const char AuxType, char b[])
- int readHB_newaux_char(const char* filename, const char AuxType, char** b,
- char** Rhsfmt)
-
- DESCRIPTION:
-
- This function opens and reads from the specified file auxillary vector(s).
- The char argument Auxtype determines which type of auxillary vector(s)
- will be read (if present in the file).
-
- AuxType = 'F' right-hand-side
- AuxType = 'G' initial estimate (Guess)
- AuxType = 'X' eXact solution
-
- If Nrhs > 1, all of the Nrhs vectors of the given type are read and
- stored in column-major order in the vector b.
-
- The "newaux" function allocates a character array to hold the values
- retrieved.
- The "mat" function uses a _pre-allocated_ array to hold the values.
-
- FUNCTION:
-
- int writeHB_mat_char(const char* filename, int M, int N,
- int nz, const int colptr[], const int rowind[],
- const char val[], int Nrhs, const char rhs[],
- const char guess[], const char exact[],
- const char* Title, const char* Key, const char* Type,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- const char* Rhstype)
-
- DESCRIPTION:
-
- The writeHB_mat_char function opens the named file and writes the specified
- matrix and optional auxillary vector(s) to that file in Harwell-Boeing
- format. The format arguments (Ptrfmt,Indfmt,Valfmt, and Rhsfmt) are
- character strings specifying "Fortran-style" output formats -- as they
- would appear in a Harwell-Boeing file. Valfmt and Rhsfmt must accurately
- represent the character representation of the values stored in val[]
- and rhs[].
-
- If NULL, the following defaults will be used for the integer vectors:
- Ptrfmt = Indfmt = "(8I10)"
- Valfmt = Rhsfmt = "(4E20.13)"
-
-
-*/
-
-/*---------------------------------------------------------------------*/
-/* If zero-based indexing is desired, _SP_base should be set to 0 */
-/* This will cause indices read from H-B files to be decremented by 1 */
-/* and indices written to H-B files to be incremented by 1 */
-/* <<< Standard usage is _SP_base = 1 >>> */
-#ifndef _SP_base
-#define _SP_base 1
-#endif
-/*---------------------------------------------------------------------*/
-
-#include "iohb.h"
-#include<stdio.h>
-#include<stdlib.h>
-#include<string.h>
-#include<math.h>
-
-char* substr(const char* S, const int pos, const int len);
-void upcase(char* S);
-void IOHBTerminate(char* message);
-
-int readHB_info(const char* filename, int* M, int* N, int* nz, char** Type,
- int* Nrhs)
-{
-/****************************************************************************/
-/* The readHB_info function opens and reads the header information from */
-/* the specified Harwell-Boeing file, and reports back the number of rows */
-/* and columns in the stored matrix (M and N), the number of nonzeros in */
-/* the matrix (nz), and the number of right-hand-sides stored along with */
-/* the matrix (Nrhs). */
-/* */
-/* For a description of the Harwell Boeing standard, see: */
-/* Duff, et al., ACM TOMS Vol.15, No.1, March 1989 */
-/* */
-/* ---------- */
-/* **CAVEAT** */
-/* ---------- */
-/* ** If the input file does not adhere to the H/B format, the ** */
-/* ** results will be unpredictable. ** */
-/* */
-/****************************************************************************/
- FILE *in_file;
- int Ptrcrd, Indcrd, Valcrd, Rhscrd;
- int Nrow, Ncol, Nnzero;
- char* mat_type;
- char Title[73], Key[9], Rhstype[4];
- char Ptrfmt[17], Indfmt[17], Valfmt[21], Rhsfmt[21];
-
- mat_type = *Type;
- if ( mat_type == NULL ) IOHBTerminate("Insufficient memory for mat_typen");
-
- if ( (in_file = fopen( filename, "r")) == NULL ) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
-
- readHB_header(in_file, Title, Key, mat_type, &Nrow, &Ncol, &Nnzero, Nrhs,
- Ptrfmt, Indfmt, Valfmt, Rhsfmt,
- &Ptrcrd, &Indcrd, &Valcrd, &Rhscrd, Rhstype);
- fclose(in_file);
- *Type = mat_type;
- *(*Type+3) = (char) NULL;
- *M = Nrow;
- *N = Ncol;
- *nz = Nnzero;
- if (Rhscrd == 0) {*Nrhs = 0;}
-
-/* In verbose mode, print some of the header information: */
-/*
- if (verbose == 1)
- {
- printf("Reading from Harwell-Boeing file %s (verbose on)...\n",filename);
- printf(" Title: %s\n",Title);
- printf(" Key: %s\n",Key);
- printf(" The stored matrix is %i by %i with %i nonzeros.\n",
- *M, *N, *nz );
- printf(" %i right-hand--side(s) stored.\n",*Nrhs);
- }
-*/
-
- return 1;
-
-}
-
-
-
-int readHB_header(FILE* in_file, char* Title, char* Key, char* Type,
- int* Nrow, int* Ncol, int* Nnzero, int* Nrhs,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- int* Ptrcrd, int* Indcrd, int* Valcrd, int* Rhscrd,
- char *Rhstype)
-{
-/*************************************************************************/
-/* Read header information from the named H/B file... */
-/*************************************************************************/
- int Totcrd,Neltvl,Nrhsix;
- char line[BUFSIZ];
-
-/* First line: */
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) first line of HB file.\n");
- (void) sscanf(line, "%72c%8[^\n]", Title, Key);
- *(Key+8) = (char) NULL;
- *(Title+72) = (char) NULL;
-
-/* Second line: */
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) second line of HB file.\n");
- if ( sscanf(line,"%i",&Totcrd) != 1) Totcrd = 0;
- if ( sscanf(line,"%*i%i",Ptrcrd) != 1) *Ptrcrd = 0;
- if ( sscanf(line,"%*i%*i%i",Indcrd) != 1) *Indcrd = 0;
- if ( sscanf(line,"%*i%*i%*i%i",Valcrd) != 1) *Valcrd = 0;
- if ( sscanf(line,"%*i%*i%*i%*i%i",Rhscrd) != 1) *Rhscrd = 0;
-
-/* Third line: */
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) third line of HB file.\n");
- if ( sscanf(line, "%3c", Type) != 1)
- IOHBTerminate("iohb.c: Invalid Type info, line 3 of Harwell-Boeing file.\n");
- upcase(Type);
- if ( sscanf(line,"%*3c%i",Nrow) != 1) *Nrow = 0 ;
- if ( sscanf(line,"%*3c%*i%i",Ncol) != 1) *Ncol = 0 ;
- if ( sscanf(line,"%*3c%*i%*i%i",Nnzero) != 1) *Nnzero = 0 ;
- if ( sscanf(line,"%*3c%*i%*i%*i%i",&Neltvl) != 1) Neltvl = 0 ;
-
-/* Fourth line: */
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) fourth line of HB file.\n");
- if ( sscanf(line, "%16c",Ptrfmt) != 1)
- IOHBTerminate("iohb.c: Invalid format info, line 4 of Harwell-Boeing file.\n");
- if ( sscanf(line, "%*16c%16c",Indfmt) != 1)
- IOHBTerminate("iohb.c: Invalid format info, line 4 of Harwell-Boeing file.\n");
- if ( sscanf(line, "%*16c%*16c%20c",Valfmt) != 1)
- IOHBTerminate("iohb.c: Invalid format info, line 4 of Harwell-Boeing file.\n");
- sscanf(line, "%*16c%*16c%*20c%20c",Rhsfmt);
- *(Ptrfmt+16) = (char) NULL;
- *(Indfmt+16) = (char) NULL;
- *(Valfmt+20) = (char) NULL;
- *(Rhsfmt+20) = (char) NULL;
-
-/* (Optional) Fifth line: */
- if (*Rhscrd != 0 )
- {
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) fifth line of HB file.\n");
- if ( sscanf(line, "%3c", Rhstype) != 1)
- IOHBTerminate("iohb.c: Invalid RHS type information, line 5 of Harwell-Boeing file.\n");
- if ( sscanf(line, "%*3c%i", Nrhs) != 1) *Nrhs = 0;
- if ( sscanf(line, "%*3c%*i%i", &Nrhsix) != 1) Nrhsix = 0;
- }
- return 1;
-}
-
-
-int readHB_mat_double(const char* filename, int colptr[], int rowind[],
- double val[])
-{
-/****************************************************************************/
-/* This function opens and reads the specified file, interpreting its */
-/* contents as a sparse matrix stored in the Harwell/Boeing standard */
-/* format and creating compressed column storage scheme vectors to hold */
-/* the index and nonzero value information. */
-/* */
-/* ---------- */
-/* **CAVEAT** */
-/* ---------- */
-/* Parsing real formats from Fortran is tricky, and this file reader */
-/* does not claim to be foolproof. It has been tested for cases when */
-/* the real values are printed consistently and evenly spaced on each */
-/* line, with Fixed (F), and Exponential (E or D) formats. */
-/* */
-/* ** If the input file does not adhere to the H/B format, the ** */
-/* ** results will be unpredictable. ** */
-/* */
-/****************************************************************************/
- FILE *in_file;
- int i,j,ind,col,offset,count,last,Nrhs;
- int Ptrcrd, Indcrd, Valcrd, Rhscrd;
- int Nrow, Ncol, Nnzero, Nentries;
- int Ptrperline, Ptrwidth, Indperline, Indwidth;
- int Valperline, Valwidth, Valprec;
- int Valflag; /* Indicates 'E','D', or 'F' float format */
- char* ThisElement;
- char Title[73], Key[8], Type[4], Rhstype[4];
- char Ptrfmt[17], Indfmt[17], Valfmt[21], Rhsfmt[21];
- char line[BUFSIZ];
-
- if ( (in_file = fopen( filename, "r")) == NULL ) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
-
- readHB_header(in_file, Title, Key, Type, &Nrow, &Ncol, &Nnzero, &Nrhs,
- Ptrfmt, Indfmt, Valfmt, Rhsfmt,
- &Ptrcrd, &Indcrd, &Valcrd, &Rhscrd, Rhstype);
-
-/* Parse the array input formats from Line 3 of HB file */
- ParseIfmt(Ptrfmt,&Ptrperline,&Ptrwidth);
- ParseIfmt(Indfmt,&Indperline,&Indwidth);
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
- ParseRfmt(Valfmt,&Valperline,&Valwidth,&Valprec,&Valflag);
- }
-
-/* Read column pointer array: */
-
- offset = 1-_SP_base; /* if base 0 storage is declared (via macro definition), */
- /* then storage entries are offset by 1 */
-
- ThisElement = (char *) malloc(Ptrwidth+1);
- if ( ThisElement == NULL ) IOHBTerminate("Insufficient memory for ThisElement.");
- *(ThisElement+Ptrwidth) = (char) NULL;
- count=0;
- for (i=0;i<Ptrcrd;i++)
- {
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in pointer data region of HB file.\n");
- col = 0;
- for (ind = 0;ind<Ptrperline;ind++)
- {
- if (count > Ncol) break;
- strncpy(ThisElement,line+col,Ptrwidth);
- /* ThisElement = substr(line,col,Ptrwidth); */
- colptr[count] = atoi(ThisElement)-offset;
- count++; col += Ptrwidth;
- }
- }
- free(ThisElement);
-
-/* Read row index array: */
-
- ThisElement = (char *) malloc(Indwidth+1);
- if ( ThisElement == NULL ) IOHBTerminate("Insufficient memory for ThisElement.");
- *(ThisElement+Indwidth) = (char) NULL;
- count = 0;
- for (i=0;i<Indcrd;i++)
- {
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in index data region of HB file.\n");
- col = 0;
- for (ind = 0;ind<Indperline;ind++)
- {
- if (count == Nnzero) break;
- strncpy(ThisElement,line+col,Indwidth);
-/* ThisElement = substr(line,col,Indwidth); */
- rowind[count] = atoi(ThisElement)-offset;
- count++; col += Indwidth;
- }
- }
- free(ThisElement);
-
-/* Read array of values: */
-
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
-
- if ( Type[0] == 'C' ) Nentries = 2*Nnzero;
- else Nentries = Nnzero;
-
- ThisElement = (char *) malloc(Valwidth+1);
- if ( ThisElement == NULL ) IOHBTerminate("Insufficient memory for ThisElement.");
- *(ThisElement+Valwidth) = (char) NULL;
- count = 0;
- for (i=0;i<Valcrd;i++)
- {
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in value data region of HB file.\n");
- if (Valflag == 'D') {
- while( strchr(line,'D') ) *strchr(line,'D') = 'E';
-/* *strchr(Valfmt,'D') = 'E'; */
- }
- col = 0;
- for (ind = 0;ind<Valperline;ind++)
- {
- if (count == Nentries) break;
- strncpy(ThisElement,line+col,Valwidth);
- /*ThisElement = substr(line,col,Valwidth);*/
- if ( Valflag != 'F' && strchr(ThisElement,'E') == NULL ) {
- /* insert a char prefix for exp */
- last = strlen(ThisElement);
- for (j=last+1;j>=0;j--) {
- ThisElement[j] = ThisElement[j-1];
- if ( ThisElement[j] == '+' || ThisElement[j] == '-' ) {
- ThisElement[j-1] = Valflag;
- break;
- }
- }
- }
- val[count] = atof(ThisElement);
- count++; col += Valwidth;
- }
- }
- free(ThisElement);
- }
-
- fclose(in_file);
- return 1;
-}
-
-int readHB_newmat_double(const char* filename, int* M, int* N, int* nonzeros,
- int** colptr, int** rowind, double** val)
-{
- int Nrhs;
- char *Type;
-
- readHB_info(filename, M, N, nonzeros, &Type, &Nrhs);
-
- *colptr = (int *)malloc((*N+1)*sizeof(int));
- if ( *colptr == NULL ) IOHBTerminate("Insufficient memory for colptr.\n");
- *rowind = (int *)malloc(*nonzeros*sizeof(int));
- if ( *rowind == NULL ) IOHBTerminate("Insufficient memory for rowind.\n");
- if ( Type[0] == 'C' ) {
-/*
- fprintf(stderr, "Warning: Reading complex data from HB file %s.\n",filename);
- fprintf(stderr, " Real and imaginary parts will be interlaced in val[].\n");
-*/
- /* Malloc enough space for real AND imaginary parts of val[] */
- *val = (double *)malloc(*nonzeros*sizeof(double)*2);
- if ( *val == NULL ) IOHBTerminate("Insufficient memory for val.\n");
- } else {
- if ( Type[0] != 'P' ) {
- /* Malloc enough space for real array val[] */
- *val = (double *)malloc(*nonzeros*sizeof(double));
- if ( *val == NULL ) IOHBTerminate("Insufficient memory for val.\n");
- }
- } /* No val[] space needed if pattern only */
- return readHB_mat_double(filename, *colptr, *rowind, *val);
-
-}
-
-int readHB_aux_double(const char* filename, const char AuxType, double b[])
-{
-/****************************************************************************/
-/* This function opens and reads the specified file, placing auxillary */
-/* vector(s) of the given type (if available) in b. */
-/* Return value is the number of vectors successfully read. */
-/* */
-/* AuxType = 'F' full right-hand-side vector(s) */
-/* AuxType = 'G' initial Guess vector(s) */
-/* AuxType = 'X' eXact solution vector(s) */
-/* */
-/* ---------- */
-/* **CAVEAT** */
-/* ---------- */
-/* Parsing real formats from Fortran is tricky, and this file reader */
-/* does not claim to be foolproof. It has been tested for cases when */
-/* the real values are printed consistently and evenly spaced on each */
-/* line, with Fixed (F), and Exponential (E or D) formats. */
-/* */
-/* ** If the input file does not adhere to the H/B format, the ** */
-/* ** results will be unpredictable. ** */
-/* */
-/****************************************************************************/
- FILE *in_file;
- int i,j,n,maxcol,start,stride,col,last,linel;
- int Ptrcrd, Indcrd, Valcrd, Rhscrd;
- int Nrow, Ncol, Nnzero, Nentries;
- int Nrhs, nvecs, rhsi;
- int Rhsperline, Rhswidth, Rhsprec;
- int Rhsflag;
- char *ThisElement;
- char Title[73], Key[9], Type[4], Rhstype[4];
- char Ptrfmt[17], Indfmt[17], Valfmt[21], Rhsfmt[21];
- char line[BUFSIZ];
-
- if ((in_file = fopen( filename, "r")) == NULL) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
-
- readHB_header(in_file, Title, Key, Type, &Nrow, &Ncol, &Nnzero, &Nrhs,
- Ptrfmt, Indfmt, Valfmt, Rhsfmt,
- &Ptrcrd, &Indcrd, &Valcrd, &Rhscrd, Rhstype);
-
- if (Nrhs <= 0)
- {
- fprintf(stderr, "Warn: Attempt to read auxillary vector(s) when none are present.\n");
- return 0;
- }
- if (Rhstype[0] != 'F' )
- {
- fprintf(stderr,"Warn: Attempt to read auxillary vector(s) which are not stored in Full form.\n");
- fprintf(stderr," Rhs must be specified as full. \n");
- return 0;
- }
-
-/* If reading complex data, allow for interleaved real and imaginary values. */
- if ( Type[0] == 'C' ) {
- Nentries = 2*Nrow;
- } else {
- Nentries = Nrow;
- }
-
- nvecs = 1;
-
- if ( Rhstype[1] == 'G' ) nvecs++;
- if ( Rhstype[2] == 'X' ) nvecs++;
-
- if ( AuxType == 'G' && Rhstype[1] != 'G' ) {
- fprintf(stderr, "Warn: Attempt to read auxillary Guess vector(s) when none are present.\n");
- return 0;
- }
- if ( AuxType == 'X' && Rhstype[2] != 'X' ) {
- fprintf(stderr, "Warn: Attempt to read auxillary eXact solution vector(s) when none are present.\n");
- return 0;
- }
-
- ParseRfmt(Rhsfmt, &Rhsperline, &Rhswidth, &Rhsprec,&Rhsflag);
- maxcol = Rhsperline*Rhswidth;
-
-/* Lines to skip before starting to read RHS values... */
- n = Ptrcrd + Indcrd + Valcrd;
-
- for (i = 0; i < n; i++)
- fgets(line, BUFSIZ, in_file);
-
-/* start - number of initial aux vector entries to skip */
-/* to reach first vector requested */
-/* stride - number of aux vector entries to skip between */
-/* requested vectors */
- if ( AuxType == 'F' ) start = 0;
- else if ( AuxType == 'G' ) start = Nentries;
- else start = (nvecs-1)*Nentries;
- stride = (nvecs-1)*Nentries;
-
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- col = 0;
-/* Skip to initial offset */
-
- for (i=0;i<start;i++) {
- if ( col >= ( maxcol<linel?maxcol:linel ) ) {
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- col = 0;
- }
- col += Rhswidth;
- }
- if (Rhsflag == 'D') {
- while( strchr(line,'D') ) *strchr(line,'D') = 'E';
- }
-
-/* Read a vector of desired type, then skip to next */
-/* repeating to fill Nrhs vectors */
-
- ThisElement = (char *) malloc(Rhswidth+1);
- if ( ThisElement == NULL ) IOHBTerminate("Insufficient memory for ThisElement.");
- *(ThisElement+Rhswidth) = (char) NULL;
- for (rhsi=0;rhsi<Nrhs;rhsi++) {
-
- for (i=0;i<Nentries;i++) {
- if ( col >= ( maxcol<linel?maxcol:linel ) ) {
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- if (Rhsflag == 'D') {
- while( strchr(line,'D') ) *strchr(line,'D') = 'E';
- }
- col = 0;
- }
- strncpy(ThisElement,line+col,Rhswidth);
- /*ThisElement = substr(line, col, Rhswidth);*/
- if ( Rhsflag != 'F' && strchr(ThisElement,'E') == NULL ) {
- /* insert a char prefix for exp */
- last = strlen(ThisElement);
- for (j=last+1;j>=0;j--) {
- ThisElement[j] = ThisElement[j-1];
- if ( ThisElement[j] == '+' || ThisElement[j] == '-' ) {
- ThisElement[j-1] = Rhsflag;
- break;
- }
- }
- }
- b[i] = atof(ThisElement);
- col += Rhswidth;
- }
-
-/* Skip any interleaved Guess/eXact vectors */
-
- for (i=0;i<stride;i++) {
- if ( col >= ( maxcol<linel?maxcol:linel ) ) {
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- col = 0;
- }
- col += Rhswidth;
- }
-
- }
- free(ThisElement);
-
-
- fclose(in_file);
- return Nrhs;
-}
-
-int readHB_newaux_double(const char* filename, const char AuxType, double** b)
-{
- int Nrhs,M,N,nonzeros;
- char *Type;
-
- readHB_info(filename, &M, &N, &nonzeros, &Type, &Nrhs);
- if ( Nrhs <= 0 ) {
- fprintf(stderr,"Warn: Requested read of aux vector(s) when none are present.\n");
- return 0;
- } else {
- if ( Type[0] == 'C' ) {
- fprintf(stderr, "Warning: Reading complex aux vector(s) from HB file %s.",filename);
- fprintf(stderr, " Real and imaginary parts will be interlaced in b[].");
- *b = (double *)malloc(M*Nrhs*sizeof(double)*2);
- if ( *b == NULL ) IOHBTerminate("Insufficient memory for rhs.\n");
- return readHB_aux_double(filename, AuxType, *b);
- } else {
- *b = (double *)malloc(M*Nrhs*sizeof(double));
- if ( *b == NULL ) IOHBTerminate("Insufficient memory for rhs.\n");
- return readHB_aux_double(filename, AuxType, *b);
- }
- }
-}
-
-int writeHB_mat_double(const char* filename, int M, int N,
- int nz, const int colptr[], const int rowind[],
- const double val[], int Nrhs, const double rhs[],
- const double guess[], const double exact[],
- const char* Title, const char* Key, const char* Type,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- const char* Rhstype)
-{
-/****************************************************************************/
-/* The writeHB function opens the named file and writes the specified */
-/* matrix and optional right-hand-side(s) to that file in Harwell-Boeing */
-/* format. */
-/* */
-/* For a description of the Harwell Boeing standard, see: */
-/* Duff, et al., ACM TOMS Vol.15, No.1, March 1989 */
-/* */
-/****************************************************************************/
- FILE *out_file;
- int i,j,entry,offset,acount,linemod;
- int totcrd, ptrcrd, indcrd, valcrd, rhscrd;
- int nvalentries, nrhsentries;
- int Ptrperline, Ptrwidth, Indperline, Indwidth;
- int Rhsperline, Rhswidth, Rhsprec;
- int Rhsflag;
- int Valperline, Valwidth, Valprec;
- int Valflag; /* Indicates 'E','D', or 'F' float format */
- char pformat[16],iformat[16],vformat[19],rformat[19];
-
- if ( Type[0] == 'C' ) {
- nvalentries = 2*nz;
- nrhsentries = 2*M;
- } else {
- nvalentries = nz;
- nrhsentries = M;
- }
-
- if ( filename != NULL ) {
- if ( (out_file = fopen( filename, "w")) == NULL ) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
- } else out_file = stdout;
-
- if ( Ptrfmt == NULL ) Ptrfmt = "(8I10)";
- ParseIfmt(Ptrfmt,&Ptrperline,&Ptrwidth);
- sprintf(pformat,"%%%dd",Ptrwidth);
- ptrcrd = (N+1)/Ptrperline;
- if ( (N+1)%Ptrperline != 0) ptrcrd++;
-
- if ( Indfmt == NULL ) Indfmt = Ptrfmt;
- ParseIfmt(Indfmt,&Indperline,&Indwidth);
- sprintf(iformat,"%%%dd",Indwidth);
- indcrd = nz/Indperline;
- if ( nz%Indperline != 0) indcrd++;
-
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
- if ( Valfmt == NULL ) Valfmt = "(4E20.13)";
- ParseRfmt(Valfmt,&Valperline,&Valwidth,&Valprec,&Valflag);
- if (Valflag == 'D') *strchr(Valfmt,'D') = 'E';
- if (Valflag == 'F')
- sprintf(vformat,"%% %d.%df",Valwidth,Valprec);
- else
- sprintf(vformat,"%% %d.%dE",Valwidth,Valprec);
- valcrd = nvalentries/Valperline;
- if ( nvalentries%Valperline != 0) valcrd++;
- } else valcrd = 0;
-
- if ( Nrhs > 0 ) {
- if ( Rhsfmt == NULL ) Rhsfmt = Valfmt;
- ParseRfmt(Rhsfmt,&Rhsperline,&Rhswidth,&Rhsprec, &Rhsflag);
- if (Rhsflag == 'F')
- sprintf(rformat,"%% %d.%df",Rhswidth,Rhsprec);
- else
- sprintf(rformat,"%% %d.%dE",Rhswidth,Rhsprec);
- if (Rhsflag == 'D') *strchr(Rhsfmt,'D') = 'E';
- rhscrd = nrhsentries/Rhsperline;
- if ( nrhsentries%Rhsperline != 0) rhscrd++;
- if ( Rhstype[1] == 'G' ) rhscrd+=rhscrd;
- if ( Rhstype[2] == 'X' ) rhscrd+=rhscrd;
- rhscrd*=Nrhs;
- } else rhscrd = 0;
-
- totcrd = 4+ptrcrd+indcrd+valcrd+rhscrd;
-
-
-/* Print header information: */
-
- fprintf(out_file,"%-72s%-8s\n%14d%14d%14d%14d%14d\n",Title, Key, totcrd,
- ptrcrd, indcrd, valcrd, rhscrd);
- fprintf(out_file,"%3s%11s%14d%14d%14d\n",Type," ", M, N, nz);
- fprintf(out_file,"%-16s%-16s%-20s", Ptrfmt, Indfmt, Valfmt);
- if ( Nrhs != 0 ) {
-/* Print Rhsfmt on fourth line and */
-/* optional fifth header line for auxillary vector information: */
- fprintf(out_file,"%-20s\n%-14s%d\n",Rhsfmt,Rhstype,Nrhs);
- } else fprintf(out_file,"\n");
-
- offset = 1-_SP_base; /* if base 0 storage is declared (via macro definition), */
- /* then storage entries are offset by 1 */
-
-/* Print column pointers: */
- for (i=0;i<N+1;i++)
- {
- entry = colptr[i]+offset;
- fprintf(out_file,pformat,entry);
- if ( (i+1)%Ptrperline == 0 ) fprintf(out_file,"\n");
- }
-
- if ( (N+1) % Ptrperline != 0 ) fprintf(out_file,"\n");
-
-/* Print row indices: */
- for (i=0;i<nz;i++)
- {
- entry = rowind[i]+offset;
- fprintf(out_file,iformat,entry);
- if ( (i+1)%Indperline == 0 ) fprintf(out_file,"\n");
- }
-
- if ( nz % Indperline != 0 ) fprintf(out_file,"\n");
-
-/* Print values: */
-
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
-
- for (i=0;i<nvalentries;i++)
- {
- fprintf(out_file,vformat,val[i]);
- if ( (i+1)%Valperline == 0 ) fprintf(out_file,"\n");
- }
-
- if ( nvalentries % Valperline != 0 ) fprintf(out_file,"\n");
-
-/* If available, print right hand sides,
- guess vectors and exact solution vectors: */
- acount = 1;
- linemod = 0;
- if ( Nrhs > 0 ) {
- for (i=0;i<Nrhs;i++)
- {
- for ( j=0;j<nrhsentries;j++ ) {
- fprintf(out_file,rformat,rhs[j]);
- if ( acount++%Rhsperline == linemod ) fprintf(out_file,"\n");
- }
- if ( acount%Rhsperline != linemod ) {
- fprintf(out_file,"\n");
- linemod = (acount-1)%Rhsperline;
- }
- rhs += nrhsentries;
- if ( Rhstype[1] == 'G' ) {
- for ( j=0;j<nrhsentries;j++ ) {
- fprintf(out_file,rformat,guess[j]);
- if ( acount++%Rhsperline == linemod ) fprintf(out_file,"\n");
- }
- if ( acount%Rhsperline != linemod ) {
- fprintf(out_file,"\n");
- linemod = (acount-1)%Rhsperline;
- }
- guess += nrhsentries;
- }
- if ( Rhstype[2] == 'X' ) {
- for ( j=0;j<nrhsentries;j++ ) {
- fprintf(out_file,rformat,exact[j]);
- if ( acount++%Rhsperline == linemod ) fprintf(out_file,"\n");
- }
- if ( acount%Rhsperline != linemod ) {
- fprintf(out_file,"\n");
- linemod = (acount-1)%Rhsperline;
- }
- exact += nrhsentries;
- }
- }
- }
-
- }
-
- if ( fclose(out_file) != 0){
- fprintf(stderr,"Error closing file in writeHB_mat_double().\n");
- return 0;
- } else return 1;
-
-}
-
-int readHB_mat_char(const char* filename, int colptr[], int rowind[],
- char val[], char* Valfmt)
-{
-/****************************************************************************/
-/* This function opens and reads the specified file, interpreting its */
-/* contents as a sparse matrix stored in the Harwell/Boeing standard */
-/* format and creating compressed column storage scheme vectors to hold */
-/* the index and nonzero value information. */
-/* */
-/* ---------- */
-/* **CAVEAT** */
-/* ---------- */
-/* Parsing real formats from Fortran is tricky, and this file reader */
-/* does not claim to be foolproof. It has been tested for cases when */
-/* the real values are printed consistently and evenly spaced on each */
-/* line, with Fixed (F), and Exponential (E or D) formats. */
-/* */
-/* ** If the input file does not adhere to the H/B format, the ** */
-/* ** results will be unpredictable. ** */
-/* */
-/****************************************************************************/
- FILE *in_file;
- int i,j,ind,col,offset,count,last;
- int Nrow,Ncol,Nnzero,Nentries,Nrhs;
- int Ptrcrd, Indcrd, Valcrd, Rhscrd;
- int Ptrperline, Ptrwidth, Indperline, Indwidth;
- int Valperline, Valwidth, Valprec;
- int Valflag; /* Indicates 'E','D', or 'F' float format */
- char* ThisElement;
- char line[BUFSIZ];
- char Title[73], Key[8], Type[4], Rhstype[4];
- char Ptrfmt[17], Indfmt[17], Rhsfmt[21];
-
- if ( (in_file = fopen( filename, "r")) == NULL ) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
-
- readHB_header(in_file, Title, Key, Type, &Nrow, &Ncol, &Nnzero, &Nrhs,
- Ptrfmt, Indfmt, Valfmt, Rhsfmt,
- &Ptrcrd, &Indcrd, &Valcrd, &Rhscrd, Rhstype);
-
-/* Parse the array input formats from Line 3 of HB file */
- ParseIfmt(Ptrfmt,&Ptrperline,&Ptrwidth);
- ParseIfmt(Indfmt,&Indperline,&Indwidth);
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
- ParseRfmt(Valfmt,&Valperline,&Valwidth,&Valprec,&Valflag);
- if (Valflag == 'D') {
- *strchr(Valfmt,'D') = 'E';
- }
- }
-
-/* Read column pointer array: */
-
- offset = 1-_SP_base; /* if base 0 storage is declared (via macro definition), */
- /* then storage entries are offset by 1 */
-
- ThisElement = (char *) malloc(Ptrwidth+1);
- if ( ThisElement == NULL ) IOHBTerminate("Insufficient memory for ThisElement.");
- *(ThisElement+Ptrwidth) = (char) NULL;
- count=0;
- for (i=0;i<Ptrcrd;i++)
- {
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in pointer data region of HB file.\n");
- col = 0;
- for (ind = 0;ind<Ptrperline;ind++)
- {
- if (count > Ncol) break;
- strncpy(ThisElement,line+col,Ptrwidth);
- /*ThisElement = substr(line,col,Ptrwidth);*/
- colptr[count] = atoi(ThisElement)-offset;
- count++; col += Ptrwidth;
- }
- }
- free(ThisElement);
-
-/* Read row index array: */
-
- ThisElement = (char *) malloc(Indwidth+1);
- if ( ThisElement == NULL ) IOHBTerminate("Insufficient memory for ThisElement.");
- *(ThisElement+Indwidth) = (char) NULL;
- count = 0;
- for (i=0;i<Indcrd;i++)
- {
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in index data region of HB file.\n");
- col = 0;
- for (ind = 0;ind<Indperline;ind++)
- {
- if (count == Nnzero) break;
- strncpy(ThisElement,line+col,Indwidth);
- /*ThisElement = substr(line,col,Indwidth);*/
- rowind[count] = atoi(ThisElement)-offset;
- count++; col += Indwidth;
- }
- }
- free(ThisElement);
-
-/* Read array of values: AS CHARACTERS*/
-
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
-
- if ( Type[0] == 'C' ) Nentries = 2*Nnzero;
- else Nentries = Nnzero;
-
- ThisElement = (char *) malloc(Valwidth+1);
- if ( ThisElement == NULL ) IOHBTerminate("Insufficient memory for ThisElement.");
- *(ThisElement+Valwidth) = (char) NULL;
- count = 0;
- for (i=0;i<Valcrd;i++)
- {
- fgets(line, BUFSIZ, in_file);
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in value data region of HB file.\n");
- if (Valflag == 'D') {
- while( strchr(line,'D') ) *strchr(line,'D') = 'E';
- }
- col = 0;
- for (ind = 0;ind<Valperline;ind++)
- {
- if (count == Nentries) break;
- ThisElement = &val[count*Valwidth];
- strncpy(ThisElement,line+col,Valwidth);
- /*strncpy(ThisElement,substr(line,col,Valwidth),Valwidth);*/
- if ( Valflag != 'F' && strchr(ThisElement,'E') == NULL ) {
- /* insert a char prefix for exp */
- last = strlen(ThisElement);
- for (j=last+1;j>=0;j--) {
- ThisElement[j] = ThisElement[j-1];
- if ( ThisElement[j] == '+' || ThisElement[j] == '-' ) {
- ThisElement[j-1] = Valflag;
- break;
- }
- }
- }
- count++; col += Valwidth;
- }
- }
- }
-
- return 1;
-}
-
-int readHB_newmat_char(const char* filename, int* M, int* N, int* nonzeros, int** colptr,
- int** rowind, char** val, char** Valfmt)
-{
- FILE *in_file;
- int Nrhs;
- int Ptrcrd, Indcrd, Valcrd, Rhscrd;
- int Valperline, Valwidth, Valprec;
- int Valflag; /* Indicates 'E','D', or 'F' float format */
- char Title[73], Key[9], Type[4], Rhstype[4];
- char Ptrfmt[17], Indfmt[17], Rhsfmt[21];
-
- if ((in_file = fopen( filename, "r")) == NULL) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
-
- *Valfmt = (char *)malloc(21*sizeof(char));
- if ( *Valfmt == NULL ) IOHBTerminate("Insufficient memory for Valfmt.");
- readHB_header(in_file, Title, Key, Type, M, N, nonzeros, &Nrhs,
- Ptrfmt, Indfmt, (*Valfmt), Rhsfmt,
- &Ptrcrd, &Indcrd, &Valcrd, &Rhscrd, Rhstype);
- fclose(in_file);
- ParseRfmt(*Valfmt,&Valperline,&Valwidth,&Valprec,&Valflag);
-
- *colptr = (int *)malloc((*N+1)*sizeof(int));
- if ( *colptr == NULL ) IOHBTerminate("Insufficient memory for colptr.\n");
- *rowind = (int *)malloc(*nonzeros*sizeof(int));
- if ( *rowind == NULL ) IOHBTerminate("Insufficient memory for rowind.\n");
- if ( Type[0] == 'C' ) {
-/*
- fprintf(stderr, "Warning: Reading complex data from HB file %s.\n",filename);
- fprintf(stderr, " Real and imaginary parts will be interlaced in val[].\n");
-*/
- /* Malloc enough space for real AND imaginary parts of val[] */
- *val = (char *)malloc(*nonzeros*Valwidth*sizeof(char)*2);
- if ( *val == NULL ) IOHBTerminate("Insufficient memory for val.\n");
- } else {
- if ( Type[0] != 'P' ) {
- /* Malloc enough space for real array val[] */
- *val = (char *)malloc(*nonzeros*Valwidth*sizeof(char));
- if ( *val == NULL ) IOHBTerminate("Insufficient memory for val.\n");
- }
- } /* No val[] space needed if pattern only */
- return readHB_mat_char(filename, *colptr, *rowind, *val, *Valfmt);
-
-}
-
-int readHB_aux_char(const char* filename, const char AuxType, char b[])
-{
-/****************************************************************************/
-/* This function opens and reads the specified file, placing auxilary */
-/* vector(s) of the given type (if available) in b : */
-/* Return value is the number of vectors successfully read. */
-/* */
-/* AuxType = 'F' full right-hand-side vector(s) */
-/* AuxType = 'G' initial Guess vector(s) */
-/* AuxType = 'X' eXact solution vector(s) */
-/* */
-/* ---------- */
-/* **CAVEAT** */
-/* ---------- */
-/* Parsing real formats from Fortran is tricky, and this file reader */
-/* does not claim to be foolproof. It has been tested for cases when */
-/* the real values are printed consistently and evenly spaced on each */
-/* line, with Fixed (F), and Exponential (E or D) formats. */
-/* */
-/* ** If the input file does not adhere to the H/B format, the ** */
-/* ** results will be unpredictable. ** */
-/* */
-/****************************************************************************/
- FILE *in_file;
- int i,j,n,maxcol,start,stride,col,last,linel,nvecs,rhsi;
- int Nrow, Ncol, Nnzero, Nentries,Nrhs;
- int Ptrcrd, Indcrd, Valcrd, Rhscrd;
- int Rhsperline, Rhswidth, Rhsprec;
- int Rhsflag;
- char Title[73], Key[9], Type[4], Rhstype[4];
- char Ptrfmt[17], Indfmt[17], Valfmt[21], Rhsfmt[21];
- char line[BUFSIZ];
- char *ThisElement;
-
- if ((in_file = fopen( filename, "r")) == NULL) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
-
- readHB_header(in_file, Title, Key, Type, &Nrow, &Ncol, &Nnzero, &Nrhs,
- Ptrfmt, Indfmt, Valfmt, Rhsfmt,
- &Ptrcrd, &Indcrd, &Valcrd, &Rhscrd, Rhstype);
-
- if (Nrhs <= 0)
- {
- fprintf(stderr, "Warn: Attempt to read auxillary vector(s) when none are present.\n");
- return 0;
- }
- if (Rhstype[0] != 'F' )
- {
- fprintf(stderr,"Warn: Attempt to read auxillary vector(s) which are not stored in Full form.\n");
- fprintf(stderr," Rhs must be specified as full. \n");
- return 0;
- }
-
-/* If reading complex data, allow for interleaved real and imaginary values. */
- if ( Type[0] == 'C' ) {
- Nentries = 2*Nrow;
- } else {
- Nentries = Nrow;
- }
-
- nvecs = 1;
-
- if ( Rhstype[1] == 'G' ) nvecs++;
- if ( Rhstype[2] == 'X' ) nvecs++;
-
- if ( AuxType == 'G' && Rhstype[1] != 'G' ) {
- fprintf(stderr, "Warn: Attempt to read auxillary Guess vector(s) when none are present.\n");
- return 0;
- }
- if ( AuxType == 'X' && Rhstype[2] != 'X' ) {
- fprintf(stderr, "Warn: Attempt to read auxillary eXact solution vector(s) when none are present.\n");
- return 0;
- }
-
- ParseRfmt(Rhsfmt, &Rhsperline, &Rhswidth, &Rhsprec,&Rhsflag);
- maxcol = Rhsperline*Rhswidth;
-
-/* Lines to skip before starting to read RHS values... */
- n = Ptrcrd + Indcrd + Valcrd;
-
- for (i = 0; i < n; i++)
- fgets(line, BUFSIZ, in_file);
-
-/* start - number of initial aux vector entries to skip */
-/* to reach first vector requested */
-/* stride - number of aux vector entries to skip between */
-/* requested vectors */
- if ( AuxType == 'F' ) start = 0;
- else if ( AuxType == 'G' ) start = Nentries;
- else start = (nvecs-1)*Nentries;
- stride = (nvecs-1)*Nentries;
-
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in auxillary vector data region of HB file.\n");
- col = 0;
-/* Skip to initial offset */
-
- for (i=0;i<start;i++) {
- col += Rhswidth;
- if ( col >= ( maxcol<linel?maxcol:linel ) ) {
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in auxillary vector data region of HB file.\n");
- col = 0;
- }
- }
-
- if (Rhsflag == 'D') {
- while( strchr(line,'D') ) *strchr(line,'D') = 'E';
- }
-/* Read a vector of desired type, then skip to next */
-/* repeating to fill Nrhs vectors */
-
- for (rhsi=0;rhsi<Nrhs;rhsi++) {
-
- for (i=0;i<Nentries;i++) {
- if ( col >= ( maxcol<linel?maxcol:linel ) ) {
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in auxillary vector data region of HB file.\n");
- if (Rhsflag == 'D') {
- while( strchr(line,'D') ) *strchr(line,'D') = 'E';
- }
- col = 0;
- }
- ThisElement = &b[i*Rhswidth];
- strncpy(ThisElement,line+col,Rhswidth);
- if ( Rhsflag != 'F' && strchr(ThisElement,'E') == NULL ) {
- /* insert a char prefix for exp */
- last = strlen(ThisElement);
- for (j=last+1;j>=0;j--) {
- ThisElement[j] = ThisElement[j-1];
- if ( ThisElement[j] == '+' || ThisElement[j] == '-' ) {
- ThisElement[j-1] = Rhsflag;
- break;
- }
- }
- }
- col += Rhswidth;
- }
- b+=Nentries*Rhswidth;
-
-/* Skip any interleaved Guess/eXact vectors */
-
- for (i=0;i<stride;i++) {
- col += Rhswidth;
- if ( col >= ( maxcol<linel?maxcol:linel ) ) {
- fgets(line, BUFSIZ, in_file);
- linel= strchr(line,'\n')-line;
- if ( sscanf(line,"%*s") < 0 )
- IOHBTerminate("iohb.c: Null (or blank) line in auxillary vector data region of HB file.\n");
- col = 0;
- }
- }
-
- }
-
-
- fclose(in_file);
- return Nrhs;
-}
-
-int readHB_newaux_char(const char* filename, const char AuxType, char** b, char** Rhsfmt)
-{
- FILE *in_file;
- int Ptrcrd, Indcrd, Valcrd, Rhscrd;
- int Nrow,Ncol,Nnzero,Nrhs;
- int Rhsperline, Rhswidth, Rhsprec;
- int Rhsflag;
- char Title[73], Key[9], Type[4], Rhstype[4];
- char Ptrfmt[17], Indfmt[17], Valfmt[21];
-
- if ((in_file = fopen( filename, "r")) == NULL) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
-
- *Rhsfmt = (char *)malloc(21*sizeof(char));
- if ( *Rhsfmt == NULL ) IOHBTerminate("Insufficient memory for Rhsfmt.");
- readHB_header(in_file, Title, Key, Type, &Nrow, &Ncol, &Nnzero, &Nrhs,
- Ptrfmt, Indfmt, Valfmt, (*Rhsfmt),
- &Ptrcrd, &Indcrd, &Valcrd, &Rhscrd, Rhstype);
- fclose(in_file);
- if ( Nrhs == 0 ) {
- fprintf(stderr,"Warn: Requested read of aux vector(s) when none are present.\n");
- return 0;
- } else {
- ParseRfmt(*Rhsfmt,&Rhsperline,&Rhswidth,&Rhsprec,&Rhsflag);
- if ( Type[0] == 'C' ) {
- fprintf(stderr, "Warning: Reading complex aux vector(s) from HB file %s.",filename);
- fprintf(stderr, " Real and imaginary parts will be interlaced in b[].");
- *b = (char *)malloc(Nrow*Nrhs*Rhswidth*sizeof(char)*2);
- if ( *b == NULL ) IOHBTerminate("Insufficient memory for rhs.\n");
- return readHB_aux_char(filename, AuxType, *b);
- } else {
- *b = (char *)malloc(Nrow*Nrhs*Rhswidth*sizeof(char));
- if ( *b == NULL ) IOHBTerminate("Insufficient memory for rhs.\n");
- return readHB_aux_char(filename, AuxType, *b);
- }
- }
-}
-
-int writeHB_mat_char(const char* filename, int M, int N,
- int nz, const int colptr[], const int rowind[],
- const char val[], int Nrhs, const char rhs[],
- const char guess[], const char exact[],
- const char* Title, const char* Key, const char* Type,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- const char* Rhstype)
-{
-/****************************************************************************/
-/* The writeHB function opens the named file and writes the specified */
-/* matrix and optional right-hand-side(s) to that file in Harwell-Boeing */
-/* format. */
-/* */
-/* For a description of the Harwell Boeing standard, see: */
-/* Duff, et al., ACM TOMS Vol.15, No.1, March 1989 */
-/* */
-/****************************************************************************/
- FILE *out_file;
- int i,j,acount,linemod,entry,offset;
- int totcrd, ptrcrd, indcrd, valcrd, rhscrd;
- int nvalentries, nrhsentries;
- int Ptrperline, Ptrwidth, Indperline, Indwidth;
- int Rhsperline, Rhswidth, Rhsprec;
- int Rhsflag;
- int Valperline, Valwidth, Valprec;
- int Valflag; /* Indicates 'E','D', or 'F' float format */
- char pformat[16],iformat[16],vformat[19],rformat[19];
-
- if ( Type[0] == 'C' ) {
- nvalentries = 2*nz;
- nrhsentries = 2*M;
- } else {
- nvalentries = nz;
- nrhsentries = M;
- }
-
- if ( filename != NULL ) {
- if ( (out_file = fopen( filename, "w")) == NULL ) {
- fprintf(stderr,"Error: Cannot open file: %s\n",filename);
- return 0;
- }
- } else out_file = stdout;
-
- if ( Ptrfmt == NULL ) Ptrfmt = "(8I10)";
- ParseIfmt(Ptrfmt,&Ptrperline,&Ptrwidth);
- sprintf(pformat,"%%%dd",Ptrwidth);
-
- if ( Indfmt == NULL ) Indfmt = Ptrfmt;
- ParseIfmt(Indfmt,&Indperline,&Indwidth);
- sprintf(iformat,"%%%dd",Indwidth);
-
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
- if ( Valfmt == NULL ) Valfmt = "(4E20.13)";
- ParseRfmt(Valfmt,&Valperline,&Valwidth,&Valprec,&Valflag);
- sprintf(vformat,"%%%ds",Valwidth);
- }
-
- ptrcrd = (N+1)/Ptrperline;
- if ( (N+1)%Ptrperline != 0) ptrcrd++;
-
- indcrd = nz/Indperline;
- if ( nz%Indperline != 0) indcrd++;
-
- valcrd = nvalentries/Valperline;
- if ( nvalentries%Valperline != 0) valcrd++;
-
- if ( Nrhs > 0 ) {
- if ( Rhsfmt == NULL ) Rhsfmt = Valfmt;
- ParseRfmt(Rhsfmt,&Rhsperline,&Rhswidth,&Rhsprec, &Rhsflag);
- sprintf(rformat,"%%%ds",Rhswidth);
- rhscrd = nrhsentries/Rhsperline;
- if ( nrhsentries%Rhsperline != 0) rhscrd++;
- if ( Rhstype[1] == 'G' ) rhscrd+=rhscrd;
- if ( Rhstype[2] == 'X' ) rhscrd+=rhscrd;
- rhscrd*=Nrhs;
- } else rhscrd = 0;
-
- totcrd = 4+ptrcrd+indcrd+valcrd+rhscrd;
-
-
-/* Print header information: */
-
- fprintf(out_file,"%-72s%-8s\n%14d%14d%14d%14d%14d\n",Title, Key, totcrd,
- ptrcrd, indcrd, valcrd, rhscrd);
- fprintf(out_file,"%3s%11s%14d%14d%14d\n",Type," ", M, N, nz);
- fprintf(out_file,"%-16s%-16s%-20s", Ptrfmt, Indfmt, Valfmt);
- if ( Nrhs != 0 ) {
-/* Print Rhsfmt on fourth line and */
-/* optional fifth header line for auxillary vector information: */
- fprintf(out_file,"%-20s\n%-14s%d\n",Rhsfmt,Rhstype,Nrhs);
- } else fprintf(out_file,"\n");
-
- offset = 1-_SP_base; /* if base 0 storage is declared (via macro definition), */
- /* then storage entries are offset by 1 */
-
-/* Print column pointers: */
- for (i=0;i<N+1;i++)
- {
- entry = colptr[i]+offset;
- fprintf(out_file,pformat,entry);
- if ( (i+1)%Ptrperline == 0 ) fprintf(out_file,"\n");
- }
-
- if ( (N+1) % Ptrperline != 0 ) fprintf(out_file,"\n");
-
-/* Print row indices: */
- for (i=0;i<nz;i++)
- {
- entry = rowind[i]+offset;
- fprintf(out_file,iformat,entry);
- if ( (i+1)%Indperline == 0 ) fprintf(out_file,"\n");
- }
-
- if ( nz % Indperline != 0 ) fprintf(out_file,"\n");
-
-/* Print values: */
-
- if ( Type[0] != 'P' ) { /* Skip if pattern only */
- for (i=0;i<nvalentries;i++)
- {
- fprintf(out_file,vformat,val+i*Valwidth);
- if ( (i+1)%Valperline == 0 ) fprintf(out_file,"\n");
- }
-
- if ( nvalentries % Valperline != 0 ) fprintf(out_file,"\n");
-
-/* Print right hand sides: */
- acount = 1;
- linemod=0;
- if ( Nrhs > 0 ) {
- for (j=0;j<Nrhs;j++) {
- for (i=0;i<nrhsentries;i++)
- {
- fprintf(out_file,rformat,rhs+i*Rhswidth);
- if ( acount++%Rhsperline == linemod ) fprintf(out_file,"\n");
- }
- if ( acount%Rhsperline != linemod ) {
- fprintf(out_file,"\n");
- linemod = (acount-1)%Rhsperline;
- }
- if ( Rhstype[1] == 'G' ) {
- for (i=0;i<nrhsentries;i++)
- {
- fprintf(out_file,rformat,guess+i*Rhswidth);
- if ( acount++%Rhsperline == linemod ) fprintf(out_file,"\n");
- }
- if ( acount%Rhsperline != linemod ) {
- fprintf(out_file,"\n");
- linemod = (acount-1)%Rhsperline;
- }
- }
- if ( Rhstype[2] == 'X' ) {
- for (i=0;i<nrhsentries;i++)
- {
- fprintf(out_file,rformat,exact+i*Rhswidth);
- if ( acount++%Rhsperline == linemod ) fprintf(out_file,"\n");
- }
- if ( acount%Rhsperline != linemod ) {
- fprintf(out_file,"\n");
- linemod = (acount-1)%Rhsperline;
- }
- }
- }
- }
-
- }
-
- if ( fclose(out_file) != 0){
- fprintf(stderr,"Error closing file in writeHB_mat_char().\n");
- return 0;
- } else return 1;
-
-}
-
-int ParseIfmt(char* fmt, int* perline, int* width)
-{
-/*************************************************/
-/* Parse an *integer* format field to determine */
-/* width and number of elements per line. */
-/*************************************************/
- char *tmp;
- if (fmt == NULL ) {
- *perline = 0; *width = 0; return 0;
- }
- upcase(fmt);
- tmp = strchr(fmt,'(');
- tmp = substr(fmt,tmp - fmt + 1, strchr(fmt,'I') - tmp - 1);
- *perline = atoi(tmp);
- tmp = strchr(fmt,'I');
- tmp = substr(fmt,tmp - fmt + 1, strchr(fmt,')') - tmp - 1);
- return *width = atoi(tmp);
-}
-
-int ParseRfmt(char* fmt, int* perline, int* width, int* prec, int* flag)
-{
-/*************************************************/
-/* Parse a *real* format field to determine */
-/* width and number of elements per line. */
-/* Also sets flag indicating 'E' 'F' 'P' or 'D' */
-/* format. */
-/*************************************************/
- char* tmp;
- char* tmp2;
- char* tmp3;
- int len;
-
- if (fmt == NULL ) {
- *perline = 0;
- *width = 0;
- flag = NULL;
- return 0;
- }
-
- upcase(fmt);
- if (strchr(fmt,'(') != NULL) fmt = strchr(fmt,'(');
- if (strchr(fmt,')') != NULL) {
- tmp2 = strchr(fmt,')');
- while ( strchr(tmp2+1,')') != NULL ) {
- tmp2 = strchr(tmp2+1,')');
- }
- *(tmp2+1) = (int) NULL;
- }
- if (strchr(fmt,'P') != NULL) /* Remove any scaling factor, which */
- { /* affects output only, not input */
- if (strchr(fmt,'(') != NULL) {
- tmp = strchr(fmt,'P');
- if ( *(++tmp) == ',' ) tmp++;
- tmp3 = strchr(fmt,'(')+1;
- len = tmp-tmp3;
- tmp2 = tmp3;
- while ( *(tmp2+len) != (int) NULL ) {
- *tmp2=*(tmp2+len);
- tmp2++;
- }
- *(strchr(fmt,')')+1) = (int) NULL;
- }
- }
- if (strchr(fmt,'E') != NULL) {
- *flag = 'E';
- } else if (strchr(fmt,'D') != NULL) {
- *flag = 'D';
- } else if (strchr(fmt,'F') != NULL) {
- *flag = 'F';
- } else {
- fprintf(stderr,"Real format %s in H/B file not supported.\n",fmt);
- return 0;
- }
- tmp = strchr(fmt,'(');
- tmp = substr(fmt,tmp - fmt + 1, strchr(fmt,*flag) - tmp - 1);
- *perline = atoi(tmp);
- tmp = strchr(fmt,*flag);
- if ( strchr(fmt,'.') ) {
- *prec = atoi( substr( fmt, strchr(fmt,'.') - fmt + 1, strchr(fmt,')') - strchr(fmt,'.')-1) );
- tmp = substr(fmt,tmp - fmt + 1, strchr(fmt,'.') - tmp - 1);
- } else {
- tmp = substr(fmt,tmp - fmt + 1, strchr(fmt,')') - tmp - 1);
- }
- return *width = atoi(tmp);
-}
-
-char* substr(const char* S, const int pos, const int len)
-{
- int i;
- char *SubS;
- if ( pos+len <= strlen(S)) {
- SubS = (char *)malloc(len+1);
- if ( SubS == NULL ) IOHBTerminate("Insufficient memory for SubS.");
- for (i=0;i<len;i++) SubS[i] = S[pos+i];
- SubS[len] = (char) NULL;
- } else {
- SubS = NULL;
- }
- return SubS;
-}
-
-#include<ctype.h>
-void upcase(char* S)
-{
-/* Convert S to uppercase */
- int i,len;
- if ( S == NULL ) return;
- len = strlen(S);
- for (i=0;i< len;i++)
- S[i] = toupper(S[i]);
-}
-
-void IOHBTerminate(char* message)
-{
- fprintf(stderr,message);
- exit(1);
-}
-
diff --git a/Utilities/BGL/boost/graph/example/iohb.h b/Utilities/BGL/boost/graph/example/iohb.h
deleted file mode 100644
index 7c1ec21faae5019caa8a03e3c1e449cf1f7479b3..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/iohb.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// (C) Copyright Jeremy Siek 2004
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef IOHB_H
-#define IOHB_H
-
-#include<stdio.h>
-#include<stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int readHB_info(const char* filename, int* M, int* N, int* nz, char** Type,
- int* Nrhs);
-
-int readHB_header(FILE* in_file, char* Title, char* Key, char* Type,
- int* Nrow, int* Ncol, int* Nnzero, int* Nrhs,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- int* Ptrcrd, int* Indcrd, int* Valcrd, int* Rhscrd,
- char *Rhstype);
-
-int readHB_mat_double(const char* filename, int colptr[], int rowind[],
- double val[]);
-
-int readHB_newmat_double(const char* filename, int* M, int* N, int* nonzeros,
- int** colptr, int** rowind, double** val);
-
-int readHB_aux_double(const char* filename, const char AuxType, double b[]);
-
-int readHB_newaux_double(const char* filename, const char AuxType, double** b);
-
-int writeHB_mat_double(const char* filename, int M, int N,
- int nz, const int colptr[], const int rowind[],
- const double val[], int Nrhs, const double rhs[],
- const double guess[], const double exact[],
- const char* Title, const char* Key, const char* Type,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- const char* Rhstype);
-
-int readHB_mat_char(const char* filename, int colptr[], int rowind[],
- char val[], char* Valfmt);
-
-int readHB_newmat_char(const char* filename, int* M, int* N, int* nonzeros, int** colptr,
- int** rowind, char** val, char** Valfmt);
-
-int readHB_aux_char(const char* filename, const char AuxType, char b[]);
-
-int readHB_newaux_char(const char* filename, const char AuxType, char** b, char** Rhsfmt);
-
-int writeHB_mat_char(const char* filename, int M, int N,
- int nz, const int colptr[], const int rowind[],
- const char val[], int Nrhs, const char rhs[],
- const char guess[], const char exact[],
- const char* Title, const char* Key, const char* Type,
- char* Ptrfmt, char* Indfmt, char* Valfmt, char* Rhsfmt,
- const char* Rhstype);
-
-int ParseIfmt(char* fmt, int* perline, int* width);
-
-int ParseRfmt(char* fmt, int* perline, int* width, int* prec, int* flag);
-
-void IOHBTerminate(char* message);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Utilities/BGL/boost/graph/example/isomorphism.cpp b/Utilities/BGL/boost/graph/example/isomorphism.cpp
deleted file mode 100644
index 8882f751d8dcd3bd3ad58346b25c2b63b9496f6b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/isomorphism.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// (C) Copyright Jeremy Siek 2001.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/isomorphism.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-#include <boost/graph/graph_utility.hpp>
-
-/*
- Sample output:
- isomorphic? 1
- f: 9 10 11 0 1 3 2 4 6 8 7 5
- */
-
-int
-main()
-{
- using namespace boost;
-
- const int n = 12;
-
- typedef adjacency_list<vecS, listS, undirectedS,
- property<vertex_index_t, int> > graph_t;
- graph_t g1(n), g2(n);
-
- std::vector<graph_traits<graph_t>::vertex_descriptor> v1(n), v2(n);
-
- property_map<graph_t, vertex_index_t>::type
- v1_index_map = get(vertex_index, g1),
- v2_index_map = get(vertex_index, g2);
-
- graph_traits<graph_t>::vertex_iterator i, end;
- int id = 0;
- for (tie(i, end) = vertices(g1); i != end; ++i, ++id) {
- put(v1_index_map, *i, id);
- v1[id] = *i;
- }
- id = 0;
- for (tie(i, end) = vertices(g2); i != end; ++i, ++id) {
- put(v2_index_map, *i, id);
- v2[id] = *i;
- }
- add_edge(v1[0], v1[1], g1); add_edge(v1[1], v1[2], g1);
- add_edge(v1[0], v1[2], g1);
- add_edge(v1[3], v1[4], g1); add_edge(v1[4], v1[5], g1);
- add_edge(v1[5], v1[6], g1); add_edge(v1[6], v1[3], g1);
- add_edge(v1[7], v1[8], g1); add_edge(v1[8], v1[9], g1);
- add_edge(v1[9], v1[10], g1);
- add_edge(v1[10], v1[11], g1); add_edge(v1[11], v1[7], g1);
-
- add_edge(v2[9], v2[10], g2); add_edge(v2[10], v2[11], g2);
- add_edge(v2[11], v2[9], g2);
- add_edge(v2[0], v2[1], g2); add_edge(v2[1], v2[3], g2);
- add_edge(v2[3], v2[2], g2); add_edge(v2[2], v2[0], g2);
- add_edge(v2[4], v2[5], g2); add_edge(v2[5], v2[7], g2);
- add_edge(v2[7], v2[8], g2);
- add_edge(v2[8], v2[6], g2); add_edge(v2[6], v2[4], g2);
-
- std::vector<graph_traits<graph_t>::vertex_descriptor> f(n);
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- bool ret = isomorphism
- (g1, g2, make_iterator_property_map(f.begin(), v1_index_map, f[0]),
- degree_vertex_invariant(), get(vertex_index, g1), get(vertex_index, g2));
-#else
- bool ret = isomorphism
- (g1, g2, isomorphism_map
- (make_iterator_property_map(f.begin(), v1_index_map, f[0])));
-#endif
- std::cout << "isomorphic? " << ret << std::endl;
-
- std::cout << "f: ";
- for (std::size_t v = 0; v != f.size(); ++v)
- std::cout << get(get(vertex_index, g2), f[v]) << " ";
- std::cout << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/iteration_macros.cpp b/Utilities/BGL/boost/graph/example/iteration_macros.cpp
deleted file mode 100644
index 49d5468c9bd9654e1451ebf49299f4743ea8fde2..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/iteration_macros.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//=======================================================================
-// Copyright 2001 Indiana University.
-// Author: Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/iteration_macros.hpp>
-
-enum family { Jeanie, Debbie, Rick, John, Amanda, Margaret, Benjamin, N };
-
-int main()
-{
- using namespace boost;
- const char *name[] = { "Jeanie", "Debbie", "Rick", "John", "Amanda",
- "Margaret", "Benjamin"
- };
-
- adjacency_list <> g(N);
- add_edge(Jeanie, Debbie, g);
- add_edge(Jeanie, Rick, g);
- add_edge(Jeanie, John, g);
- add_edge(Debbie, Amanda, g);
- add_edge(Rick, Margaret, g);
- add_edge(John, Benjamin, g);
-
- graph_traits<adjacency_list <> >::vertex_iterator i, end;
- graph_traits<adjacency_list <> >::adjacency_iterator ai, a_end;
- property_map<adjacency_list <>, vertex_index_t>::type
- index_map = get(vertex_index, g);
-
- BGL_FORALL_VERTICES(i, g, adjacency_list<>) {
- std::cout << name[get(index_map, i)];
-
- if (out_degree(i, g) == 0)
- std::cout << " has no children";
- else
- std::cout << " is the parent of ";
-
- BGL_FORALL_ADJACENT(i, j, g, adjacency_list<>)
- std::cout << name[get(index_map, j)] << ", ";
- std::cout << std::endl;
- }
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/iterator-property-map-eg.cpp b/Utilities/BGL/boost/graph/example/iterator-property-map-eg.cpp
deleted file mode 100644
index 549a4b9bb7cbcce61e2ec2a6dedf9e7f7d0ecc07..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/iterator-property-map-eg.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <iostream>
-#include <boost/property_map.hpp>
-
-int
-main()
-{
- using namespace boost;
- double x[] = { 0.2, 4.5, 3.2 };
- iterator_property_map < double *, identity_property_map, double, double& > pmap(x);
- std::cout << "x[1] = " << get(pmap, 1) << std::endl;
- put(pmap, 0, 1.7);
- std::cout << "x[0] = " << pmap[0] << std::endl;
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/johnson-eg.cpp b/Utilities/BGL/boost/graph/example/johnson-eg.cpp
deleted file mode 100644
index 10c0e46e6d84619c91cfacff82a4dc3c0adac032..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/johnson-eg.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include <iomanip>
-#include <vector>
-#include <boost/property_map.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/johnson_all_pairs_shortest.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list<vecS, vecS, directedS, no_property,
- property< edge_weight_t, int, property< edge_weight2_t, int > > > Graph;
- const int V = 5;
- typedef std::pair < int, int >Edge;
- Edge edge_array[] =
- { Edge(0, 1), Edge(0, 4), Edge(0, 2), Edge(1, 3), Edge(1, 4),
- Edge(2, 1), Edge(3, 2), Edge(3, 0), Edge(4, 3)
- };
- const std::size_t E = sizeof(edge_array) / sizeof(Edge);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- Graph g(V);
- for (std::size_t j = 0; j < E; ++j)
- add_edge(edge_array[j].first, edge_array[j].second, g);
-#else
- Graph g(edge_array, edge_array + E, V);
-#endif
-
- property_map < Graph, edge_weight_t >::type w = get(edge_weight, g);
- int weights[] = { 3, -4, 8, 1, 7, 4, -5, 2, 6 };
- int *wp = weights;
-
- graph_traits < Graph >::edge_iterator e, e_end;
- for (boost::tie(e, e_end) = edges(g); e != e_end; ++e)
- w[*e] = *wp++;
-
- std::vector < int >d(V, (std::numeric_limits < int >::max)());
- int D[V][V];
- johnson_all_pairs_shortest_paths(g, D, distance_map(&d[0]));
-
- std::cout << " ";
- for (int k = 0; k < V; ++k)
- std::cout << std::setw(5) << k;
- std::cout << std::endl;
- for (int i = 0; i < V; ++i) {
- std::cout << i << " -> ";
- for (int j = 0; j < V; ++j) {
- if (D[i][j] > 20 || D[i][j] < -20)
- std::cout << std::setw(5) << "inf";
- else
- std::cout << std::setw(5) << D[i][j];
- }
- std::cout << std::endl;
- }
-
- std::ofstream fout("figs/johnson-eg.dot");
- fout << "digraph A {\n"
- << " rankdir=LR\n"
- << "size=\"5,3\"\n"
- << "ratio=\"fill\"\n"
- << "edge[style=\"bold\"]\n" << "node[shape=\"circle\"]\n";
-
- graph_traits < Graph >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
- fout << source(*ei, g) << " -> " << target(*ei, g)
- << "[label=" << get(edge_weight, g)[*ei] << "]\n";
-
- fout << "}\n";
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/johnson.expected b/Utilities/BGL/boost/graph/example/johnson.expected
deleted file mode 100644
index 55084c127c904f0f6a73a1d827313de4812aec9f..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/johnson.expected
+++ /dev/null
@@ -1,7 +0,0 @@
- 0 1 2 3 4 5
-0 -> 0 0 -1 -5 0 -4
-1 -> inf 0 1 -3 2 -4
-2 -> inf 3 0 -4 1 -1
-3 -> inf 7 4 0 5 3
-4 -> inf 2 -1 -5 0 -2
-5 -> inf 8 5 1 6 0
diff --git a/Utilities/BGL/boost/graph/example/kevin-bacon.cpp b/Utilities/BGL/boost/graph/example/kevin-bacon.cpp
deleted file mode 100644
index 2678bb05bcdb31f09b391a6cc1d2e7c6b9d4c59c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/kevin-bacon.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <boost/tokenizer.hpp>
-#include <boost/tuple/tuple.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <map>
-
-using namespace boost;
-
-template <typename DistanceMap>
-class bacon_number_recorder : public default_bfs_visitor
-{
-public:
- bacon_number_recorder(DistanceMap dist) : d(dist) { }
-
- template <typename Edge, typename Graph>
- void tree_edge(Edge e, const Graph& g) const
- {
- typename graph_traits<Graph>::vertex_descriptor
- u = source(e, g), v = target(e, g);
- d[v] = d[u] + 1;
- }
-private:
- DistanceMap d;
-};
-
-// Convenience function
-template < typename DistanceMap >
-bacon_number_recorder<DistanceMap>
-record_bacon_number(DistanceMap d)
-{
- return bacon_number_recorder < DistanceMap > (d);
-}
-
-
-int
-main()
-{
- std::ifstream datafile("./kevin-bacon.dat");
- if (!datafile) {
- std::cerr << "No ./kevin-bacon.dat file" << std::endl;
- return EXIT_FAILURE;
- }
-
- typedef adjacency_list < vecS, vecS, undirectedS, property < vertex_name_t,
- std::string >, property < edge_name_t, std::string > > Graph;
- Graph g;
-
- typedef property_map < Graph, vertex_name_t >::type actor_name_map_t;
- actor_name_map_t actor_name = get(vertex_name, g);
- typedef property_map < Graph, edge_name_t >::type movie_name_map_t;
- movie_name_map_t connecting_movie = get(edge_name, g);
-
- typedef graph_traits < Graph >::vertex_descriptor Vertex;
- typedef std::map < std::string, Vertex > NameVertexMap;
- NameVertexMap actors;
-
- for (std::string line; std::getline(datafile, line);) {
- char_delimiters_separator < char >sep(false, "", ";");
- tokenizer <> line_toks(line, sep);
- tokenizer <>::iterator i = line_toks.begin();
- std::string actors_name = *i++;
- NameVertexMap::iterator pos;
- bool inserted;
- Vertex u, v;
- tie(pos, inserted) = actors.insert(std::make_pair(actors_name, Vertex()));
- if (inserted) {
- u = add_vertex(g);
- actor_name[u] = actors_name;
- pos->second = u;
- } else
- u = pos->second;
-
- std::string movie_name = *i++;
-
- tie(pos, inserted) = actors.insert(std::make_pair(*i, Vertex()));
- if (inserted) {
- v = add_vertex(g);
- actor_name[v] = *i;
- pos->second = v;
- } else
- v = pos->second;
-
- graph_traits < Graph >::edge_descriptor e;
- tie(e, inserted) = add_edge(u, v, g);
- if (inserted)
- connecting_movie[e] = movie_name;
-
- }
-
- std::vector < int >bacon_number(num_vertices(g));
-
- Vertex src = actors["Kevin Bacon"];
- bacon_number[src] = 0;
-
- breadth_first_search(g, src,
- visitor(record_bacon_number(&bacon_number[0])));
-
- graph_traits < Graph >::vertex_iterator i, end;
- for (tie(i, end) = vertices(g); i != end; ++i) {
- std::cout << actor_name[*i] << " has a Bacon number of "
- << bacon_number[*i] << std::endl;
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/kevin-bacon.dat b/Utilities/BGL/boost/graph/example/kevin-bacon.dat
deleted file mode 100644
index de17569d170707a06ba330503581e0212e8a3e38..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/kevin-bacon.dat
+++ /dev/null
@@ -1,50 +0,0 @@
-William Shatner;Loaded Weapon 1 (1993);Denise Richards
-Denise Richards;Wild Things (1998);Kevin Bacon
-Patrick Stewart;Prince of Egypt, The (1998);Steve Martin
-Steve Martin;Novocaine (2000);Kevin Bacon
-Gerard Depardieu;Unhook the Stars (1996);Clint Howard
-Clint Howard;My Dog Skip (2000);Kevin Bacon
-Sean Astin;White Water Summer (1987);Kevin Bacon
-Theodore Hesburgh;Rudy (1993);Gerry Becker
-Gerry Becker;Sleepers (1996);Kevin Bacon
-Henry Fonda;Midway (1976);Robert Wagner
-Robert Wagner;Wild Things (1998);Kevin Bacon
-Mark Hamill;Slipstream (1989);Bill Paxton
-Bill Paxton;Apollo 13 (1995);Kevin Bacon
-Harrison Ford;Random Hearts (1999);Steve Altes
-Steve Altes;Hollow Man (2000);Kevin Bacon
-Alec Guinness;Kafka (1991);Theresa Russell
-Theresa Russell;Wild Things (1998);Kevin Bacon
-Carrie Fisher;Soapdish (1991);Elisabeth Shue
-Elisabeth Shue;Hollow Man (2000);Kevin Bacon
-Sean Connery;Rising Sun (1993);Peter Crombie
-Peter Crombie;My Dog Skip (2000);Kevin Bacon
-Dana Young;Bersaglio mobile (1967);Bebe Drake
-Bebe Drake;Report to the Commissioner (1975);William Devane
-A. Paliakov;Kutuzov (1944);Nikolai Brilling
-Nikolai Brilling;Otello (1955);Kathleen Byron
-Kathleen Byron;Saving Private Ryan (1998);Tom Hanks
-Tom Hanks;Apollo 13 (1995);Kevin Bacon
-Zoya Barantsevich;Slesar i kantzler (1923);Nikolai Panov
-Nikolai Panov;Zhenshchina s kinzhalom (1916);Zoia Karabanova
-Zoia Karabanova;Song to Remember, A (1945);William Challee
-William Challee;Irish Whiskey Rebellion (1972);William Devane
-William Devane;Hollow Man (2000);Kevin Bacon
-P. Biryukov;Pikovaya dama (1910);Aleksandr Gromov
-Aleksandr Gromov;Tikhij Don (1930);Yelena Maksimova
-Yelena Maksimova;Bezottsovshchina (1976);Lev Prygunov
-Lev Prygunov;Saint, The (1997);Elisabeth Shue
-Yelena Chaika;Ostrov zabenya (1917);Viktor Tourjansky
-Viktor Tourjansky;Zagrobnaya skitalitsa (1915);Olga Baclanova
-Olga Baclanova;Freaks (1932);Angelo Rossitto
-Angelo Rossitto;Dark, The (1979);William Devane
-Christel Holch;Hvide Slavehandel, Den (1910/I);Aage Schmidt
-Aage Schmidt;Begyndte ombord, Det (1937);Valso Holm
-Valso Holm;Spion 503 (1958);Max von Sydow
-Max von Sydow;Judge Dredd (1995);Diane Lane
-Diane Lane;My Dog Skip (2000);Kevin Bacon
-Val Kilmer;Saint, The (1997);Elisabeth Shue
-Marilyn Monroe;Niagara (1953);George Ives
-George Ives;Stir of Echoes (1999);Kevin Bacon
-Jacques Perrin;Deserto dei tartari, Il (1976);Vittorio Gassman
-Vittorio Gassman;Sleepers (1996);Kevin Bacon
diff --git a/Utilities/BGL/boost/graph/example/kevin_bacon.expected b/Utilities/BGL/boost/graph/example/kevin_bacon.expected
deleted file mode 100644
index c49f55c63058eae43a865f049adbf5bf6635a3e6..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/kevin_bacon.expected
+++ /dev/null
@@ -1,101 +0,0 @@
-William Shatner was in Loaded Weapon 1 (1993) with Denise Richards
-Denise Richards was in Wild Things (1998) with Kevin Bacon
-Patrick Stewart was in Prince of Egypt, The (1998) with Steve Martin
-Steve Martin was in Novocaine (2000) with Kevin Bacon
-Gerard Depardieu was in Unhook the Stars (1996) with Clint Howard
-Clint Howard was in My Dog Skip (2000) with Kevin Bacon
-Sean Astin was in White Water Summer (1987) with Kevin Bacon
-Theodore Hesburgh was in Rudy (1993) with Gerry Becker
-Gerry Becker was in Sleepers (1996) with Kevin Bacon
-Henry Fonda was in Midway (1976) with Robert Wagner
-Robert Wagner was in Wild Things (1998) with Kevin Bacon
-Mark Hamill was in Slipstream (1989) with Bill Paxton
-Bill Paxton was in Apollo 13 (1995) with Kevin Bacon
-Harrison Ford was in Random Hearts (1999) with Steve Altes
-Steve Altes was in Hollow Man (2000) with Kevin Bacon
-Alec Guinness was in Kafka (1991) with Theresa Russell
-Theresa Russell was in Wild Things (1998) with Kevin Bacon
-Carrie Fisher was in Soapdish (1991) with Elisabeth Shue
-Elisabeth Shue was in Hollow Man (2000) with Kevin Bacon
-Sean Connery was in Rising Sun (1993) with Peter Crombie
-Peter Crombie was in My Dog Skip (2000) with Kevin Bacon
-Dana Young was in Bersaglio mobile (1967) with Bebe Drake
-Bebe Drake was in Report to the Commissioner (1975) with William Devane
-A. Paliakov was in Kutuzov (1944) with Nikolai Brilling
-Nikolai Brilling was in Otello (1955) with Kathleen Byron
-Kathleen Byron was in Saving Private Ryan (1998) with Tom Hanks
-Tom Hanks was in Apollo 13 (1995) with Kevin Bacon
-Zoya Barantsevich was in Slesar i kantzler (1923) with Nikolai Panov
-Nikolai Panov was in Zhenshchina s kinzhalom (1916) with Zoia Karabanova
-Zoia Karabanova was in Song to Remember, A (1945) with William Challee
-William Challee was in Irish Whiskey Rebellion (1972) with William Devane
-William Devane was in Hollow Man (2000) with Kevin Bacon
-P. Biryukov was in Pikovaya dama (1910) with Aleksandr Gromov
-Aleksandr Gromov was in Tikhij Don (1930) with Yelena Maksimova
-Yelena Maksimova was in Bezottsovshchina (1976) with Lev Prygunov
-Lev Prygunov was in Saint, The (1997) with Elisabeth Shue
-Yelena Chaika was in Ostrov zabenya (1917) with Viktor Tourjansky
-Viktor Tourjansky was in Zagrobnaya skitalitsa (1915) with Olga Baclanova
-Olga Baclanova was in Freaks (1932) with Angelo Rossitto
-Angelo Rossitto was in Dark, The (1979) with William Devane
-Christel Holch was in Hvide Slavehandel, Den (1910/I) with Aage Schmidt
-Aage Schmidt was in Begyndte ombord, Det (1937) with Valso Holm
-Valso Holm was in Spion 503 (1958) with Max von Sydow
-Max von Sydow was in Judge Dredd (1995) with Diane Lane
-Diane Lane was in My Dog Skip (2000) with Kevin Bacon
-Val Kilmer was in Saint, The (1997) with Elisabeth Shue
-Marilyn Monroe was in Niagara (1953) with George Ives
-George Ives was in Stir of Echoes (1999) with Kevin Bacon
-Jacques Perrin was in Deserto dei tartari, Il (1976) with Vittorio Gassman
-Vittorio Gassman was in Sleepers (1996) with Kevin Bacon
-William Shatner's bacon number is 2
-Denise Richards's bacon number is 1
-Kevin Bacon's bacon number is 0
-Patrick Stewart's bacon number is 2
-Steve Martin's bacon number is 1
-Gerard Depardieu's bacon number is 2
-Clint Howard's bacon number is 1
-Sean Astin's bacon number is 1
-Theodore Hesburgh's bacon number is 2
-Gerry Becker's bacon number is 1
-Henry Fonda's bacon number is 2
-Robert Wagner's bacon number is 1
-Mark Hamill's bacon number is 2
-Bill Paxton's bacon number is 1
-Harrison Ford's bacon number is 2
-Steve Altes's bacon number is 1
-Alec Guinness's bacon number is 2
-Theresa Russell's bacon number is 1
-Carrie Fisher's bacon number is 2
-Elisabeth Shue's bacon number is 1
-Sean Connery's bacon number is 2
-Peter Crombie's bacon number is 1
-Dana Young's bacon number is 3
-Bebe Drake's bacon number is 2
-William Devane's bacon number is 1
-A. Paliakov's bacon number is 4
-Nikolai Brilling's bacon number is 3
-Kathleen Byron's bacon number is 2
-Tom Hanks's bacon number is 1
-Zoya Barantsevich's bacon number is 5
-Nikolai Panov's bacon number is 4
-Zoia Karabanova's bacon number is 3
-William Challee's bacon number is 2
-P. Biryukov's bacon number is 5
-Aleksandr Gromov's bacon number is 4
-Yelena Maksimova's bacon number is 3
-Lev Prygunov's bacon number is 2
-Yelena Chaika's bacon number is 5
-Viktor Tourjansky's bacon number is 4
-Olga Baclanova's bacon number is 3
-Angelo Rossitto's bacon number is 2
-Christel Holch's bacon number is 5
-Aage Schmidt's bacon number is 4
-Valso Holm's bacon number is 3
-Max von Sydow's bacon number is 2
-Diane Lane's bacon number is 1
-Val Kilmer's bacon number is 2
-Marilyn Monroe's bacon number is 2
-George Ives's bacon number is 1
-Jacques Perrin's bacon number is 2
-Vittorio Gassman's bacon number is 1
diff --git a/Utilities/BGL/boost/graph/example/king_ordering.cpp b/Utilities/BGL/boost/graph/example/king_ordering.cpp
deleted file mode 100644
index f35dcc48e7b0ee174dbc3b01e5f2181482dc5ce0..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/king_ordering.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-// Doug Gregor, D. Kevin McGrath
-//
-// This file is part of the Boost Graph Library
-//
-// You should have received a copy of the License Agreement for the
-// Boost Graph Library along with the software; see the file LICENSE.
-// If not, contact Office of Research, University of Notre Dame, Notre
-// Dame, IN 46556.
-//
-// Permission to modify the code and to distribute modified code is
-// granted, provided the text of this NOTICE is retained, a notice that
-// the code was modified is included with the above COPYRIGHT NOTICE and
-// with the COPYRIGHT NOTICE in the LICENSE file, and that the LICENSE
-// file is distributed with the modified code.
-//
-// LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
-// By way of example, but not limitation, Licensor MAKES NO
-// REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
-// PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE COMPONENTS
-// OR DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS
-// OR OTHER RIGHTS.
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <vector>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/king_ordering.hpp>
-#include <boost/graph/properties.hpp>
-#include <boost/graph/bandwidth.hpp>
-
-/*
- Sample Output
- original bandwidth: 8
- Reverse Cuthill-McKee ordering starting at: 6
- 8 3 0 9 2 5 1 4 7 6
- bandwidth: 4
- Reverse Cuthill-McKee ordering starting at: 0
- 9 1 4 6 7 2 8 5 3 0
- bandwidth: 4
- Reverse Cuthill-McKee ordering:
- 0 8 5 7 3 6 4 2 1 9
- bandwidth: 4
- */
-int main(int , char* [])
-{
- using namespace boost;
- using namespace std;
- typedef adjacency_list<vecS, vecS, undirectedS,
- property<vertex_color_t, default_color_type,
- property<vertex_degree_t,int> > > Graph;
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::vertices_size_type size_type;
-
- typedef std::pair<std::size_t, std::size_t> Pair;
- Pair edges[14] = { Pair(0,3), //a-d
- Pair(0,5), //a-f
- Pair(1,2), //b-c
- Pair(1,4), //b-e
- Pair(1,6), //b-g
- Pair(1,9), //b-j
- Pair(2,3), //c-d
- Pair(2,4), //c-e
- Pair(3,5), //d-f
- Pair(3,8), //d-i
- Pair(4,6), //e-g
- Pair(5,6), //f-g
- Pair(5,7), //f-h
- Pair(6,7) }; //g-h
-
- Graph G(10);
- for (int i = 0; i < 14; ++i)
- add_edge(edges[i].first, edges[i].second, G);
-
- graph_traits<Graph>::vertex_iterator ui, ui_end;
-
- property_map<Graph,vertex_degree_t>::type deg = get(vertex_degree, G);
- for (boost::tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui)
- deg[*ui] = degree(*ui, G);
-
- property_map<Graph, vertex_index_t>::type
- index_map = get(vertex_index, G);
-
- std::cout << "original bandwidth: " << bandwidth(G) << std::endl;
-
- std::vector<Vertex> inv_perm(num_vertices(G));
- std::vector<size_type> perm(num_vertices(G));
- {
- Vertex s = vertex(6, G);
- //king_ordering
- king_ordering(G, s, inv_perm.rbegin(), get(vertex_color, G),
- get(vertex_degree, G));
- cout << "King ordering starting at: " << s << endl;
- cout << " ";
- for (std::vector<Vertex>::const_iterator i = inv_perm.begin();
- i != inv_perm.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != inv_perm.size(); ++c)
- perm[index_map[inv_perm[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
- {
- Vertex s = vertex(0, G);
- //king_ordering
- king_ordering(G, s, inv_perm.rbegin(), get(vertex_color, G),
- get(vertex_degree, G));
- cout << "King ordering starting at: " << s << endl;
- cout << " ";
- for (std::vector<Vertex>::const_iterator i=inv_perm.begin();
- i != inv_perm.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != inv_perm.size(); ++c)
- perm[index_map[inv_perm[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
-
- {
- //king_ordering
- king_ordering(G, inv_perm.rbegin(), get(vertex_color, G),
- make_degree_map(G));
-
- cout << "King ordering:" << endl;
- cout << " ";
- for (std::vector<Vertex>::const_iterator i=inv_perm.begin();
- i != inv_perm.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != inv_perm.size(); ++c)
- perm[index_map[inv_perm[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/knights-tour.cpp b/Utilities/BGL/boost/graph/example/knights-tour.cpp
deleted file mode 100644
index 292bdfa23a049170147a4496552a059106306cd5..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/knights-tour.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <stdlib.h>
-#include <iostream>
-#include <stack>
-#include <queue>
-#include <boost/operators.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/visitors.hpp>
-#include <boost/property_map.hpp>
-
-using namespace boost;
-
-typedef
-std::pair < int, int >
- Position;
-Position
- knight_jumps[8] = {
- Position(2, -1),
- Position(1, -2),
- Position(-1, -2),
- Position(-2, -1),
- Position(-2, 1),
- Position(-1, 2),
- Position(1, 2),
- Position(2, 1)
-};
-
-
-Position
-operator + (const Position & p1, const Position & p2)
-{
- return Position(p1.first + p2.first, p1.second + p2.second);
-}
-
-struct knights_tour_graph;
-struct knight_adjacency_iterator:
- public
- boost::forward_iterator_helper <
- knight_adjacency_iterator,
- Position,
- std::ptrdiff_t,
- Position *,
- Position >
-{
- knight_adjacency_iterator()
- {
- }
- knight_adjacency_iterator(int ii, Position p, const knights_tour_graph & g)
- :
- m_pos(p),
- m_g(&g),
- m_i(ii)
- {
- valid_position();
- }
- Position operator *() const
- {
- return
- m_pos +
- knight_jumps[m_i];
- }
- void
- operator++ ()
- {
- ++m_i;
- valid_position();
- }
- bool
- operator == (const knight_adjacency_iterator & x) const {
- return
- m_i ==
- x.
- m_i;
- }
-protected:
- void
- valid_position();
- Position
- m_pos;
- const knights_tour_graph *
- m_g;
- int
- m_i;
-};
-
-struct knights_tour_graph
-{
- typedef Position
- vertex_descriptor;
- typedef
- std::pair <
- vertex_descriptor,
- vertex_descriptor >
- edge_descriptor;
- typedef knight_adjacency_iterator
- adjacency_iterator;
- typedef void
- out_edge_iterator;
- typedef void
- in_edge_iterator;
- typedef void
- edge_iterator;
- typedef void
- vertex_iterator;
- typedef int
- degree_size_type;
- typedef int
- vertices_size_type;
- typedef int
- edges_size_type;
- typedef directed_tag
- directed_category;
- typedef disallow_parallel_edge_tag
- edge_parallel_category;
- typedef adjacency_graph_tag
- traversal_category;
- knights_tour_graph(int n):
- m_board_size(n)
- {
- }
- int
- m_board_size;
-};
-int
-num_vertices(const knights_tour_graph & g)
-{
- return g.m_board_size * g.m_board_size;
-}
-
-void
-knight_adjacency_iterator::valid_position()
-{
- Position new_pos = m_pos + knight_jumps[m_i];
- while (m_i < 8 && (new_pos.first < 0 || new_pos.second < 0
- || new_pos.first >= m_g->m_board_size
- || new_pos.second >= m_g->m_board_size)) {
- ++m_i;
- new_pos = m_pos + knight_jumps[m_i];
- }
-}
-
-
-std::pair < knights_tour_graph::adjacency_iterator,
- knights_tour_graph::adjacency_iterator >
-adjacent_vertices(knights_tour_graph::vertex_descriptor v,
- const knights_tour_graph & g)
-{
- typedef knights_tour_graph::adjacency_iterator Iter;
- return std::make_pair(Iter(0, v, g), Iter(8, v, g));
-}
-
-
-struct compare_first
-{
- template < typename P > bool operator() (const P & x, const P & y)
- {
- return x.first < y.first;
- }
-};
-
-template < typename Graph, typename TimePropertyMap >
- bool backtracking_search(Graph & g,
- typename graph_traits <
- Graph >::vertex_descriptor src,
- TimePropertyMap time_map)
-{
- typedef typename graph_traits < Graph >::vertex_descriptor Vertex;
- typedef std::pair < int, Vertex > P;
- std::stack < P > S;
- int time_stamp = 0;
-
- S.push(std::make_pair(time_stamp, src));
- while (!S.empty()) {
- Vertex x;
- tie(time_stamp, x) = S.top();
- put(time_map, x, time_stamp);
- // all vertices have been visited, success!
- if (time_stamp == num_vertices(g) - 1)
- return true;
-
- bool deadend = true;
- typename graph_traits < Graph >::adjacency_iterator i, end;
- for (tie(i, end) = adjacent_vertices(x, g); i != end; ++i)
- if (get(time_map, *i) == -1) {
- S.push(std::make_pair(time_stamp + 1, *i));
- deadend = false;
- }
-
- if (deadend) {
- put(time_map, x, -1);
- S.pop();
- tie(time_stamp, x) = S.top();
- while (get(time_map, x) != -1) { // unwind stack to last unexplored vertex
- put(time_map, x, -1);
- S.pop();
- tie(time_stamp, x) = S.top();
- }
- }
-
- } // while (!S.empty())
- return false;
-}
-
-template < typename Vertex, typename Graph, typename TimePropertyMap > int
-number_of_successors(Vertex x, Graph & g, TimePropertyMap time_map)
-{
- int s_x = 0;
- typename graph_traits < Graph >::adjacency_iterator i, end;
- for (tie(i, end) = adjacent_vertices(x, g); i != end; ++i)
- if (get(time_map, *i) == -1)
- ++s_x;
- return s_x;
-}
-
-template < typename Graph, typename TimePropertyMap >
- bool warnsdorff(Graph & g,
- typename graph_traits < Graph >::vertex_descriptor src,
- TimePropertyMap time_map)
-{
- typedef typename graph_traits < Graph >::vertex_descriptor Vertex;
- typedef std::pair < int, Vertex > P;
- std::stack < P > S;
- int time_stamp = 0;
-
- S.push(std::make_pair(time_stamp, src));
- while (!S.empty()) {
- Vertex x;
- tie(time_stamp, x) = S.top();
- put(time_map, x, time_stamp);
- // all vertices have been visited, success!
- if (time_stamp == num_vertices(g) - 1)
- return true;
-
- // Put adjacent vertices into a local priority queue
- std::priority_queue < P, std::vector < P >, compare_first > Q;
- typename graph_traits < Graph >::adjacency_iterator i, end;
- int num_succ;
- for (tie(i, end) = adjacent_vertices(x, g); i != end; ++i)
- if (get(time_map, *i) == -1) {
- num_succ = number_of_successors(*i, g, time_map);
- Q.push(std::make_pair(num_succ, *i));
- }
- bool deadend = Q.empty();
- // move vertices from local priority queue to the stack
- for (; !Q.empty(); Q.pop()) {
- tie(num_succ, x) = Q.top();
- S.push(std::make_pair(time_stamp + 1, x));
- }
- if (deadend) {
- put(time_map, x, -1);
- S.pop();
- tie(time_stamp, x) = S.top();
- while (get(time_map, x) != -1) { // unwind stack to last unexplored vertex
- put(time_map, x, -1);
- S.pop();
- tie(time_stamp, x) = S.top();
- }
- }
-
- } // while (!S.empty())
- return false;
-}
-
-
-struct board_map
-{
- typedef int value_type;
- typedef Position key_type;
- typedef read_write_property_map_tag category;
- board_map(int *b, int n):m_board(b), m_size(n)
- {
- }
- friend int get(const board_map & ba, Position p);
- friend void put(const board_map & ba, Position p, int v);
- friend std::ostream & operator << (std::ostream & os, const board_map & ba);
-private:
- int *m_board;
- int m_size;
-};
-
-int
-get(const board_map & ba, Position p)
-{
- return ba.m_board[p.first * ba.m_size + p.second];
-}
-
-void
-put(const board_map & ba, Position p, int v)
-{
- ba.m_board[p.first * ba.m_size + p.second] = v;
-}
-
-std::ostream & operator << (std::ostream & os, const board_map & ba) {
- for (int i = 0; i < ba.m_size; ++i) {
- for (int j = 0; j < ba.m_size; ++j)
- os << get(ba, Position(i, j)) << "\t";
- os << std::endl;
- }
- return os;
-}
-
-int
-main(int argc, char *argv[])
-{
- int
- N;
- if (argc == 2)
- N = atoi(argv[1]);
- else
- N = 8;
-
- knights_tour_graph
- g(N);
- int *
- board =
- new int[num_vertices(g)];
- board_map
- chessboard(board, N);
- for (int i = 0; i < N; ++i)
- for (int j = 0; j < N; ++j)
- put(chessboard, Position(i, j), -1);
-
- bool
- ret =
- warnsdorff(g, Position(0, 0), chessboard);
-
- if (ret)
- for (int i = 0; i < N; ++i) {
- for (int j = 0; j < N; ++j)
- std::cout << get(chessboard, Position(i, j)) << "\t";
- std::cout << std::endl;
- } else
- std::cout << "method failed" << std::endl;
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/knights_tour.expected b/Utilities/BGL/boost/graph/example/knights_tour.expected
deleted file mode 100644
index a7f230b463605361702b3d454ebda6da285bf782..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/knights_tour.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-0 13 28 61 10 15 18 47
-29 36 11 14 27 46 9 16
-12 1 62 37 60 17 48 19
-35 30 59 54 49 26 45 8
-2 55 34 63 38 53 20 25
-31 58 39 52 23 50 7 44
-40 3 56 33 42 5 24 21
-57 32 41 4 51 22 43 6
diff --git a/Utilities/BGL/boost/graph/example/kruskal-example.cpp b/Utilities/BGL/boost/graph/example/kruskal-example.cpp
deleted file mode 100644
index 23d360570a88dfed25eeb8f099dd2cbc2a81d049..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/kruskal-example.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/kruskal_min_spanning_tree.hpp>
-#include <iostream>
-#include <fstream>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < vecS, vecS, undirectedS,
- no_property, property < edge_weight_t, int > > Graph;
- typedef graph_traits < Graph >::edge_descriptor Edge;
- typedef graph_traits < Graph >::vertex_descriptor Vertex;
- typedef std::pair<int, int> E;
-
- const int num_nodes = 5;
- E edge_array[] = { E(0, 2), E(1, 3), E(1, 4), E(2, 1), E(2, 3),
- E(3, 4), E(4, 0), E(4, 1)
- };
- int weights[] = { 1, 1, 2, 7, 3, 1, 1, 1 };
- std::size_t num_edges = sizeof(edge_array) / sizeof(E);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- Graph g(num_nodes);
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, g);
- for (std::size_t j = 0; j < num_edges; ++j) {
- Edge e; bool inserted;
- tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g);
- weightmap[e] = weights[j];
- }
-#else
- Graph g(edge_array, edge_array + num_edges, weights, num_nodes);
-#endif
- property_map < Graph, edge_weight_t >::type weight = get(edge_weight, g);
- std::vector < Edge > spanning_tree;
-
- kruskal_minimum_spanning_tree(g, std::back_inserter(spanning_tree));
-
- std::cout << "Print the edges in the MST:" << std::endl;
- for (std::vector < Edge >::iterator ei = spanning_tree.begin();
- ei != spanning_tree.end(); ++ei) {
- std::cout << source(*ei, g) << " <--> " << target(*ei, g)
- << " with weight of " << weight[*ei]
- << std::endl;
- }
-
- std::ofstream fout("figs/kruskal-eg.dot");
- fout << "graph A {\n"
- << " rankdir=LR\n"
- << " size=\"3,3\"\n"
- << " ratio=\"filled\"\n"
- << " edge[style=\"bold\"]\n" << " node[shape=\"circle\"]\n";
- graph_traits<Graph>::edge_iterator eiter, eiter_end;
- for (tie(eiter, eiter_end) = edges(g); eiter != eiter_end; ++eiter) {
- fout << source(*eiter, g) << " -- " << target(*eiter, g);
- if (std::find(spanning_tree.begin(), spanning_tree.end(), *eiter)
- != spanning_tree.end())
- fout << "[color=\"black\", label=\"" << get(edge_weight, g, *eiter)
- << "\"];\n";
- else
- fout << "[color=\"gray\", label=\"" << get(edge_weight, g, *eiter)
- << "\"];\n";
- }
- fout << "}\n";
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/kruskal-telephone.cpp b/Utilities/BGL/boost/graph/example/kruskal-telephone.cpp
deleted file mode 100644
index 1a24e77f337ca3e49a0528d89e1ee96f0a473714..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/kruskal-telephone.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <boost/lexical_cast.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/kruskal_min_spanning_tree.hpp>
-
-int
-main()
-{
- using namespace boost;
- GraphvizGraph g_dot;
- read_graphviz("figs/telephone-network.dot", g_dot);
-
- typedef adjacency_list < vecS, vecS, undirectedS, no_property,
- property < edge_weight_t, int > > Graph;
- Graph g(num_vertices(g_dot));
- property_map < GraphvizGraph, edge_attribute_t >::type
- edge_attr_map = get(edge_attribute, g_dot);
- graph_traits < GraphvizGraph >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) {
- int weight = lexical_cast < int >(edge_attr_map[*ei]["label"]);
- property < edge_weight_t, int >edge_property(weight);
- add_edge(source(*ei, g_dot), target(*ei, g_dot), edge_property, g);
- }
-
- std::vector < graph_traits < Graph >::edge_descriptor > mst;
- typedef std::vector < graph_traits < Graph >::edge_descriptor >::size_type size_type;
- kruskal_minimum_spanning_tree(g, std::back_inserter(mst));
-
- property_map < Graph, edge_weight_t >::type weight = get(edge_weight, g);
- int total_weight = 0;
- for (size_type e = 0; e < mst.size(); ++e)
- total_weight += get(weight, mst[e]);
- std::cout << "total weight: " << total_weight << std::endl;
-
- typedef graph_traits < Graph >::vertex_descriptor Vertex;
- for (size_type i = 0; i < mst.size(); ++i) {
- Vertex u = source(mst[i], g), v = target(mst[i], g);
- edge_attr_map[edge(u, v, g_dot).first]["color"] = "black";
- }
- std::ofstream out("figs/telephone-mst-kruskal.dot");
- graph_property < GraphvizGraph, graph_edge_attribute_t >::type &
- graph_edge_attr_map = get_property(g_dot, graph_edge_attribute);
- graph_edge_attr_map["color"] = "gray";
- graph_edge_attr_map["style"] = "bold";
- write_graphviz(out, g_dot);
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/kruskal.expected b/Utilities/BGL/boost/graph/example/kruskal.expected
deleted file mode 100644
index 7fa4320ffb079dfcb0d94c85ace6714656755c46..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/kruskal.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-Print the edge in MST:
-0 <--> 2 with weight of 1
-3 <--> 4 with weight of 1
-4 <--> 0 with weight of 1
-1 <--> 3 with weight of 1
diff --git a/Utilities/BGL/boost/graph/example/last-mod-time.cpp b/Utilities/BGL/boost/graph/example/last-mod-time.cpp
deleted file mode 100644
index 4788dd72b278cc2a1af66d565e081c3d846b043e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/last-mod-time.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename VertexNamePropertyMap > void
-read_graph_file(std::istream & graph_in, std::istream & name_in,
- Graph & g, VertexNamePropertyMap name_map)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- typename graph_traits < Graph >::vertex_descriptor u;
- typename property_traits < VertexNamePropertyMap >::value_type name;
-
- graph_in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) { // Add n vertices to the graph
- u = add_vertex(g);
- name_in >> name;
- put(name_map, u, name); // ** Attach name property to vertex u **
- }
- size_type src, targ;
- while (graph_in >> src) // Read in edges
- if (graph_in >> targ)
- add_edge(src, targ, g); // add an edge to the graph
- else
- break;
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS, // The graph is directed
- property < vertex_name_t, std::string > // Add a vertex property
- >graph_type;
-
- graph_type g; // use default constructor to create empty graph
- std::ifstream file_in("makefile-dependencies.dat"),
- name_in("makefile-target-names.dat");
- if (!file_in) {
- std::cerr << "** Error: could not open file makefile-target-names.dat"
- << std::endl;
- exit(-1);
- }
- // Obtain internal property map from the graph
- property_map < graph_type, vertex_name_t >::type name_map =
- get(vertex_name, g);
- read_graph_file(file_in, name_in, g, name_map);
-
- // Create storage for last modified times
- std::vector < time_t > last_mod_vec(num_vertices(g));
- // Create nickname for the property map type
- typedef iterator_property_map < std::vector < time_t >::iterator,
- property_map < graph_type, vertex_index_t >::type, time_t, time_t&> iter_map_t;
- // Create last modified time property map
- iter_map_t mod_time_map(last_mod_vec.begin(), get(vertex_index, g));
-
- property_map < graph_type, vertex_name_t >::type name = get(vertex_name, g);
- struct stat stat_buf;
- graph_traits < graph_type >::vertex_descriptor u;
- typedef graph_traits < graph_type >::vertex_iterator vertex_iter_t;
- std::pair < vertex_iter_t, vertex_iter_t > p;
- for (p = vertices(g); p.first != p.second; ++p.first) {
- u = *p.first;
- if (stat(name[u].c_str(), &stat_buf) != 0)
- std::cerr << "error in stat() for file " << name[u] << std::endl;
- put(mod_time_map, u, stat_buf.st_mtime);
- }
-
- for (p = vertices(g); p.first != p.second; ++p.first) {
- std::cout << name[*p.first] << " was last modified at "
- << ctime(&mod_time_map[*p.first]);
- }
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/leda-concept-check.cpp b/Utilities/BGL/boost/graph/example/leda-concept-check.cpp
deleted file mode 100644
index 21fc16060d9f3b952bd0139158dcbd10ac4bae04..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/leda-concept-check.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/graph_concepts.hpp>
-#include <boost/graph/leda_graph.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef leda::GRAPH < int, int >Graph;
- function_requires < VertexListGraphConcept < Graph > >();
- function_requires < BidirectionalGraphConcept < Graph > >();
- function_requires < VertexMutableGraphConcept < Graph > >();
- function_requires < EdgeMutableGraphConcept < Graph > >();
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/leda-graph-eg.cpp b/Utilities/BGL/boost/graph/example/leda-graph-eg.cpp
deleted file mode 100644
index 81449a669543d86b291a1e64f74a5c570441b140..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/leda-graph-eg.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/graph/leda_graph.hpp>
-#include <iostream>
-#undef string // LEDA macro!
-int
-main()
-{
- using namespace boost;
- typedef leda::GRAPH < std::string, int >graph_t;
- graph_t g;
- g.new_node("Philoctetes");
- g.new_node("Heracles");
- g.new_node("Alcmena");
- g.new_node("Eurystheus");
- g.new_node("Amphitryon");
- typedef property_map < graph_t, vertex_all_t >::type NodeMap;
- NodeMap node_name_map = get(vertex_all, g);
- graph_traits < graph_t >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- std::cout << node_name_map[*vi] << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/leda-regression.cfg b/Utilities/BGL/boost/graph/example/leda-regression.cfg
deleted file mode 100644
index 5009fc4dd48528be42398e5d703ab55ca581aee4..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/leda-regression.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-// Boost Graph Library LEDA examples regression test configuration file
-//
-// From the boost/status directory, run
-// ./regression --tests ../libs/graph/example/leda-regression.cfg -o graph-leda-eg.html
-//
-// Please keep the entries ordered alphabetically by the test's file name.
-
-compile libs/graph/example/leda-concept-check.cpp
-compile libs/graph/example/leda-graph-eg.cpp
-compile libs/graph/example/topo-sort-with-leda.cpp
diff --git a/Utilities/BGL/boost/graph/example/loops_dfs.cpp b/Utilities/BGL/boost/graph/example/loops_dfs.cpp
deleted file mode 100644
index 66855b8893230b66a8a73e4aa05abb5ea5a87cb3..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/loops_dfs.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <stack>
-#include <map>
-#include <boost/lexical_cast.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/copy.hpp>
-#include <boost/graph/reverse_graph.hpp>
-
-using namespace boost;
-
-template < typename OutputIterator >
-class back_edge_recorder : public default_dfs_visitor
-{
-public:
- back_edge_recorder(OutputIterator out):m_out(out) { }
-
- template < typename Edge, typename Graph >
- void back_edge(Edge e, const Graph &)
- {
- *m_out++ = e;
- }
-private:
- OutputIterator m_out;
-};
-
-// object generator function
-template < typename OutputIterator >
-back_edge_recorder < OutputIterator >
-make_back_edge_recorder(OutputIterator out)
-{
- return back_edge_recorder < OutputIterator > (out);
-}
-
-template < typename Graph, typename Loops > void
-find_loops(typename graph_traits < Graph >::vertex_descriptor entry,
- const Graph & g,
- Loops & loops) // A container of sets of vertices
-{
- function_requires < BidirectionalGraphConcept < Graph > >();
- typedef typename graph_traits < Graph >::edge_descriptor Edge;
- typedef typename graph_traits < Graph >::vertex_descriptor Vertex;
- std::vector < Edge > back_edges;
- std::vector < default_color_type > color_map(num_vertices(g));
- depth_first_visit(g, entry,
- make_back_edge_recorder(std::back_inserter(back_edges)),
- make_iterator_property_map(color_map.begin(),
- get(vertex_index, g), color_map[0]));
-
- for (std::vector < Edge >::size_type i = 0; i < back_edges.size(); ++i) {
- typename Loops::value_type x;
- loops.push_back(x);
- compute_loop_extent(back_edges[i], g, loops.back());
- }
-}
-
-template < typename Graph, typename Set > void
-compute_loop_extent(typename graph_traits <
- Graph >::edge_descriptor back_edge, const Graph & g,
- Set & loop_set)
-{
- function_requires < BidirectionalGraphConcept < Graph > >();
- typedef typename graph_traits < Graph >::vertex_descriptor Vertex;
- typedef color_traits < default_color_type > Color;
-
- Vertex loop_head, loop_tail;
- loop_tail = source(back_edge, g);
- loop_head = target(back_edge, g);
-
- std::vector < default_color_type >
- reachable_from_head(num_vertices(g), Color::white());
- default_color_type c;
- depth_first_visit(g, loop_head, default_dfs_visitor(),
- make_iterator_property_map(reachable_from_head.begin(),
- get(vertex_index, g), c));
-
- std::vector < default_color_type > reachable_to_tail(num_vertices(g));
- reverse_graph < Graph > reverse_g(g);
- depth_first_visit(reverse_g, loop_tail, default_dfs_visitor(),
- make_iterator_property_map(reachable_to_tail.begin(),
- get(vertex_index, g), c));
-
- typename graph_traits < Graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- if (reachable_from_head[*vi] != Color::white()
- && reachable_to_tail[*vi] != Color::white())
- loop_set.insert(*vi);
-}
-
-
-int
-main(int argc, char *argv[])
-{
- if (argc < 3) {
- std::cerr << "usage: loops_dfs <in-file> <out-file>" << std::endl;
- return -1;
- }
- GraphvizDigraph g_in;
- read_graphviz(argv[1], g_in);
-
- typedef adjacency_list < vecS, vecS, bidirectionalS,
- GraphvizVertexProperty,
- GraphvizEdgeProperty, GraphvizGraphProperty > Graph;
- typedef graph_traits < Graph >::vertex_descriptor Vertex;
-
- Graph g;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the get_property() function
- get_property(g, graph_name) = "loops";
-#endif
-
- copy_graph(g_in, g);
-
- typedef std::set < Vertex > set_t;
- typedef std::list < set_t > list_of_sets_t;
- list_of_sets_t loops;
- Vertex entry = *vertices(g).first;
-
- find_loops(entry, g, loops);
-
- property_map<Graph, vertex_attribute_t>::type vattr_map = get(vertex_attribute, g);
- property_map<Graph, edge_attribute_t>::type eattr_map = get(edge_attribute, g);
- graph_traits < Graph >::edge_iterator ei, ei_end;
-
- for (list_of_sets_t::iterator i = loops.begin(); i != loops.end(); ++i) {
- std::vector < bool > in_loop(num_vertices(g), false);
- for (set_t::iterator j = (*i).begin(); j != (*i).end(); ++j) {
- vattr_map[*j]["color"] = "gray";
- in_loop[*j] = true;
- }
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
- if (in_loop[source(*ei, g)] && in_loop[target(*ei, g)])
- eattr_map[*ei]["color"] = "gray";
- }
-
- std::ofstream loops_out(argv[2]);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the get_property() functions
- loops_out << "digraph loops {\n"
- << "size=\"3,3\"\n"
- << "ratio=\"fill\"\n"
- << "shape=\"box\"\n";
- graph_traits<Graph>::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- loops_out << *vi << "[";
- for (std::map<std::string,std::string>::iterator ai = vattr_map[*vi].begin();
- ai != vattr_map[*vi].end(); ++ai) {
- loops_out << ai->first << "=" << ai->second;
- if (next(ai) != vattr_map[*vi].end())
- loops_out << ", ";
- }
- loops_out<< "]";
- }
-
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
- loops_out << source(*ei, g) << " -> " << target(*ei, g) << "[";
- std::map<std::string,std::string>& attr_map = eattr_map[*ei];
- for (std::map<std::string,std::string>::iterator eai = attr_map.begin();
- eai != attr_map.end(); ++eai) {
- loops_out << eai->first << "=" << eai->second;
- if (next(eai) != attr_map.end())
- loops_out << ", ";
- }
- loops_out<< "]";
- }
- loops_out << "}\n";
-#else
- get_property(g, graph_graph_attribute)["size"] = "3,3";
- get_property(g, graph_graph_attribute)["ratio"] = "fill";
- get_property(g, graph_vertex_attribute)["shape"] = "box";
-
- write_graphviz(loops_out, g,
- make_vertex_attributes_writer(g),
- make_edge_attributes_writer(g),
- make_graph_attributes_writer(g));
-#endif
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/makefile-dependencies.dat b/Utilities/BGL/boost/graph/example/makefile-dependencies.dat
deleted file mode 100644
index 8772cefb0728335eed395ae323f8abcdf273cfcc..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/makefile-dependencies.dat
+++ /dev/null
@@ -1,20 +0,0 @@
-15
-0 5
-0 7
-0 11
-1 5
-1 11
-2 5
-2 9
-2 11
-3 7
-4 5
-5 13
-6 7
-7 13
-8 9
-9 12
-10 11
-11 12
-12 14
-13 12
diff --git a/Utilities/BGL/boost/graph/example/makefile-target-names.dat b/Utilities/BGL/boost/graph/example/makefile-target-names.dat
deleted file mode 100644
index 166cbb0e2dcadf5fa1869ff605c52d2234a30adc..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/makefile-target-names.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-dax.h
-yow.h
-boz.h
-zow.h
-bar.cpp
-bar.o
-foo.cpp
-foo.o
-zig.cpp
-zig.o
-zag.cpp
-zag.o
-libzigzag.a
-libfoobar.a
-killerapp
diff --git a/Utilities/BGL/boost/graph/example/max_flow.cpp b/Utilities/BGL/boost/graph/example/max_flow.cpp
deleted file mode 100644
index 16a0c9ed24af7b49e67810425ffc409a5259d26c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/max_flow.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//=======================================================================
-// Copyright 2000 University of Notre Dame.
-// Authors: Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <string>
-#include <boost/graph/push_relabel_max_flow.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/read_dimacs.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-// Use a DIMACS network flow file as stdin.
-// max_flow < max_flow.dat
-//
-// Sample output:
-// c The total flow:
-// s 13
-//
-// c flow values:
-// f 0 6 3
-// f 0 1 6
-// f 0 2 4
-// f 1 5 1
-// f 1 0 0
-// f 1 3 5
-// f 2 4 4
-// f 2 3 0
-// f 2 0 0
-// f 3 7 5
-// f 3 2 0
-// f 3 1 0
-// f 4 5 4
-// f 4 6 0
-// f 5 4 0
-// f 5 7 5
-// f 6 7 3
-// f 6 4 0
-// f 7 6 0
-// f 7 5 0
-
-int
-main()
-{
- using namespace boost;
-
- typedef adjacency_list_traits<vecS, vecS, directedS> Traits;
- typedef adjacency_list<listS, vecS, directedS,
- property<vertex_name_t, std::string>,
- property<edge_capacity_t, long,
- property<edge_residual_capacity_t, long,
- property<edge_reverse_t, Traits::edge_descriptor> > >
- > Graph;
-
- Graph g;
-
- property_map<Graph, edge_capacity_t>::type
- capacity = get(edge_capacity, g);
- property_map<Graph, edge_reverse_t>::type
- rev = get(edge_reverse, g);
- property_map<Graph, edge_residual_capacity_t>::type
- residual_capacity = get(edge_residual_capacity, g);
-
- Traits::vertex_descriptor s, t;
- read_dimacs_max_flow(g, capacity, rev, s, t);
-
- long flow;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // Use non-named parameter version
- property_map<Graph, vertex_index_t>::type
- indexmap = get(vertex_index, g);
- flow = push_relabel_max_flow(g, s, t, capacity, residual_capacity, rev, indexmap);
-#else
- flow = push_relabel_max_flow(g, s, t);
-#endif
-
- std::cout << "c The total flow:" << std::endl;
- std::cout << "s " << flow << std::endl << std::endl;
-
- std::cout << "c flow values:" << std::endl;
- graph_traits<Graph>::vertex_iterator u_iter, u_end;
- graph_traits<Graph>::out_edge_iterator ei, e_end;
- for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter)
- for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei)
- if (capacity[*ei] > 0)
- std::cout << "f " << *u_iter << " " << target(*ei, g) << " "
- << (capacity[*ei] - residual_capacity[*ei]) << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/max_flow.dat b/Utilities/BGL/boost/graph/example/max_flow.dat
deleted file mode 100644
index bb979a5b88925950f2fe31a2a579607ee70641e7..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/max_flow.dat
+++ /dev/null
@@ -1,25 +0,0 @@
-c This file was generated by genrmf.
-c The parameters are: a: 2 b: 2 c1: 1 c2: 5
-p max 8 20
-n 1 s
-n 8 t
-a 1 7 3
-a 1 2 20
-a 1 3 20
-a 2 6 1
-a 2 1 20
-a 2 4 20
-a 3 5 4
-a 3 4 20
-a 3 1 20
-a 4 8 5
-a 4 3 20
-a 4 2 20
-a 5 6 20
-a 5 7 20
-a 6 5 20
-a 6 8 20
-a 7 8 20
-a 7 5 20
-a 8 7 20
-a 8 6 20
diff --git a/Utilities/BGL/boost/graph/example/max_flow.expected b/Utilities/BGL/boost/graph/example/max_flow.expected
deleted file mode 100644
index f2bb856075b0d6405ffc24e0a359c376f84f21c9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/max_flow.expected
+++ /dev/null
@@ -1,24 +0,0 @@
-c The total flow:
-s 13
-
-c flow values:
-f 0 6 3
-f 0 1 0
-f 0 2 10
-f 1 5 1
-f 1 0 0
-f 1 3 0
-f 2 4 4
-f 2 3 6
-f 2 0 0
-f 3 7 5
-f 3 2 0
-f 3 1 1
-f 4 5 4
-f 4 6 0
-f 5 4 0
-f 5 7 5
-f 6 7 3
-f 6 4 0
-f 7 6 0
-f 7 5 0
diff --git a/Utilities/BGL/boost/graph/example/max_flow2.dat b/Utilities/BGL/boost/graph/example/max_flow2.dat
deleted file mode 100644
index d607777d3b7d0e3b2eac792c9685c8c59dfa7add..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/max_flow2.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-p max 2 1
-n 1 s
-n 2 t
-a 1 2 5
diff --git a/Utilities/BGL/boost/graph/example/max_flow3.dat b/Utilities/BGL/boost/graph/example/max_flow3.dat
deleted file mode 100644
index 1340a4e82cc1abfcc77dccc1057fd96d92f21d3d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/max_flow3.dat
+++ /dev/null
@@ -1,46 +0,0 @@
-p max 12 43
-n 10 s
-n 11 t
-a 1 6 43
-a 1 3 18
-a 1 2 66
-a 1 8 115
-a 2 6 22
-a 2 5 41
-a 2 4 42
-a 2 3 84
-a 2 1 66
-a 2 9 163
-a 3 4 41
-a 3 7 60
-a 3 9 79
-a 3 2 84
-a 3 1 18
-a 4 5 84
-a 4 2 42
-a 4 9 121
-a 4 3 41
-a 4 7 102
-a 5 6 64
-a 5 2 41
-a 5 4 84
-a 6 8 158
-a 6 1 43
-a 6 2 22
-a 6 5 64
-a 6 11 701
-a 7 4 102
-a 7 3 60
-a 8 6 158
-a 8 1 115
-a 9 4 121
-a 9 3 79
-a 9 2 163
-a 10 12 701
-a 12 1 100
-a 12 3 100
-a 12 4 100
-a 12 5 100
-a 12 6 100
-a 12 7 100
-a 12 8 100
diff --git a/Utilities/BGL/boost/graph/example/miles_span.cpp b/Utilities/BGL/boost/graph/example/miles_span.cpp
deleted file mode 100644
index e905867323fd35b774d7c454b7e497e7739adff9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/miles_span.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-// Sample output:
-//
-// The graph miles(100,0,0,0,0,10,0) has 405 edges,
-// and its minimum spanning tree has length 14467.
-//
-
-#include <boost/config.hpp>
-#include <string.h>
-#include <stdio.h>
-#include <boost/graph/stanford_graph.hpp>
-#include <boost/graph/prim_minimum_spanning_tree.hpp>
-
-// A visitor class for accumulating the total length of the minimum
-// spanning tree. The Distance template parameter is for a
-// PropertyMap.
-template <class Distance>
-struct total_length_visitor : public boost::dijkstra_visitor<> {
- typedef typename boost::property_traits<Distance>::value_type D;
- total_length_visitor(D& len, Distance d)
- : _total_length(len), _distance(d) { }
- template <class Vertex, class Graph>
- inline void finish_vertex(Vertex s, Graph& g) {
- _total_length += boost::get(_distance, s);
- }
- D& _total_length;
- Distance _distance;
-};
-
-int main(int argc, char* argv[])
-{
- using namespace boost;
- Graph* g;
-
- unsigned long n = 100;
- unsigned long n_weight = 0;
- unsigned long w_weight = 0;
- unsigned long p_weight = 0;
- unsigned long d = 10;
- long s = 0;
- unsigned long r = 1;
- char* file_name = NULL;
-
- while(--argc){
- if(sscanf(argv[argc],"-n%lu",&n)==1);
- else if(sscanf(argv[argc],"-N%lu",&n_weight)==1);
- else if(sscanf(argv[argc],"-W%lu",&w_weight)==1);
- else if(sscanf(argv[argc],"-P%lu",&p_weight)==1);
- else if(sscanf(argv[argc],"-d%lu",&d)==1);
- else if(sscanf(argv[argc],"-r%lu",&r)==1);
- else if(sscanf(argv[argc],"-s%ld",&s)==1);
- else if(strcmp(argv[argc],"-v")==0) verbose = 1;
- else if(strncmp(argv[argc],"-g",2)==0) file_name = argv[argc]+2;
- else{
- fprintf(stderr,
- "Usage: %s [-nN][-dN][-rN][-sN][-NN][-WN][-PN][-v][-gfoo]\n",
- argv[0]);
- return -2;
- }
- }
- if (file_name) r = 1;
-
- while (r--) {
- if (file_name)
- g = restore_graph(file_name);
- else
- g = miles(n,n_weight,w_weight,p_weight,0L,d,s);
-
- if(g == NULL || g->n <= 1) {
- fprintf(stderr,"Sorry, can't create the graph! (error code %ld)\n",
- panic_code);
- return-1;
- }
-
- printf("The graph %s has %ld edges,\n", g->id, g->m / 2);
-
- long sp_length = 0;
-
- // Use the "z" utility field for distance.
- typedef property_map<Graph*, z_property<long> >::type Distance;
- Distance d = get(z_property<long>(), g);
- // Use the "w" property for parent
- typedef property_map<Graph*, w_property<Vertex*> >::type Parent;
- Parent p = get(w_property<Vertex*>(), g);
- total_length_visitor<Distance> length_vis(sp_length, d);
-
- prim_minimum_spanning_tree(g, p,
- distance_map(get(z_property<long>(), g)).
- weight_map(get(edge_length_t(), g)).
- // Use the "y" utility field for color
- color_map(get(y_property<long>(), g)).
- visitor(length_vis));
-
- printf(" and its minimum spanning tree has length %ld.\n", sp_length);
-
- gb_recycle(g);
- s++;
- }
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/miles_span.expected b/Utilities/BGL/boost/graph/example/miles_span.expected
deleted file mode 100644
index f2ab51101c2b52bb3d4dcba0eead552f6e44f1d2..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/miles_span.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-The graph miles(100,0,0,0,0,10,0) has 405 edges,
- and its minimum spanning tree has length 14467.
diff --git a/Utilities/BGL/boost/graph/example/min_max_paths.cpp b/Utilities/BGL/boost/graph/example/min_max_paths.cpp
deleted file mode 100644
index d9da0ff49081bd03d0aa2e97e4173352f2dbe3ad..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/min_max_paths.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//=======================================================================
-// Copyright 1997-2001 University of Notre Dame.
-// Authors: Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-
-#include <boost/graph/graph_traits.hpp>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/dijkstra_shortest_paths.hpp>
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/transpose_graph.hpp>
-
-/* Output:
-
- distances from start vertex:
- distance(a) = 0
- distance(b) = 3
- distance(c) = 1
- distance(d) = 3
- distance(e) = 3
-
- min-max paths tree
- a --> c
- b -->
- c --> d
- d --> e
- e --> b
-
-*/
-
-int
-main(int , char* [])
-{
- using namespace boost;
-
- typedef adjacency_list<listS, vecS, directedS,
- no_property, property<edge_weight_t, int> > Graph;
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
-
- typedef std::pair<int,int> E;
-
- const char name[] = "abcdef";
-
- const int num_nodes = 6;
- E edges[] = { E(0,2), E(1,1), E(1,3), E(1,4), E(2,1), E(2,3),
- E(3,4), E(4,0), E(4,1) };
- int weights[] = { 1, 2, 1, 2, 7, 3, 1, 1, 1};
- const int n_edges = sizeof(edges)/sizeof(E);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle iterator constructors
- Graph G(num_nodes);
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, G);
- for (std::size_t j = 0; j < sizeof(edges) / sizeof(E); ++j) {
- graph_traits<Graph>::edge_descriptor e; bool inserted;
- tie(e, inserted) = add_edge(edges[j].first, edges[j].second, G);
- weightmap[e] = weights[j];
- }
-#else
- Graph G(edges, edges + n_edges, weights, num_nodes);
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, G);
-#endif
-
- std::vector<Vertex> p(num_vertices(G));
- std::vector<int> d(num_vertices(G));
-
- Vertex s = *(vertices(G).first);
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- dijkstra_shortest_paths
- (G, s, &p[0], &d[0], weightmap, get(vertex_index, G),
- std::greater<int>(), closed_plus<int>(), (std::numeric_limits<int>::max)(), 0,
- default_dijkstra_visitor());
-#else
- dijkstra_shortest_paths
- (G, s, distance_map(&d[0]).
- predecessor_map(&p[0]).
- distance_compare(std::greater<int>()));
-#endif
-
- std::cout << "distances from start vertex:" << std::endl;
- graph_traits<Graph>::vertex_iterator vi, vend;
- for(tie(vi,vend) = vertices(G); vi != vend; ++vi)
- std::cout << "distance(" << name[*vi] << ") = " << d[*vi] << std::endl;
- std::cout << std::endl;
-
- std::cout << "min-max paths tree" << std::endl;
- adjacency_list<> tree(num_nodes);
-
- for(tie(vi,vend) = vertices(G); vi != vend; ++vi)
- if (*vi != p[*vi])
- add_edge(p[*vi], *vi, tree);
-
- print_graph(tree, name);
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/minimum_degree_ordering.cpp b/Utilities/BGL/boost/graph/example/minimum_degree_ordering.cpp
deleted file mode 100644
index 049895cc8b4b7ff5b83e1ee1c3c9d1c8e6d430f7..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/minimum_degree_ordering.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-//-*-c++-*-
-//=======================================================================
-// Copyright 1997-2001 University of Notre Dame.
-// Authors: Lie-Quan Lee
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-/*
- This file is to demo how to use minimum_degree_ordering algorithm.
-
- Important Note: This implementation requires the BGL graph to be
- directed. Therefore, nonzero entry (i, j) in a symmetrical matrix
- A coresponds to two directed edges (i->j and j->i).
-
- The bcsstk01.rsa is an example graph in Harwell-Boeing format,
- and bcsstk01 is the ordering produced by Liu's MMD implementation.
- Link this file with iohb.c to get the harwell-boeing I/O functions.
- To run this example, type:
-
- ./minimum_degree_ordering bcsstk01.rsa bcsstk01
-
-*/
-
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include "boost/graph/adjacency_list.hpp"
-#include "boost/graph/graph_utility.hpp"
-#include "boost/graph/minimum_degree_ordering.hpp"
-#include "iohb.h"
-
-//copy and modify from mtl harwell boeing stream
-struct harwell_boeing
-{
- harwell_boeing(char* filename) {
- int Nrhs;
- char* Type;
- Type = new char[4];
- isComplex = false;
- readHB_info(filename, &M, &N, &nonzeros, &Type, &Nrhs);
- colptr = (int *)malloc((N+1)*sizeof(int));
- if ( colptr == NULL ) IOHBTerminate("Insufficient memory for colptr.\n");
- rowind = (int *)malloc(nonzeros*sizeof(int));
- if ( rowind == NULL ) IOHBTerminate("Insufficient memory for rowind.\n");
-
- if ( Type[0] == 'C' ) {
- isComplex = true;
- val = (double *)malloc(nonzeros*sizeof(double)*2);
- if ( val == NULL ) IOHBTerminate("Insufficient memory for val.\n");
-
- } else {
- if ( Type[0] != 'P' ) {
- val = (double *)malloc(nonzeros*sizeof(double));
- if ( val == NULL ) IOHBTerminate("Insufficient memory for val.\n");
- }
- }
-
- readHB_mat_double(filename, colptr, rowind, val);
-
- cnt = 0;
- col = 0;
- delete [] Type;
- }
-
- ~harwell_boeing() {
- free(colptr);
- free(rowind);
- free(val);
- }
-
- inline int nrows() const { return M; }
-
- int cnt;
- int col;
- int* colptr;
- bool isComplex;
- int M;
- int N;
- int nonzeros;
- int* rowind;
- double* val;
-};
-
-int main(int argc, char* argv[])
-{
- using namespace std;
- using namespace boost;
-
- if (argc < 2) {
- cout << argv[0] << " HB file" << endl;
- return -1;
- }
-
- int delta = 0;
-
- if ( argc >= 4 )
- delta = atoi(argv[3]);
-
- typedef double Type;
-
- harwell_boeing hbs(argv[1]);
-
- //must be BGL directed graph now
- typedef adjacency_list<vecS, vecS, directedS> Graph;
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
-
- int n = hbs.nrows();
-
- cout << "n is " << n << endl;
-
- Graph G(n);
-
- int num_edge = 0;
-
- for (int i = 0; i < n; ++i)
- for (int j = hbs.colptr[i]; j < hbs.colptr[i+1]; ++j)
- if ( (hbs.rowind[j - 1] - 1 ) > i ) {
- add_edge(hbs.rowind[j - 1] - 1, i, G);
- add_edge(i, hbs.rowind[j - 1] - 1, G);
- num_edge++;
- }
-
- cout << "number of off-diagnal elements: " << num_edge << endl;
-
- typedef std::vector<int> Vector;
-
- Vector inverse_perm(n, 0);
- Vector perm(n, 0);
-
- Vector supernode_sizes(n, 1); // init has to be 1
-
- boost::property_map<Graph, vertex_index_t>::type
- id = get(vertex_index, G);
-
- Vector degree(n, 0);
-
- minimum_degree_ordering
- (G,
- make_iterator_property_map(°ree[0], id, degree[0]),
- &inverse_perm[0],
- &perm[0],
- make_iterator_property_map(&supernode_sizes[0], id, supernode_sizes[0]),
- delta, id);
-
- if ( argc >= 3 ) {
- ifstream input(argv[2]);
- if ( input.fail() ) {
- cout << argv[3] << " is failed to open!. " << endl;
- return -1;
- }
- int comp;
- bool is_correct = true;
- int i;
- for ( i=0; i<n; i++ ) {
- input >> comp;
- if ( comp != inverse_perm[i]+1 ) {
- cout << "at i= " << i << ": " << comp
- << " ***is NOT EQUAL to*** " << inverse_perm[i]+1 << endl;
- is_correct = false;
- }
- }
- for ( i=0; i<n; i++ ) {
- input >> comp;
- if ( comp != perm[i]+1 ) {
- cout << "at i= " << i << ": " << comp
- << " ***is NOT EQUAL to*** " << perm[i]+1 << endl;
- is_correct = false;
- }
- }
- if ( is_correct )
- cout << "Permutation and inverse permutation are correct. "<< endl;
- else
- cout << "WARNING -- Permutation or inverse permutation is not the "
- << "same ones generated by Liu's " << endl;
-
- }
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/modify_graph.cpp b/Utilities/BGL/boost/graph/example/modify_graph.cpp
deleted file mode 100644
index 4cd93306deeb2ef9ea82893db8786f62ea7332f5..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/modify_graph.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-using namespace boost;
-
-// Predicate Function for use in remove if
-template <class NamePropertyMap>
-struct name_equals_predicate
-{
- name_equals_predicate(const std::string& x, NamePropertyMap name)
- : m_str(x), m_name(name) { }
-
- template <class Edge>
- bool operator()(const Edge& e) const {
- return m_str == m_name[e];
- }
- std::string m_str;
- NamePropertyMap m_name;
-};
-// helper creation function
-template <class NamePropertyMap>
-inline name_equals_predicate<NamePropertyMap>
-name_equals(const std::string& str, NamePropertyMap name) {
- return name_equals_predicate<NamePropertyMap>(str, name);
-}
-
-template <class MutableGraph>
-void modify_demo(MutableGraph& g)
-{
- typedef graph_traits<MutableGraph> GraphTraits;
- typedef typename GraphTraits::vertices_size_type size_type;
- typedef typename GraphTraits::edge_descriptor edge_descriptor;
- size_type n = 0;
- typename GraphTraits::edges_size_type m = 0;
- typename GraphTraits::vertex_descriptor u, v, w;
- edge_descriptor e, e1, e2;
- typename property_map<MutableGraph, edge_name_t>::type
- name_map = get(edge_name, g);
- bool added;
- typename GraphTraits::vertex_iterator vi, vi_end;
-
- {
- v = add_vertex(g);
-
- assert(num_vertices(g) == n + 1);
- assert(size_type(vertices(g).second - vertices(g).first) == n + 1);
- assert(v == *std::find(vertices(g).first, vertices(g).second, v));
- }
- {
- remove_vertex(v, g);
-
- assert(num_vertices(g) == n);
- assert(size_type(vertices(g).second - vertices(g).first) == n);
- // v is no longer a valid vertex descriptor
- }
- {
- u = add_vertex(g);
- v = add_vertex(g);
-
- std::pair<edge_descriptor, bool> p = add_edge(u, v, g);
-
- assert(num_edges(g) == m + 1);
- assert(p.second == true); // edge should have been added
- assert(source(p.first, g) == u);
- assert(target(p.first, g) == v);
- assert(p.first == *std::find(out_edges(u, g).first,
- out_edges(u, g).second, p.first));
- assert(p.first == *std::find(in_edges(v, g).first,
- in_edges(v, g).second, p.first));
- }
- {
- // use tie() for convenience, avoid using the std::pair
-
- u = add_vertex(g);
- v = add_vertex(g);
-
- tie(e, added) = add_edge(u, v, g);
-
- assert(num_edges(g) == m + 2);
- assert(added == true); // edge should have been added
- assert(source(e, g) == u);
- assert(target(e, g) == v);
- assert(e == *std::find(out_edges(u, g).first, out_edges(u, g).second, e));
- assert(e == *std::find(in_edges(v, g).first, in_edges(v, g).second, e));
- }
- {
- add_edge(u, v, g); // add a parallel edge
-
- remove_edge(u, v, g);
-
- assert(num_edges(g) == m + 1);
- bool exists;
- tie(e, exists) = edge(u, v, g);
- assert(exists == false);
- assert(out_degree(u, g) == 0);
- assert(in_degree(v, g) == 0);
- }
- {
- e = *edges(g).first;
- tie(u, v) = incident(e, g);
-
- remove_edge(e, g);
-
- assert(num_edges(g) == m);
- assert(out_degree(u, g) == 0);
- assert(in_degree(v, g) == 0);
- }
- {
- add_edge(u, v, g);
-
- typename GraphTraits::out_edge_iterator iter, iter_end;
- tie(iter, iter_end) = out_edges(u, g);
-
- remove_edge(iter, g);
-
- assert(num_edges(g) == m);
- assert(out_degree(u, g) == 0);
- assert(in_degree(v, g) == 0);
- }
- {
- w = add_vertex(g);
- tie(e1, added) = add_edge(u, v, g);
- tie(e2, added) = add_edge(v, w, g);
- name_map[e1] = "I-5";
- name_map[e2] = "Route 66";
-
- typename GraphTraits::out_edge_iterator iter, iter_end;
- tie(iter, iter_end) = out_edges(u, g);
-
- remove_edge_if(name_equals("Route 66", name_map), g);
-
- assert(num_edges(g) == m + 1);
-
- remove_edge_if(name_equals("I-5", name_map), g);
-
- assert(num_edges(g) == m);
- assert(out_degree(u, g) == 0);
- assert(out_degree(v, g) == 0);
- assert(in_degree(v, g) == 0);
- assert(in_degree(w, g) == 0);
- }
- {
- tie(e1, added) = add_edge(u, v, g);
- tie(e2, added) = add_edge(u, w, g);
- name_map[e1] = "foo";
- name_map[e2] = "foo";
-
- remove_out_edge_if(u, name_equals("foo", name_map), g);
-
- assert(num_edges(g) == m);
- assert(out_degree(u, g) == 0);
- }
- {
- tie(e1, added) = add_edge(u, v, g);
- tie(e2, added) = add_edge(w, v, g);
- name_map[e1] = "bar";
- name_map[e2] = "bar";
-
- remove_in_edge_if(v, name_equals("bar", name_map), g);
-
- assert(num_edges(g) == m);
- assert(in_degree(v, g) == 0);
- }
- {
- add_edge(u, v, g);
- add_edge(u, w, g);
- add_edge(u, v, g);
- add_edge(v, u, g);
-
- clear_vertex(u, g);
-
- assert(out_degree(u, g) == 0);
-
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- typename GraphTraits::adjacency_iterator ai, ai_end;
- for (tie(ai, ai_end) = adjacent_vertices(*vi, g);
- ai != ai_end; ++ai)
- assert(*ai != u);
- }
- }
-}
-
-int
-main()
-{
- adjacency_list<listS, vecS, bidirectionalS,
- no_property, property<edge_name_t, std::string> > g;
-
- modify_demo(g);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/modify_graph.expected b/Utilities/BGL/boost/graph/example/modify_graph.expected
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Utilities/BGL/boost/graph/example/neighbor_bfs.cpp b/Utilities/BGL/boost/graph/example/neighbor_bfs.cpp
deleted file mode 100644
index e5b888402cae0ef49e13096856dc34f26ba93b69..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/neighbor_bfs.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-
-#include <algorithm>
-#include <vector>
-#include <utility>
-#include <iostream>
-
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/graph/neighbor_bfs.hpp>
-#include <boost/property_map.hpp>
-
-/*
-
- Sample Output:
-
- 0 --> 2
- 1 --> 1 3 4
- 2 --> 1 3 4
- 3 --> 1 4
- 4 --> 0 1
- distances: 0 2 1 2 1
- parent[0] = 0
- parent[1] = 2
- parent[2] = 0
- parent[3] = 2
- parent[4] = 0
-
-*/
-
-using namespace boost;
-
-template <class ParentDecorator>
-struct print_parent {
- print_parent(const ParentDecorator& p_) : p(p_) { }
- template <class Vertex>
- void operator()(const Vertex& v) const {
- std::cout << "parent[" << v << "] = " << p[v] << std::endl;
- }
- ParentDecorator p;
-};
-
-template <class DistanceMap, class PredecessorMap, class ColorMap>
-class distance_and_pred_visitor : public neighbor_bfs_visitor<>
-{
- typedef typename property_traits<ColorMap>::value_type ColorValue;
- typedef color_traits<ColorValue> Color;
-public:
- distance_and_pred_visitor(DistanceMap d, PredecessorMap p, ColorMap c)
- : m_distance(d), m_predecessor(p), m_color(c) { }
-
- template <class Edge, class Graph>
- void tree_out_edge(Edge e, const Graph& g) const
- {
- typename graph_traits<Graph>::vertex_descriptor
- u = source(e, g), v = target(e, g);
- put(m_distance, v, get(m_distance, u) + 1);
- put(m_predecessor, v, u);
- }
- template <class Edge, class Graph>
- void tree_in_edge(Edge e, const Graph& g) const
- {
- typename graph_traits<Graph>::vertex_descriptor
- u = source(e, g), v = target(e, g);
- put(m_distance, u, get(m_distance, v) + 1);
- put(m_predecessor, u, v);
- }
-
- DistanceMap m_distance;
- PredecessorMap m_predecessor;
- ColorMap m_color;
-};
-
-int main(int , char* [])
-{
- typedef adjacency_list<
- mapS, vecS, bidirectionalS,
- property<vertex_color_t, default_color_type>
- > Graph;
-
- typedef property_map<Graph, vertex_color_t>::type
- ColorMap;
-
- Graph G(5);
- add_edge(0, 2, G);
- add_edge(1, 1, G);
- add_edge(1, 3, G);
- add_edge(1, 4, G);
- add_edge(2, 1, G);
- add_edge(2, 3, G);
- add_edge(2, 4, G);
- add_edge(3, 1, G);
- add_edge(3, 4, G);
- add_edge(4, 0, G);
- add_edge(4, 1, G);
-
- typedef Graph::vertex_descriptor Vertex;
-
- // Array to store predecessor (parent) of each vertex. This will be
- // used as a Decorator (actually, its iterator will be).
- std::vector<Vertex> p(num_vertices(G));
- // VC++ version of std::vector has no ::pointer, so
- // I use ::value_type* instead.
- typedef std::vector<Vertex>::value_type* Piter;
-
- // Array to store distances from the source to each vertex . We use
- // a built-in array here just for variety. This will also be used as
- // a Decorator.
- typedef graph_traits<Graph>::vertices_size_type size_type;
- size_type d[5];
- std::fill_n(d, 5, 0);
-
- // The source vertex
- Vertex s = *(vertices(G).first);
- p[s] = s;
- distance_and_pred_visitor<size_type*, Vertex*, ColorMap>
- vis(d, &p[0], get(vertex_color, G));
- neighbor_breadth_first_search
- (G, s, visitor(vis).
- color_map(get(vertex_color, G)));
-
- print_graph(G);
-
- if (num_vertices(G) < 11) {
- std::cout << "distances: ";
-#ifdef BOOST_OLD_STREAM_ITERATORS
- std::copy(d, d + 5, std::ostream_iterator<int, char>(std::cout, " "));
-#else
- std::copy(d, d + 5, std::ostream_iterator<int>(std::cout, " "));
-#endif
- std::cout << std::endl;
-
- std::for_each(vertices(G).first, vertices(G).second,
- print_parent<Piter>(&p[0]));
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/ordered_out_edges.cpp b/Utilities/BGL/boost/graph/example/ordered_out_edges.cpp
deleted file mode 100644
index 93613332cb56c56121f453f85328812ba49c8f3b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/ordered_out_edges.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <functional>
-#include <string>
-
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/properties.hpp>
-
-/*
- Sample output:
-
- 0 --chandler--> 1 --joe--> 1
- 1 --chandler--> 0 --joe--> 0 --curly--> 2 --dick--> 3 --dick--> 3
- 2 --curly--> 1 --tom--> 4
- 3 --dick--> 1 --dick--> 1 --harry--> 4
- 4 --tom--> 2 --harry--> 3
-
- name(0,1) = chandler
-
- name(0,1) = chandler
- name(0,1) = joe
-
- */
-
-template <class StoredEdge>
-struct order_by_name
- : public std::binary_function<StoredEdge,StoredEdge,bool>
-{
- bool operator()(const StoredEdge& e1, const StoredEdge& e2) const {
- // Order by target vertex, then by name.
- // std::pair's operator< does a nice job of implementing
- // lexicographical compare on tuples.
- return std::make_pair(e1.get_target(), boost::get(boost::edge_name, e1))
- < std::make_pair(e2.get_target(), boost::get(boost::edge_name, e2));
- }
-};
-
-#if !defined BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-struct ordered_set_by_nameS { };
-namespace boost {
- template <class ValueType>
- struct container_gen<ordered_set_by_nameS, ValueType> {
- typedef std::multiset<ValueType, order_by_name<ValueType> > type;
- };
-}
-#else
-struct ordered_set_by_nameS {
- template <class T>
- struct bind_ { typedef std::multiset<T, order_by_name<T> > type; };
-};
-namespace boost {
- template <> struct container_selector<ordered_set_by_nameS> {
- typedef ordered_set_by_nameS type;
- };
-}
-#endif
-
-namespace boost {
- template <>
- struct parallel_edge_traits<ordered_set_by_nameS> {
- typedef allow_parallel_edge_tag type;
- };
-}
-
-int
-main()
-{
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
- std::cout << "This program requires partial specialization" << std::endl;
-#else
- using namespace boost;
- typedef property<edge_name_t, std::string> EdgeProperty;
- typedef adjacency_list<ordered_set_by_nameS, vecS, undirectedS,
- no_property, EdgeProperty> graph_type;
- graph_type g;
-
- add_edge(0, 1, EdgeProperty("joe"), g);
- add_edge(1, 2, EdgeProperty("curly"), g);
- add_edge(1, 3, EdgeProperty("dick"), g);
- add_edge(1, 3, EdgeProperty("dick"), g);
- add_edge(2, 4, EdgeProperty("tom"), g);
- add_edge(3, 4, EdgeProperty("harry"), g);
- add_edge(0, 1, EdgeProperty("chandler"), g);
-
- property_map<graph_type, vertex_index_t>::type id = get(vertex_index, g);
- property_map<graph_type, edge_name_t>::type name = get(edge_name, g);
-
- graph_traits<graph_type>::vertex_iterator i, end;
- graph_traits<graph_type>::out_edge_iterator ei, edge_end;
- for (boost::tie(i, end) = vertices(g); i != end; ++i) {
- std::cout << id[*i] << " ";
- for (boost::tie(ei, edge_end) = out_edges(*i, g); ei != edge_end; ++ei)
- std::cout << " --" << name[*ei] << "--> " << id[target(*ei, g)] << " ";
- std::cout << std::endl;
- }
- std::cout << std::endl;
-
- bool found;
- typedef graph_traits<graph_type> Traits;
- Traits::edge_descriptor e;
- Traits::out_edge_iterator e_first, e_last;
-
- tie(e, found) = edge(0, 1, g);
- if (found)
- std::cout << "name(0,1) = " << name[e] << std::endl;
- else
- std::cout << "not found" << std::endl;
- std::cout << std::endl;
-
- tie(e_first, e_last) = edge_range(0, 1, g);
- while (e_first != e_last)
- std::cout << "name(0,1) = " << name[*e_first++] << std::endl;
-#endif
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/ordered_out_edges.expected b/Utilities/BGL/boost/graph/example/ordered_out_edges.expected
deleted file mode 100644
index 63548a1a073d0fb7da5672fb7129aaf2013d41d0..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/ordered_out_edges.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-0 --chandler--> 1 --joe--> 1
-1 --chandler--> 0 --joe--> 0 --curly--> 2 --dick--> 3 --dick--> 3
-2 --curly--> 1 --tom--> 4
-3 --dick--> 1 --dick--> 1 --harry--> 4
-4 --tom--> 2 --harry--> 3
-
-name(0,1) = chandler
-
-name(0,1) = chandler
-name(0,1) = joe
diff --git a/Utilities/BGL/boost/graph/example/ospf-example.cpp b/Utilities/BGL/boost/graph/example/ospf-example.cpp
deleted file mode 100644
index 1533288927d249e457bd886b4524650525821ef9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/ospf-example.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <fstream> // for file I/O
-#include <boost/graph/graphviz.hpp> // for read/write_graphviz()
-#include <boost/graph/dijkstra_shortest_paths.hpp>
-#include <boost/lexical_cast.hpp>
-int
-main()
-{
- using namespace boost;
- GraphvizDigraph g_dot;
- read_graphviz("figs/ospf-graph.dot", g_dot);
-
- typedef adjacency_list < vecS, vecS, directedS, no_property,
- property < edge_weight_t, int > > Graph;
- typedef graph_traits < Graph >::vertex_descriptor vertex_descriptor;
- Graph g(num_vertices(g_dot));
- property_map < GraphvizDigraph, edge_attribute_t >::type
- edge_attr_map = get(edge_attribute, g_dot);
- graph_traits < GraphvizDigraph >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) {
- int weight = lexical_cast < int >(edge_attr_map[*ei]["label"]);
- property < edge_weight_t, int >edge_property(weight);
- add_edge(source(*ei, g_dot), target(*ei, g_dot), edge_property, g);
- }
-
- vertex_descriptor router_six;
- property_map < GraphvizDigraph, vertex_attribute_t >::type
- vertex_attr_map = get(vertex_attribute, g_dot);
- graph_traits < GraphvizDigraph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g_dot); vi != vi_end; ++vi)
- if ("RT6" == vertex_attr_map[*vi]["label"]) {
- router_six = *vi;
- break;
- }
-
- std::vector < vertex_descriptor > parent(num_vertices(g));
- // All vertices start out as there own parent
- typedef graph_traits < Graph >::vertices_size_type size_type;
- for (size_type p = 0; p < num_vertices(g); ++p)
- parent[p] = p;
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- std::vector<int> distance(num_vertices(g));
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, g);
- property_map<Graph, vertex_index_t>::type indexmap = get(vertex_index, g);
- dijkstra_shortest_paths
- (g, router_six, &parent[0], &distance[0], weightmap,
- indexmap, std::less<int>(), closed_plus<int>(),
- (std::numeric_limits<int>::max)(), 0, default_dijkstra_visitor());
-#else
- dijkstra_shortest_paths(g, router_six, predecessor_map(&parent[0]));
-#endif
-
- graph_traits < GraphvizDigraph >::edge_descriptor e;
- for (size_type i = 0; i < num_vertices(g); ++i)
- if (parent[i] != i) {
- e = edge(parent[i], i, g_dot).first;
- edge_attr_map[e]["color"] = "black";
- }
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle write_graphviz :(
- {
- std::ofstream out("figs/ospf-sptree.dot");
- out << "digraph loops {\n"
- << "size=\"3,3\"\n"
- << "ratio=\"fill\"\n"
- << "shape=\"box\"\n";
- graph_traits<Graph>::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- out << *vi << "[";
- for (std::map<std::string,std::string>::iterator ai = vattr_map[*vi].begin();
- ai != vattr_map[*vi].end(); ++ai) {
- out << ai->first << "=" << ai->second;
- if (next(ai) != vattr_map[*vi].end())
- out << ", ";
- }
- out<< "]";
- }
-
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
- out << source(*ei, g) << " -> " << target(*ei, g) << "[";
- std::map<std::string,std::string>& attr_map = eattr_map[*ei];
- for (std::map<std::string,std::string>::iterator eai = attr_map.begin();
- eai != attr_map.end(); ++eai) {
- out << eai->first << "=" << eai->second;
- if (next(eai) != attr_map.end())
- out << ", ";
- }
- out<< "]";
- }
- out << "}\n";
- }
-#else
- graph_property < GraphvizDigraph, graph_edge_attribute_t >::type &
- graph_edge_attr_map = get_property(g_dot, graph_edge_attribute);
- graph_edge_attr_map["color"] = "grey";
- write_graphviz("figs/ospf-sptree.dot", g_dot);
-#endif
-
- std::ofstream rtable("routing-table.dat");
- rtable << "Dest Next Hop Total Cost" << std::endl;
- for (tie(vi, vi_end) = vertices(g_dot); vi != vi_end; ++vi)
- if (parent[*vi] != *vi) {
- rtable << vertex_attr_map[*vi]["label"] << " ";
- vertex_descriptor v = *vi, child;
- int path_cost = 0;
- property_map < Graph, edge_weight_t >::type
- weight_map = get(edge_weight, g);
- do {
- path_cost += get(weight_map, edge(parent[v], v, g).first);
- child = v;
- v = parent[v];
- } while (v != parent[v]);
- rtable << vertex_attr_map[child]["label"] << " ";
- rtable << path_cost << std::endl;
-
- }
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/parallel-compile-time.cpp b/Utilities/BGL/boost/graph/example/parallel-compile-time.cpp
deleted file mode 100644
index f66d1bd90bd74c765c7ab27f3cf777a403281764..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/parallel-compile-time.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include <numeric>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/graph/property_iter_range.hpp>
-#include <boost/graph/depth_first_search.hpp> // for default_dfs_visitor
-
-namespace std
-{
- template < typename T >
- std::istream & operator >> (std::istream & in, std::pair < T, T > &p)
- {
- in >> p.first >> p.second;
- return in;
- }
-}
-
-namespace boost
-{
- enum vertex_compile_cost_t { vertex_compile_cost };
- BOOST_INSTALL_PROPERTY(vertex, compile_cost);
-}
-
-using namespace boost;
-
-typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- listS, // Store vertex set in a std::list
- directedS, // The file dependency graph is directed
- // vertex properties
- property < vertex_name_t, std::string,
- property < vertex_compile_cost_t, float,
- property < vertex_distance_t, float,
- property < vertex_color_t, default_color_type > > > >,
- // an edge property
- property < edge_weight_t, float > >
- file_dep_graph2;
-
-typedef graph_traits<file_dep_graph2>::vertex_descriptor vertex_t;
-typedef graph_traits<file_dep_graph2>::edge_descriptor edge_t;
-
-
-template < typename Graph, typename ColorMap, typename Visitor > void
-dfs_v2(const Graph & g,
- typename graph_traits < Graph >::vertex_descriptor u,
- ColorMap color, Visitor vis)
-{
- typedef typename property_traits < ColorMap >::value_type color_type;
- typedef color_traits < color_type > ColorT;
- color[u] = ColorT::gray();
- vis.discover_vertex(u, g);
- typename graph_traits < Graph >::out_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei)
- if (color[target(*ei, g)] == ColorT::white()) {
- vis.tree_edge(*ei, g);
- dfs_v2(g, target(*ei, g), color, vis);
- } else if (color[target(*ei, g)] == ColorT::gray())
- vis.back_edge(*ei, g);
- else
- vis.forward_or_cross_edge(*ei, g);
- color[u] = ColorT::black();
- vis.finish_vertex(u, g);
-}
-
-template < typename Graph, typename Visitor, typename ColorMap > void
-generic_dfs_v2(const Graph & g, Visitor vis, ColorMap color)
-{
- typedef typename property_traits <ColorMap >::value_type ColorValue;
- typedef color_traits < ColorValue > ColorT;
- typename graph_traits < Graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- color[*vi] = ColorT::white();
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- if (color[*vi] == ColorT::white())
- dfs_v2(g, *vi, color, vis);
-}
-
-
-template < typename OutputIterator >
-struct topo_visitor: public default_dfs_visitor
-{
- topo_visitor(OutputIterator & order):
- topo_order(order)
- {
- }
- template < typename Graph > void
- finish_vertex(typename graph_traits < Graph >::vertex_descriptor u,
- const Graph &)
- {
- *topo_order++ = u;
- }
- OutputIterator & topo_order;
-};
-
-template < typename Graph, typename OutputIterator, typename ColorMap > void
-topo_sort(const Graph & g, OutputIterator topo_order, ColorMap color)
-{
- topo_visitor < OutputIterator > vis(topo_order);
- generic_dfs_v2(g, vis, color);
-}
-
-
-typedef property_map < file_dep_graph2, vertex_name_t >::type name_map_t;
-typedef property_map < file_dep_graph2, vertex_compile_cost_t >::type
- compile_cost_map_t;
-typedef property_map < file_dep_graph2, vertex_distance_t >::type distance_map_t;
-typedef property_map < file_dep_graph2, vertex_color_t >::type color_map_t;
-
-
-int
-main()
-{
- std::ifstream file_in("makefile-dependencies.dat");
- typedef graph_traits < file_dep_graph2 >::vertices_size_type size_type;
- size_type n_vertices;
- file_in >> n_vertices; // read in number of vertices
- std::istream_iterator < std::pair < size_type,
- size_type > >input_begin(file_in), input_end;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- file_dep_graph2 g;
- typedef graph_traits<file_dep_graph2 >::vertex_descriptor vertex_t;
- std::vector<vertex_t> id2vertex;
- for (std::size_t v = 0; v < n_vertices; ++v)
- id2vertex.push_back(add_vertex(g));
- while (input_begin != input_end) {
- size_type i, j;
- tie(i, j) = *input_begin++;
- add_edge(id2vertex[i], id2vertex[j], g);
- }
-#else
- file_dep_graph2 g(input_begin, input_end, n_vertices);
-#endif
-
- name_map_t
- name_map =
- get(vertex_name, g);
- compile_cost_map_t
- compile_cost_map =
- get(vertex_compile_cost, g);
- distance_map_t
- distance_map =
- get(vertex_distance, g);
- color_map_t
- color_map =
- get(vertex_color, g);
-
- {
- std::ifstream name_in("makefile-target-names.dat");
- std::ifstream compile_cost_in("target-compile-costs.dat");
- graph_traits < file_dep_graph2 >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- name_in >> name_map[*vi];
- compile_cost_in >> compile_cost_map[*vi];
- }
-
- }
- std::vector < vertex_t > topo_order(num_vertices(g));
- topo_sort(g, topo_order.rbegin(), color_map);
-
- graph_traits < file_dep_graph2 >::vertex_iterator i, i_end;
- graph_traits < file_dep_graph2 >::adjacency_iterator vi, vi_end;
-
- // find source vertices with zero in-degree by marking all vertices with incoming edges
- for (tie(i, i_end) = vertices(g); i != i_end; ++i)
- color_map[*i] = white_color;
- for (tie(i, i_end) = vertices(g); i != i_end; ++i)
- for (tie(vi, vi_end) = adjacent_vertices(*i, g); vi != vi_end; ++vi)
- color_map[*vi] = black_color;
-
- // initialize distances to zero, or for source vertices, to the compile cost
- for (tie(i, i_end) = vertices(g); i != i_end; ++i)
- if (color_map[*i] == white_color)
- distance_map[*i] = compile_cost_map[*i];
- else
- distance_map[*i] = 0;
-
- std::vector < vertex_t >::iterator ui;
- for (ui = topo_order.begin(); ui != topo_order.end(); ++ui) {
- vertex_t
- u = *
- ui;
- for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi)
- if (distance_map[*vi] < distance_map[u] + compile_cost_map[*vi])
- distance_map[*vi] = distance_map[u] + compile_cost_map[*vi];
- }
-
- graph_property_iter_range < file_dep_graph2,
- vertex_distance_t >::iterator ci, ci_end;
- tie(ci, ci_end) = get_property_iter_range(g, vertex_distance);
- std::cout << "total (parallel) compile time: "
- << *std::max_element(ci, ci_end) << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/prim-example.cpp b/Utilities/BGL/boost/graph/example/prim-example.cpp
deleted file mode 100644
index cdd93f76e824d537d002f8c1c6b5ec048ff72a78..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/prim-example.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/prim_minimum_spanning_tree.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < vecS, vecS, undirectedS,
- property<vertex_distance_t, int>, property < edge_weight_t, int > > Graph;
- typedef std::pair < int, int >E;
- const int num_nodes = 5;
- E edges[] = { E(0, 2), E(1, 3), E(1, 4), E(2, 1), E(2, 3),
- E(3, 4), E(4, 0)
- };
- int weights[] = { 1, 1, 2, 7, 3, 1, 1 };
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- Graph g(num_nodes);
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, g);
- for (std::size_t j = 0; j < sizeof(edges) / sizeof(E); ++j) {
- graph_traits<Graph>::edge_descriptor e; bool inserted;
- tie(e, inserted) = add_edge(edges[j].first, edges[j].second, g);
- weightmap[e] = weights[j];
- }
-#else
- Graph g(edges, edges + sizeof(edges) / sizeof(E), weights, num_nodes);
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, g);
-#endif
- std::vector < graph_traits < Graph >::vertex_descriptor >
- p(num_vertices(g));
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- property_map<Graph, vertex_distance_t>::type distance = get(vertex_distance, g);
- property_map<Graph, vertex_index_t>::type indexmap = get(vertex_index, g);
- prim_minimum_spanning_tree
- (g, *vertices(g).first, &p[0], distance, weightmap, indexmap,
- default_dijkstra_visitor());
-#else
- prim_minimum_spanning_tree(g, &p[0]);
-#endif
-
- for (std::size_t i = 0; i != p.size(); ++i)
- if (p[i] != i)
- std::cout << "parent[" << i << "] = " << p[i] << std::endl;
- else
- std::cout << "parent[" << i << "] = no parent" << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/prim-telephone.cpp b/Utilities/BGL/boost/graph/example/prim-telephone.cpp
deleted file mode 100644
index 34d9dacd7d337370e034f221f166b9706e547dae..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/prim-telephone.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <boost/lexical_cast.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/prim_minimum_spanning_tree.hpp>
-int
-main()
-{
- using namespace boost;
- GraphvizGraph g_dot;
- read_graphviz("figs/telephone-network.dot", g_dot);
-
- typedef adjacency_list < vecS, vecS, undirectedS, no_property,
- property < edge_weight_t, int > > Graph;
- Graph g(num_vertices(g_dot));
- property_map < GraphvizGraph, edge_attribute_t >::type
- edge_attr_map = get(edge_attribute, g_dot);
- graph_traits < GraphvizGraph >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g_dot); ei != ei_end; ++ei) {
- int weight = lexical_cast < int >(edge_attr_map[*ei]["label"]);
- property < edge_weight_t, int >edge_property(weight);
- add_edge(source(*ei, g_dot), target(*ei, g_dot), edge_property, g);
- }
-
- typedef graph_traits < Graph >::vertex_descriptor Vertex;
- std::vector < Vertex > parent(num_vertices(g));
- property_map < Graph, edge_weight_t >::type weight = get(edge_weight, g);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- property_map<Graph, vertex_index_t>::type indexmap = get(vertex_index, g);
- std::vector<std::size_t> distance(num_vertices(g));
- prim_minimum_spanning_tree(g, *vertices(g).first, &parent[0], &distance[0],
- weight, indexmap, default_dijkstra_visitor());
-#else
- prim_minimum_spanning_tree(g, &parent[0]);
-#endif
-
- int total_weight = 0;
- for (int v = 0; v < num_vertices(g); ++v)
- if (parent[v] != v)
- total_weight += get(weight, edge(parent[v], v, g).first);
- std::cout << "total weight: " << total_weight << std::endl;
-
- for (int u = 0; u < num_vertices(g); ++u)
- if (parent[u] != u)
- edge_attr_map[edge(parent[u], u, g_dot).first]["color"] = "black";
- std::ofstream out("figs/telephone-mst-prim.dot");
- graph_property < GraphvizGraph, graph_edge_attribute_t >::type &
- graph_edge_attr_map = get_property(g_dot, graph_edge_attribute);
- graph_edge_attr_map["color"] = "gray";
- write_graphviz(out, g_dot);
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/prim.expected b/Utilities/BGL/boost/graph/example/prim.expected
deleted file mode 100644
index 0a51ff8189b9971ab6e811a04d6c6e3cb0615c73..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/prim.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-parent[a] = a
-parent[b] = a
-parent[c] = f
-parent[d] = c
-parent[e] = d
-parent[f] = g
-parent[g] = h
-parent[h] = a
-parent[i] = c
diff --git a/Utilities/BGL/boost/graph/example/print-adjacent-vertices.cpp b/Utilities/BGL/boost/graph/example/print-adjacent-vertices.cpp
deleted file mode 100644
index 7b1c4b1c9363d1a948c9b948ba62ebebb63de897..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/print-adjacent-vertices.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename VertexNamePropertyMap > void
-read_graph_file(std::istream & graph_in, std::istream & name_in,
- Graph & g, VertexNamePropertyMap name_map)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- typename graph_traits < Graph >::vertex_descriptor u;
- typename property_traits < VertexNamePropertyMap >::value_type name;
-
- graph_in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) { // Add n vertices to the graph
- u = add_vertex(g);
- name_in >> name;
- put(name_map, u, name); // ** Attach name property to vertex u **
- }
- size_type src, targ;
- while (graph_in >> src) // Read in edges
- if (graph_in >> targ)
- add_edge(src, targ, g); // add an edge to the graph
- else
- break;
-}
-
-template < typename Graph, typename VertexNameMap > void
-output_adjacent_vertices(std::ostream & out,
- typename graph_traits < Graph >::vertex_descriptor u,
- const Graph & g, VertexNameMap name_map)
-{
- typename graph_traits < Graph >::adjacency_iterator vi, vi_end;
- out << get(name_map, u) << " -> { ";
- for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi)
- out << get(name_map, *vi) << " ";
- out << "}" << std::endl;
-}
-
-template < typename NameMap > class name_equals_t {
-public:
- name_equals_t(const std::string & n, NameMap map)
- : m_name(n), m_name_map(map)
- {
- }
- template < typename Vertex > bool operator()(Vertex u) const
- {
- return get(m_name_map, u) == m_name;
- }
-private:
- std::string m_name;
- NameMap m_name_map;
-};
-
-// object generator function
-template < typename NameMap >
- inline name_equals_t < NameMap >
-name_equals(const std::string & str, NameMap name)
-{
- return name_equals_t < NameMap > (str, name);
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS, // The graph is directed
- property < vertex_name_t, std::string > // Add a vertex property
- >graph_type;
-
- graph_type g; // use default constructor to create empty graph
- const char* dep_file_name = "makefile-dependencies.dat";
- const char* target_file_name = "makefile-target-names.dat";
- std::ifstream file_in(dep_file_name), name_in(target_file_name);
- if (!file_in) {
- std::cerr << "** Error: could not open file " << dep_file_name
- << std::endl;
- return -1;
- }
- if (!name_in) {
- std::cerr << "** Error: could not open file " << target_file_name
- << std::endl;
- return -1;
- }
- // Obtain internal property map from the graph
- property_map < graph_type, vertex_name_t >::type name_map =
- get(vertex_name, g);
- read_graph_file(file_in, name_in, g, name_map);
-
- graph_traits < graph_type >::vertex_iterator i, end;
- tie(i, end) = vertices(g);
- i = std::find_if(i, end, name_equals("dax.h", get(vertex_name, g)));
- output_adjacent_vertices(std::cout, *i, g, get(vertex_name, g));
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/print-edges.cpp b/Utilities/BGL/boost/graph/example/print-edges.cpp
deleted file mode 100644
index 6c982675d897e6feaae1ec6a3e5e382726db5f3b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/print-edges.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename VertexNamePropertyMap > void
-read_graph_file(std::istream & graph_in, std::istream & name_in,
- Graph & g, VertexNamePropertyMap name_map)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- typename graph_traits < Graph >::vertex_descriptor u;
- typename property_traits < VertexNamePropertyMap >::value_type name;
-
- graph_in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) { // Add n vertices to the graph
- u = add_vertex(g);
- name_in >> name;
- put(name_map, u, name); // ** Attach name property to vertex u **
- }
- size_type src, targ;
- while (graph_in >> src) // Read in edges
- if (graph_in >> targ)
- add_edge(src, targ, g); // add an edge to the graph
- else
- break;
-}
-
-template < typename Graph, typename VertexNameMap > void
-print_dependencies(std::ostream & out, const Graph & g,
- VertexNameMap name_map)
-{
- typename graph_traits < Graph >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
- out << get(name_map, source(*ei, g)) << " -$>$ "
- << get(name_map, target(*ei, g)) << std::endl;
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS, // The graph is directed
- property < vertex_name_t, std::string > // Add a vertex property
- >graph_type;
-
- graph_type g; // use default constructor to create empty graph
- const char* dep_file_name = "makefile-dependencies.dat";
- const char* target_file_name = "makefile-target-names.dat";
- std::ifstream file_in(dep_file_name), name_in(target_file_name);
- if (!file_in) {
- std::cerr << "** Error: could not open file " << dep_file_name
- << std::endl;
- return -1;
- }
- if (!name_in) {
- std::cerr << "** Error: could not open file " << target_file_name
- << std::endl;
- return -1;
- }
-
- // Obtain internal property map from the graph
- property_map < graph_type, vertex_name_t >::type name_map =
- get(vertex_name, g);
- read_graph_file(file_in, name_in, g, name_map);
-
- print_dependencies(std::cout, g, get(vertex_name, g));
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/print-in-edges.cpp b/Utilities/BGL/boost/graph/example/print-in-edges.cpp
deleted file mode 100644
index d2a6f15d1b3608ed26329c197c99a2c803e7f05b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/print-in-edges.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename VertexNamePropertyMap > void
-read_graph_file(std::istream & graph_in, std::istream & name_in,
- Graph & g, VertexNamePropertyMap name_map)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- typename graph_traits < Graph >::vertex_descriptor u;
- typename property_traits < VertexNamePropertyMap >::value_type name;
-
- graph_in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) { // Add n vertices to the graph
- u = add_vertex(g);
- name_in >> name;
- put(name_map, u, name); // ** Attach name property to vertex u **
- }
- size_type src, targ;
- while (graph_in >> src) // Read in edges
- if (graph_in >> targ)
- add_edge(src, targ, g); // add an edge to the graph
- else
- break;
-}
-
-template < typename Graph, typename VertexNameMap > void
-output_in_edges(std::ostream & out, const Graph & g,
- typename graph_traits < Graph >::vertex_descriptor v,
- VertexNameMap name_map)
-{
- typename graph_traits < Graph >::in_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = in_edges(v, g); ei != ei_end; ++ei)
- out << get(name_map, source(*ei, g)) << " -> "
- << get(name_map, target(*ei, g)) << std::endl;
-}
-
-template < typename NameMap > class name_equals_t {
-public:
- name_equals_t(const std::string & n, NameMap map)
- : m_name(n), m_name_map(map)
- {
- }
- template < typename Vertex > bool operator()(Vertex u) const
- {
- return get(m_name_map, u) == m_name;
- }
-private:
- std::string m_name;
- NameMap m_name_map;
-};
-
-// object generator function
-template < typename NameMap >
- inline name_equals_t < NameMap >
-name_equals(const std::string & str, NameMap name)
-{
- return name_equals_t < NameMap > (str, name);
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- bidirectionalS, // The graph is directed, with both out-edges and in-edges
- property < vertex_name_t, std::string > // Add a vertex property
- >graph_type;
-
- graph_type g; // use default constructor to create empty graph
- const char* dep_file_name = "makefile-dependencies.dat";
- const char* target_file_name = "makefile-target-names.dat";
- std::ifstream file_in(dep_file_name), name_in(target_file_name);
- if (!file_in) {
- std::cerr << "** Error: could not open file " << dep_file_name
- << std::endl;
- return -1;
- }
- if (!name_in) {
- std::cerr << "** Error: could not open file " << target_file_name
- << std::endl;
- return -1;
- }
-
- // Obtain internal property map from the graph
- property_map < graph_type, vertex_name_t >::type name_map =
- get(vertex_name, g);
- read_graph_file(file_in, name_in, g, name_map);
-
- graph_traits < graph_type >::vertex_iterator i, end;
- tie(i, end) = vertices(g);
- typedef property_map < graph_type, vertex_name_t >::type name_map_t;
- i = std::find_if(i, end, name_equals("libzigzag.a", get(vertex_name, g)));
- output_in_edges(std::cout, g, *i, get(vertex_name, g));
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/print-out-edges.cpp b/Utilities/BGL/boost/graph/example/print-out-edges.cpp
deleted file mode 100644
index e5532f00dad10fba869c905a95cddb8d348b1c97..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/print-out-edges.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename VertexNamePropertyMap > void
-read_graph_file(std::istream & graph_in, std::istream & name_in,
- Graph & g, VertexNamePropertyMap name_map)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- typename graph_traits < Graph >::vertex_descriptor u;
- typename property_traits < VertexNamePropertyMap >::value_type name;
-
- graph_in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) { // Add n vertices to the graph
- u = add_vertex(g);
- name_in >> name;
- put(name_map, u, name); // ** Attach name property to vertex u **
- }
- size_type src, targ;
- while (graph_in >> src) // Read in edges
- if (graph_in >> targ)
- add_edge(src, targ, g); // add an edge to the graph
- else
- break;
-}
-
-template < typename Graph, typename VertexNameMap > void
-output_out_edges(std::ostream & out, const Graph & g,
- typename graph_traits < Graph >::vertex_descriptor u,
- VertexNameMap name_map)
-{
- typename graph_traits < Graph >::out_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei)
- out << get(name_map, source(*ei, g)) << " -> "
- << get(name_map, target(*ei, g)) << std::endl;
-}
-
-template < typename NameMap > class name_equals_t {
-public:
- name_equals_t(const std::string & n, NameMap map)
- : m_name(n), m_name_map(map)
- {
- }
- template < typename Vertex > bool operator()(Vertex u) const
- {
- return get(m_name_map, u) == m_name;
- }
-private:
- std::string m_name;
- NameMap m_name_map;
-};
-
-// object generator function
-template < typename NameMap >
- inline name_equals_t < NameMap >
-name_equals(const std::string & str, NameMap name)
-{
- return name_equals_t < NameMap > (str, name);
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS, // The graph is directed
- property < vertex_name_t, std::string > // Add a vertex property
- >graph_type;
-
- graph_type g; // use default constructor to create empty graph
- const char* dep_file_name = "makefile-dependencies.dat";
- const char* target_file_name = "makefile-target-names.dat";
- std::ifstream file_in(dep_file_name), name_in(target_file_name);
- if (!file_in) {
- std::cerr << "** Error: could not open file " << dep_file_name
- << std::endl;
- return -1;
- }
- if (!name_in) {
- std::cerr << "** Error: could not open file " << target_file_name
- << std::endl;
- return -1;
- }
- // Obtain internal property map from the graph
- property_map < graph_type, vertex_name_t >::type name_map =
- get(vertex_name, g);
- read_graph_file(file_in, name_in, g, name_map);
-
- graph_traits < graph_type >::vertex_iterator i, end;
- tie(i, end) = vertices(g);
- typedef property_map < graph_type, vertex_name_t >::type name_map_t;
- name_equals_t < name_map_t > predicate("dax.h", get(vertex_name, g));
- i = std::find_if(i, end, predicate);
- output_out_edges(std::cout, g, *i, get(vertex_name, g));
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/property-map-traits-eg.cpp b/Utilities/BGL/boost/graph/example/property-map-traits-eg.cpp
deleted file mode 100644
index c82ab19c5b787a6f86e79aeccd25906e89001ca5..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/property-map-traits-eg.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < listS, listS, directedS,
- property < vertex_name_t, std::string > >graph_t;
- graph_t g;
- graph_traits < graph_t >::vertex_descriptor u = add_vertex(g);
- property_map < graph_t, vertex_name_t >::type
- name_map = get(vertex_name, g);
- name_map[u] = "Joe";
- std::cout << name_map[u] << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/property_iterator.cpp b/Utilities/BGL/boost/graph/example/property_iterator.cpp
deleted file mode 100644
index 8bffee14023ebb444ad4e84ee6bc8eaf7764f37e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/property_iterator.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-
-// (C) Copyright François Faure, iMAGIS-GRAVIR / UJF, 2001. Permission
-// to copy, use, modify, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. This software
-// is provided "as is" without express or implied warranty, and with
-// no claim as to its suitability for any purpose.
-
-
-// Revision History:
-// 03 May 2001 Jeremy Siek
-// Moved property iterator code to headers.
-// 02 May 2001 François Faure
-// Initial version.
-
-#include <boost/graph/adjacency_list_io.hpp>
-#include <boost/graph/property_iter_range.hpp>
-#include <fstream>
-#include <algorithm>
-
-
-using namespace boost;
-
-//======== vertex properties
-struct toto_t {
- enum { num = 23063};
- typedef vertex_property_tag kind;
-};
-typedef property< toto_t, double > Toto;
-
-struct radius_t {
- enum { num = 23062};
- typedef vertex_property_tag kind;
-};
-typedef property< radius_t, double, Toto > Radius;
-
-struct mass_t {
- enum { num = 23061};
- typedef vertex_property_tag kind;
-};
-typedef property< mass_t, int, Radius > Mass;
-
-
-//====== edge properties
-struct stiff_t {
- enum { num = 23064};
- typedef edge_property_tag kind;
-};
-typedef property<stiff_t, double> Stiff;
-
-
-
-//===== graph type
-typedef Mass VertexProperty;
-typedef Stiff EdgeProperty;
-typedef adjacency_list<vecS, setS, bidirectionalS,
- VertexProperty, EdgeProperty> Graph;
-
-
-//===== utilities
-struct Print
-{
- template<class T>
- Print& operator() (const T& t) {
- std::cout << t << " ";
- return (*this);
- }
-};
-
-template<class T>
-struct Set
-{
- T value;
-
- Set( const T& t ):value(t){}
-
- Set& operator() (T& t) {
- t=value;
- return (*this);
- }
-};
-
-
-//===== program
-int main(int argc, char* argv[])
-{
- if (argc < 2) {
- std::cerr<<"args: file"<<std::endl;
- return EXIT_FAILURE;
- }
-
- std::ifstream readFile(argv[1]);
-
- Graph graph;
- readFile >> read( graph );
- std::cout << write( graph );
-
- std::cout << "radii:" << std::endl;
- graph_property_iter_range<Graph,radius_t>::type
- seqRadius = get_property_iter_range(graph,radius_t());
- std::for_each( seqRadius.first, seqRadius.second, Print() );
- std::cout << std::endl;
-
- std::cout << "stiff:" << std::endl;
- graph_property_iter_range<Graph,stiff_t>::type
- seqStiff = get_property_iter_range(graph, stiff_t());
- std::for_each( seqStiff.first, seqStiff.second, Print() );
- std::cout << std::endl;
-
- seqStiff = get_property_iter_range(graph, stiff_t());
- std::for_each( seqStiff.first, seqStiff.second, Set<double>(2.4) );
-
- std::cout << "new stiff:" << std::endl;
- seqStiff = get_property_iter_range(graph,stiff_t());
- std::for_each( seqStiff.first, seqStiff.second, Print() );
- std::cout << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/push-relabel-eg.cpp b/Utilities/BGL/boost/graph/example/push-relabel-eg.cpp
deleted file mode 100644
index 2015ebcbef54a7371367d436259ada16768f84b6..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/push-relabel-eg.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <string>
-#include <boost/graph/push_relabel_max_flow.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/read_dimacs.hpp>
-
-// Use a DIMACS network flow file as stdin.
-// push-relabel-eg < max_flow.dat
-//
-// Sample output:
-// c The total flow:
-// s 13
-//
-// c flow values:
-// f 0 6 3
-// f 0 1 0
-// f 0 2 10
-// f 1 5 1
-// f 1 0 0
-// f 1 3 0
-// f 2 4 4
-// f 2 3 6
-// f 2 0 0
-// f 3 7 5
-// f 3 2 0
-// f 3 1 1
-// f 4 5 4
-// f 4 6 0
-// f 5 4 0
-// f 5 7 5
-// f 6 7 3
-// f 6 4 0
-// f 7 6 0
-// f 7 5 0
-
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list_traits < vecS, vecS, directedS > Traits;
- typedef adjacency_list < vecS, vecS, directedS,
- property < vertex_name_t, std::string >,
- property < edge_capacity_t, long,
- property < edge_residual_capacity_t, long,
- property < edge_reverse_t, Traits::edge_descriptor > > > > Graph;
- Graph g;
-
- property_map < Graph, edge_capacity_t >::type
- capacity = get(edge_capacity, g);
- property_map < Graph, edge_residual_capacity_t >::type
- residual_capacity = get(edge_residual_capacity, g);
- property_map < Graph, edge_reverse_t >::type rev = get(edge_reverse, g);
- Traits::vertex_descriptor s, t;
- read_dimacs_max_flow(g, capacity, rev, s, t);
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- property_map<Graph, vertex_index_t>::type indexmap = get(vertex_index, g);
- long flow = push_relabel_max_flow(g, s, t, capacity, residual_capacity, rev,
- indexmap);
-#else
- long flow = push_relabel_max_flow(g, s, t);
-#endif
-
- std::cout << "c The total flow:" << std::endl;
- std::cout << "s " << flow << std::endl << std::endl;
- std::cout << "c flow values:" << std::endl;
- graph_traits < Graph >::vertex_iterator u_iter, u_end;
- graph_traits < Graph >::out_edge_iterator ei, e_end;
- for (tie(u_iter, u_end) = vertices(g); u_iter != u_end; ++u_iter)
- for (tie(ei, e_end) = out_edges(*u_iter, g); ei != e_end; ++ei)
- if (capacity[*ei] > 0)
- std::cout << "f " << *u_iter << " " << target(*ei, g) << " "
- << (capacity[*ei] - residual_capacity[*ei]) << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/put-get-helper-eg.cpp b/Utilities/BGL/boost/graph/example/put-get-helper-eg.cpp
deleted file mode 100644
index 6bb911dbaf94f4c74fedc3a07b54c17b12b8a2fe..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/put-get-helper-eg.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <vector>
-#include <string>
-#include <boost/property_map.hpp>
-
-#ifdef BOOST_NO_STD_ITERATOR_TRAITS
-#error This examples requires a compiler that provides a working std::iterator_traits
-#endif
-
-
-namespace foo
-{
- using namespace boost;
- template < class RandomAccessIterator, class IndexMap >
- class iterator_property_map:public boost::put_get_helper <
- typename std::iterator_traits < RandomAccessIterator >::reference,
- iterator_property_map < RandomAccessIterator, IndexMap > >
- {
- public:
- typedef std::ptrdiff_t key_type;
- typedef typename std::iterator_traits < RandomAccessIterator >::value_type
- value_type;
- typedef typename std::iterator_traits < RandomAccessIterator >::reference
- reference;
- typedef boost::lvalue_property_map_tag category;
-
- iterator_property_map(RandomAccessIterator cc = RandomAccessIterator(),
- const IndexMap & _id =
- IndexMap()):iter(cc), index(_id)
- {
- }
- reference operator[] (std::ptrdiff_t v) const
- {
- return *(iter + get(index, v));
- }
- protected:
- RandomAccessIterator iter;
- IndexMap index;
- };
-
-}
-
-int
-main()
-{
- typedef std::vector < std::string > vec_t;
- typedef foo::iterator_property_map < vec_t::iterator,
- boost::identity_property_map > pmap_t;
- using namespace boost;
- function_requires < Mutable_LvaluePropertyMapConcept < pmap_t, int > >();
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/quick-tour.cpp b/Utilities/BGL/boost/graph/example/quick-tour.cpp
deleted file mode 100644
index d790e594c98de33a910109da3d619c449e5bca0d..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/quick-tour.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <boost/graph/adjacency_list.hpp>
-using namespace boost;
-
-template < typename VertexDescriptor, typename VertexNameMap > void
-print_vertex_name(VertexDescriptor v, VertexNameMap name_map)
-{
- std::cout << get(name_map, v);
-}
-
-template < typename Graph, typename TransDelayMap, typename VertexNameMap > void
-print_trans_delay(typename graph_traits < Graph >::edge_descriptor e,
- const Graph & g, TransDelayMap delay_map,
- VertexNameMap name_map)
-{
- std::cout << "trans-delay(" << get(name_map, source(e, g)) << ","
- << get(name_map, target(e, g)) << ") = " << get(delay_map, e);
-}
-
-template < typename Graph, typename VertexNameMap > void
-print_vertex_names(const Graph & g, VertexNameMap name_map)
-{
- std::cout << "vertices(g) = { ";
- typedef typename graph_traits < Graph >::vertex_iterator iter_t;
- for (std::pair < iter_t, iter_t > p = vertices(g); p.first != p.second;
- ++p.first) {
- print_vertex_name(*p.first, name_map);
- std::cout << ' ';
- }
- std::cout << "}" << std::endl;
-}
-
-template < typename Graph, typename TransDelayMap, typename VertexNameMap > void
-print_trans_delays(const Graph & g, TransDelayMap trans_delay_map,
- VertexNameMap name_map)
-{
- typename graph_traits < Graph >::edge_iterator first, last;
- for (tie(first, last) = edges(g); first != last; ++first) {
- print_trans_delay(*first, g, trans_delay_map, name_map);
- std::cout << std::endl;
- }
-}
-
-template < typename Graph, typename VertexNameMap, typename TransDelayMap > void
-build_router_network(Graph & g, VertexNameMap name_map,
- TransDelayMap delay_map)
-{
- typename graph_traits < Graph >::vertex_descriptor a, b, c, d, e;
- a = add_vertex(g);
- name_map[a] = 'a';
- b = add_vertex(g);
- name_map[b] = 'b';
- c = add_vertex(g);
- name_map[c] = 'c';
- d = add_vertex(g);
- name_map[d] = 'd';
- e = add_vertex(g);
- name_map[e] = 'e';
-
- typename graph_traits < Graph >::edge_descriptor ed;
- bool inserted;
-
- tie(ed, inserted) = add_edge(a, b, g);
- delay_map[ed] = 1.2;
- tie(ed, inserted) = add_edge(a, d, g);
- delay_map[ed] = 4.5;
- tie(ed, inserted) = add_edge(b, d, g);
- delay_map[ed] = 1.8;
- tie(ed, inserted) = add_edge(c, a, g);
- delay_map[ed] = 2.6;
- tie(ed, inserted) = add_edge(c, e, g);
- delay_map[ed] = 5.2;
- tie(ed, inserted) = add_edge(d, c, g);
- delay_map[ed] = 0.4;
- tie(ed, inserted) = add_edge(d, e, g);
- delay_map[ed] = 3.3;
-
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, listS, directedS,
- property < vertex_name_t, char >,
- property < edge_weight_t, double > > graph_t;
- graph_t g;
-
- property_map < graph_t, vertex_name_t >::type name_map =
- get(vertex_name, g);
- property_map < graph_t, edge_weight_t >::type delay_map =
- get(edge_weight, g);
-
- build_router_network(g, name_map, delay_map);
- print_vertex_names(g, name_map);
- print_trans_delays(g, delay_map, name_map);
-}
diff --git a/Utilities/BGL/boost/graph/example/quick_tour.cpp b/Utilities/BGL/boost/graph/example/quick_tour.cpp
deleted file mode 100644
index 78128c9b3c625bf155a40797ffe6dab038c387f0..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/quick_tour.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream> // for std::cout
-#include <utility> // for std::pair
-#include <algorithm> // for std::for_each
-#include <boost/utility.hpp> // for boost::tie
-#include <boost/graph/graph_traits.hpp> // for boost::graph_traits
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graphviz.hpp>
-
-using namespace boost;
-
-template <class Graph> struct exercise_vertex {
- exercise_vertex(Graph& g_) : g(g_) { }
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- void operator()(const Vertex& v) const
- {
- using namespace boost;
- typename property_map<Graph, vertex_index_t>::type
- vertex_id = get(vertex_index, g);
- std::cout << "vertex: " << get(vertex_id, v) << std::endl;
-
- // Write out the outgoing edges
- std::cout << "\tout-edges: ";
- typename graph_traits<Graph>::out_edge_iterator out_i, out_end;
- typename graph_traits<Graph>::edge_descriptor e;
- for (tie(out_i, out_end) = out_edges(v, g);
- out_i != out_end; ++out_i)
- {
- e = *out_i;
- Vertex src = source(e, g), targ = target(e, g);
- std::cout << "(" << get(vertex_id, src)
- << "," << get(vertex_id, targ) << ") ";
- }
- std::cout << std::endl;
-
- // Write out the incoming edges
- std::cout << "\tin-edges: ";
- typename graph_traits<Graph>::in_edge_iterator in_i, in_end;
- for (tie(in_i, in_end) = in_edges(v, g); in_i != in_end; ++in_i)
- {
- e = *in_i;
- Vertex src = source(e, g), targ = target(e, g);
- std::cout << "(" << get(vertex_id, src)
- << "," << get(vertex_id, targ) << ") ";
- }
- std::cout << std::endl;
-
- // Write out all adjacent vertices
- std::cout << "\tadjacent vertices: ";
- typename graph_traits<Graph>::adjacency_iterator ai, ai_end;
- for (tie(ai,ai_end) = adjacent_vertices(v, g); ai != ai_end; ++ai)
- std::cout << get(vertex_id, *ai) << " ";
- std::cout << std::endl;
- }
- Graph& g;
-};
-
-
-int main(int,char*[])
-{
- // create a typedef for the Graph type
- typedef adjacency_list<vecS, vecS, bidirectionalS,
- no_property, property<edge_weight_t, float> > Graph;
-
- // Make convenient labels for the vertices
- enum { A, B, C, D, E, N };
- const int num_vertices = N;
- const char* name = "ABCDE";
-
- // writing out the edges in the graph
- typedef std::pair<int,int> Edge;
- Edge edge_array[] =
- { Edge(A,B), Edge(A,D), Edge(C,A), Edge(D,C),
- Edge(C,E), Edge(B,D), Edge(D,E), };
- const int num_edges = sizeof(edge_array)/sizeof(edge_array[0]);
-
- // average transmission delay (in milliseconds) for each connection
- float transmission_delay[] = { 1.2, 4.5, 2.6, 0.4, 5.2, 1.8, 3.3, 9.1 };
-
- // declare a graph object, adding the edges and edge properties
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- Graph g(num_vertices);
- property_map<Graph, edge_weight_t>::type weightmap = get(edge_weight, g);
- for (std::size_t j = 0; j < num_edges; ++j) {
- graph_traits<Graph>::edge_descriptor e; bool inserted;
- tie(e, inserted) = add_edge(edge_array[j].first, edge_array[j].second, g);
- weightmap[e] = transmission_delay[j];
- }
-#else
- Graph g(edge_array, edge_array + num_edges,
- transmission_delay, num_vertices);
-#endif
-
- boost::property_map<Graph, vertex_index_t>::type
- vertex_id = get(vertex_index, g);
- boost::property_map<Graph, edge_weight_t>::type
- trans_delay = get(edge_weight, g);
-
- std::cout << "vertices(g) = ";
- typedef graph_traits<Graph>::vertex_iterator vertex_iter;
- std::pair<vertex_iter, vertex_iter> vp;
- for (vp = vertices(g); vp.first != vp.second; ++vp.first)
- std::cout << name[get(vertex_id, *vp.first)] << " ";
- std::cout << std::endl;
-
- std::cout << "edges(g) = ";
- graph_traits<Graph>::edge_iterator ei, ei_end;
- for (tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
- std::cout << "(" << name[get(vertex_id, source(*ei, g))]
- << "," << name[get(vertex_id, target(*ei, g))] << ") ";
- std::cout << std::endl;
-
- std::for_each(vertices(g).first, vertices(g).second,
- exercise_vertex<Graph>(g));
-
- std::map<std::string,std::string> graph_attr, vertex_attr, edge_attr;
- graph_attr["size"] = "3,3";
- graph_attr["rankdir"] = "LR";
- graph_attr["ratio"] = "fill";
- vertex_attr["shape"] = "circle";
-
- boost::write_graphviz(std::cout, g,
- make_label_writer(name),
- make_label_writer(trans_delay),
- make_graph_attributes_writer(graph_attr, vertex_attr,
- edge_attr));
-
- return 0;
-}
-
-
diff --git a/Utilities/BGL/boost/graph/example/quick_tour.expected b/Utilities/BGL/boost/graph/example/quick_tour.expected
deleted file mode 100644
index ec66d962ed422c8488fb632d021a51bce6c510bb..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/quick_tour.expected
+++ /dev/null
@@ -1,22 +0,0 @@
-vertices(g) = 0 1 2 3 4
-edges(g) = (0,1) (0,2) (0,3) (0,4) (2,0) (2,4) (3,0) (3,1) (3,4) (4,0) (4,1)
-vertex: 0
- out-edges: (0,1) (0,2) (0,3) (0,4)
- in-edges: (2,0) (3,0) (4,0)
- adjacent vertices: 1 2 3 4
-vertex: 1
- out-edges:
- in-edges: (0,1) (3,1) (4,1)
- adjacent vertices:
-vertex: 2
- out-edges: (2,0) (2,4)
- in-edges: (0,2)
- adjacent vertices: 0 4
-vertex: 3
- out-edges: (3,0) (3,1) (3,4)
- in-edges: (0,3)
- adjacent vertices: 0 1 4
-vertex: 4
- out-edges: (4,0) (4,1)
- in-edges: (0,4) (2,4) (3,4)
- adjacent vertices: 0 1
diff --git a/Utilities/BGL/boost/graph/example/reachable-loop-head.cpp b/Utilities/BGL/boost/graph/example/reachable-loop-head.cpp
deleted file mode 100644
index 729335e6cb1b8ed6ff7413053cd11263e3bbcc7c..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/reachable-loop-head.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/copy.hpp>
-
-int
-main(int argc, char *argv[])
-{
- if (argc < 3) {
- std::cerr << "usage: reachable-loop-head.exe <in-file> <out-file>"
- << std::endl;
- return -1;
- }
- using namespace boost;
- GraphvizDigraph g;
- read_graphviz(argv[1], g);
- graph_traits < GraphvizDigraph >::vertex_descriptor loop_head = 1;
- typedef color_traits < default_color_type > Color;
-
- std::vector < default_color_type >
- reachable_from_head(num_vertices(g), Color::white());
- default_color_type c;
- depth_first_visit(g, loop_head, default_dfs_visitor(),
- make_iterator_property_map(reachable_from_head.begin(),
- get(vertex_index, g), c));
-
- property_map<GraphvizDigraph, vertex_attribute_t>::type
- vattr_map = get(vertex_attribute, g);
-
- graph_traits < GraphvizDigraph >::vertex_iterator i, i_end;
- for (tie(i, i_end) = vertices(g); i != i_end; ++i)
- if (reachable_from_head[*i] != Color::white()) {
- vattr_map[*i]["color"] = "gray";
- vattr_map[*i]["style"] = "filled";
- }
-
- std::ofstream loops_out(argv[2]);
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ has trouble with the get_property() functions
- loops_out << "digraph G {\n"
- << "size=\"3,3\"\n"
- << "ratio=\"fill\"\n"
- << "shape=\"box\"\n";
- graph_traits<GraphvizDigraph>::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- loops_out << *vi << "[";
- for (std::map<std::string,std::string>::iterator ai = vattr_map[*vi].begin();
- ai != vattr_map[*vi].end(); ++ai) {
- loops_out << ai->first << "=" << ai->second;
- if (next(ai) != vattr_map[*vi].end())
- loops_out << ", ";
- }
- loops_out<< "]";
- }
- property_map<GraphvizDigraph, edge_attribute_t>::type
- eattr_map = get(edge_attribute, g);
- graph_traits<GraphvizDigraph>::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei) {
- loops_out << source(*ei, g) << " -> " << target(*ei, g) << "[";
- std::map<std::string,std::string>& attr_map = eattr_map[*ei];
- for (std::map<std::string,std::string>::iterator eai = attr_map.begin();
- eai != attr_map.end(); ++eai) {
- loops_out << eai->first << "=" << eai->second;
- if (next(eai) != attr_map.end())
- loops_out << ", ";
- }
- loops_out<< "]";
- }
- loops_out << "}\n";
-#else
- get_property(g, graph_graph_attribute)["size"] = "3,3";
- get_property(g, graph_graph_attribute)["ratio"] = "fill";
- get_property(g, graph_vertex_attribute)["shape"] = "box";
-
- write_graphviz(loops_out, g,
- make_vertex_attributes_writer(g),
- make_edge_attributes_writer(g),
- make_graph_attributes_writer(g));
-#endif
-
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/reachable-loop-tail.cpp b/Utilities/BGL/boost/graph/example/reachable-loop-tail.cpp
deleted file mode 100644
index b4ca439a6f19e6b5c0a6b6304c70c7b1d8e6c951..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/reachable-loop-tail.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/depth_first_search.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/copy.hpp>
-#include <boost/graph/reverse_graph.hpp>
-
-int
-main(int argc, char *argv[])
-{
- if (argc < 3) {
- std::cerr << "usage: reachable-loop-tail.exe <in-file> <out-file>"
- << std::endl;
- return -1;
- }
- using namespace boost;
- GraphvizDigraph g_in;
- read_graphviz(argv[1], g_in);
-
- typedef adjacency_list < vecS, vecS, bidirectionalS,
- GraphvizVertexProperty,
- GraphvizEdgeProperty, GraphvizGraphProperty > Graph;
- Graph g;
- copy_graph(g_in, g);
-
- graph_traits < GraphvizDigraph >::vertex_descriptor loop_tail = 6;
- typedef color_traits < default_color_type > Color;
- default_color_type c;
-
- std::vector < default_color_type > reachable_to_tail(num_vertices(g));
- reverse_graph < Graph > reverse_g(g);
- depth_first_visit(reverse_g, loop_tail, default_dfs_visitor(),
- make_iterator_property_map(reachable_to_tail.begin(),
- get(vertex_index, g), c));
-
- std::ofstream loops_out(argv[2]);
- loops_out << "digraph G {\n"
- << " graph [ratio=\"fill\",size=\"3,3\"];\n"
- << " node [shape=\"box\"];\n" << " edge [style=\"bold\"];\n";
-
- property_map<Graph, vertex_attribute_t>::type
- vattr_map = get(vertex_attribute, g);
- graph_traits < GraphvizDigraph >::vertex_iterator i, i_end;
- for (tie(i, i_end) = vertices(g_in); i != i_end; ++i) {
- loops_out << *i << "[label=\"" << vattr_map[*i]["label"]
- << "\"";
- if (reachable_to_tail[*i] != Color::white()) {
- loops_out << ", color=\"gray\", style=\"filled\"";
- }
- loops_out << "]\n";
- }
- graph_traits < GraphvizDigraph >::edge_iterator e, e_end;
- for (tie(e, e_end) = edges(g_in); e != e_end; ++e)
- loops_out << source(*e, g) << " -> " << target(*e, g) << ";\n";
- loops_out << "}\n";
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/regression.cfg b/Utilities/BGL/boost/graph/example/regression.cfg
deleted file mode 100644
index 762d2e6c9215cdeab16f2efb9337dec170bd8fa0..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/regression.cfg
+++ /dev/null
@@ -1,114 +0,0 @@
-// Boost Graph Library examples regression test configuration file
-//
-// From the boost/status directory, run
-// ./regression --tests ../libs/graph/example/regression.cfg -o graph-eg.html
-//
-// Please keep the entries ordered alphabetically by the test's file name.
-
-compile libs/graph/example/accum-compile-times.cpp
-compile libs/graph/example/adjacency_list.cpp
-compile libs/graph/example/adjacency_list_io.cpp
-compile libs/graph/example/adjacency_matrix.cpp
-compile libs/graph/example/bellman-example.cpp
-compile libs/graph/example/bellman-ford-internet.cpp
-compile libs/graph/example/bfs-example.cpp
-compile libs/graph/example/bfs-name-printer.cpp
-compile libs/graph/example/bfs.cpp
-compile libs/graph/example/bfs_neighbor.cpp
-compile libs/graph/example/biconnected_components.cpp
-compile libs/graph/example/boost_web_graph.cpp
-compile libs/graph/example/bucket_sorter.cpp
-compile libs/graph/example/cc-internet.cpp
-compile libs/graph/example/city_visitor.cpp
-compile libs/graph/example/components_on_edgelist.cpp
-compile libs/graph/example/connected-components.cpp
-compile libs/graph/example/connected_components.cpp
-compile libs/graph/example/container_gen.cpp
-compile libs/graph/example/copy-example.cpp
-compile libs/graph/example/cuthill_mckee_ordering.cpp
-compile libs/graph/example/cycle-file-dep.cpp
-compile libs/graph/example/cycle-file-dep2.cpp
-compile libs/graph/example/dag_shortest_paths.cpp
-compile libs/graph/example/dave.cpp
-compile libs/graph/example/default-constructor.cpp
-compile libs/graph/example/default-constructor2.cpp
-compile libs/graph/example/dfs-example.cpp
-compile libs/graph/example/dfs-parenthesis.cpp
-compile libs/graph/example/dfs.cpp
-compile libs/graph/example/dfs_parenthesis.cpp
-compile libs/graph/example/dijkstra-example.cpp
-compile libs/graph/example/edge-connectivity.cpp
-compile libs/graph/example/edge-function.cpp
-compile libs/graph/example/edge-iter-constructor.cpp
-compile libs/graph/example/edge_basics.cpp
-compile libs/graph/example/edge_connectivity.cpp
-compile libs/graph/example/edge_iterator_constructor.cpp
-compile libs/graph/example/edge_property.cpp
-compile libs/graph/example/edmunds-karp-eg.cpp
-compile libs/graph/example/exterior_properties.cpp
-compile libs/graph/example/exterior_property_map.cpp
-compile libs/graph/example/family-tree-eg.cpp
-compile libs/graph/example/fibonacci_heap.cpp
-compile libs/graph/example/file_dependencies.cpp
-compile libs/graph/example/filtered_graph.cpp
-compile libs/graph/example/gerdemann.cpp
-compile libs/graph/example/graph-assoc-types.cpp
-compile libs/graph/example/graph-property-iter-eg.cpp
-compile libs/graph/example/graph.cpp
-compile libs/graph/example/graphviz.cpp
-compile libs/graph/example/in_edges.cpp
-compile libs/graph/example/incremental-components-eg.cpp
-compile libs/graph/example/incremental_components.cpp
-compile libs/graph/example/interior_property_map.cpp
-compile libs/graph/example/isomorphism.cpp
-compile libs/graph/example/iterator-property-map-eg.cpp
-compile libs/graph/example/johnson-eg.cpp
-compile libs/graph/example/kevin-bacon.cpp
-compile libs/graph/example/knights-tour.cpp
-compile libs/graph/example/kruskal-example.cpp
-compile libs/graph/example/kruskal-telephone.cpp
-compile libs/graph/example/last-mod-time.cpp
-compile libs/graph/example/loops_dfs.cpp
-compile libs/graph/example/max_flow.cpp
-compile libs/graph/example/min_max_paths.cpp
-compile libs/graph/example/minimum_degree_ordering.cpp
-compile libs/graph/example/modify_graph.cpp
-compile libs/graph/example/neighbor_bfs.cpp
-compile libs/graph/example/ordered_out_edges.cpp
-compile libs/graph/example/ospf-example.cpp
-compile libs/graph/example/parallel-compile-time.cpp
-compile libs/graph/example/prim-example.cpp
-compile libs/graph/example/prim-telephone.cpp
-compile libs/graph/example/print-adjacent-vertices.cpp
-compile libs/graph/example/print-edges.cpp
-compile libs/graph/example/print-in-edges.cpp
-compile libs/graph/example/print-out-edges.cpp
-compile libs/graph/example/property-map-traits-eg.cpp
-compile libs/graph/example/property_iterator.cpp
-compile libs/graph/example/push-relabel-eg.cpp
-compile libs/graph/example/put-get-helper-eg.cpp
-compile libs/graph/example/quick-tour.cpp
-compile libs/graph/example/quick_tour.cpp
-compile libs/graph/example/reachable-loop-head.cpp
-compile libs/graph/example/reachable-loop-tail.cpp
-compile libs/graph/example/remove_edge_if_bidir.cpp
-compile libs/graph/example/remove_edge_if_dir.cpp
-compile libs/graph/example/remove_edge_if_undir.cpp
-compile libs/graph/example/reverse-graph-eg.cpp
-compile libs/graph/example/scc.cpp
-compile libs/graph/example/strong-components.cpp
-compile libs/graph/example/strong_components.cpp
-compile libs/graph/example/subgraph.cpp
-compile libs/graph/example/topo-sort-file-dep.cpp
-compile libs/graph/example/topo-sort-file-dep2.cpp
-compile libs/graph/example/topo-sort1.cpp
-compile libs/graph/example/topo-sort2.cpp
-compile libs/graph/example/topo_sort.cpp
-compile libs/graph/example/transitive_closure.cpp
-compile libs/graph/example/transpose-example.cpp
-compile libs/graph/example/undirected.cpp
-compile libs/graph/example/vector-as-graph.cpp
-compile libs/graph/example/vertex-name-property.cpp
-compile libs/graph/example/vertex_basics.cpp
-compile libs/graph/example/visitor.cpp
-
diff --git a/Utilities/BGL/boost/graph/example/regrtest.py b/Utilities/BGL/boost/graph/example/regrtest.py
deleted file mode 100644
index a5e523abd8ab94613074a691ae1aa14cd501850a..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/regrtest.py
+++ /dev/null
@@ -1,306 +0,0 @@
-#!/usr/bin/python
-
-# boost graph library compilation regression test
-
-# Usage: regrtest [*|compiler] [*|library/program]
-#
-# Default: regrtest * *
-#
-# Compilers: bcc = Borland 5.5.1
-# cw = Metrowerks CodeWarrior
-# gcc = GNU GCC
-# gcc-stlport = GNU GCC with STLport library
-# como = Comeau C++
-# vc = Microsoft Visual C++
-# vcstlport = Microsoft Visual C++ with STLport library
-# suncc = Sun's C++ compiler
-# kcc = KAI C++ 3.4g
-#
-# Examples: regrtest
-# regrtest
-# regrtest gcc
-# regrtest * smart_ptr/smart_ptr_test.cpp
-# regrtest gcc smart_ptr/smart_ptr_test.cpp
-#
-# Note: use the following command line syntax if output is to be redirected:
-# python regrtest.py [*|compiler] [*|library/program] >log 2>&1
-
-# Revision history:
-# 09 Dec 00 Modified the main boost regrtest.py to create this file. -Jeremy
-
-
-# The Metrowerks and Microsoft compilers require various environment variables be set.
-# See mwcc -help
-# See http://msdn.microsoft.com/library/devprods/vs6/visualc/vccore/_core_building_on_the_command_line.3a_.overview.htm
-# Others:
-# See bcb4.hlp. Don't bother with bcb4tools.hlp; it has a bad link to the command line options
-
-import sys
-import os
-import time
-
-#------------------------------------------------------------------------------#
-
-def invoke( desc, command ):
-
- print " ", desc
- f.write( "<td>" )
- print " ", command #script debugging aid
- sys.stdout.flush()
- rs=os.system( command )
- print " return status: ", rs
- if rs==0:
- f.write( "yes" )
- else:
- f.write( "no" )
- f.write( "</td>\n" )
-
-#------------------------------------------------------------------------------#
-
-def compile( program ):
-
- fullpath= path + "/libs/" + program
-
- print
- print "*****", program, "*****"
-
- f.write( "<tr>\n" )
- f.write( "<td><a href=\"" + program + "\">" + program + "</a></td>\n" )
-
-# ---------- Linux2 ---------- #
-
- if sys.platform == "linux2":
- if compiler_arg == "*" or compiler_arg == "gcc":
- invoke( "GCC 2.95.2", 'g++ -ftemplate-depth-30 -c -I' + path + ' ' + fullpath )
- if compiler_arg == "*" or compiler_arg == "gcc-stlport":
- invoke( "GCC 2.95.2 STLport 4.0", 'g++ -V 2.95.2-stlport -c -ftemplate-depth-30 -I' + path + ' ' + fullpath )
-# if compiler_arg == "*" or compiler_arg == "gcc-exp":
-# invoke( "GCC pre-2.97 experimental", '/opt/exp/gcc/bin/g++ -ftemplate-depth-30 -I' + path + ' ' + fullpath )
- if compiler_arg == "*" or compiler_arg == "como":
- invoke( "Comeau C++ 4.2.44 beta3", 'como -c -I' + path + ' ' + fullpath)
-# if compiler_arg == "*" or compiler_arg == "occ":
-# invoke( "OpenC++ 2.5.9", 'occ -c --regular-c++ -I' + path + ' ' + fullpath)
-
-# ----------- Solaris (Sun OS 5)/Sparc ------ #
-
- elif sys.platform == "sunos5":
- if compiler_arg == "*" or compiler_arg =="suncc":
- invoke("Sun WorkShop 6 2000/04/07 C++ 5.1", 'CC -c -I' + path + ' ' + fullpath )
- if compiler_arg == "*" or compiler_arg == "gcc":
- invoke( "GCC 2.95.2", 'g++ -Wall -pedantic -ftemplate-depth-30 -Wno-long-long -c -I' + path + ' ' + fullpath )
- if compiler_arg == "*" or compiler_arg == "kcc":
- invoke( "KCC 3.4g", 'KCC --strict_warnings -lm -I' + path + ' ' + fullpath )
-
-
-# ----------- BeOS5/Intel ------ #
-#
-# currently this compiler fails so many tests that it may not be worth while
-# reporting the results: most of these are as a result of broken C++ standard
-# libraries and a non-standard <climits>, problems that the forthcoming
-# gcc3 should fix (STLPort does not build on this platform).
-#
- elif sys.platform == "beos":
- if compiler_arg=="*" or compiler_arg=="gcc":
- invoke( "GNU GCC", "c++ -ftemplate-depth-30 -Wall -I" + path + " " + fullpath )
- if compiler_arg=="*" or compiler_arg=="gcc-sgi":
- invoke( "GNU GCC", "c++ -ftemplate-depth-30 -Wall -I/boot/home/config/stlport/stl330 -I" + path + " " + fullpath )
-
-# ---------- Windows ---------- #
-
- else:
-# if compiler_arg=="*" or compiler_arg=="bcc54":
-# bcc54_path=os.environ["BOOST_BCC54_PATH"]
-# invoke( "Borland C++ 5.4 up2", "\"" + bcc54_path + "/bcc32\" -I" + path + " -j10 -q " + fullpath )
- if compiler_arg=="*" or compiler_arg=="bcc":
- bcc55_path=os.environ["BOOST_BCC55_PATH"]
- invoke( "Borland C++ 5.5.1", "\"" + bcc55_path + "/bcc32\" -I" + path + " -j10 -q " + fullpath )
-
- # GCC 2.95.2 is looping on some tests, so only invoke if asked for by name
- #if compiler_arg=="*" or compiler_arg=="gcc":
- if compiler_arg=="gcc":
- # TODO: fix the absolute STLport paths
- invoke( "GNU GCC", "c++ -ftemplate-depth-30 -I" + path + " -IC:/stl/STLport-4.0b8/stlport " + fullpath + " c:/stl/STLport-4.0b8/lib/libstlport_gcc.a" )
-
- if compiler_arg=="*" or compiler_arg=="cw":
- invoke( "Metrowerks CodeWarrior", "mwcc -maxerrors 10 -cwd source -I- -I" + path + " " + fullpath )
-
-#John Maddock says use /Zm400 switch; it increases compiler memory
-# /MDd causes compiler errors in VC98\INCLUDE\xlocnum -Jeremy Siek
- if compiler_arg=="*" or compiler_arg=="vc":
- invoke( "VC++ with MS library", 'cl /c /nologo /Zm400 /W3 /GR /GX /Zi /Od /GZ /I "' + path + '" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" ' + fullpath )
- if compiler_arg=="*" or compiler_arg=="vcstlport":
- stl=os.environ["BOOST_STLPORT_PATH"]
- invoke( "VC++ with STLport library", 'cl /c /nologo /Zm400 /W3 /GR /GX /Zi /Od /GZ /I "' + stl + '" /I "' + path + '" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_CONSOLE" ' + fullpath )
-
-
- f.write( "</tr>\n" )
-
-#------------------------------------------------------------------------------#
-
-def library():
-
- print
- print "***** Boost Library *****"
-
- f.write( "<tr>\n" )
- f.write( "<td>Boost Graph Library build</td>\n" )
-
- #if compiler_arg=="*" or compiler_arg=="bcc32":
- #if compiler_arg=="*" or compiler_arg=="gcc":
- #if compiler_arg=="*" or compiler_arg=="cw":
-
- #if compiler_arg=="*" or compiler_arg=="vc":
- # command='cl /nologo /MDd /W3 /GR /GX /Zi /Od /GZ /I "' + path + '" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB /c"'
- # command=command + " " + path + "/libs/" + ...
- # invoke( "VC++ with MS library", command )
-
-# invoke( "MS Lib with MS library", 'lib /nologo /out:"boost_vc.lib" boost_timer_vc.obj boost_prg_timer_vc.obj boost_prg_display_vc.obj' )
-
- #if compiler_arg=="*" or compiler_arg=="vcstlport":
-
- f.write( "</tr>\n" )
-
-#---------------------------------- main ------------------------------------#
-
-# set up environment variables
-
-path=os.environ["BOOST_PATH"]
-
-compiler_arg="*"
-if len(sys.argv)>1:
- compiler_arg=sys.argv[1]
-
-program_arg="*"
-if len(sys.argv)>2:
- program_arg=sys.argv[2]
-
-if sys.platform == "linux2":
- platform = "Linux/x86"
-elif sys.platform == "sunos5":
- platform = "SunOS5/sparc"
-elif sys.platform == "beos":
- platform = "BeOS5/x86"
-elif sys.platform == "win32":
- platform = "Windows"
- if os.name == "nt":
- platform = platform + " NT / Windows 2000"
-else:
- print "**** Error: unknown platform ****"
- sys.exit(1)
-
-f=open( "cs-" + sys.platform + ".html", "w" )
-
-f.write( "<html>\n<head>\n<title>\nCompiler Status: " + platform + "\n</title>\n</head>" )
-f.write( "<body bgcolor=\"#FFFFFF\" text=\"#000000\">\n" )
-f.write( "<h1><img border=\"0\" src=\"../../../boost.png\" width=\"277\" height=\"86\"></h1>\n" )
-f.write( "<h1>Compiler Status: " + platform + "</h1>\n" )
-f.write( "<p><b>Run Date:</b> " + time.strftime("%d %b %Y %H:%M GMT", time.gmtime(time.time())) + "</p>\n" )
-f.write( "<p>\n" )
-f.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"5\">\n" )
-f.write( "<tr>\n" )
-f.write( "<td>Program</td>\n" )
-
-if sys.platform == "linux2":
- if compiler_arg == "*" or compiler_arg == "gcc":
- f.write( "<td>GNU<br>GCC<br>2.95.2</td>\n" )
- if compiler_arg == "*" or compiler_arg == "gcc-stlport":
- f.write( "<td>GNU<br>GCC<br>2.95.2<br>STLport<br>4.0</td>\n" )
-# if compiler_arg == "*" or compiler_arg == "gcc-exp":
-# f.write( "<td>GNU<br>GCC<br>pre-2.97 experimental</td>\n" )
- if compiler_arg == "*" or compiler_arg == "como":
- f.write( "<td>Comeau C++<br>4.2.44 beta3<br>STLport<br>4.0</td>\n" )
-# if compiler_arg == "*" or compiler_arg == "occ":
-# f.write( "<td>OpenC++<br>2.5.9</td>\n" )
-elif sys.platform == "sunos5":
- if compiler_arg == "*" or compiler_arg == "suncc":
- f.write( "<td>Sun C++<br>Sun WorkShop 6, C++ 5.1</td>\n" )
- if compiler_arg == "*" or compiler_arg == "gcc":
- f.write( "<td>GNU<br>GCC<br>2.95.2</td>\n" )
- if compiler_arg == "*" or compiler_arg == "kcc":
- f.write( "<td>KAI<br>KCC<br>3.4g</td>\n" )
-elif sys.platform == "beos":
- if compiler_arg == "*" or compiler_arg == "gcc":
- f.write( "<td>GNUPro<br>GCC 2.9</td>\n" )
- if compiler_arg == "*" or compiler_arg == "gcc-sgi":
- f.write( "<td>GNUPro<br>GCC 2.9<br>+<br>SGI STL 3.3</td>\n" )
-else:
-# if compiler_arg=="*" or compiler_arg=="bcc54":
-# f.write( "<td>Borland<br>BCC<br>5.4 up2</td>\n" )
- if compiler_arg=="*" or compiler_arg=="bcc":
- f.write( "<td>Borland<br>BCC<br>5.5.1</td>\n" )
-
- # GCC 2.95.2 is looping on some tests, so only invoke if asked for by name
- #if compiler_arg=="*" or compiler_arg=="gcc":
- if compiler_arg=="gcc":
- f.write( "<td>GNU<br>GCC<br>2.95.2<br>STLport<br>4.0 beta 8</td>\n" )
- if compiler_arg=="*" or compiler_arg=="cw":
- f.write( "<td>Metrowerks<br>CodeWarrior<br>6.0</td>\n" )
- if compiler_arg=="*" or compiler_arg=="vc":
- f.write( "<td>Microsoft<br>VC++<br>6.0 SP4</td>\n" )
- if compiler_arg=="*" or compiler_arg=="vcstlport":
- f.write( "<td>Microsoft<br>VC++<br>6.0 SP4<br>STLport<br>4.0</td>\n" )
-
-f.write( "</tr>\n" )
-
-if program_arg=="*":
-# compile( "graph/example/LEDA_concept_check.cpp" )
- compile( "graph/example/adjacency_list.cpp" )
- compile( "graph/example/bellman_ford.cpp" )
- compile( "graph/example/bfs.cpp" )
- compile( "graph/example/bfs_basics.cpp" )
- compile( "graph/example/bucket_sorter.cpp" )
- compile( "graph/example/city_visitor.cpp" )
- compile( "graph/example/components_on_edgelist.cpp" )
- compile( "graph/example/concept_checks.cpp" )
- compile( "graph/example/connected_components.cpp" )
- compile( "graph/example/container_gen.cpp" )
- compile( "graph/example/cuthill_mckee_ordering.cpp" )
- compile( "graph/example/dave.cpp" )
- compile( "graph/example/dfs.cpp" )
- compile( "graph/example/dfs_basics.cpp" )
- compile( "graph/example/dfs_parenthesis.cpp" )
- compile( "graph/example/dijkstra.cpp" )
- compile( "graph/example/dynamic_components.cpp" )
- compile( "graph/example/edge_basics.cpp" )
- compile( "graph/example/edge_iterator_constructor.cpp" )
- compile( "graph/example/edge_property.cpp" )
- compile( "graph/example/exterior_properties.cpp" )
- compile( "graph/example/exterior_property_map.cpp" )
- compile( "graph/example/family_tree.cpp" )
- compile( "graph/example/fibonacci_heap.cpp" )
- compile( "graph/example/file_dependencies.cpp" )
- compile( "graph/example/gerdemann.cpp" )
- compile( "graph/example/graph.cpp" )
- compile( "graph/example/in_edges.cpp" )
- compile( "graph/example/interior_property_map.cpp" )
- compile( "graph/example/johnson.cpp" )
- compile( "graph/example/kevin_bacon.cpp" )
- compile( "graph/example/knights_tour.cpp" )
- compile( "graph/example/kruskal.cpp" )
- compile( "graph/example/max_flow.cpp" )
-# compile( "graph/example/miles_span.cpp" )
- compile( "graph/example/ordered_out_edges.cpp" )
- compile( "graph/example/prim.cpp" )
- compile( "graph/example/quick_tour.cpp" )
- compile( "graph/example/remove_edge_if_bidir.cpp" )
- compile( "graph/example/remove_edge_if_dir.cpp" )
- compile( "graph/example/remove_edge_if_undir.cpp" )
- compile( "graph/example/reverse_graph.cpp" )
- compile( "graph/example/topo_sort.cpp" )
- compile( "graph/example/undirected.cpp" )
- compile( "graph/example/vector_as_graph.cpp" )
- compile( "graph/example/vertex_basics.cpp" )
- compile( "graph/example/visitor.cpp" )
-else:
- compile( program_arg )
-
-f.write( "</table>\n" );
-if sys.platform == "linux2":
- f.write( "<p>\nNote: A hand-crafted <limits> Standard header has been applied to all configurations.\n" )
-f.write( "</body>\n</html>\n" )
-
-# end
-
-
-
-
diff --git a/Utilities/BGL/boost/graph/example/remove_edge_if_bidir.cpp b/Utilities/BGL/boost/graph/example/remove_edge_if_bidir.cpp
deleted file mode 100644
index 09ddea09788b26b88d96f7d7f413acaf36f8c4c1..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/remove_edge_if_bidir.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-/*
- Sample output:
-
- original graph:
- 0 --> 3 2 3
- 1 --> 3
- 2 --> 0
- 3 --> 2
- 1(0,3) 2(0,2) 3(0,3) 4(1,3) 5(2,0) 6(3,2)
-
- removing edges connecting 0 to 3
- 0 --> 2
- 1 --> 3
- 2 --> 0
- 3 --> 2
- 2(0,2) 4(1,3) 5(2,0) 6(3,2)
- removing edges with weight greater than 3
- 0 --> 2
- 1 -->
- 2 -->
- 3 -->
- 2(0,2)
-
-
- */
-
-using namespace boost;
-
-typedef adjacency_list<vecS, vecS, bidirectionalS,
- no_property, property<edge_weight_t, int> > Graph;
-
-struct has_weight_greater_than {
- has_weight_greater_than(int w_, Graph& g_) : w(w_), g(g_) { }
- bool operator()(graph_traits<Graph>::edge_descriptor e) {
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- property_map<Graph, edge_weight_t>::type weight = get(edge_weight, g);
- return get(weight, e) > w;
-#else
- // This version of get() breaks VC++
- return get(edge_weight, g, e) > w;
-#endif
- }
- int w;
- Graph& g;
-};
-
-int
-main()
-{
- typedef std::pair<std::size_t,std::size_t> Edge;
- Edge edge_array[6] = { Edge(0,3), Edge(0,2), Edge(0, 3),
- Edge(1,3),
- Edge(2, 0),
- Edge(3, 2) };
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- Graph g(4);
- for (std::size_t j = 0; j < 6; ++j)
- add_edge(edge_array[j].first, edge_array[j].second, g);
-#else
- Graph g(edge_array, edge_array + 6, 4);
-#endif
- property_map<Graph, edge_weight_t>::type
- weight = get(edge_weight, g);
-
- int w = 0;
- graph_traits<Graph>::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
- weight[*ei] = ++w;
-
- property_map<Graph, vertex_index_t>::type indexmap = get(vertex_index, g);
-
- std::cout << "original graph:" << std::endl;
- print_graph(g, indexmap);
- print_edges2(g, indexmap, weight);
- std::cout << std::endl;
-
- std::cout << "removing edges connecting 0 to 3" << std::endl;
- remove_out_edge_if(vertex(0,g), incident_to(vertex(3,g), g), g);
- print_graph(g, indexmap);
- print_edges2(g, indexmap, weight);
-
- std::cout << "removing edges with weight greater than 3" << std::endl;
- remove_edge_if(has_weight_greater_than(3, g), g);
- print_graph(g, indexmap);
- print_edges2(g, indexmap, weight);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/remove_edge_if_bidir.expected b/Utilities/BGL/boost/graph/example/remove_edge_if_bidir.expected
deleted file mode 100644
index 62bf6ee03e2cec47a6747e35dc7446499e4eb1ca..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/remove_edge_if_bidir.expected
+++ /dev/null
@@ -1,19 +0,0 @@
-original graph:
-0 --> 3 2 3
-1 --> 3
-2 --> 0
-3 --> 2
-1(0,3) 2(0,2) 3(0,3) 4(1,3) 5(2,0) 6(3,2)
-
-removing edges connecting 0 to 3
-0 --> 2
-1 --> 3
-2 --> 0
-3 --> 2
-2(0,2) 4(1,3) 5(2,0) 6(3,2)
-removing edges with weight greater than 3
-0 --> 2
-1 -->
-2 -->
-3 -->
-2(0,2)
diff --git a/Utilities/BGL/boost/graph/example/remove_edge_if_dir.cpp b/Utilities/BGL/boost/graph/example/remove_edge_if_dir.cpp
deleted file mode 100644
index 6b6f76edbf35cb803fc428a14a5ca04ed19006e5..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/remove_edge_if_dir.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-/*
- Sample output:
-
- original graph:
- 0 --> 3 2 3
- 1 --> 3
- 2 --> 0
- 3 --> 2
-
- removing edges (0,3)
- 0 --> 2
- 1 --> 3
- 2 --> 0
- 3 --> 2
- removing edge (0,2) and (3, 2)
- 0 -->
- 1 --> 3
- 2 --> 0
- 3 -->
-
- */
-
-using namespace boost;
-
-typedef adjacency_list<vecS, vecS, directedS> Graph;
-
-
-int
-main()
-{
- typedef std::pair<std::size_t,std::size_t> Edge;
- Edge edges[6] = { Edge(0,3), Edge(0,2), Edge(0, 3),
- Edge(1,3),
- Edge(2, 0),
- Edge(3, 2) };
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle iterator constructor
- Graph g(4);
- for (std::size_t j = 0; j < 6; ++j)
- add_edge(edges[j].first, edges[j].second, g);
-#else
- Graph g(edges, edges + 6, 4);
-#endif
-
- std::cout << "original graph:" << std::endl;
- print_graph(g, get(vertex_index, g));
- std::cout << std::endl;
-
- std::cout << "removing edges (0,3)" << std::endl;
- remove_out_edge_if(vertex(0,g), incident_to(vertex(3,g), g), g);
- print_graph(g, get(vertex_index, g));
-
- std::cout << "removing edge (0,2) and (3, 2)" << std::endl;
- remove_edge_if(incident_to(vertex(2,g), g), g);
- print_graph(g, get(vertex_index, g));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/remove_edge_if_dir.expected b/Utilities/BGL/boost/graph/example/remove_edge_if_dir.expected
deleted file mode 100644
index 875e4854851a3e1270d90082db87d54d3067a6f5..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/remove_edge_if_dir.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-original graph:
-0 --> 3 2 3
-1 --> 3
-2 --> 0
-3 --> 2
-
-removing edges (0,3)
-0 --> 2
-1 --> 3
-2 --> 0
-3 --> 2
-removing edge (0,2) and (3, 2)
-0 -->
-1 --> 3
-2 --> 0
-3 -->
diff --git a/Utilities/BGL/boost/graph/example/remove_edge_if_undir.cpp b/Utilities/BGL/boost/graph/example/remove_edge_if_undir.cpp
deleted file mode 100644
index 7af8131b70e86b02ebf8e7ef0d24af7780e99d33..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/remove_edge_if_undir.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-using namespace boost;
-
-/*
- Sample output:
-
- original graph:
- 0 <--> 3 3 2
- 1 <--> 3
- 2 <--> 0 3
- 3 <--> 0 0 1 2
- 1(0,3) 2(0,3) 3(1,3) 4(2,0) 5(3,2)
-
- removing edges connecting 0 and 3
- 0 <--> 2
- 1 <--> 3
- 2 <--> 0 3
- 3 <--> 1 2
- 3(1,3) 4(2,0) 5(3,2)
- removing edges with weight greater than 3
- 0 <-->
- 1 <--> 3
- 2 <-->
- 3 <--> 1
- 3(1,3)
-
- */
-
-typedef adjacency_list<vecS, vecS, undirectedS,
- no_property, property<edge_weight_t, int> > Graph;
-
-struct has_weight_greater_than {
- has_weight_greater_than(int w_, Graph& g_) : w(w_), g(g_) { }
- bool operator()(graph_traits<Graph>::edge_descriptor e) {
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- property_map<Graph, edge_weight_t>::type weight = get(edge_weight, g);
- return get(weight, e) > w;
-#else
- // This version of get breaks VC++
- return get(edge_weight, g, e) > w;
-#endif
- }
- int w;
- Graph& g;
-};
-
-int
-main()
-{
- typedef std::pair<std::size_t,std::size_t> Edge;
- Edge edge_array[5] = { Edge(0, 3), Edge(0, 3),
- Edge(1, 3),
- Edge(2, 0),
- Edge(3, 2) };
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- Graph g(4);
- for (std::size_t j = 0; j < 5; ++j)
- add_edge(edge_array[j].first, edge_array[j].second, g);
-#else
- Graph g(edge_array, edge_array + 5, 4);
-#endif
- property_map<Graph, edge_weight_t>::type
- weight = get(edge_weight, g);
-
- int w = 0;
- graph_traits<Graph>::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(g); ei != ei_end; ++ei)
- weight[*ei] = ++w;
-
- std::cout << "original graph:" << std::endl;
- print_graph(g, get(vertex_index, g));
- print_edges2(g, get(vertex_index, g), get(edge_weight, g));
- std::cout << std::endl;
-
- std::cout << "removing edges connecting 0 and 3" << std::endl;
- remove_out_edge_if(vertex(0, g), incident_on(vertex(3, g), g), g);
- print_graph(g, get(vertex_index, g));
- print_edges2(g, get(vertex_index, g), get(edge_weight, g));
-
- std::cout << "removing edges with weight greater than 3" << std::endl;
- remove_edge_if(has_weight_greater_than(3, g), g);
- print_graph(g, get(vertex_index, g));
- print_edges2(g, get(vertex_index, g), get(edge_weight, g));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/remove_edge_if_undir.expected b/Utilities/BGL/boost/graph/example/remove_edge_if_undir.expected
deleted file mode 100644
index 1614e3833efb06582e30ed08567e83aa5b672c89..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/remove_edge_if_undir.expected
+++ /dev/null
@@ -1,19 +0,0 @@
-original graph:
-0 <--> 3 3 2
-1 <--> 3
-2 <--> 0 3
-3 <--> 0 0 1 2
-1(0,3) 2(0,3) 3(1,3) 4(2,0) 5(3,2)
-
-removing edges connecting 0 and 3
-0 <--> 2
-1 <--> 3
-2 <--> 0 3
-3 <--> 1 2
-3(1,3) 4(2,0) 5(3,2)
-removing edges with weight greater than 3
-0 <-->
-1 <--> 3
-2 <-->
-3 <--> 1
-3(1,3)
diff --git a/Utilities/BGL/boost/graph/example/reverse-graph-eg.cpp b/Utilities/BGL/boost/graph/example/reverse-graph-eg.cpp
deleted file mode 100644
index 9ccf1875c410026405d8c25c79dc22539fc6ea96..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/reverse-graph-eg.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-
-#include <algorithm>
-#include <vector>
-#include <utility>
-#include <iostream>
-
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/reverse_graph.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < vecS, vecS, bidirectionalS > Graph;
-
- Graph G(5);
- add_edge(0, 2, G);
- add_edge(1, 1, G);
- add_edge(1, 3, G);
- add_edge(1, 4, G);
- add_edge(2, 1, G);
- add_edge(2, 3, G);
- add_edge(2, 4, G);
- add_edge(3, 1, G);
- add_edge(3, 4, G);
- add_edge(4, 0, G);
- add_edge(4, 1, G);
-
- std::cout << "original graph:" << std::endl;
- print_graph(G, get(vertex_index, G));
-
-
- std::cout << std::endl << "reversed graph:" << std::endl;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 // avoid VC++ bug...
- reverse_graph<Graph> R(G);
- print_graph(R, get(vertex_index, G));
-#else
- print_graph(make_reverse_graph(G), get(vertex_index, G));
-#endif
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/reverse_graph.expected b/Utilities/BGL/boost/graph/example/reverse_graph.expected
deleted file mode 100644
index fc3bb22c98340ca9668a8e6b3d5b5e4e5577f4a8..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/reverse_graph.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-original graph:
-0 --> 2
-1 --> 1 3 4
-2 --> 1 3 4
-3 --> 1 4
-4 --> 0 1
-
-reversed graph:
-0 --> 4
-1 --> 1 2 3 4
-2 --> 0
-3 --> 1 2
-4 --> 1 2 3
diff --git a/Utilities/BGL/boost/graph/example/roget_components.cpp b/Utilities/BGL/boost/graph/example/roget_components.cpp
deleted file mode 100644
index c5d2efa0263686ba846d1ec0484d11fd1cf61c72..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/roget_components.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-//=======================================================================
-// Copyright 2001 University of Notre Dame.
-// Authors: Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <stdio.h>
-#include <iostream>
-#include <boost/graph/stanford_graph.hpp>
-#include <boost/graph/strong_components.hpp>
-
-#define specs(v) \
- (filename ? index_map[v] : v->cat_no) << " " << v->name
-
-int main(int argc, char* argv[])
-{
- using namespace boost;
- Graph* g;
- typedef graph_traits<Graph*>::vertex_descriptor vertex_t;
- unsigned long n = 0;
- unsigned long d = 0;
- unsigned long p = 0;
- long s = 0;
- char* filename = NULL;
- int c, i;
-
- while (--argc) {
- if (sscanf(argv[argc], "-n%lu", &n) == 1);
- else if (sscanf(argv[argc], "-d%lu", &d) == 1);
- else if (sscanf(argv[argc], "-p%lu", &p) == 1);
- else if (sscanf(argv[argc], "-s%ld", &s) == 1);
- else if (strncmp(argv[argc], "-g", 2) == 0)
- filename = argv[argc] + 2;
- else {
- fprintf(stderr, "Usage: %s [-nN][-dN][-pN][-sN][-gfoo]\n", argv[0]);
- return -2;
- }
- }
-
- g = (filename ? restore_graph(filename) : roget(n, d, p, s));
- if (g == NULL) {
- fprintf(stderr, "Sorry, can't create the graph! (error code %ld)\n",
- panic_code);
- return -1;
- }
- printf("Reachability analysis of %s\n\n", g->id);
-
- // - The root map corresponds to what Knuth calls the "min" field.
- // - The discover time map is the "rank" field
- // - Knuth uses the rank field for double duty, to record the
- // discover time, and to keep track of which vertices have
- // been visited. The BGL strong_components() function needs
- // a separate field for marking colors, so we use the w field.
-
- std::vector<int> comp(num_vertices(g));
- property_map<Graph*, vertex_index_t>::type
- index_map = get(vertex_index, g);
-
- property_map<Graph*, v_property<vertex_t> >::type
- root = get(v_property<vertex_t>(), g);
-
- int num_comp = strong_components
- (g, make_iterator_property_map(comp.begin(), index_map),
- root_map(root).
- discover_time_map(get(z_property<long>(), g)).
- color_map(get(w_property<long>(), g)));
-
- std::vector< std::vector<vertex_t> > strong_comp(num_comp);
-
- // First add representative vertices to each component's list
- graph_traits<Graph*>::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- if (root[*vi] == *vi)
- strong_comp[comp[index_map[*vi]]].push_back(*vi);
-
- // Then add the other vertices of the component
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- if (root[*vi] != *vi)
- strong_comp[comp[index_map[*vi]]].push_back(*vi);
-
- // We do not print out the "from" and "to" information as Knuth
- // does because we no longer have easy access to that information
- // from outside the algorithm.
-
- for (c = 0; c < num_comp; ++c) {
- vertex_t v = strong_comp[c].front();
- std::cout << "Strong component `" << specs(v) << "'";
- if (strong_comp[c].size() > 1) {
- std::cout << " also includes:\n";
- for (i = 1; i < strong_comp[c].size(); ++i)
- std::cout << " " << specs(strong_comp[c][i]) << std::endl;
- } else
- std::cout << std::endl;
- }
-
- // Next we print out the "component graph" or "condensation", that
- // is, we consider each component to be a vertex in a new graph
- // where there is an edge connecting one component to another if there
- // is one or more edges connecting any of the vertices from the
- // first component to any of the vertices in the second. We use the
- // name of the representative vertex as the name of the component.
-
- printf("\nLinks between components:\n");
-
- // This array provides an efficient way to check if we've already
- // created a link from the current component to the component
- // of the target vertex.
- std::vector<int> mark(num_comp, (std::numeric_limits<int>::max)());
-
- // We go in reverse order just to mimic the output ordering in
- // Knuth's version.
- for (c = num_comp - 1; c >= 0; --c) {
- vertex_t u = strong_comp[c][0];
- for (i = 0; i < strong_comp[c].size(); ++i) {
- vertex_t v = strong_comp[c][i];
- graph_traits<Graph*>::out_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = out_edges(v, g); ei != ei_end; ++ei) {
- vertex_t x = target(*ei, g);
- int comp_x = comp[index_map[x]];
- if (comp_x != c && mark[comp_x] != c) {
- mark[comp_x] = c;
- vertex_t w = strong_comp[comp_x][0];
- std::cout << specs(u) << " -> " << specs(w)
- << " (e.g., " << specs(v) << " -> " << specs(x) << ")\n";
- } // if
- } // for
- } // for
- } // for
-}
diff --git a/Utilities/BGL/boost/graph/example/scc.cpp b/Utilities/BGL/boost/graph/example/scc.cpp
deleted file mode 100644
index 0851d3219d19e9ab2a370f33e71aac7e4984bb04..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/scc.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <map>
-#include <string>
-#include <boost/graph/strong_components.hpp>
-#include <boost/graph/graphviz.hpp>
-
-int
-main()
-{
- using namespace boost;
- GraphvizDigraph g;
- read_graphviz("figs/scc.dot", g);
-
- typedef graph_traits < GraphvizDigraph >::vertex_descriptor vertex_t;
- std::map < vertex_t, int >component;
-
- strong_components(g, make_assoc_property_map(component));
-
- property_map < GraphvizDigraph, vertex_attribute_t >::type
- vertex_attr_map = get(vertex_attribute, g);
- std::string color[] = {
- "white", "gray", "black", "lightgray"};
- graph_traits < GraphvizDigraph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- vertex_attr_map[*vi]["color"] = color[component[*vi]];
- vertex_attr_map[*vi]["style"] = "filled";
- if (vertex_attr_map[*vi]["color"] == "black")
- vertex_attr_map[*vi]["fontcolor"] = "white";
- }
- write_graphviz("figs/scc-out.dot", g);
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/scc.dot b/Utilities/BGL/boost/graph/example/scc.dot
deleted file mode 100644
index eb55f5d6374888d7fe27e3d6e1501caf8dc50a2e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/scc.dot
+++ /dev/null
@@ -1,33 +0,0 @@
-
-digraph SCC {
- node[shape=circle];
- ratio=1.2
- a
- b
- c
- d
- e
- f
- g
- h
- i
- j
-
- a -> b
- a -> f
- a -> h
- b -> c
- b -> a
- c -> d
- c -> b
- d -> e
- e -> d
- f -> g
- g -> f
- g -> d
- h -> i
- i -> h
- i -> j
- i -> e
- i -> c
-}
diff --git a/Utilities/BGL/boost/graph/example/sgb-regression.cfg b/Utilities/BGL/boost/graph/example/sgb-regression.cfg
deleted file mode 100644
index 067a5ea6ea496d6269acd66bef3a817bb5307325..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/sgb-regression.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-// Boost Graph Library LEDA examples regression test configuration file
-//
-// From the boost/status directory, run
-// ./regression --tests ../libs/graph/example/sgb-regression.cfg -o graph-sgb-eg.html
-//
-// Please keep the entries ordered alphabetically by the test's file name.
-
-compile libs/graph/example/girth.cpp
-compile libs/graph/example/miles_span.cpp
-compile libs/graph/example/topo-sort-with-sgb.cpp
-compile libs/graph/example/roget_components.cpp
diff --git a/Utilities/BGL/boost/graph/example/sloan_ordering.cpp b/Utilities/BGL/boost/graph/example/sloan_ordering.cpp
deleted file mode 100644
index 774558fb4427c5c7e708cfdd93c79c4ca9f83ea0..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/sloan_ordering.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-//
-//=======================================================================
-// Copyright 2002 Marc Wintermantel (wintermantel@imes.mavt.ethz.ch)
-// ETH Zurich, Center of Structure Technologies (www.imes.ethz.ch/st)
-//
-// This file is part of the Boost Graph Library
-//
-// You should have received a copy of the License Agreement for the
-// Boost Graph Library along with the software; see the file LICENSE.
-// If not, contact Office of Research, University of Notre Dame, Notre
-// Dame, IN 46556.
-//
-// Permission to modify the code and to distribute modified code is
-// granted, provided the text of this NOTICE is retained, a notice that
-// the code was modified is included with the above COPYRIGHT NOTICE and
-// with the COPYRIGHT NOTICE in the LICENSE file, and that the LICENSE
-// file is distributed with the modified code.
-//
-// LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
-// By way of example, but not limitation, Licensor MAKES NO
-// REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
-// PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE COMPONENTS
-// OR DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS
-// OR OTHER RIGHTS.
-//=======================================================================
-//
-
-
-#include <boost/config.hpp>
-#include <vector>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/sloan_ordering.hpp>
-#include <boost/graph/properties.hpp>
-#include <boost/graph/bandwidth.hpp>
-#include <boost/graph/profile.hpp>
-#include <boost/graph/wavefront.hpp>
-
-
-using std::cout;
-using std::endl;
-
-/*
- Sample Output
- #####################################
- ### First light of sloan-ordering ###
- #####################################
-
- original bandwidth: 8
- original profile: 42
- original max_wavefront: 7
- original aver_wavefront: 4.2
- original rms_wavefront: 4.58258
-
- Starting vertex: 0
- Pseudoperipheral vertex: 9
- Pseudoperipheral radius: 4
-
- Sloan ordering starting at: 0
- 0 8 3 7 5 2 4 6 1 9
- bandwidth: 4
- profile: 28
- max_wavefront: 4
- aver_wavefront: 2.8
- rms_wavefront: 2.93258
-
- Sloan ordering without a start-vertex:
- 8 0 3 7 5 2 4 6 1 9
- bandwidth: 4
- profile: 27
- max_wavefront: 4
- aver_wavefront: 2.7
- rms_wavefront: 2.84605
-
- ###############################
- ### sloan-ordering finished ###
- ###############################
-*/
-
-int main(int , char* [])
-{
- cout << endl;
- cout << "#####################################" << endl;
- cout << "### First light of sloan-ordering ###" << endl;
- cout << "#####################################" << endl << endl;
-
- using namespace boost;
- using namespace std;
-
-
- //Defining the graph type
- typedef adjacency_list<
- setS,
- vecS,
- undirectedS,
- property<
- vertex_color_t,
- default_color_type,
- property<
- vertex_degree_t,
- int,
- property<
- vertex_priority_t,
- double > > > > Graph;
-
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::vertices_size_type size_type;
-
- typedef std::pair<std::size_t, std::size_t> Pair;
-
- Pair edges[14] = { Pair(0,3), //a-d
- Pair(0,5), //a-f
- Pair(1,2), //b-c
- Pair(1,4), //b-e
- Pair(1,6), //b-g
- Pair(1,9), //b-j
- Pair(2,3), //c-d
- Pair(2,4), //c-e
- Pair(3,5), //d-f
- Pair(3,8), //d-i
- Pair(4,6), //e-g
- Pair(5,6), //f-g
- Pair(5,7), //f-h
- Pair(6,7) }; //g-h
-
-
- //Creating a graph and adding the edges from above into it
- Graph G(10);
- for (int i = 0; i < 14; ++i)
- add_edge(edges[i].first, edges[i].second, G);
-
- //Creating two iterators over the vertices
- graph_traits<Graph>::vertex_iterator ui, ui_end;
-
- //Creating a property_map with the degrees of the degrees of each vertex
- property_map<Graph,vertex_degree_t>::type deg = get(vertex_degree, G);
- for (boost::tie(ui, ui_end) = vertices(G); ui != ui_end; ++ui)
- deg[*ui] = degree(*ui, G);
-
- //Creating a property_map for the indices of a vertex
- property_map<Graph, vertex_index_t>::type index_map = get(vertex_index, G);
-
- std::cout << "original bandwidth: " << bandwidth(G) << std::endl;
- std::cout << "original profile: " << profile(G) << std::endl;
- std::cout << "original max_wavefront: " << max_wavefront(G) << std::endl;
- std::cout << "original aver_wavefront: " << aver_wavefront(G) << std::endl;
- std::cout << "original rms_wavefront: " << rms_wavefront(G) << std::endl;
-
-
- //Creating a vector of vertices
- std::vector<Vertex> sloan_order(num_vertices(G));
- //Creating a vector of size_type
- std::vector<size_type> perm(num_vertices(G));
-
- {
-
- //Setting the start node
- Vertex s = vertex(0, G);
- int ecc; //defining a variable for the pseudoperipheral radius
-
- //Calculating the pseudoeperipheral node and radius
- Vertex e = pseudo_peripheral_pair(G, s, ecc, get(vertex_color, G), get(vertex_degree, G) );
-
- cout << endl;
- cout << "Starting vertex: " << s << endl;
- cout << "Pseudoperipheral vertex: " << e << endl;
- cout << "Pseudoperipheral radius: " << ecc << endl << endl;
-
-
-
- //Sloan ordering
- sloan_ordering(G, s, e, sloan_order.begin(), get(vertex_color, G),
- get(vertex_degree, G), get(vertex_priority, G));
-
- cout << "Sloan ordering starting at: " << s << endl;
- cout << " ";
-
- for (std::vector<Vertex>::const_iterator i = sloan_order.begin();
- i != sloan_order.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != sloan_order.size(); ++c)
- perm[index_map[sloan_order[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " profile: "
- << profile(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " max_wavefront: "
- << max_wavefront(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " aver_wavefront: "
- << aver_wavefront(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " rms_wavefront: "
- << rms_wavefront(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
-
-
-
-
- /////////////////////////////////////////////////
- //Version including finding a good starting point
- /////////////////////////////////////////////////
-
- {
- //sloan_ordering
- sloan_ordering(G, sloan_order.begin(),
- get(vertex_color, G),
- make_degree_map(G),
- get(vertex_priority, G) );
-
- cout << endl << "Sloan ordering without a start-vertex:" << endl;
- cout << " ";
- for (std::vector<Vertex>::const_iterator i=sloan_order.begin();
- i != sloan_order.end(); ++i)
- cout << index_map[*i] << " ";
- cout << endl;
-
- for (size_type c = 0; c != sloan_order.size(); ++c)
- perm[index_map[sloan_order[c]]] = c;
- std::cout << " bandwidth: "
- << bandwidth(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " profile: "
- << profile(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " max_wavefront: "
- << max_wavefront(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " aver_wavefront: "
- << aver_wavefront(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- std::cout << " rms_wavefront: "
- << rms_wavefront(G, make_iterator_property_map(&perm[0], index_map, perm[0]))
- << std::endl;
- }
-
-
-
- cout << endl;
- cout << "###############################" << endl;
- cout << "### sloan-ordering finished ###" << endl;
- cout << "###############################" << endl << endl;
- return 0;
-
-}
diff --git a/Utilities/BGL/boost/graph/example/strong-components.cpp b/Utilities/BGL/boost/graph/example/strong-components.cpp
deleted file mode 100644
index 251b71668fb2f13f98202c858718161c5e8b21e2..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/strong-components.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <vector>
-#include <iostream>
-#include <boost/graph/strong_components.hpp>
-#include <boost/graph/adjacency_list.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef adjacency_list < vecS, vecS, directedS > Graph;
- const int N = 6;
- Graph G(N);
- add_edge(0, 1, G);
- add_edge(1, 1, G);
- add_edge(1, 3, G);
- add_edge(1, 4, G);
- add_edge(3, 4, G);
- add_edge(3, 0, G);
- add_edge(4, 3, G);
- add_edge(5, 2, G);
-
- std::vector<int> c(N);
- int num = strong_components
- (G, make_iterator_property_map(c.begin(), get(vertex_index, G), c[0]));
-
- std::cout << "Total number of components: " << num << std::endl;
- std::vector < int >::iterator i;
- for (i = c.begin(); i != c.end(); ++i)
- std::cout << "Vertex " << i - c.begin()
- << " is in component " << *i << std::endl;
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/strong_components.cpp b/Utilities/BGL/boost/graph/example/strong_components.cpp
deleted file mode 100644
index 4b01f88624bb584a3b4e6930905fa49bb73e9770..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/strong_components.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//=======================================================================
-// Copyright 1997-2001 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <boost/graph/strong_components.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/graph_utility.hpp>
-/*
- Sample output:
- A directed graph:
- a --> b f h
- b --> c a
- c --> d b
- d --> e
- e --> d
- f --> g
- g --> f d
- h --> i
- i --> h j e c
- j -->
-
- Total number of components: 4
- Vertex a is in component 3
- Vertex b is in component 3
- Vertex c is in component 3
- Vertex d is in component 0
- Vertex e is in component 0
- Vertex f is in component 1
- Vertex g is in component 1
- Vertex h is in component 3
- Vertex i is in component 3
- Vertex j is in component 2
- */
-
-int main(int, char*[])
-{
- using namespace boost;
- const char* name = "abcdefghij";
-
- GraphvizDigraph G;
- read_graphviz("scc.dot", G);
-
- std::cout << "A directed graph:" << std::endl;
- print_graph(G, name);
- std::cout << std::endl;
-
- typedef graph_traits<GraphvizGraph>::vertex_descriptor Vertex;
-
- std::vector<int> component(num_vertices(G)), discover_time(num_vertices(G));
- std::vector<default_color_type> color(num_vertices(G));
- std::vector<Vertex> root(num_vertices(G));
- int num = strong_components(G, &component[0],
- root_map(&root[0]).
- color_map(&color[0]).
- discover_time_map(&discover_time[0]));
-
- std::cout << "Total number of components: " << num << std::endl;
- std::vector<int>::size_type i;
- for (i = 0; i != component.size(); ++i)
- std::cout << "Vertex " << name[i]
- <<" is in component " << component[i] << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/strong_components.expected b/Utilities/BGL/boost/graph/example/strong_components.expected
deleted file mode 100644
index 7786f51ea596ba0288774b08c629d77e92d6c0e9..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/strong_components.expected
+++ /dev/null
@@ -1,23 +0,0 @@
-A directed graph:
-a --> b f h
-b --> c a
-c --> d b
-d --> e
-e --> d
-f --> g
-g --> f d
-h --> i
-i --> h j e c
-j -->
-
-Total number of components: 4
-Vertex a is in component 3
-Vertex b is in component 3
-Vertex c is in component 3
-Vertex d is in component 0
-Vertex e is in component 0
-Vertex f is in component 1
-Vertex g is in component 1
-Vertex h is in component 3
-Vertex i is in component 3
-Vertex j is in component 2
diff --git a/Utilities/BGL/boost/graph/example/subgraph.cpp b/Utilities/BGL/boost/graph/example/subgraph.cpp
deleted file mode 100644
index 25db1960669842cbeceaa23a91b5389f6913a85f..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/subgraph.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//=======================================================================
-// Copyright 2001 University of Notre Dame.
-// Author: Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-/*
- Sample output:
-
- G0:
- 0 --> 1
- 1 --> 2 3
- 2 --> 5
- 3 -->
- 4 --> 1 5
- 5 --> 3
- 0(0,1) 1(1,2) 2(1,3) 6(2,5) 3(4,1) 4(4,5) 5(5,3)
-
- G1:
- 2 --> 5
- 4 --> 5
- 5 -->
- 6(2,5) 4(4,5)
-
- G2:
- 0 --> 1
- 1 -->
- 0(0,1)
-
- */
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/subgraph.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-int main(int,char*[])
-{
- using namespace boost;
- typedef adjacency_list_traits<vecS, vecS, directedS> Traits;
- typedef subgraph< adjacency_list<vecS, vecS, directedS,
- property<vertex_color_t, int>, property<edge_index_t, int> > > Graph;
-
- const int N = 6;
- Graph G0(N);
- enum { A, B, C, D, E, F}; // for conveniently refering to vertices in G0
-
- Graph& G1 = G0.create_subgraph();
- Graph& G2 = G0.create_subgraph();
- enum { A1, B1, C1 }; // for conveniently refering to vertices in G1
- enum { A2, B2 }; // for conveniently refering to vertices in G2
-
- add_vertex(C, G1); // global vertex C becomes local A1 for G1
- add_vertex(E, G1); // global vertex E becomes local B1 for G1
- add_vertex(F, G1); // global vertex F becomes local C1 for G1
-
- add_vertex(A, G2); // global vertex A becomes local A1 for G2
- add_vertex(B, G2); // global vertex B becomes local B1 for G2
-
- add_edge(A, B, G0);
- add_edge(B, C, G0);
- add_edge(B, D, G0);
- add_edge(E, B, G0);
- add_edge(E, F, G0);
- add_edge(F, D, G0);
-
- add_edge(A1, C1, G1); // (A1,C1) is subgraph G1 local indices for (C,F).
-
- std::cout << "G0:" << std::endl;
- print_graph(G0, get(vertex_index, G0));
- print_edges2(G0, get(vertex_index, G0), get(edge_index, G0));
- std::cout << std::endl;
-
- Graph::children_iterator ci, ci_end;
- int num = 1;
- for (tie(ci, ci_end) = G0.children(); ci != ci_end; ++ci) {
- std::cout << "G" << num++ << ":" << std::endl;
- print_graph(*ci, get(vertex_index, *ci));
- print_edges2(*ci, get(vertex_index, *ci), get(edge_index, *ci));
- std::cout << std::endl;
- }
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/subgraph.expected b/Utilities/BGL/boost/graph/example/subgraph.expected
deleted file mode 100644
index a75a0ce75d1602c94b809e6350a9eda195b80575..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/subgraph.expected
+++ /dev/null
@@ -1,20 +0,0 @@
-G0:
-0 --> 1
-1 --> 2 3
-2 --> 5
-3 -->
-4 --> 1 5
-5 --> 3
-0(0,1) 1(1,2) 2(1,3) 6(2,5) 3(4,1) 4(4,5) 5(5,3)
-
-G1:
-2 --> 5
-4 --> 5
-5 -->
-6(2,5) 4(4,5)
-
-G2:
-0 --> 1
-1 -->
-0(0,1)
-
diff --git a/Utilities/BGL/boost/graph/example/subgraph_properties.cpp b/Utilities/BGL/boost/graph/example/subgraph_properties.cpp
deleted file mode 100644
index 7de21cec9a265b9fb3421ee03c5afb2f2b3c5190..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/subgraph_properties.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// (C) Copyright Jeremy Siek 2004
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-/*
- Sample output:
-
- After initializing properties for G1:
- Global and local properties for vertex G0[C]...
- G0[C]= A1
- G1[A1]= A1
- Global and local properties for vertex G0[E]...
- G0[E]= B1
- G1[B1]= B1
- Global and local properties for vertex G0[F]...
- G0[F]= C1
- G1[C1]= C1
-
-
- After initializing properties for G2:
- Global and local properties for vertex G0[A]
- G0[A]= A2
- G2[A2]= A2
- Global and local properties for vertex G0[C]...
- G0[C]= B2
- G1[A1]= B2
- G2[B2]= B2
-
- */
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/subgraph.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-int main(int,char*[])
-{
- using namespace boost;
- //typedef adjacency_list_traits<vecS, vecS, directedS> Traits;// Does nothing?
- typedef property< vertex_color_t, int,
- property< vertex_name_t, std::string > > VertexProperty;
-
- typedef subgraph< adjacency_list< vecS, vecS, directedS,
- VertexProperty, property<edge_index_t, int> > > Graph;
-
- const int N = 6;
- Graph G0(N);
- enum { A, B, C, D, E, F}; // for conveniently refering to vertices in G0
-
- property_map<Graph, vertex_name_t>::type name = get(vertex_name_t(), G0);
- name[A] = "A";
- name[B] = "B";
- name[C] = "C";
- name[D] = "D";
- name[E] = "E";
- name[F] = "F";
-
- Graph& G1 = G0.create_subgraph();
- enum { A1, B1, C1 }; // for conveniently refering to vertices in G1
-
- add_vertex(C, G1); // global vertex C becomes local A1 for G1
- add_vertex(E, G1); // global vertex E becomes local B1 for G1
- add_vertex(F, G1); // global vertex F becomes local C1 for G1
-
- property_map<Graph, vertex_name_t>::type name1 = get(vertex_name_t(), G1);
- name1[A1] = "A1";
-
- std::cout << std::endl << "After initializing properties for G1:" << std::endl;
- std::cout << " Global and local properties for vertex G0[C]..." << std::endl;
- std::cout << " G0[C]= " << boost::get(vertex_name, G0, C) << std::endl;// prints: "G0[C]= C"
- std::cout << " G1[A1]= " << boost::get(vertex_name, G1, A1) << std::endl;// prints: "G1[A1]= A1"
-
- name1[B1] = "B1";
-
- std::cout << " Global and local properties for vertex G0[E]..." << std::endl;
- std::cout << " G0[E]= " << boost::get(vertex_name, G0, E) << std::endl;// prints: "G0[E]= E"
- std::cout << " G1[B1]= " << boost::get(vertex_name, G1, B1) << std::endl;// prints: "G1[B1]= B1"
-
- name1[C1] = "C1";
-
- std::cout << " Global and local properties for vertex G0[F]..." << std::endl;
- std::cout << " G0[F]= " << boost::get(vertex_name, G0, F) << std::endl;// prints: "G0[F]= F"
- std::cout << " G1[C1]= " << boost::get(vertex_name, G1, C1) << std::endl;// prints: "G1[C1]= C1"
-
- Graph& G2 = G0.create_subgraph();
- enum { A2, B2 }; // for conveniently refering to vertices in G2
-
- add_vertex(A, G2); // global vertex A becomes local A2 for G2
- add_vertex(C, G2); // global vertex C becomes local B2 for G2
-
- property_map<Graph, vertex_name_t>::type name2 = get(vertex_name_t(), G2);
- name2[A2] = "A2";
-
- std::cout << std::endl << std::endl << "After initializing properties for G2:" << std::endl;
- std::cout << " Global and local properties for vertex G0[A]" << std::endl;
- std::cout << " G0[A]= " << boost::get(vertex_name, G0, A) << std::endl;// prints: "G0[A]= A"
- std::cout << " G2[A2]= " << boost::get(vertex_name, G2, A2) << std::endl;// prints: "G2[A2]= A2"
-
- name2[B2] = "B2";
-
- std::cout << " Global and local properties for vertex G0[C]..." << std::endl;
- std::cout << " G0[C]= " << boost::get(vertex_name, G0, C) << std::endl;// prints: "G0[C]= C"
- std::cout << " G1[A1]= " << boost::get(vertex_name, G1, A1) << std::endl;// prints: "G1[A1]= A1"
- std::cout << " G2[B2]= " << boost::get(vertex_name, G2, B2) << std::endl;// prints: "G2[B2]= B2"
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/target-compile-costs.dat b/Utilities/BGL/boost/graph/example/target-compile-costs.dat
deleted file mode 100644
index cc1453577c87ce2c5a7b244c32e20c43d7cb3336..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/target-compile-costs.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-0.0
-0.0
-0.0
-0.0
-0.0
-1.5
-0.0
-2.8
-0.0
-3.6
-0.0
-8.7
-1.1
-1.5
-2.1
diff --git a/Utilities/BGL/boost/graph/example/tc.dot b/Utilities/BGL/boost/graph/example/tc.dot
deleted file mode 100644
index 39c429411d9885f5082c527efe203ea0f6ae068b..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/tc.dot
+++ /dev/null
@@ -1,13 +0,0 @@
-digraph TC {
- node[shape=circle];
- a
- b
- c
- d
-
- b -> c
- b -> d
- c -> b
- d -> c
- d -> a
-}
diff --git a/Utilities/BGL/boost/graph/example/test-astar-cities.dot b/Utilities/BGL/boost/graph/example/test-astar-cities.dot
deleted file mode 100644
index aee8107c7b2274f1710ad798351f000f0316f054..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/test-astar-cities.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-graph G {
-0[label="Troy", pos="460,193", fontsize="11"];
-1[label="Lake Placid", pos="432,338", fontsize="11"];
-2[label="Plattsburgh", pos="480,378", fontsize="11"];
-3[label="Massena", pos="352,400", fontsize="11"];
-4[label="Watertown", pos="262,309", fontsize="11"];
-5[label="Utica", pos="322,228", fontsize="11"];
-6[label="Syracuse", pos="241,222", fontsize="11"];
-7[label="Rochester", pos="111,234", fontsize="11"];
-8[label="Buffalo", pos="0,208", fontsize="11"];
-9[label="Ithaca", pos="209,166", fontsize="11"];
-10[label="Binghamton", pos="262,134", fontsize="11"];
-11[label="Woodstock", pos="422,128", fontsize="11"];
-12[label="New York", pos="437,0", fontsize="11"];
-0--5 [label="96", fontsize="11"];
-0--1 [label="134", fontsize="11"];
-0--2 [label="143", fontsize="11"];
-1--2 [label="65", fontsize="11"];
-2--3 [label="115", fontsize="11"];
-1--3 [label="133", fontsize="11"];
-3--4 [label="117", fontsize="11"];
-4--5 [label="116", fontsize="11"];
-4--6 [label="74", fontsize="11"];
-5--6 [label="56", fontsize="11"];
-6--7 [label="84", fontsize="11"];
-7--8 [label="73", fontsize="11"];
-6--9 [label="69", fontsize="11"];
-9--10 [label="70", fontsize="11"];
-9--7 [label="116", fontsize="11"];
-10--0 [label="147", fontsize="11"];
-10--11 [label="173", fontsize="11"];
-10--12 [label="183", fontsize="11"];
-6--10 [label="74", fontsize="11"];
-11--0 [label="71", fontsize="11"];
-11--12 [label="124", fontsize="11"];
-}
diff --git a/Utilities/BGL/boost/graph/example/topo-sort-file-dep.cpp b/Utilities/BGL/boost/graph/example/topo-sort-file-dep.cpp
deleted file mode 100644
index 21d0d3263efcd0fda819c9a9f9a63b1035093d96..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo-sort-file-dep.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-using namespace boost;
-
-namespace std
-{
- template < typename T >
- std::istream & operator >> (std::istream & in, std::pair < T, T > &p)
- {
- in >> p.first >> p.second;
- return in;
- }
-}
-
-typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS // The file dependency graph is directed
-> file_dep_graph;
-
-typedef graph_traits < file_dep_graph >::vertex_descriptor vertex_t;
-typedef graph_traits < file_dep_graph >::edge_descriptor edge_t;
-
-void
-topo_sort_dfs(const file_dep_graph & g, vertex_t u, vertex_t * &topo_order,
- int *mark)
-{
- mark[u] = 1; // 1 means visited, 0 means not yet visited
- graph_traits < file_dep_graph >::adjacency_iterator vi, vi_end;
- for (tie(vi, vi_end) = adjacent_vertices(u, g); vi != vi_end; ++vi)
- if (mark[*vi] == 0)
- topo_sort_dfs(g, *vi, topo_order, mark);
-
- *--topo_order = u;
-}
-
-void
-topo_sort(const file_dep_graph & g, vertex_t * topo_order)
-{
- std::vector < int >mark(num_vertices(g), 0);
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- if (mark[*vi] == 0)
- topo_sort_dfs(g, *vi, topo_order, &mark[0]);
-}
-
-
-int
-main()
-{
- std::ifstream file_in("makefile-dependencies.dat");
- typedef graph_traits < file_dep_graph >::vertices_size_type size_type;
- size_type n_vertices;
- file_in >> n_vertices; // read in number of vertices
- std::istream_iterator < std::pair < size_type, size_type > >
- input_begin(file_in), input_end;
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- file_dep_graph g(n_vertices);
- while (input_begin != input_end) {
- size_type i, j;
- tie(i, j) = *input_begin++;
- add_edge(i, j, g);
- }
-#else
- file_dep_graph g(input_begin, input_end, n_vertices);
-#endif
-
- std::vector < std::string > name(num_vertices(g));
- std::ifstream name_in("makefile-target-names.dat");
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- name_in >> name[*vi];
-
- std::vector < vertex_t > order(num_vertices(g));
- topo_sort(g, &order[0] + num_vertices(g));
- for (size_type i = 0; i < num_vertices(g); ++i)
- std::cout << name[order[i]] << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/topo-sort-file-dep2.cpp b/Utilities/BGL/boost/graph/example/topo-sort-file-dep2.cpp
deleted file mode 100644
index 05024761241687cddbdf082f18fad54879cd9ca0..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo-sort-file-dep2.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-using namespace boost;
-
-namespace std
-{
- template < typename T >
- std::istream &
- operator >> (std::istream & in, std::pair < T, T > &p)
- {
- in >> p.first >> p.second;
- return
- in;
- }
-}
-
-typedef adjacency_list <
- listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS // The file dependency graph is directed
- > file_dep_graph;
-
-typedef graph_traits <file_dep_graph >::vertex_descriptor vertex_t;
-typedef graph_traits <file_dep_graph >::edge_descriptor edge_t;
-
-template < typename Visitor > void
-dfs_v1(const file_dep_graph & g, vertex_t u, default_color_type * color,
- Visitor vis)
-{
- color[u] = gray_color;
- vis.discover_vertex(u, g);
- graph_traits < file_dep_graph >::out_edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = out_edges(u, g); ei != ei_end; ++ei) {
- if (color[target(*ei, g)] == white_color) {
- vis.tree_edge(*ei, g);
- dfs_v1(g, target(*ei, g), color, vis);
- } else if (color[target(*ei, g)] == gray_color)
- vis.back_edge(*ei, g);
- else
- vis.forward_or_cross_edge(*ei, g);
- }
- color[u] = black_color;
- vis.finish_vertex(u, g);
-}
-
-template < typename Visitor > void
-generic_dfs_v1(const file_dep_graph & g, Visitor vis)
-{
- std::vector < default_color_type > color(num_vertices(g), white_color);
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi) {
- if (color[*vi] == white_color)
- dfs_v1(g, *vi, &color[0], vis);
- }
-}
-
-struct dfs_visitor_default
-{
- template < typename V, typename G > void
- discover_vertex(V, const G &)
- {
- }
-
- template < typename E, typename G > void
- tree_edge(E, const G &)
- {
- }
-
- template < typename E, typename G > void
- back_edge(E, const G &)
- {
- }
-
- template < typename E, typename G > void
- forward_or_cross_edge(E, const G &)
- {
- }
-
- template < typename V, typename G > void
- finish_vertex(V, const G &)
- {
- }
-};
-
-struct topo_visitor : public dfs_visitor_default
-{
- topo_visitor(vertex_t * &order) : topo_order(order)
- {
- }
- void
- finish_vertex(vertex_t u, const file_dep_graph &)
- {
- *--topo_order = u;
- }
- vertex_t*& topo_order;
-};
-
-void
-topo_sort(const file_dep_graph & g, vertex_t * topo_order)
-{
- topo_visitor vis(topo_order);
- generic_dfs_v1(g, vis);
-}
-
-
-int
-main()
-{
- std::ifstream file_in("makefile-dependencies.dat");
- typedef graph_traits<file_dep_graph>::vertices_size_type size_type;
- size_type n_vertices;
- file_in >> n_vertices; // read in number of vertices
- std::istream_iterator < std::pair < size_type,
- size_type > >input_begin(file_in), input_end;
-
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- file_dep_graph g(n_vertices);
- while (input_begin != input_end) {
- size_type i, j;
- tie(i, j) = *input_begin++;
- add_edge(i, j, g);
- }
-#else
- file_dep_graph g(input_begin, input_end, n_vertices);
-#endif
-
- std::vector < std::string > name(num_vertices(g));
- std::ifstream name_in("makefile-target-names.dat");
- graph_traits < file_dep_graph >::vertex_iterator vi, vi_end;
- for (tie(vi, vi_end) = vertices(g); vi != vi_end; ++vi)
- name_in >> name[*vi];
-
- std::vector < vertex_t > order(num_vertices(g));
- topo_sort(g, &order[0] + num_vertices(g));
- for (size_type i = 0; i < num_vertices(g); ++i)
- std::cout << name[order[i]] << std::endl;
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/topo-sort-with-leda.cpp b/Utilities/BGL/boost/graph/example/topo-sort-with-leda.cpp
deleted file mode 100644
index cd24b76e30c462b8dda3792194064b4f41c7dd9e..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo-sort-with-leda.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <vector>
-#include <string>
-#include <boost/graph/topological_sort.hpp>
-#include <boost/graph/leda_graph.hpp>
-// Undefine macros from LEDA that conflict with the C++ Standard Library.
-#undef string
-#undef vector
-
-int
-main()
-{
- using namespace boost;
- typedef GRAPH < std::string, char >graph_t;
- graph_t leda_g;
- typedef graph_traits < graph_t >::vertex_descriptor vertex_t;
- std::vector < vertex_t > vert(7);
- vert[0] = add_vertex(std::string("pick up kids from school"), leda_g);
- vert[1] = add_vertex(std::string("buy groceries (and snacks)"), leda_g);
- vert[2] = add_vertex(std::string("get cash at ATM"), leda_g);
- vert[3] =
- add_vertex(std::string("drop off kids at soccer practice"), leda_g);
- vert[4] = add_vertex(std::string("cook dinner"), leda_g);
- vert[5] = add_vertex(std::string("pick up kids from soccer"), leda_g);
- vert[6] = add_vertex(std::string("eat dinner"), leda_g);
-
- add_edge(vert[0], vert[3], leda_g);
- add_edge(vert[1], vert[3], leda_g);
- add_edge(vert[1], vert[4], leda_g);
- add_edge(vert[2], vert[1], leda_g);
- add_edge(vert[3], vert[5], leda_g);
- add_edge(vert[4], vert[6], leda_g);
- add_edge(vert[5], vert[6], leda_g);
-
- std::vector < vertex_t > topo_order;
- node_array < default_color_type > color_array(leda_g);
-
- topological_sort(leda_g, std::back_inserter(topo_order),
- color_map(make_leda_node_property_map(color_array)));
-
- std::reverse(topo_order.begin(), topo_order.end());
- int n = 1;
- for (std::vector < vertex_t >::iterator i = topo_order.begin();
- i != topo_order.end(); ++i, ++n)
- std::cout << n << ": " << leda_g[*i] << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/topo-sort-with-sgb.cpp b/Utilities/BGL/boost/graph/example/topo-sort-with-sgb.cpp
deleted file mode 100644
index 9b0ea8e5d39bf231bd4cc12fc46658d037791fc3..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo-sort-with-sgb.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <vector>
-#include <string>
-#include <iostream>
-#include <boost/graph/topological_sort.hpp>
-#include <boost/graph/stanford_graph.hpp>
-
-int
-main()
-{
- using namespace boost;
- const int n_vertices = 7;
- Graph *sgb_g = gb_new_graph(n_vertices);
-
- const char *tasks[] = {
- "pick up kids from school",
- "buy groceries (and snacks)",
- "get cash at ATM",
- "drop off kids at soccer practice",
- "cook dinner",
- "pick up kids from soccer",
- "eat dinner"
- };
- const int n_tasks = sizeof(tasks) / sizeof(char *);
-
- gb_new_arc(sgb_g->vertices + 0, sgb_g->vertices + 3, 0);
- gb_new_arc(sgb_g->vertices + 1, sgb_g->vertices + 3, 0);
- gb_new_arc(sgb_g->vertices + 1, sgb_g->vertices + 4, 0);
- gb_new_arc(sgb_g->vertices + 2, sgb_g->vertices + 1, 0);
- gb_new_arc(sgb_g->vertices + 3, sgb_g->vertices + 5, 0);
- gb_new_arc(sgb_g->vertices + 4, sgb_g->vertices + 6, 0);
- gb_new_arc(sgb_g->vertices + 5, sgb_g->vertices + 6, 0);
-
- typedef graph_traits < Graph * >::vertex_descriptor vertex_t;
- std::vector < vertex_t > topo_order;
- topological_sort(sgb_g, std::back_inserter(topo_order),
- vertex_index_map(get(vertex_index, sgb_g)));
- int n = 1;
- for (std::vector < vertex_t >::reverse_iterator i = topo_order.rbegin();
- i != topo_order.rend(); ++i, ++n)
- std::cout << n << ": " << tasks[get(vertex_index, sgb_g)[*i]] << std::endl;
-
- gb_recycle(sgb_g);
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/topo-sort1.cpp b/Utilities/BGL/boost/graph/example/topo-sort1.cpp
deleted file mode 100644
index 90c98a2d9992330569c76b86504ab151a1ded2bf..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo-sort1.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <deque> // to store the vertex ordering
-#include <vector>
-#include <list>
-#include <iostream>
-#include <boost/graph/vector_as_graph.hpp>
-#include <boost/graph/topological_sort.hpp>
-
-int
-main()
-{
- using namespace boost;
- const char *tasks[] = {
- "pick up kids from school",
- "buy groceries (and snacks)",
- "get cash at ATM",
- "drop off kids at soccer practice",
- "cook dinner",
- "pick up kids from soccer",
- "eat dinner"
- };
- const int n_tasks = sizeof(tasks) / sizeof(char *);
-
- std::vector < std::list < int > > g(n_tasks);
- g[0].push_back(3);
- g[1].push_back(3);
- g[1].push_back(4);
- g[2].push_back(1);
- g[3].push_back(5);
- g[4].push_back(6);
- g[5].push_back(6);
-
- std::deque < int >topo_order;
-
- topological_sort(g, std::front_inserter(topo_order),
- vertex_index_map(identity_property_map()));
-
- int n = 1;
- for (std::deque < int >::iterator i = topo_order.begin();
- i != topo_order.end(); ++i, ++n)
- std::cout << tasks[*i] << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/topo-sort2.cpp b/Utilities/BGL/boost/graph/example/topo-sort2.cpp
deleted file mode 100644
index 4663181ef2c508467e36e51d046e2dc1b8359f14..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo-sort2.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <vector>
-#include <deque>
-#include <iostream>
-#include <boost/graph/topological_sort.hpp>
-#include <boost/graph/adjacency_list.hpp>
-int
-main()
-{
- using namespace boost;
- const char *tasks[] = {
- "pick up kids from school",
- "buy groceries (and snacks)",
- "get cash at ATM",
- "drop off kids at soccer practice",
- "cook dinner",
- "pick up kids from soccer",
- "eat dinner"
- };
- const int n_tasks = sizeof(tasks) / sizeof(char *);
-
- adjacency_list < listS, vecS, directedS > g(n_tasks);
-
- add_edge(0, 3, g);
- add_edge(1, 3, g);
- add_edge(1, 4, g);
- add_edge(2, 1, g);
- add_edge(3, 5, g);
- add_edge(4, 6, g);
- add_edge(5, 6, g);
-
- std::deque < int >topo_order;
-
- topological_sort(g, std::front_inserter(topo_order),
- vertex_index_map(identity_property_map()));
-
- int n = 1;
- for (std::deque < int >::iterator i = topo_order.begin();
- i != topo_order.end(); ++i, ++n)
- std::cout << tasks[*i] << std::endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/Utilities/BGL/boost/graph/example/topo_sort.cpp b/Utilities/BGL/boost/graph/example/topo_sort.cpp
deleted file mode 100644
index 124db6a2d69739fe31e2c56f3433378b45cf5bd6..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo_sort.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <list>
-#include <algorithm>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/topological_sort.hpp>
-#include <iterator>
-#include <utility>
-
-
-typedef std::pair<std::size_t,std::size_t> Pair;
-
-/*
- Topological sort example
-
- The topological sort algorithm creates a linear ordering
- of the vertices such that if edge (u,v) appears in the graph,
- then u comes before v in the ordering.
-
- Sample output:
-
- A topological ordering: 2 5 0 1 4 3
-
-*/
-
-int
-main(int , char* [])
-{
- //begin
- using namespace boost;
-
- /* Topological sort will need to color the graph. Here we use an
- internal decorator, so we "property" the color to the graph.
- */
- typedef adjacency_list<vecS, vecS, directedS,
- property<vertex_color_t, default_color_type> > Graph;
-
- typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
- Pair edges[6] = { Pair(0,1), Pair(2,4),
- Pair(2,5),
- Pair(0,3), Pair(1,4),
- Pair(4,3) };
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- // VC++ can't handle the iterator constructor
- Graph G(6);
- for (std::size_t j = 0; j < 6; ++j)
- add_edge(edges[j].first, edges[j].second, G);
-#else
- Graph G(edges, edges + 6, 6);
-#endif
-
- boost::property_map<Graph, vertex_index_t>::type id = get(vertex_index, G);
-
- typedef std::vector< Vertex > container;
- container c;
- topological_sort(G, std::back_inserter(c));
-
- std::cout << "A topological ordering: ";
- for (container::reverse_iterator ii = c.rbegin();
- ii != c.rend(); ++ii)
- std::cout << id[*ii] << " ";
- std::cout << std::endl;
-
- return 0;
-}
-
diff --git a/Utilities/BGL/boost/graph/example/topo_sort.expected b/Utilities/BGL/boost/graph/example/topo_sort.expected
deleted file mode 100644
index aeb3f41fe70fcbc6e666b64449fb612355cc00e8..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/topo_sort.expected
+++ /dev/null
@@ -1 +0,0 @@
-A topological ordering: 2 5 0 1 4 3
diff --git a/Utilities/BGL/boost/graph/example/transitive_closure.cpp b/Utilities/BGL/boost/graph/example/transitive_closure.cpp
deleted file mode 100644
index 2b99cdb9681ce6cc799e156742d3f3d7bf8f48e1..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/transitive_closure.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Jeremy Siek 2001
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// NOTE: this final is generated by libs/graph/doc/transitive_closure.w
-
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#error The transitive closure algorithm uses partial specialization.
-#endif
-
-#include <boost/graph/transitive_closure.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-int
-main(int, char *[])
-{
- using namespace boost;
- typedef property < vertex_name_t, char >Name;
- typedef property < vertex_index_t, std::size_t, Name > Index;
- typedef adjacency_list < listS, listS, directedS, Index > graph_t;
- typedef graph_traits < graph_t >::vertex_descriptor vertex_t;
- graph_t G;
- std::vector < vertex_t > verts(4);
- for (int i = 0; i < 4; ++i)
- verts[i] = add_vertex(Index(i, Name('a' + i)), G);
- add_edge(verts[1], verts[2], G);
- add_edge(verts[1], verts[3], G);
- add_edge(verts[2], verts[1], G);
- add_edge(verts[3], verts[2], G);
- add_edge(verts[3], verts[0], G);
-
- std::cout << "Graph G:" << std::endl;
- print_graph(G, get(vertex_name, G));
-
- adjacency_list <> TC;
- transitive_closure(G, TC);
-
- std::cout << std::endl << "Graph G+:" << std::endl;
- char name[] = "abcd";
- print_graph(TC, name);
- std::cout << std::endl;
-
- std::ofstream out("tc-out.dot");
- write_graphviz(out, TC, make_label_writer(name));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/transpose-example.cpp b/Utilities/BGL/boost/graph/example/transpose-example.cpp
deleted file mode 100644
index 0231027ffe91475c9d0f5bcd73559982f3365394..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/transpose-example.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/transpose_graph.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-int
-main()
-{
- using namespace boost;
- typedef int weight_t;
- typedef adjacency_list < vecS, vecS, bidirectionalS,
- property < vertex_name_t, char > > graph_t;
-
- enum { a, b, c, d, e, f, g, N };
- graph_t G(N);
- property_map < graph_t, vertex_name_t >::type
- name_map = get(vertex_name, G);
- char name = 'a';
- graph_traits < graph_t >::vertex_iterator v, v_end;
- for (tie(v, v_end) = vertices(G); v != v_end; ++v, ++name)
- name_map[*v] = name;
-
- typedef std::pair < int, int >E;
- E edge_array[] = { E(a, c), E(a, d), E(b, a), E(b, d), E(c, f),
- E(d, c), E(d, e), E(d, f), E(e, b), E(e, g), E(f, e), E(f, g)
- };
- for (int i = 0; i < 12; ++i)
- add_edge(edge_array[i].first, edge_array[i].second, G);
-
- print_graph(G, name_map);
- std::cout << std::endl;
-
- graph_t G_T;
- transpose_graph(G, G_T);
-
- print_graph(G_T, name_map);
-
- graph_traits < graph_t >::edge_iterator ei, ei_end;
- for (tie(ei, ei_end) = edges(G); ei != ei_end; ++ei)
- assert(edge(target(*ei, G), source(*ei, G), G_T).second == true);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/undirected.cpp b/Utilities/BGL/boost/graph/example/undirected.cpp
deleted file mode 100644
index 49a7ed7d3d46516c68de6ccbe5e9a38fb81de116..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/undirected.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <boost/graph/adjacency_list.hpp>
-using namespace boost;
-
-template < typename UndirectedGraph > void
-undirected_graph_demo1()
-{
- const int V = 3;
- UndirectedGraph undigraph(V);
- typename graph_traits < UndirectedGraph >::vertex_descriptor zero, one, two;
- typename graph_traits < UndirectedGraph >::out_edge_iterator out, out_end;
- typename graph_traits < UndirectedGraph >::in_edge_iterator in, in_end;
-
- zero = vertex(0, undigraph);
- one = vertex(1, undigraph);
- two = vertex(2, undigraph);
- add_edge(zero, one, undigraph);
- add_edge(zero, two, undigraph);
- add_edge(one, two, undigraph);
-
- std::cout << "out_edges(0): ";
- for (tie(out, out_end) = out_edges(zero, undigraph); out != out_end; ++out)
- std::cout << *out;
- std::cout << std::endl << "in_edges(0): ";
- for (tie(in, in_end) = in_edges(zero, undigraph); in != in_end; ++in)
- std::cout << *in;
- std::cout << std::endl;
-}
-
-template < typename DirectedGraph > void
-directed_graph_demo()
-{
- const int V = 2;
- DirectedGraph digraph(V);
- typename graph_traits < DirectedGraph >::vertex_descriptor u, v;
- typedef typename DirectedGraph::edge_property_type Weight;
- typename property_map < DirectedGraph, edge_weight_t >::type
- weight = get(edge_weight, digraph);
- typename graph_traits < DirectedGraph >::edge_descriptor e1, e2;
- bool found;
-
- u = vertex(0, digraph);
- v = vertex(1, digraph);
- add_edge(u, v, Weight(1.2), digraph);
- add_edge(v, u, Weight(2.4), digraph);
- tie(e1, found) = edge(u, v, digraph);
- tie(e2, found) = edge(v, u, digraph);
- std::cout << "in a directed graph is ";
-#ifdef __GNUC__
- // no boolalpha
- std::cout << "(u,v) == (v,u) ? " << (e1 == e2) << std::endl;
-#else
- std::cout << "(u,v) == (v,u) ? "
- << std::boolalpha << (e1 == e2) << std::endl;
-#endif
- std::cout << "weight[(u,v)] = " << get(weight, e1) << std::endl;
- std::cout << "weight[(v,u)] = " << get(weight, e2) << std::endl;
-}
-
-template < typename UndirectedGraph > void
-undirected_graph_demo2()
-{
- const int V = 2;
- UndirectedGraph undigraph(V);
- typename graph_traits < UndirectedGraph >::vertex_descriptor u, v;
- typedef typename UndirectedGraph::edge_property_type Weight;
- typename property_map < UndirectedGraph, edge_weight_t >::type
- weight = get(edge_weight, undigraph);
- typename graph_traits < UndirectedGraph >::edge_descriptor e1, e2;
- bool found;
-
- u = vertex(0, undigraph);
- v = vertex(1, undigraph);
- add_edge(u, v, Weight(3.1), undigraph);
- tie(e1, found) = edge(u, v, undigraph);
- tie(e2, found) = edge(v, u, undigraph);
- std::cout << "in an undirected graph is ";
-#ifdef __GNUC__
- std::cout << "(u,v) == (v,u) ? " << (e1 == e2) << std::endl;
-#else
- std::cout << "(u,v) == (v,u) ? "
- << std::boolalpha << (e1 == e2) << std::endl;
-#endif
- std::cout << "weight[(u,v)] = " << get(weight, e1) << std::endl;
- std::cout << "weight[(v,u)] = " << get(weight, e2) << std::endl;
-}
-
-
-int
-main()
-{
- typedef property < edge_weight_t, double >Weight;
- typedef adjacency_list < vecS, vecS, undirectedS,
- no_property, Weight > UndirectedGraph;
- typedef adjacency_list < vecS, vecS, directedS,
- no_property, Weight > DirectedGraph;
- undirected_graph_demo1 < UndirectedGraph > ();
- undirected_graph_demo2 < UndirectedGraph > ();
- directed_graph_demo < DirectedGraph > ();
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/undirected.expected b/Utilities/BGL/boost/graph/example/undirected.expected
deleted file mode 100644
index 015a7afc9f3844d51093beccf2503483e24ed810..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/undirected.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-in a directed graph is (u,v) == (v,u) ? 0
-weight[(u,v)] = 1.2
-weight[(v,u)] = 2.4
-in an undirected graph is (u,v) == (v,u) ? 1
-weight[(u,v)] = 3.1
-weight[(v,u)] = 3.1
-the edges incident to v: (0,1)
diff --git a/Utilities/BGL/boost/graph/example/undirected_dfs.cpp b/Utilities/BGL/boost/graph/example/undirected_dfs.cpp
deleted file mode 100644
index bc314d39bc5e66b5d392d28440fd0facb6342c69..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/undirected_dfs.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//=======================================================================
-// Copyright 2002 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/undirected_dfs.hpp>
-#include <boost/cstdlib.hpp>
-#include <iostream>
-
-/*
- Example graph from Tarjei Knapstad.
-
- H15
- |
- H8 C2
- \ / \
- H9-C0-C1 C3-O7-H14
- / | |
- H10 C6 C4
- / \ / \
- H11 C5 H13
- |
- H12
-*/
-
-std::string name[] = { "C0", "C1", "C2", "C3", "C4", "C5", "C6", "O7",
- "H8", "H9", "H10", "H11", "H12", "H13", "H14", "H15"};
-
-
-struct detect_loops : public boost::dfs_visitor<>
-{
- template <class Edge, class Graph>
- void back_edge(Edge e, const Graph& g) {
- std::cout << name[source(e, g)]
- << " -- "
- << name[target(e, g)] << "\n";
- }
-};
-
-int main(int, char*[])
-{
- using namespace boost;
- typedef adjacency_list< vecS, vecS, undirectedS,
- no_property,
- property<edge_color_t, default_color_type> > graph_t;
- typedef graph_traits<graph_t>::vertex_descriptor vertex_t;
-
- const std::size_t N = sizeof(name)/sizeof(std::string);
- graph_t g(N);
-
- add_edge(0, 1, g);
- add_edge(0, 8, g);
- add_edge(0, 9, g);
- add_edge(0, 10, g);
- add_edge(1, 2, g);
- add_edge(1, 6, g);
- add_edge(2, 15, g);
- add_edge(2, 3, g);
- add_edge(3, 7, g);
- add_edge(3, 4, g);
- add_edge(4, 13, g);
- add_edge(4, 5, g);
- add_edge(5, 12, g);
- add_edge(5, 6, g);
- add_edge(6, 11, g);
- add_edge(7, 14, g);
-
- std::cout << "back edges:\n";
- detect_loops vis;
- undirected_dfs(g, root_vertex(vertex_t(0)).visitor(vis)
- .edge_color_map(get(edge_color, g)));
- std::cout << std::endl;
-
- return boost::exit_success;
-}
diff --git a/Utilities/BGL/boost/graph/example/vector-as-graph.cpp b/Utilities/BGL/boost/graph/example/vector-as-graph.cpp
deleted file mode 100644
index ccf6abeb69739f63748cba1a4eec740177952c6f..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/vector-as-graph.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#error The vector_as_graph.hpp header requires partial specialization
-#endif
-
-#include <vector>
-#include <list>
-#include <iostream> // needed by graph_utility. -Jeremy
-#include <boost/graph/vector_as_graph.hpp>
-#include <boost/graph/graph_utility.hpp>
-
-int
-main()
-{
- enum
- { r, s, t, u, v, w, x, y, N };
- char name[] = "rstuvwxy";
- typedef std::vector < std::list < int > > Graph;
- Graph g(N);
- g[r].push_back(v);
- g[s].push_back(r);
- g[s].push_back(r);
- g[s].push_back(w);
- g[t].push_back(x);
- g[u].push_back(t);
- g[w].push_back(t);
- g[w].push_back(x);
- g[x].push_back(y);
- g[y].push_back(u);
- boost::print_graph(g, name);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/vector_as_graph.expected b/Utilities/BGL/boost/graph/example/vector_as_graph.expected
deleted file mode 100644
index 1f72879473a986ce0f0741cf4a8314a446943358..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/vector_as_graph.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-order of discovery: s r w v t x y u
-order of finish: s r w v t x y u
diff --git a/Utilities/BGL/boost/graph/example/vertex-name-property.cpp b/Utilities/BGL/boost/graph/example/vertex-name-property.cpp
deleted file mode 100644
index c1216f04668bab02d262dffbd8bf89091e963a83..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/vertex-name-property.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//=======================================================================
-// Copyright 2001 Jeremy G. Siek, Andrew Lumsdaine, Lie-Quan Lee,
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-#include <boost/config.hpp>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace boost;
-
-template < typename Graph, typename VertexNamePropertyMap > void
-read_graph_file(std::istream & graph_in, std::istream & name_in,
- Graph & g, VertexNamePropertyMap name_map)
-{
- typedef typename graph_traits < Graph >::vertices_size_type size_type;
- size_type n_vertices;
- typename graph_traits < Graph >::vertex_descriptor u;
- typename property_traits < VertexNamePropertyMap >::value_type name;
-
- graph_in >> n_vertices; // read in number of vertices
- for (size_type i = 0; i < n_vertices; ++i) { // Add n vertices to the graph
- u = add_vertex(g);
- name_in >> name;
- put(name_map, u, name); // ** Attach name property to vertex u **
- }
- size_type src, targ;
- while (graph_in >> src) // Read in edges
- if (graph_in >> targ)
- add_edge(src, targ, g); // add an edge to the graph
- else
- break;
-}
-
-
-int
-main()
-{
- typedef adjacency_list < listS, // Store out-edges of each vertex in a std::list
- vecS, // Store vertex set in a std::vector
- directedS, // The graph is directed
- property < vertex_name_t, std::string > // Add a vertex property
- >graph_type;
-
- graph_type g; // use default constructor to create empty graph
- const char* dep_file_name = "makefile-dependencies.dat";
- const char* target_file_name = "makefile-target-names.dat";
- std::ifstream file_in(dep_file_name), name_in(target_file_name);
- if (!file_in) {
- std::cerr << "** Error: could not open file " << dep_file_name
- << std::endl;
- return -1;
- }
- if (!name_in) {
- std::cerr << "** Error: could not open file " << target_file_name
- << std::endl;
- return -1;
- }
-
- // Obtain internal property map from the graph
- property_map < graph_type, vertex_name_t >::type name_map =
- get(vertex_name, g);
- read_graph_file(file_in, name_in, g, name_map);
-
- // Create storage for last modified times
- std::vector < time_t > last_mod_vec(num_vertices(g));
- // Create nickname for the property map type
- typedef iterator_property_map < std::vector < time_t >::iterator,
- property_map < graph_type, vertex_index_t >::type, time_t, time_t& > iter_map_t;
- // Create last modified time property map
- iter_map_t mod_time_map(last_mod_vec.begin(), get(vertex_index, g));
-
- assert(num_vertices(g) == 15);
- assert(num_edges(g) == 19);
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/vertex_basics.cpp b/Utilities/BGL/boost/graph/example/vertex_basics.cpp
deleted file mode 100644
index 8d2053fbc9000880acc8445de3e94e80f3749da2..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/vertex_basics.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <algorithm>
-#include <boost/graph/adjacency_list.hpp>
-
-using namespace std;
-using namespace boost;
-
-
-/*
- Vertex Basics
-
- This example demonstrates the GGCL Vertex interface.
-
- Sample output:
-
- vertices(g) = 0 1 2 3 4
- vertex id: 0
- out-edges: (0,1) (0,2) (0,3) (0,4)
- in-edges: (2,0) (3,0) (4,0)
- adjacent vertices: 1 2 3 4
-
- vertex id: 1
- out-edges:
- in-edges: (0,1) (3,1) (4,1)
- adjacent vertices:
-
- vertex id: 2
- out-edges: (2,0) (2,4)
- in-edges: (0,2)
- adjacent vertices: 0 4
-
- vertex id: 3
- out-edges: (3,0) (3,1) (3,4)
- in-edges: (0,3)
- adjacent vertices: 0 1 4
-
- vertex id: 4
- out-edges: (4,0) (4,1)
- in-edges: (0,4) (2,4) (3,4)
- adjacent vertices: 0 1
-
-
- */
-
-
-/* some helper functors for output */
-
-template <class Graph>
-struct print_edge {
- print_edge(Graph& g) : G(g) { }
-
- typedef typename boost::graph_traits<Graph>::edge_descriptor Edge;
- typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
- void operator()(Edge e) const
- {
- typename boost::property_map<Graph, vertex_index_t>::type
- id = get(vertex_index, G);
-
- Vertex src = source(e, G);
- Vertex targ = target(e, G);
-
- cout << "(" << id[src] << "," << id[targ] << ") ";
- }
-
- Graph& G;
-};
-
-template <class Graph>
-struct print_index {
- print_index(Graph& g) : G(g){ }
-
- typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
- void operator()(Vertex c) const
- {
- typename boost::property_map<Graph,vertex_index_t>::type
- id = get(vertex_index, G);
- cout << id[c] << " ";
- }
-
- Graph& G;
-};
-
-
-template <class Graph>
-struct exercise_vertex {
- typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
-
- exercise_vertex(Graph& _g) : g(_g) { }
-
- void operator()(Vertex v) const
- {
- typename boost::property_map<Graph, vertex_index_t>::type
- id = get(vertex_index, g);
-
- cout << "vertex id: " << id[v] << endl;
-
- cout << "out-edges: ";
- for_each(out_edges(v, g).first, out_edges(v,g).second,
- print_edge<Graph>(g));
-
- cout << endl;
-
- cout << "in-edges: ";
- for_each(in_edges(v, g).first, in_edges(v,g).second,
- print_edge<Graph>(g));
-
- cout << endl;
-
- cout << "adjacent vertices: ";
- for_each(adjacent_vertices(v,g).first,
- adjacent_vertices(v,g).second, print_index<Graph>(g));
- cout << endl << endl;
- }
-
- Graph& g;
-};
-
-
-int
-main()
-{
- typedef adjacency_list<vecS,vecS,bidirectionalS> MyGraphType;
-
- typedef pair<int,int> Pair;
- Pair edge_array[11] = { Pair(0,1), Pair(0,2), Pair(0,3), Pair(0,4),
- Pair(2,0), Pair(3,0), Pair(2,4), Pair(3,1),
- Pair(3,4), Pair(4,0), Pair(4,1) };
-
- /* Construct a graph using the edge_array*/
- MyGraphType g(5);
- for (int i=0; i<11; ++i)
- add_edge(edge_array[i].first, edge_array[i].second, g);
-
- boost::property_map<MyGraphType, vertex_index_t>::type
- id = get(vertex_index, g);
-
- cout << "vertices(g) = ";
- boost::graph_traits<MyGraphType>::vertex_iterator vi;
- for (vi = vertices(g).first; vi != vertices(g).second; ++vi)
- std::cout << id[*vi] << " ";
- std::cout << std::endl;
-
- /* Use the STL for_each algorithm to "exercise" all
- of the vertices in the graph */
- for_each(vertices(g).first, vertices(g).second,
- exercise_vertex<MyGraphType>(g));
-
- return 0;
-}
diff --git a/Utilities/BGL/boost/graph/example/vertex_basics.expected b/Utilities/BGL/boost/graph/example/vertex_basics.expected
deleted file mode 100644
index 96a103d961fdb49c7899dfe420e49bdfedb7e121..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/vertex_basics.expected
+++ /dev/null
@@ -1,26 +0,0 @@
-vertices(g) = 0 1 2 3 4
-vertex id: 0
-out-edges: (0,1) (0,2) (0,3) (0,4)
-in-edges: (2,0) (3,0) (4,0)
-adjacent vertices: 1 2 3 4
-
-vertex id: 1
-out-edges:
-in-edges: (0,1) (3,1) (4,1)
-adjacent vertices:
-
-vertex id: 2
-out-edges: (2,0) (2,4)
-in-edges: (0,2)
-adjacent vertices: 0 4
-
-vertex id: 3
-out-edges: (3,0) (3,1) (3,4)
-in-edges: (0,3)
-adjacent vertices: 0 1 4
-
-vertex id: 4
-out-edges: (4,0) (4,1)
-in-edges: (0,4) (2,4) (3,4)
-adjacent vertices: 0 1
-
diff --git a/Utilities/BGL/boost/graph/example/visitor.cpp b/Utilities/BGL/boost/graph/example/visitor.cpp
deleted file mode 100644
index 700932d844dbb51d24fa6ba7b07fb620562d9bff..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/visitor.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-//=======================================================================
-// Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
-//
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//=======================================================================
-//
-// Sample output
-//
-// DFS categorized directed graph
-// tree: 0 --> 2
-// tree: 2 --> 1
-// back: 1 --> 1
-// tree: 1 --> 3
-// back: 3 --> 1
-// tree: 3 --> 4
-// back: 4 --> 0
-// back: 4 --> 1
-// forward or cross: 2 --> 3
-
-// BFS categorized directed graph
-// tree: 0 --> 2
-// tree: 2 --> 1
-// tree: 2 --> 3
-// cycle: 1 --> 1
-// cycle: 1 --> 3
-// cycle: 3 --> 1
-// tree: 3 --> 4
-// cycle: 4 --> 0
-// cycle: 4 --> 1
-
-#include <boost/config.hpp>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <utility>
-#include <string>
-
-#include <boost/graph/visitors.hpp>
-#include <boost/graph/graph_utility.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/depth_first_search.hpp>
-
-using namespace boost;
-using namespace std;
-
-template <class Tag>
-struct edge_printer : public base_visitor<edge_printer<Tag> > {
- typedef Tag event_filter;
- edge_printer(std::string edge_t) : m_edge_type(edge_t) { }
- template <class Edge, class Graph>
- void operator()(Edge e, Graph& G) {
- std::cout << m_edge_type << ": " << source(e, G)
- << " --> " << target(e, G) << std::endl;
- }
- std::string m_edge_type;
-};
-template <class Tag>
-edge_printer<Tag> print_edge(std::string type, Tag) {
- return edge_printer<Tag>(type);
-}
-
-int
-main(int, char*[])
-{
-
- using namespace boost;
-
- typedef adjacency_list<> Graph;
- typedef std::pair<int,int> E;
- E edges[] = { E(0, 2),
- E(1, 1), E(1, 3),
- E(2, 1), E(2, 3),
- E(3, 1), E(3, 4),
- E(4, 0), E(4, 1) };
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- Graph G(5);
- for (std::size_t j = 0; j < sizeof(edges)/sizeof(E); ++j)
- add_edge(edges[j].first, edges[j].second, G);
-#else
- Graph G(edges, edges + sizeof(edges)/sizeof(E), 5);
-#endif
-
- typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
- typedef boost::graph_traits<Graph>::vertices_size_type size_type;
-
- std::vector<size_type> d(num_vertices(G));
- std::vector<size_type> f(num_vertices(G));
-
- cout << "DFS categorized directed graph" << endl;
- depth_first_search(G, visitor(make_dfs_visitor(
- make_list(print_edge("tree", on_tree_edge()),
- print_edge("back", on_back_edge()),
- print_edge("forward or cross", on_forward_or_cross_edge())
- ))));
-
- cout << endl << "BFS categorized directed graph" << endl;
- boost::breadth_first_search
- (G, vertex(0, G), visitor(make_bfs_visitor(
- std::make_pair(print_edge("tree", on_tree_edge()),
- print_edge("cycle", on_non_tree_edge())))));
-
- return 0;
-}
-
diff --git a/Utilities/BGL/boost/graph/example/visitor.expected b/Utilities/BGL/boost/graph/example/visitor.expected
deleted file mode 100644
index 18bad31fcecb81942f79df35a0fc2cffd6a77efc..0000000000000000000000000000000000000000
--- a/Utilities/BGL/boost/graph/example/visitor.expected
+++ /dev/null
@@ -1,21 +0,0 @@
-DFS categorized directed graph
-tree: 0 --> 2
-tree: 2 --> 1
-back: 1 --> 1
-tree: 1 --> 3
-back: 3 --> 1
-tree: 3 --> 4
-back: 4 --> 0
-back: 4 --> 1
-forward or cross: 2 --> 3
-
-BFS categorized directed graph
-tree: 0 --> 2
-tree: 2 --> 1
-tree: 2 --> 3
-cycle: 1 --> 1
-cycle: 1 --> 3
-cycle: 3 --> 1
-tree: 3 --> 4
-cycle: 4 --> 0
-cycle: 4 --> 1
diff --git a/Utilities/BGL/boost/iterator.hpp b/Utilities/BGL/boost/iterator.hpp
index d3844e71c0df9f073898af5da32436dc81194c43..d5d9f46e949c8200e3bb1ea710b4152a37dad945 100644
--- a/Utilities/BGL/boost/iterator.hpp
+++ b/Utilities/BGL/boost/iterator.hpp
@@ -4,7 +4,7 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-// See http://www.boost.org/libs/utility for documentation.
+// See http://www.boost.org/libs/butility for documentation.
// Revision History
// 12 Jan 01 added <cstddef> for std::ptrdiff_t (Jens Maurer)
diff --git a/Utilities/BGL/boost/limits.hpp b/Utilities/BGL/boost/limits.hpp
index f468dbce73970d90f2dbb6caad297a5e98a8d319..0f7a5929325233f9262ff56b0e0f4f6bc9fe23f3 100644
--- a/Utilities/BGL/boost/limits.hpp
+++ b/Utilities/BGL/boost/limits.hpp
@@ -6,7 +6,7 @@
//
// use this header as a workaround for missing <limits>
-// See http://www.boost.org/libs/utility/limits.html for documentation.
+// See http://www.boost.org/libs/butility/limits.html for documentation.
#ifndef BOOST_LIMITS
#define BOOST_LIMITS
diff --git a/Utilities/BGL/boost/mpl/for_each.hpp b/Utilities/BGL/boost/mpl/for_each.hpp
index b87deb67b0c3762b561d09c80d245294f31efad9..b1138b3df55aa8f98680e2c2de39276bc5765fe7 100644
--- a/Utilities/BGL/boost/mpl/for_each.hpp
+++ b/Utilities/BGL/boost/mpl/for_each.hpp
@@ -23,7 +23,7 @@
#include <boost/mpl/aux_/unwrap.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/utility/value_init.hpp>
+#include <boost/butility/value_init.hpp>
namespace boost { namespace mpl {
diff --git a/Utilities/BGL/boost/next_prior.hpp b/Utilities/BGL/boost/next_prior.hpp
index e1d2e42891976c678a5bd5fe1f1ba86526346e7d..ac130f6c5e4fbe44665285181142531a7b953176 100644
--- a/Utilities/BGL/boost/next_prior.hpp
+++ b/Utilities/BGL/boost/next_prior.hpp
@@ -4,7 +4,7 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-// See http://www.boost.org/libs/utility for documentation.
+// See http://www.boost.org/libs/butility for documentation.
// Revision History
// 13 Dec 2003 Added next(x, n) and prior(x, n) (Daniel Walker)
diff --git a/Utilities/BGL/boost/operators.hpp b/Utilities/BGL/boost/operators.hpp
index fbba602384e1f637cfe256ca9546066def7cf4c3..7c80dc4262b52774dc1bd1cd6cfce4313a39b9d6 100644
--- a/Utilities/BGL/boost/operators.hpp
+++ b/Utilities/BGL/boost/operators.hpp
@@ -5,7 +5,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-// See http://www.boost.org/libs/utility/operators.htm for documentation.
+// See http://www.boost.org/libs/butility/operators.htm for documentation.
// Revision History
// 21 Oct 02 Modified implementation of operators to allow compilers with a
diff --git a/Utilities/BGL/boost/optional/optional.hpp b/Utilities/BGL/boost/optional/optional.hpp
index 99f3af028dbcd9fa0b1de5a08dd5e942ef8fe0da..a357dc372c2a7b466f520133961767937e8bb61f 100644
--- a/Utilities/BGL/boost/optional/optional.hpp
+++ b/Utilities/BGL/boost/optional/optional.hpp
@@ -27,7 +27,7 @@
#include "boost/mpl/not.hpp"
#include "boost/detail/reference_content.hpp"
#include "boost/none_t.hpp"
-#include "boost/utility/compare_pointees.hpp"
+#include "boost/butility/compare_pointees.hpp"
#if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
// VC6.0 has the following bug:
diff --git a/Utilities/BGL/boost/ref.hpp b/Utilities/BGL/boost/ref.hpp
index 3745e7ca0f7d8784c7d17aa40d982f559eb6ab40..c4d40430e666d9eca1dce4bc550ddc850acba1e0 100644
--- a/Utilities/BGL/boost/ref.hpp
+++ b/Utilities/BGL/boost/ref.hpp
@@ -8,7 +8,7 @@
#endif
#include <boost/config.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/butility/addressof.hpp>
#include <boost/mpl/bool.hpp>
//
diff --git a/Utilities/BGL/boost/spirit/utility/chset.hpp b/Utilities/BGL/boost/spirit/butility/chset.hpp
similarity index 97%
rename from Utilities/BGL/boost/spirit/utility/chset.hpp
rename to Utilities/BGL/boost/spirit/butility/chset.hpp
index 4273d1ce24e81b595916f11fe89ab45badff14e6..94fa99fe9023563f1492dd9bf3eb3e0d58ef5ee5 100644
--- a/Utilities/BGL/boost/spirit/utility/chset.hpp
+++ b/Utilities/BGL/boost/spirit/butility/chset.hpp
@@ -13,7 +13,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/shared_ptr.hpp>
#include <boost/spirit/core/primitives/primitives.hpp>
-#include <boost/spirit/utility/impl/chset/basic_chset.hpp>
+#include <boost/spirit/butility/impl/chset/basic_chset.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
@@ -179,5 +179,5 @@ chset_p( ::boost::ulong_long_type ch)
#endif
-#include <boost/spirit/utility/impl/chset.ipp>
-#include <boost/spirit/utility/chset_operators.hpp>
+#include <boost/spirit/butility/impl/chset.ipp>
+#include <boost/spirit/butility/chset_operators.hpp>
diff --git a/Utilities/BGL/boost/spirit/utility/chset_operators.hpp b/Utilities/BGL/boost/spirit/butility/chset_operators.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/chset_operators.hpp
rename to Utilities/BGL/boost/spirit/butility/chset_operators.hpp
index e1446ff5f7e81e3a28d291721ce426a1ebd66dac..215d20d5aa93e7965f7bc41c1cedda623e4aaf17 100644
--- a/Utilities/BGL/boost/spirit/utility/chset_operators.hpp
+++ b/Utilities/BGL/boost/spirit/butility/chset_operators.hpp
@@ -11,7 +11,7 @@
#define BOOST_SPIRIT_CHSET_OPERATORS_HPP
///////////////////////////////////////////////////////////////////////////////
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/butility/chset.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
@@ -395,4 +395,4 @@ operator^(nothing_parser a, chset<CharT> const& b);
#endif
-#include <boost/spirit/utility/impl/chset_operators.ipp>
+#include <boost/spirit/butility/impl/chset_operators.ipp>
diff --git a/Utilities/BGL/boost/spirit/utility/confix.hpp b/Utilities/BGL/boost/spirit/butility/confix.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/confix.hpp
rename to Utilities/BGL/boost/spirit/butility/confix.hpp
index d6b48c2e89c406c0ad924fabe103d4f0ca48a060..030ed65fca4ec6c036648d8fcec0c5e9839c291f 100644
--- a/Utilities/BGL/boost/spirit/utility/confix.hpp
+++ b/Utilities/BGL/boost/spirit/butility/confix.hpp
@@ -13,7 +13,7 @@
#include <boost/config.hpp>
#include <boost/spirit/meta/as_parser.hpp>
#include <boost/spirit/core/composite/operators.hpp>
-#include <boost/spirit/utility/impl/confix.ipp>
+#include <boost/spirit/butility/impl/confix.ipp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/distinct.hpp b/Utilities/BGL/boost/spirit/butility/distinct.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/distinct.hpp
rename to Utilities/BGL/boost/spirit/butility/distinct.hpp
index 4e1625f08a1da33d72c4bf8197fb213722f8ab09..c65716ca3c8bae65751220f7b78ad7348f110da2 100644
--- a/Utilities/BGL/boost/spirit/utility/distinct.hpp
+++ b/Utilities/BGL/boost/spirit/butility/distinct.hpp
@@ -16,7 +16,7 @@
#include <boost/spirit/core/composite/directives.hpp>
#include <boost/spirit/core/composite/epsilon.hpp>
#include <boost/spirit/core/non_terminal/rule.hpp>
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/butility/chset.hpp>
namespace boost {
namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/escape_char.hpp b/Utilities/BGL/boost/spirit/butility/escape_char.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/escape_char.hpp
rename to Utilities/BGL/boost/spirit/butility/escape_char.hpp
index 2db0436ce4d504a52b03d0586191d00b0fda163b..58a7651e4b0cef0ee770c2f73345282f001ba634 100644
--- a/Utilities/BGL/boost/spirit/utility/escape_char.hpp
+++ b/Utilities/BGL/boost/spirit/butility/escape_char.hpp
@@ -17,7 +17,7 @@
#include <boost/spirit/debug.hpp>
-#include <boost/spirit/utility/impl/escape_char.ipp>
+#include <boost/spirit/butility/impl/escape_char.ipp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/flush_multi_pass.hpp b/Utilities/BGL/boost/spirit/butility/flush_multi_pass.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/flush_multi_pass.hpp
rename to Utilities/BGL/boost/spirit/butility/flush_multi_pass.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/functor_parser.hpp b/Utilities/BGL/boost/spirit/butility/functor_parser.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/functor_parser.hpp
rename to Utilities/BGL/boost/spirit/butility/functor_parser.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/grammar_def.hpp b/Utilities/BGL/boost/spirit/butility/grammar_def.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/grammar_def.hpp
rename to Utilities/BGL/boost/spirit/butility/grammar_def.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset.ipp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/impl/chset.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset.ipp
index 91d11a4dcb05c04bd191e35995471c239c708998..e185352dd82e44844dcd7d042b8a39f53deb5fe3 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset.ipp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset.ipp
@@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/limits.hpp>
-#include <boost/spirit/utility/chset.hpp>
+#include <boost/spirit/butility/chset.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.hpp b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.hpp
similarity index 96%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.hpp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.hpp
index 57413dc6ca182e52863ada8f6de0e468a8f51703..c065d7232cc640adea95e138e581e453a93a12a3 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.hpp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.hpp
@@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <bitset>
-#include <boost/spirit/utility/impl/chset/range_run.hpp>
+#include <boost/spirit/butility/impl/chset/range_run.hpp>
namespace boost { namespace spirit {
@@ -99,4 +99,4 @@ namespace boost { namespace spirit {
#endif
-#include <boost/spirit/utility/impl/chset/basic_chset.ipp>
+#include <boost/spirit/butility/impl/chset/basic_chset.ipp>
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.ipp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.ipp
index 9370e3f8ad5f3e2bcfff38bdba848704d8b857ba..01b95120227cfa19667ddb38bf366990bd6849d6 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/basic_chset.ipp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/basic_chset.ipp
@@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <bitset>
-#include <boost/spirit/utility/impl/chset/basic_chset.hpp>
+#include <boost/spirit/butility/impl/chset/basic_chset.hpp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.hpp b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.hpp
similarity index 98%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/range_run.hpp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/range_run.hpp
index 320e949e1ff7aa5f397d0211fef89e6e5744d36a..55e884dee2be072d86dc7b1cf0d61d0455dd2510 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.hpp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.hpp
@@ -115,4 +115,4 @@ namespace boost { namespace spirit { namespace utility { namespace impl {
#endif
-#include <boost/spirit/utility/impl/chset/range_run.ipp>
+#include <boost/spirit/butility/impl/chset/range_run.ipp>
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.ipp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/impl/chset/range_run.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset/range_run.ipp
index 45491bc3fb38380da9922b4628922906158af864..31ef425c8818b9550608341f57f08462f05824b0 100644
--- a/Utilities/BGL/boost/spirit/utility/impl/chset/range_run.ipp
+++ b/Utilities/BGL/boost/spirit/butility/impl/chset/range_run.ipp
@@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <algorithm> // for std::lower_bound
#include <boost/spirit/core/assert.hpp> // for BOOST_SPIRIT_ASSERT
-#include <boost/spirit/utility/impl/chset/range_run.hpp>
+#include <boost/spirit/butility/impl/chset/range_run.hpp>
#include <boost/spirit/debug.hpp>
#include <boost/limits.hpp>
diff --git a/Utilities/BGL/boost/spirit/utility/impl/chset_operators.ipp b/Utilities/BGL/boost/spirit/butility/impl/chset_operators.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/chset_operators.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/chset_operators.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/confix.ipp b/Utilities/BGL/boost/spirit/butility/impl/confix.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/confix.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/confix.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/escape_char.ipp b/Utilities/BGL/boost/spirit/butility/impl/escape_char.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/escape_char.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/escape_char.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/lists.ipp b/Utilities/BGL/boost/spirit/butility/impl/lists.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/lists.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/lists.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/impl/regex.ipp b/Utilities/BGL/boost/spirit/butility/impl/regex.ipp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/impl/regex.ipp
rename to Utilities/BGL/boost/spirit/butility/impl/regex.ipp
diff --git a/Utilities/BGL/boost/spirit/utility/lists.hpp b/Utilities/BGL/boost/spirit/butility/lists.hpp
similarity index 99%
rename from Utilities/BGL/boost/spirit/utility/lists.hpp
rename to Utilities/BGL/boost/spirit/butility/lists.hpp
index 489f2700a67ad36a3471c2344162bb588fc0d783..7e7e4c7cf5f643124d38891a42265df1ee1dc694 100644
--- a/Utilities/BGL/boost/spirit/utility/lists.hpp
+++ b/Utilities/BGL/boost/spirit/butility/lists.hpp
@@ -14,7 +14,7 @@
#include <boost/spirit/meta/as_parser.hpp>
#include <boost/spirit/core/parser.hpp>
#include <boost/spirit/core/composite/composite.hpp>
-#include <boost/spirit/utility/impl/lists.ipp>
+#include <boost/spirit/butility/impl/lists.ipp>
///////////////////////////////////////////////////////////////////////////////
namespace boost { namespace spirit {
diff --git a/Utilities/BGL/boost/spirit/utility/loops.hpp b/Utilities/BGL/boost/spirit/butility/loops.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/loops.hpp
rename to Utilities/BGL/boost/spirit/butility/loops.hpp
diff --git a/Utilities/BGL/boost/spirit/utility/regex.hpp b/Utilities/BGL/boost/spirit/butility/regex.hpp
similarity index 98%
rename from Utilities/BGL/boost/spirit/utility/regex.hpp
rename to Utilities/BGL/boost/spirit/butility/regex.hpp
index ace254322c7f9a1ef83e4082b70110f76f8b6fe2..9066d49020356bfa3fbc4f7f833b96de2fb4df87 100644
--- a/Utilities/BGL/boost/spirit/utility/regex.hpp
+++ b/Utilities/BGL/boost/spirit/butility/regex.hpp
@@ -46,7 +46,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <boost/spirit/meta/as_parser.hpp>
#include <boost/spirit/core/parser.hpp>
-#include <boost/spirit/utility/impl/regex.ipp>
+#include <boost/spirit/butility/impl/regex.ipp>
#include <boost/detail/iterator.hpp> // for boost::detail::iterator_traits
///////////////////////////////////////////////////////////////////////////////
diff --git a/Utilities/BGL/boost/spirit/utility/scoped_lock.hpp b/Utilities/BGL/boost/spirit/butility/scoped_lock.hpp
similarity index 100%
rename from Utilities/BGL/boost/spirit/utility/scoped_lock.hpp
rename to Utilities/BGL/boost/spirit/butility/scoped_lock.hpp
diff --git a/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp b/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp
index 2c624f8ac4b05a4a422387bed1fdbc7e8b5d7497..e1db673275d40234616fd2c4ab2066f701c8a393 100644
--- a/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/iterator/deref.hpp
@@ -12,7 +12,7 @@
#include <boost/spirit/fusion/detail/config.hpp>
#include <boost/spirit/fusion/iterator/detail/iterator_base.hpp>
#include <boost/spirit/fusion/iterator/as_fusion_iterator.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/type_traits/is_const.hpp>
namespace boost { namespace fusion
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp
index da2f4c64d4648099e27979a62b99103b741d127f..608f70287b56f5884cf675b17403b1fcbb1963f7 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/equal_to.hpp
@@ -14,7 +14,7 @@
#include <boost/spirit/fusion/sequence/detail/sequence_equal_to.hpp>
#ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/spirit/fusion/sequence/is_sequence.hpp>
#include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
#endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp
index c52515c26b93ff7684906612678a302125411eb7..799efb532f59dfb44877b3c622952038abefecda 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/greater.hpp
@@ -14,7 +14,7 @@
#include <boost/spirit/fusion/sequence/detail/sequence_greater.hpp>
#ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/spirit/fusion/sequence/is_sequence.hpp>
#include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
#endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp
index cd3e5dc56cc40fe7e450e064eeb10e4cb7b2f2f8..c3fbdd7f08040db7ded9741ccd4a6ec3ef66ae16 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/greater_equal.hpp
@@ -14,7 +14,7 @@
#include <boost/spirit/fusion/sequence/detail/sequence_greater_equal.hpp>
#ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/spirit/fusion/sequence/is_sequence.hpp>
#include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
#endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp
index 3b176b3f2e8596a3b4aa53e12ebf2455f098e1c0..26809677c6f746c1146f8e564ff9123a8014f868 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/less.hpp
@@ -14,7 +14,7 @@
#include <boost/spirit/fusion/sequence/detail/sequence_less.hpp>
#ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/spirit/fusion/sequence/is_sequence.hpp>
#include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
#endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp
index 445f0e741a07a82099da71d0023339c9c1c97c7f..2c03c60f26629f7eab6673378b0d070a37168f0b 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/less_equal.hpp
@@ -14,7 +14,7 @@
#include <boost/spirit/fusion/sequence/detail/sequence_less_equal.hpp>
#ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/spirit/fusion/sequence/is_sequence.hpp>
#include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
#endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp
index cdaf5c839c360b084864c2e5b66074c16092ac1c..9db395f585f9f461a9c1d96145fb106071c8a1fc 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/not_equal_to.hpp
@@ -14,7 +14,7 @@
#include <boost/spirit/fusion/sequence/detail/sequence_not_equal_to.hpp>
#ifdef FUSION_COMFORMING_COMPILER
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/spirit/fusion/sequence/is_sequence.hpp>
#include <boost/spirit/fusion/sequence/as_fusion_sequence.hpp>
#endif
diff --git a/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp b/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp
index 713e7c2f4e610f4edc25cf4414d8d0b3ede20c9e..a22682cd3bb086f43ad5de48fdeed62702e8f10c 100644
--- a/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp
+++ b/Utilities/BGL/boost/spirit/fusion/sequence/tuple10.hpp
@@ -16,7 +16,7 @@
#include <boost/mpl/int.hpp>
#include <boost/mpl/vector/vector10.hpp>
#include <boost/mpl/if.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/butility/addressof.hpp>
namespace boost { namespace fusion
{
diff --git a/Utilities/BGL/boost/spirit/utility.hpp b/Utilities/BGL/boost/spirit/utility.hpp
index 6fdf7ba8350fcbde8eb6f5c0e8735aa2c76c65f2..e1018da2cc09d29f749bb310358d4fc7e1e7ec00 100644
--- a/Utilities/BGL/boost/spirit/utility.hpp
+++ b/Utilities/BGL/boost/spirit/utility.hpp
@@ -24,18 +24,18 @@
///////////////////////////////////////////////////////////////////////////////
// Utility.Parsers
-#include <boost/spirit/utility/chset.hpp>
-#include <boost/spirit/utility/chset_operators.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
-#include <boost/spirit/utility/functor_parser.hpp>
-#include <boost/spirit/utility/loops.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/lists.hpp>
-#include <boost/spirit/utility/distinct.hpp>
+#include <boost/spirit/butility/chset.hpp>
+#include <boost/spirit/butility/chset_operators.hpp>
+#include <boost/spirit/butility/escape_char.hpp>
+#include <boost/spirit/butility/functor_parser.hpp>
+#include <boost/spirit/butility/loops.hpp>
+#include <boost/spirit/butility/confix.hpp>
+#include <boost/spirit/butility/lists.hpp>
+#include <boost/spirit/butility/distinct.hpp>
// Utility.Support
-#include <boost/spirit/utility/flush_multi_pass.hpp>
-#include <boost/spirit/utility/scoped_lock.hpp>
+#include <boost/spirit/butility/flush_multi_pass.hpp>
+#include <boost/spirit/butility/scoped_lock.hpp>
#endif // !defined(BOOST_SPIRIT_UTILITY_MAIN_HPP)
diff --git a/Utilities/BGL/boost/throw_exception.hpp b/Utilities/BGL/boost/throw_exception.hpp
index bb79a37d8afc01565e5e8044c36f18d50e07a800..85a36454a08d9798aa0a4a51167c801d1ea8e8b2 100644
--- a/Utilities/BGL/boost/throw_exception.hpp
+++ b/Utilities/BGL/boost/throw_exception.hpp
@@ -16,7 +16,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
-// http://www.boost.org/libs/utility/throw_exception.html
+// http://www.boost.org/libs/butility/throw_exception.html
//
#include <boost/config.hpp>
diff --git a/Utilities/BGL/boost/utility.hpp b/Utilities/BGL/boost/utility.hpp
index 211d89d67ef6495dabc753db1c1fb75f32ad00be..02ca546ed9d376ac648d42eef7b8233f1bf20d4d 100644
--- a/Utilities/BGL/boost/utility.hpp
+++ b/Utilities/BGL/boost/utility.hpp
@@ -4,14 +4,14 @@
// subject to the Boost Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
-// See <http://www.boost.org/libs/utility/> for the library's home page.
+// See <http://www.boost.org/libs/butility/> for the library's home page.
#ifndef BOOST_UTILITY_HPP
#define BOOST_UTILITY_HPP
-#include <boost/utility/addressof.hpp>
-#include <boost/utility/base_from_member.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/butility/addressof.hpp>
+#include <boost/butility/base_from_member.hpp>
+#include <boost/butility/enable_if.hpp>
#include <boost/checked_delete.hpp>
#include <boost/next_prior.hpp>
#include <boost/noncopyable.hpp>
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 16e83a1cf91e48bb696504ef624590cfe8a3a327..9dbfe40746afd32f92251b7ac7383b9ed8e8c706 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -8,35 +8,45 @@ IF(OTB_USE_VISU_GUI)
ENDIF(OTB_USE_VISU_GUI)
IF(NOT OTB_USE_EXTERNAL_ITK)
- SUBDIRS(ITK)
+ ADD_SUBDIRECTORY(ITK)
ENDIF(NOT OTB_USE_EXTERNAL_ITK)
IF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
- SUBDIRS( otbopenthreads )
+ ADD_SUBDIRECTORY( otbopenthreads )
ENDIF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
IF(OTB_USE_LIBLAS)
- SUBDIRS( otbliblas )
+ ADD_SUBDIRECTORY( otbliblas )
ENDIF(OTB_USE_LIBLAS)
IF(OTB_COMPILE_JPEG2000)
- SUBDIRS( otbopenjpeg )
+ ADD_SUBDIRECTORY( otbopenjpeg )
ENDIF(OTB_COMPILE_JPEG2000)
IF(NOT OTB_USE_EXTERNAL_EXPAT)
- SUBDIRS( otbexpat )
+ ADD_SUBDIRECTORY( otbexpat )
ENDIF(NOT OTB_USE_EXTERNAL_EXPAT)
IF(NOT OTB_USE_EXTERNAL_BOOST)
- SUBDIRS(BGL)
+ ADD_SUBDIRECTORY(BGL)
ENDIF(NOT OTB_USE_EXTERNAL_BOOST)
-SUBDIRS(otbsvm dxflib InsightJournal otbossim otbossimplugins otb6S tinyXMLlib otbkml otbedison otbsiftfast otbconfigfile)
+ADD_SUBDIRECTORY(otbsvm )
+ADD_SUBDIRECTORY(dxflib)
+ADD_SUBDIRECTORY(InsightJournal)
+ADD_SUBDIRECTORY(otbossim)
+ADD_SUBDIRECTORY(otbossimplugins)
+ADD_SUBDIRECTORY(otb6S)
+ADD_SUBDIRECTORY(tinyXMLlib)
+ADD_SUBDIRECTORY(otbkml)
+ADD_SUBDIRECTORY(otbedison)
+ADD_SUBDIRECTORY(otbsiftfast)
+ADD_SUBDIRECTORY(otbconfigfile)
IF(BUILD_TESTING)
- SUBDIRS( Dart )
+ ADD_SUBDIRECTORY( Dart )
ENDIF(BUILD_TESTING)
diff --git a/Utilities/FLTK/CMakeLists.txt b/Utilities/FLTK/CMakeLists.txt
index c8dd145acc22569a6632e442566f3f516d8f2b0b..63a0aa7d5b3cfb1455a8f0a362032608faf11634 100644
--- a/Utilities/FLTK/CMakeLists.txt
+++ b/Utilities/FLTK/CMakeLists.txt
@@ -189,65 +189,74 @@ MACRO(PERFORM_CMAKE_TEST FILE TEST)
ENDMACRO(PERFORM_CMAKE_TEST FILE TEST)
# Set an option to build the zlib library or not
-OPTION(FLTK_USE_SYSTEM_ZLIB "Use's system zlib" OFF)
-IF(FLTK_USE_SYSTEM_ZLIB)
- IF(ZLIB_FOUND)
- SET(CMAKE_TEST_SPECIAL_LIBRARIES ${ZLIB_LIBRARIES})
- SET(FLTK_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
- PERFORM_CMAKE_TEST(CMake/PlatformTests.cxx HAVE_LIBZ)
- ENDIF(ZLIB_FOUND)
- # We build the fltk zlib
-ELSE(FLTK_USE_SYSTEM_ZLIB)
- MARK_AS_ADVANCED(ZLIB_INCLUDE_DIR)
- MARK_AS_ADVANCED(ZLIB_LIBRARY)
- SUBDIRS(zlib)
- SET(HAVE_LIBZ 1)
- SET(FLTK_ZLIB_LIBRARIES fltk_zlib)
- SET(FLTK_LIBRARIES "${FLTK_LIBRARIES};fltk_zlib")
- INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/zlib")
-ENDIF(FLTK_USE_SYSTEM_ZLIB)
+# OPTION(FLTK_USE_SYSTEM_ZLIB "Use's system zlib" OFF)
+IF(ZLIB_FOUND)
+ SET(CMAKE_TEST_SPECIAL_LIBRARIES ${ZLIB_LIBRARIES})
+ SET(FLTK_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
+ PERFORM_CMAKE_TEST(CMake/PlatformTests.cxx HAVE_LIBZ)
+ELSE (ZLIB_FOUND)
+ MARK_AS_ADVANCED(ZLIB_INCLUDE_DIR)
+ MARK_AS_ADVANCED(ZLIB_LIBRARY)
+ IF(WIN32)
+ IF(NOT CYGWIN)
+ SUBDIRS(zlib)
+ SET(HAVE_LIBZ 1)
+ SET(FLTK_ZLIB_LIBRARIES fltk_zlib)
+ SET(FLTK_LIBRARIES "${FLTK_LIBRARIES};fltk_zlib")
+ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/zlib")
+ ENDIF(NOT CYGWIN)
+ ELSE(WIN32)
+ MESSAGE(FATAL_ERROR "Cannot find Z library.")
+ ENDIF(WIN32)
+ENDIF (ZLIB_FOUND)
# Set an option to build the jpeg library or not
-OPTION(FLTK_USE_SYSTEM_JPEG "Use's system jpeg" OFF)
-IF(FLTK_USE_SYSTEM_JPEG)
- IF(JPEG_FOUND)
+#OPTION(FLTK_USE_SYSTEM_JPEG "Use's system jpeg" OFF)
+IF(JPEG_FOUND)
SET(CMAKE_TEST_SPECIAL_LIBRARIES ${JPEG_LIBRARIES})
SET(FLTK_JPEG_LIBRARIES ${JPEG_LIBRARIES})
PERFORM_CMAKE_TEST(CMake/PlatformTests.cxx HAVE_LIBJPEG)
- ENDIF(JPEG_FOUND)
- # We build the fltk png
-ELSE(FLTK_USE_SYSTEM_JPEG)
- MARK_AS_ADVANCED(JPEG_INCLUDE_DIR)
- MARK_AS_ADVANCED(JPEG_LIBRARY)
- SUBDIRS(jpeg)
- SET(HAVE_LIBJPEG 1)
- SET(FLTK_JPEG_LIBRARIES fltk_jpeg)
- SET(FLTK_LIBRARIES "${FLTK_LIBRARIES};fltk_jpeg")
- INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/jpeg")
-ENDIF(FLTK_USE_SYSTEM_JPEG)
-
+ELSE (JPEG_FOUND)
+ MARK_AS_ADVANCED(JPEG_INCLUDE_DIR)
+ MARK_AS_ADVANCED(JPEG_LIBRARY)
+ IF(WIN32)
+ IF(NOT CYGWIN)
+ SUBDIRS(jpeg)
+ SET(HAVE_LIBJPEG 1)
+ SET(FLTK_JPEG_LIBRARIES fltk_jpeg)
+ SET(FLTK_LIBRARIES "${FLTK_LIBRARIES};fltk_jpeg")
+ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/jpeg")
+ ENDIF(NOT CYGWIN)
+ ELSE(WIN32)
+ MESSAGE(FATAL_ERROR "Cannot find JPEG library.")
+ ENDIF(WIN32)
+ENDIF(JPEG_FOUND)
+
# Set an option to build the png library or not
-OPTION(FLTK_USE_SYSTEM_PNG "Use's system png" OFF)
-IF(FLTK_USE_SYSTEM_PNG)
- IF(PNG_FOUND)
+# OPTION(FLTK_USE_SYSTEM_PNG "Use's system png" OFF)
+IF(PNG_FOUND)
SET(CMAKE_TEST_SPECIAL_LIBRARIES ${PNG_LIBRARIES})
SET(FLTK_PNG_LIBRARIES ${PNG_LIBRARIES})
PERFORM_CMAKE_TEST(CMake/PlatformTests.cxx HAVE_LIBPNG)
PERFORM_CMAKE_TEST(CMake/PlatformTests.cxx HAVE_PNG_GET_VALID)
PERFORM_CMAKE_TEST(CMake/PlatformTests.cxx HAVE_PNG_SET_TRNS_TO_ALPHA)
SET(HAVE_PNG_H 1)
- ENDIF(PNG_FOUND)
- # We build the fltk png
-ELSE(FLTK_USE_SYSTEM_PNG)
- MARK_AS_ADVANCED(PNG_INCLUDE_DIR)
- MARK_AS_ADVANCED(PNG_LIBRARY)
- SUBDIRS(png)
- SET(HAVE_LIBPNG 1)
- SET(HAVE_PNG_H 1)
- SET(FLTK_PNG_LIBRARIES fltk_png)
- SET(FLTK_LIBRARIES "${FLTK_LIBRARIES};fltk_png")
- INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/png")
-ENDIF(FLTK_USE_SYSTEM_PNG)
+ELSE (PNG_FOUND)
+ MARK_AS_ADVANCED(PNG_INCLUDE_DIR)
+ MARK_AS_ADVANCED(PNG_LIBRARY)
+ IF(WIN32)
+ IF(NOT CYGWIN)
+ SUBDIRS(png)
+ SET(HAVE_LIBPNG 1)
+ SET(HAVE_PNG_H 1)
+ SET(FLTK_PNG_LIBRARIES fltk_png)
+ SET(FLTK_LIBRARIES "${FLTK_LIBRARIES};fltk_png")
+ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/png")
+ ENDIF(NOT CYGWIN)
+ ELSE(WIN32)
+ MESSAGE(FATAL_ERROR "Cannot find PNG library.")
+ ENDIF(WIN32)
+ENDIF(PNG_FOUND)
SET(FLTK_DATADIR "${CMAKE_INSTALL_PREFIX}/share/FLTK")
SET(FLTK_DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/FLTK")
diff --git a/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h b/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h
index ba2a48e1574099b4d5b4cf8f093a9b963620be8c..30e4c89750178338fe1e6a969e2571f3502ea82c 100644
--- a/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h
+++ b/Utilities/ITK/Code/BasicFilters/itkCannyEdgeDetectionImageFilter.h
@@ -194,14 +194,14 @@ public:
return this->m_Threshold;
}
- ///* Set the Threshold value for detected edges. */
+ /** Set the Threshold value for detected edges. */
itkSetMacro(UpperThreshold, OutputImagePixelType );
itkGetConstMacro(UpperThreshold, OutputImagePixelType);
itkSetMacro(LowerThreshold, OutputImagePixelType );
itkGetConstMacro(LowerThreshold, OutputImagePixelType);
- /* Set the Thresholdvalue for detected edges. */
+ /** Set the Thresholdvalue for detected edges. */
itkSetMacro(OutsideValue, OutputImagePixelType);
itkGetConstMacro(OutsideValue, OutputImagePixelType);
diff --git a/Utilities/dxflib/CMakeLists.txt b/Utilities/dxflib/CMakeLists.txt
index e4df2ad34b7f2c9fa8d2e6ee7fa02057b0fdac9e..867243ef4ac995141157ebfa6dda69feb8464a08 100644
--- a/Utilities/dxflib/CMakeLists.txt
+++ b/Utilities/dxflib/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT(dxflib)
FILE(GLOB dxflib_SRCS "*.cpp")
ADD_LIBRARY(dxf ${dxflib_SRCS})
-TARGET_LINK_LIBRARIES(dxf)
+
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(dxf PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Utilities/otbconfigfile/CMakeLists.txt b/Utilities/otbconfigfile/CMakeLists.txt
index dd622f9749c55741eda9b899a5766712e675d2bf..245153a5e402a6c3524bcccd4e6eb6eea1be8f57 100644
--- a/Utilities/otbconfigfile/CMakeLists.txt
+++ b/Utilities/otbconfigfile/CMakeLists.txt
@@ -5,7 +5,6 @@ FILE(GLOB otbconfigfilelib_HDRS "ConfigFile.h")
ADD_LIBRARY(otbconfigfile ${otbconfigfilelib_SRCS} )
-TARGET_LINK_LIBRARIES(otbconfigfile )
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbconfigfile PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Utilities/otbopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/CMakeLists.txt
index a0fb512f63655cf85f36f7c9217e919f7c8874a0..4356c48bc9b8a1c45fd95b7d2d06b578e41ebf2a 100644
--- a/Utilities/otbopenjpeg/CMakeLists.txt
+++ b/Utilities/otbopenjpeg/CMakeLists.txt
@@ -84,7 +84,8 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/opj_configure.h.in
#-----------------------------------------------------------------------------
# Always build the library
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-SUBDIRS(libopenjpeg)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ADD_SUBDIRECTORY(libopenjpeg)
#-----------------------------------------------------------------------------
# For the documentation
diff --git a/Utilities/otbopenjpeg/libopenjpeg/dwt.c b/Utilities/otbopenjpeg/libopenjpeg/dwt.c
index aafa74cc1374d4ea1187d7994d6b22f61557794c..47d7d8d08dd4f12f5ea424d45d0809d298a2b1a4 100644
--- a/Utilities/otbopenjpeg/libopenjpeg/dwt.c
+++ b/Utilities/otbopenjpeg/libopenjpeg/dwt.c
@@ -72,7 +72,7 @@ typedef struct v4dwt_local {
static const OPJ_FLOAT32 alpha = 1.586134342f; // 12994
static const OPJ_FLOAT32 beta = 0.052980118f; // 434
-static const OPJ_FLOAT32 gamma = -0.882911075f; // -7233
+static const OPJ_FLOAT32 opj_gamma_const = -0.882911075f; // -7233
static const OPJ_FLOAT32 delta = -0.443506852f; // -3633
static const OPJ_FLOAT32 K = 1.230174105f; // 10078
@@ -772,14 +772,14 @@ static void v4dwt_decode(v4dwt_t* restrict dwt){
v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(K));
v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(c13318));
v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(delta));
- v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(gamma));
+ v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(opj_gamma_const));
v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(beta));
v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(alpha));
#else
v4dwt_decode_step1(dwt->wavelet+a, dwt->sn, K);
v4dwt_decode_step1(dwt->wavelet+b, dwt->dn, c13318);
v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), delta);
- v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), gamma);
+ v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), opj_gamma_const);
v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), beta);
v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), alpha);
#endif
diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt
index 4764d625f5bb91b6cdff97c54cdeb66fea88df7a..e6b2ca5c74ead4ed1d7423815901d7cbe35ff838 100644
--- a/Utilities/otbossim/CMakeLists.txt
+++ b/Utilities/otbossim/CMakeLists.txt
@@ -139,9 +139,15 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
${ossim_projection_SRCS}
${ossim_imaging_SRCS}
${ossim_parallel_SRCS}
- ${ossim_elevation_SRCS}
+ ${ossim_elevation_SRCS})
+
+ SET_TARGET_PROPERTIES(otbossim
+ PROPERTIES
+ LINK_INTERFACE_LIBRARIES ""
)
- TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} ${OPENTHREADS_LIBRARY})
+# TARGET_LINK_LIBRARIES(otbossim ${GDAL_LIBRARY})#To make sure that gdal appear before geotiff
+# TARGET_LINK_LIBRARIES(otbossim ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${OPENTHREADS_LIBRARY})
+ TARGET_LINK_LIBRARIES(otbossim ${OPENTHREADS_LIBRARY})
IF(NOT OTB_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS otbossim
diff --git a/Utilities/otbossim/include/ossim/base/ossimPolyLine.h b/Utilities/otbossim/include/ossim/base/ossimPolyLine.h
index 18d0dab285eb4943edc2d11b886be8fab355cb3e..742f1ff757c416403901cf6e54d8feb62f04075f 100644
--- a/Utilities/otbossim/include/ossim/base/ossimPolyLine.h
+++ b/Utilities/otbossim/include/ossim/base/ossimPolyLine.h
@@ -11,7 +11,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimPolyLine.h 14789 2009-06-29 16:48:14Z dburken $
+// $Id: ossimPolyLine.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimPolyLine_HEADER
#define ossimPolyLine_HEADER
@@ -69,7 +69,7 @@ public:
ossim_uint32 getNumberOfVertices()const
{
- return theVertexList.size();
+ return (ossim_uint32)theVertexList.size();
}
void getIntegerBounds(ossim_int32& minX,
diff --git a/Utilities/otbossim/include/ossim/base/ossimPolynom.h b/Utilities/otbossim/include/ossim/base/ossimPolynom.h
index 583ec23f32968f6d73ba6e1c2187ac8be4910e96..0482d0c11e599ebbac7b083ade5acd98a595c89b 100644
--- a/Utilities/otbossim/include/ossim/base/ossimPolynom.h
+++ b/Utilities/otbossim/include/ossim/base/ossimPolynom.h
@@ -617,7 +617,7 @@ LMSfit(const EXPT_SET& expset,
nullify();
//check size
- int nobs = obs_input.size();
+ int nobs = (int)obs_input.size();
if (nobs != (int)obs_output.size())
{
std::cerr<<"ossimPolynom::LMSfit ERROR observation input/output must have the same size"<<std::endl;
@@ -628,7 +628,7 @@ LMSfit(const EXPT_SET& expset,
std::cerr<<"ossimPolynom::LMSfit ERROR observation count is zero"<<std::endl;
return false;
}
- int ncoeff = expset.size();
+ int ncoeff = (int)expset.size();
if (ncoeff<=0)
{
std::cerr<<"ossimPolynom::LMSfit ERROR exponent count is zero"<<std::endl;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h b/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h
index e49d1b776524dcbb3c30de3a05b071740a27add1..6b6b1964a76664a9d076a0f514d4bb63511db268 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimIgenGenerator.h
@@ -5,7 +5,7 @@
// Author: Garrett Potts (gpotts@imagelinks.com)
//
//*************************************************************************
-// $Id: ossimIgenGenerator.h 9968 2006-11-29 14:01:53Z gpotts $
+// $Id: ossimIgenGenerator.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimIgenGenerator_HEADER
#define ossimIgenGenerator_HEADER
#include <stack>
@@ -91,7 +91,7 @@ public:
ossim_uint32 getNumberOfSpecFiles()const
{
- return theSpecFileList.size();
+ return (ossim_uint32)theSpecFileList.size();
}
ossimFilename getSpecFilename(ossim_uint32 specFileIndex = 0)const
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimImageData.h b/Utilities/otbossim/include/ossim/imaging/ossimImageData.h
index 91481a0c42e930adf27df8d066b19b2bc51e7919..85ccb04893498cd36e052e01451e88bc17cafe1d 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimImageData.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimImageData.h
@@ -9,7 +9,7 @@
// Description: Container class for a tile of image data.
//
//*******************************************************************
-// $Id: ossimImageData.h 15798 2009-10-23 19:15:20Z gpotts $
+// $Id: ossimImageData.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimImageData_HEADER
#define ossimImageData_HEADER
@@ -593,13 +593,13 @@ public:
* destination buffer is to be overwritten by the selected band of the
* source image data (no questions asked).
*
- * @note The src object should have at least the same number of bands as
- * the 'dest' buffer.
+ * @note: The 'dest' buffer should have at least the same number of bands
+ * as the 'src' object.
*
* Currently this routine is only implemented for il_type set to OSSIM_BSQ.
*
- * @param dest The destination buffer with at least the same number of bands
- * as the src (this) object.
+ * @param dest The destination buffer, which should have at least the
+ * same number of bands as the 'src' object.
* @param src_band The 0-based band of the source image data.
* @param dest_band The 0-based band of the dest buffer.
* @param dest_rect The rectangle of the destination buffer.
@@ -630,13 +630,13 @@ public:
* destination buffer is to be overwritten by the selected band of the
* source image data (no questions asked).
*
- * Note: The src object should have at least the same number of bands as
- * the 'dest' buffer.
+ * @note: The 'dest' buffer should have at least the same number of bands
+ * as the 'src' object.
*
* Currently this routine is only implemented for il_type set to OSSIM_BSQ.
*
- * @param dest The destination buffer with at least the same number of bands
- * as the src (this) object.
+ * @param dest The destination buffer, which should have at least the
+ * same number of bands as the 'src' object.
* @param src_band The 0-based band of the source image data.
* @param dest_band The 0-based band of the dest buffer.
* @param dest_rect The rectangle of the destination buffer.
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h b/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h
index e411eb92ddd495329a617e48832576cf6e2077d8..1e2e39164cbcaa645efec2cbfae0c04339db91de 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimImageHandler.h
@@ -12,7 +12,7 @@
// derive from.
//
//********************************************************************
-// $Id: ossimImageHandler.h 15798 2009-10-23 19:15:20Z gpotts $
+// $Id: ossimImageHandler.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimImageHandler_HEADER
#define ossimImageHandler_HEADER
@@ -549,7 +549,17 @@ public:
ossim_uint32 getStartingResLevel() const;
void setStartingResLevel(ossim_uint32 level);
-
+
+ /**
+ * Sets the supplementary directory
+ */
+ virtual void setSupplementaryDirectory(const ossimFilename& dir);
+
+ /**
+ * Returns the supplementary directory
+ */
+ virtual const ossimFilename& getSupplementaryDirectory()const;
+
protected:
@@ -592,6 +602,7 @@ protected:
ossimFilename theImageFile;
ossimFilename theOverviewFile;
+ ossimFilename theSupplementaryDirectory;
ossimRefPtr<ossimImageHandler> theOverview;
vector<ossimIpt> theValidImageVertices;
ossimImageMetaData theMetaData;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h b/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h
index f9c94253c1c1f64815ecc21e4615de1dbfc5d03a..0be96f8aebeb453a426db5c5344b89d0b3af1d61 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimNitfWriterBase.h
@@ -27,7 +27,7 @@ class ossimProjection;
* @brief OSSIM nitf writer base class to hold methods common to
* all nitf writers.
*/
-class ossimNitfWriterBase : public ossimImageFileWriter
+class OSSIM_DLL ossimNitfWriterBase : public ossimImageFileWriter
{
public:
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h
index f0987843f050ed990f06144aba71ce6bc88d582d..56b56c37c0d7b5dd6bdf6cdca255a0bf719042f3 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactory.h
@@ -7,7 +7,7 @@
// Description: The ossim overview builder factory.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactory.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewBuilderFactory.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewBuilderFactory_HEADER
#define ossimOverviewBuilderFactory_HEADER
@@ -37,7 +37,7 @@ public:
* @brief Creates a builder from a string. This should match a string from
* the getTypeNameList() method. Pure virtual.
*
- * @return Pointer to ossimOverviewBuilderInterface or NULL is not found
+ * @return Pointer to ossimOverviewBuilderBase or NULL is not found
* within registered factories.
*/
virtual ossimOverviewBuilderBase* createBuilder(
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h
index 7adfc24ce5d82b414a2d40ab4c0e6f01e937c90a..94d385bbc1d93665ec12a27d257478b2c24b9788 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryBase.h
@@ -7,7 +7,7 @@
// Description: The base class for overview builders.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactoryBase.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewBuilderFactoryBase.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewBuilderFactoryBase_HEADER
#define ossimOverviewBuilderFactoryBase_HEADER
@@ -36,7 +36,7 @@ public:
* @brief Creates a builder from a string. This should match a string from
* the getTypeNameList() method. Pure virtual.
*
- * @return Pointer to ossimOverviewBuilderInterface or NULL is not found
+ * @return Pointer to ossimOverviewBuilderBase or NULL is not found
* within registered factories.
*/
virtual ossimOverviewBuilderBase* createBuilder(const ossimString& typeName) const = 0;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h
index 9821c78b0e1559d7ab7c83734fdd239116cf3cc5..7502290018e27aeb95715d6b4f01ab2fab395608 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewBuilderFactoryRegistry.h
@@ -7,7 +7,7 @@
// Description: The factory registry for overview builders.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactoryRegistry.h 9930 2006-11-22 19:23:40Z dburken $
+// $Id: ossimOverviewBuilderFactoryRegistry.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewBuilderFactoryRegistry_HEADER
#define ossimOverviewBuilderFactoryRegistry_HEADER
@@ -60,7 +60,7 @@ public:
/**
* @brief Creates a builder from a string. This should match a string from
* the getTypeNameList() method.
- * @return Pointer to ossimOverviewBuilderInterface or NULL is not found
+ * @return Pointer to ossimOverviewBuilderBase or NULL is not found
* within registered factories.
*/
ossimOverviewBuilderBase* createBuilder(const ossimString& typeName) const;
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h b/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h
index 193595929d9ab65cb842926c3051caa52c4a3486..94d06bedf268f286072f6104b604eb527b33ce9b 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimOverviewSequencer.h
@@ -7,7 +7,7 @@
// Description: Class definition for sequencer for building overview files.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewSequencer.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewSequencer.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOverviewSequencer_HEADER
#define ossimOverviewSequencer_HEADER
@@ -132,7 +132,21 @@ public:
*/
void setResampleType(
ossimFilterResampler::ossimFilterResamplerType resampleType);
-
+
+ /**
+ * @return The index location of the current tile.
+ */
+ ossim_uint32 getCurrentTileNumber() const;
+
+ /**
+ * @brief Will set the internal pointers to the specified
+ * tile number. To get the data for this tile number and then
+ * to set up to the next tile in the sequence just call
+ * getNextTile.
+ * @param tileNumber The index location of the desired tile.
+ */
+ void setCurrentTileNumber( ossim_uint32 tileNumber );
+
protected:
/** virtual destructor */
virtual ~ossimOverviewSequencer();
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h b/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h
index a78eba94e29a119224953f2bb2ad92d06b0fb915..27e385d351a67fda056e8164b99e64a5aaa532c8 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimTiffOverviewBuilder.h
@@ -11,7 +11,7 @@
// Contains class declaration for TiffOverviewBuilder.
//
//*******************************************************************
-// $Id: ossimTiffOverviewBuilder.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimTiffOverviewBuilder.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimTiffOverviewBuilder_HEADER
#define ossimTiffOverviewBuilder_HEADER
@@ -133,7 +133,7 @@ public:
/**
* @brief Sets the input to the builder. Satisfies pure virtual from
- * ossimOverviewBuilderInterface.
+ * ossimOverviewBuilderBase.
*
* @param imageSource The input to the builder.
*
@@ -143,7 +143,7 @@ public:
/**
* @brief Sets the output filename.
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
* @param file The output file name.
*/
virtual void setOutputFile(const ossimFilename& file);
@@ -167,7 +167,7 @@ public:
/**
* @brief Sets the overview output type.
*
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
*
* Currently handled types are:
* "ossim_tiff_nearest" and "ossim_tiff_box"
@@ -181,20 +181,20 @@ public:
/**
* @brief Gets the overview type.
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
* @return The overview output type as a string.
*/
virtual ossimString getOverviewType() const;
/**
* @brief Method to populate class supported types.
- * Satisfies pure virtual from ossimOverviewBuilderInterface.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
* @param typeList List of ossimStrings to add to.
*/
virtual void getTypeNameList(std::vector<ossimString>& typeList)const;
/**
- * @biref Method to set properties.
+ * @brief Method to set properties.
* @param property Property to set.
*
* @note Currently supported property:
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h b/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h
index 44a9dec9c84fa27cd7f4a723f18184ebd0b17da4..588df30a2932cd78cea703e7ebd3acc019350bfd 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimTiffTileSource.h
@@ -13,7 +13,7 @@
// ossimTiffTileSource is derived from ImageHandler which is derived from
// TileSource.
//*******************************************************************
-// $Id: ossimTiffTileSource.h 15825 2009-10-27 15:31:44Z dburken $
+// $Id: ossimTiffTileSource.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimTiffTileSource_HEADER
#define ossimTiffTileSource_HEADER
@@ -252,7 +252,7 @@ private:
void setReadMethod();
- virtual void initializeBuffers();
+ virtual bool initializeBuffers();
/**
* Change tiff directory and sets theCurrentDirectory.
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h b/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h
index 7e365e9600581568c58f88455e53b09fa75d2529..c370ab1063159c8ac4187c99f1636f2dd78f9f44 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimTileCache.h
@@ -9,7 +9,7 @@
// Description: This file contains the cache algorithm
//
//***********************************
-// $Id: ossimTileCache.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimTileCache.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef DataCache_HEADER
#define DataCache_HEADER
@@ -61,7 +61,7 @@ public:
- virtual long numberOfItems()const{return theCache?theCache->size():0;}
+ virtual long numberOfItems()const{return theCache?(long)theCache->size():(long)0;}
virtual void display()const;
virtual ossim_uint32 sizeInBytes(){return theSizeInBytes;}
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimTileMapTileSource.h b/Utilities/otbossim/include/ossim/imaging/ossimTileMapTileSource.h
index 2913cf54c046593e09fba5b65c1689c4b4b60b57..4ab83b1ca08b8a23d6256db75ea9e1b623971315 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimTileMapTileSource.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimTileMapTileSource.h
@@ -40,18 +40,6 @@ public:
virtual bool open();
- virtual double getNullPixelValue(ossim_uint32 band=0)const;
-
- virtual double getMinPixelValue(ossim_uint32 band=0)const;
-
- virtual double getMaxPixelValue(ossim_uint32 band=0)const;
-
- virtual ossimScalarType getOutputScalarType() const;
-
- bool getAcquisitionDate(ossimDate& date)const;
- ossimString getSatelliteName()const;
-
- ossimFilename getBandFilename(ossim_uint32 idx)const;
//! Returns the image geometry object associated with this tile source or NULL if non defined.
//! The geometry contains full-to-local image transform as well as projection (image-to-world)
@@ -62,28 +50,12 @@ public:
virtual bool loadState(const ossimKeywordlist& kwl,
const char* prefix = NULL);
- /**
- * @brief Gets a property for matching name.
- * @param name The name of the property to get.
- * @return Returns property matching "name".
- */
- virtual ossimRefPtr<ossimProperty> getProperty(const ossimString& name)const;
-
- /**
- * @brief Gets a list of property names available.
- * @param propertyNames The list to push back names to.
- */
- virtual void getPropertyNames(std::vector<ossimString>& propertyNames)const;
protected:
virtual ~ossimTileMapTileSource();
private:
- void openHeader(const ossimFilename& file);
-
- ossimRefPtr<ossimFfL7> theFfHdr;
-
TYPE_DATA
};
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageHandler.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageHandler.h
new file mode 100644
index 0000000000000000000000000000000000000000..12a88676b8d1da5ede89de04d3958eebad008bda
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageHandler.h
@@ -0,0 +1,292 @@
+//*******************************************************************
+//
+// License: See top level LICENSE.txt file.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for ossimVirtualImageHandler.
+// ossimVirtualImageHandler is derived from ImageHandler which is
+// derived from ImageSource.
+//*******************************************************************
+// $Id: ossimVirtualImageHandler.h 14655 2009-06-05 11:58:56Z dburken $
+
+#ifndef ossimVirtualImageHandler_HEADER
+#define ossimVirtualImageHandler_HEADER
+
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/base/ossimIrect.h>
+#include <tiffio.h>
+
+class ossimImageData;
+
+class OSSIMDLLEXPORT ossimVirtualImageHandler : public ossimImageHandler
+{
+public:
+
+ enum ReadMethod
+ {
+ UNKNOWN,
+ READ_RGBA_U8_TILE,
+ READ_RGBA_U8_STRIP,
+ READ_RGBA_U8A_STRIP,
+ READ_SCAN_LINE,
+ READ_TILE
+ };
+
+ ossimVirtualImageHandler();
+
+ virtual ~ossimVirtualImageHandler();
+
+ virtual ossimString getLongName() const;
+ virtual ossimString getShortName() const;
+
+ /**
+ * Returns true if the image_file can be opened and is a valid tiff file.
+ */
+ virtual bool open( const ossimFilename& image_file );
+ virtual void close();
+ virtual bool isOpen()const;
+
+ /**
+ * Returns a pointer to a tile given an origin representing the upper left
+ * corner of the tile to grab from the image.
+ * Satisfies pure virtual from TileSource class.
+ */
+ virtual ossimRefPtr<ossimImageData> getTile( const ossimIrect& rect,
+ ossim_uint32 resLevel=0 );
+
+ /**
+ * Method to get a tile.
+ *
+ * @param result The tile to stuff. Note The requested rectangle in full
+ * image space and bands should be set in the result tile prior to
+ * passing. It will be an error if:
+ * result.getNumberOfBands() != this->getNumberOfOutputBands()
+ *
+ * @return true on success false on error. If return is false, result
+ * is undefined so caller should handle appropriately with makeBlank or
+ * whatever.
+ */
+ virtual bool getTile(ossimImageData& result, ossim_uint32 resLevel=0);
+
+ /**
+ * Returns the number of bands in the image.
+ * Satisfies pure virtual from ImageHandler class.
+ */
+ virtual ossim_uint32 getNumberOfInputBands() const;
+ virtual ossim_uint32 getNumberOfOutputBands () const;
+
+ /**
+ * Returns the number of lines in the image.
+ * Satisfies pure virtual from ImageHandler class.
+ */
+ virtual ossim_uint32 getNumberOfLines(ossim_uint32 resLevel = 0) const;
+
+ /**
+ * Returns the number of samples in the image.
+ * Satisfies pure virtual from ImageHandler class.
+ */
+ virtual ossim_uint32 getNumberOfSamples(ossim_uint32 resLevel = 0) const;
+
+ /**
+ * Returns the zero-based (relative) image rectangle for the reduced
+ * resolution data set (rrds) passed in. Note that rrds 0 is the highest
+ * resolution rrds.
+ */
+ virtual ossimIrect getImageRectangle(ossim_uint32 resLevel = 0) const;
+
+ /**
+ * Returns the number of reduced resolution data sets (rrds).
+ * Notes:
+ *
+ * - The full res image is counted as a data set so an image with no
+ * reduced resolution data set will have a count of one.
+ * - This method counts R0 as a res set even if it does not have one.
+ * This was done deliberately so as to not screw up code down the
+ * line.
+ */
+ virtual ossim_uint32 getNumberOfDecimationLevels() const;
+
+ /**
+ * Returns the output pixel type of the tile source.
+ */
+ virtual ossimScalarType getOutputScalarType() const;
+
+ /**
+ * Returns the width of the tiles within a frame file.
+ */
+ virtual ossim_uint32 getTileWidth() const;
+
+ /**
+ * Returns the height of the tiles within a frame file.
+ */
+ virtual ossim_uint32 getTileHeight() const;
+
+ /**
+ * Returns the width of the frame files.
+ */
+ virtual ossim_uint32 getFrameWidth() const;
+
+ /**
+ * Returns the height of the frame files.
+ */
+ virtual ossim_uint32 getFrameHeight() const;
+
+ /**
+ * Returns true if the virtual image has a copy of the
+ * highest resolution imagery from the source data.
+ */
+ bool hasR0() const;
+
+ virtual double getMinPixelValue( ossim_uint32 band=0 )const;
+ virtual double getMaxPixelValue( ossim_uint32 band=0 )const;
+
+ virtual bool isValidRLevel( ossim_uint32 resLevel ) const;
+
+ /**
+ * @return The tile width of the image or 0 if the image is not tiled.
+ * Note: this is not the same as the ossimImageSource::getTileWidth which
+ * returns the output tile width, which can be different than the
+ * internal image tile width on disk.
+ */
+ virtual ossim_uint32 getImageTileWidth() const;
+
+ /**
+ * @return The tile width of the image or 0 if the image is not tiled.
+ * Note: this is not the same as the ossimImageSource::getTileHeight which
+ * returns the output tile width which can be different than the internal
+ * image tile width on disk.
+ */
+ virtual ossim_uint32 getImageTileHeight() const;
+
+ virtual void setProperty( ossimRefPtr<ossimProperty> property );
+ virtual ossimRefPtr<ossimProperty> getProperty( const ossimString& name )const;
+ virtual void getPropertyNames( std::vector<ossimString>& propertyNames )const;
+
+ virtual std::ostream& print( std::ostream& os ) const;
+
+protected:
+
+ /**
+ * Returns true if no errors.
+ */
+ bool open();
+
+ bool allocateBuffer();
+
+ bool loadTile( const ossimIrect& clip_rect,
+ ossimImageData& result,
+ ossim_uint32 resLevel );
+
+ virtual bool initializeBuffers();
+
+ /**
+ * @brief validateMinNax Checks min and max to make sure they are not equal
+ * to the scalar type nan or double nan; sets to default min max if so.
+ */
+ void validateMinMax();
+
+ /**
+ * Retrieves the virtual image header info from a keywordlist.
+ *
+ * @param kwl A keywordlist where the header info is stored.
+ * @return true on success, false on error.
+ */
+ virtual bool loadHeaderInfo( const ossimKeywordlist& kwl );
+
+ /**
+ * Retrieves the virtual image -specific information for
+ * a single image entry from the keywordlist.
+ */
+ void loadNativeKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Retrieves the geometry information for a single image entry
+ * from the keywordlist.
+ */
+ void loadGeometryKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Retrieves general image information for a single image entry
+ * from the keywordlist.
+ */
+ void loadGeneralKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Grab the null, min, and max values from the input keywordlist.
+ */
+ void loadMetaData( const ossimKeywordlist& kwl );
+
+ /**
+ * Opens a tiff file for a single output frame for reading.
+ *
+ * @param resLevel The zero-based resolution level of the frame
+ * @param row The zero-based row at which the frame is located
+ * @param col The zero-based column at which the frame is located
+ * @return true on success, false on error.
+ */
+ bool openTiff( int resLevel, int row, int col );
+
+ /**
+ * Close the currently open tiff file.
+ * @return true on success, false on error.
+ */
+ bool closeTiff();
+
+ /**
+ * Calculates and returns the number of tiles in x,y that a
+ * single frame of the virtual image contain.
+ *
+ * @return the number of tiles in x,y directions.
+ */
+ ossimIpt getNumberOfTilesPerFrame() const;
+
+ ossim_uint8* theBuffer;
+ ossim_uint32 theBufferSize;
+ ossimIrect theBufferRect;
+ ossim_uint8* theNullBuffer;
+ ossim_uint16 theSampleFormatUnit;
+ double theMaxSampleValue;
+ double theMinSampleValue;
+ ossim_uint16 theBitsPerSample;
+ ossim_uint32 theBytesPerPixel;
+ ossimFilename theImageSubdirectory;
+ ossimFilename theCurrentFrameName;
+ ossimString theVirtualWriterType;
+ ossimString theMajorVersion;
+ ossimString theMinorVersion;
+ ossim_uint16 theCompressType;
+ ossim_int32 theCompressQuality;
+ bool theOverviewFlag;
+ bool theOpenedFlag;
+ bool theR0isFullRes;
+ ossim_int16 theEntryIndex;
+ ossim_uint16 theResLevelStart;
+ ossim_uint16 theResLevelEnd;
+ ossim_uint16 theSamplesPerPixel;
+ ossim_uint16 theNumberOfResLevels;
+ ossim_uint16 thePlanarConfig;
+ ossimScalarType theScalarType;
+ vector<ossimIpt> theNumberOfFrames;
+ ReadMethod theReadMethod;
+ ossim_int32 theImageTileWidth;
+ ossim_int32 theImageTileLength;
+ ossim_int32 theImageFrameWidth;
+ ossim_int32 theImageFrameLength;
+ ossim_int32 theR0NumberOfLines;
+ ossim_int32 theR0NumberOfSamples;
+ ossim_uint16 thePhotometric;
+ TIFF* theTif;
+ ossimRefPtr<ossimImageData> theTile;
+ vector<ossim_uint32> theImageWidth;
+ vector<ossim_uint32> theImageLength;
+
+ TYPE_DATA
+};
+
+#endif
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageTiffWriter.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageTiffWriter.h
new file mode 100644
index 0000000000000000000000000000000000000000..cda45b89c0a770eeaa36227bc3cae464e5151734
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageTiffWriter.h
@@ -0,0 +1,191 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for VirtualImageTiffWriter.
+//
+//*******************************************************************
+// $Id: ossimVirtualImageTiffWriter.h 11683 2007-09-07 17:25:30Z gpotts $
+#ifndef ossimVirtualImageTiffWriter_HEADER
+#define ossimVirtualImageTiffWriter_HEADER
+
+#include <ossim/base/ossimRefPtr.h>
+#include <ossim/projection/ossimMapProjectionInfo.h>
+#include <ossim/imaging/ossimVirtualImageWriter.h>
+
+class OSSIMDLLEXPORT ossimVirtualImageTiffWriter : public ossimVirtualImageWriter
+{
+public:
+
+ ossimVirtualImageTiffWriter( const ossimFilename& filename = ossimFilename(),
+ ossimImageHandler* inputSource = 0,
+ bool overviewFlag = false );
+
+ virtual ~ossimVirtualImageTiffWriter();
+
+ virtual void setOutputTileSize( const ossimIpt& tileSize );
+
+ virtual ossimIpt getOutputTileSize()const;
+
+ /**
+ * Sets the compression quality for use when using a compression type
+ * of COMPRESSION_JPEG.
+ *
+ * @param quality Range 1 to 100 with 100 being best quality.
+ */
+ virtual void setCompressionQuality( ossim_int32 quality );
+
+ /**
+ * Compression type can be JPEG, PACKBITS, or ZIP/DEFLATE
+ */
+ virtual void setCompressionType( const ossimString& type );
+
+ /**
+ * @brief Returns the overview type associated with the given
+ * filter resampler type.
+ *
+ * Called from ossimVirtualImageBuilder.
+ *
+ * Currently handled types are:
+ * "ossim_virtual_tiff_nearest" and "ossim_virtual_tiff_box"
+ *
+ * @param type a resampler filter type.
+ *
+ * @return the overview type.
+ */
+ static ossimString getOverviewType(
+ ossimFilterResampler::ossimFilterResamplerType type );
+
+ /**
+ * @brief Returns the filter resampler type associated with the given
+ * overview type.
+ *
+ * Called from ossimVirtualImageBuilder.
+ *
+ * Currently handled types are:
+ * "ossim_virtual_tiff_nearest" and "ossim_virtual_tiff_box"
+ *
+ * @param type This should be the string representing the type. This method
+ * will do nothing if type is not handled and return false.
+ *
+ * @return the filter resampler type.
+ */
+ static ossimFilterResampler::ossimFilterResamplerType
+ getResamplerType( const ossimString& type );
+
+ /**
+ * @brief Identifies whether or not the overview type is handled by
+ * this writer.
+ *
+ * Called from ossimVirtualImageBuilder.
+ *
+ * Currently handled types are:
+ * "ossim_virtual_tiff_nearest" and "ossim_virtual_tiff_box"
+ *
+ * @param type This should be the string representing the type. This method
+ * will do nothing if type is not handled and return false.
+ *
+ * @return true if type is handled, false if not.
+ */
+ static bool isOverviewTypeHandled( const ossimString& type );
+
+ /**
+ * @brief Method to populate class supported types.
+ * Called from ossimVirtualImageBuilder.
+ * @param typeList List of ossimStrings to add to.
+ */
+ static void getTypeNameList( std::vector<ossimString>& typeList );
+
+protected:
+
+ /**
+ * @brief Method to initialize output file name from image handler.
+ * @return true on success, false on error.
+ */
+ virtual bool initializeOutputFilenamFromHandler();
+
+ /**
+ * Set the metadata tags for the appropriate resLevel.
+ * Level zero is the full resolution image.
+ *
+ * @param rrds_level The current reduced res level.
+ * @param outputRect The dimensions (zero based) of res set.
+ */
+ virtual bool setTags( ossim_int32 resLevel,
+ const ossimIrect& outputRect ) const;
+
+ /**
+ * Opens a tiff file for a single output frame for writing.
+ *
+ * @param resLevel The zero-based resolution level of the frame
+ * @param row The zero-based row at which the frame is located
+ * @param col The zero-based column at which the frame is located
+ * @return true on success, false on error.
+ */
+ bool openTiff( int resLevel, int row, int col );
+
+ /**
+ * Close the currently open tiff file.
+ * @return true on success, false on error.
+ */
+ bool closeTiff();
+
+ /**
+ * Renames the current frame from the temporary name
+ * it carries during writing to the final name. I.e.
+ * the .tmp at the end of the name is removed.
+ */
+ void renameTiff();
+
+ /**
+ * Closes the current frame file.
+ */
+ void flushTiff();
+
+ /**
+ * Copy user-selected individual frames of the full resolution
+ * image data to the output virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Partial();
+
+ /**
+ * Copy all of the full resolution image data to the output
+ * virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Full();
+
+ /**
+ * Write user-selected individual frames of the reduced resolution
+ * image data to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnPartial( ossim_uint32 resLevel );
+
+ /**
+ * Write all of the reduced resolution image data at the given
+ * resolution level to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnFull( ossim_uint32 resLevel );
+
+ TIFF* theTif;
+ ossimRefPtr<ossimMapProjectionInfo> theProjectionInfo;
+ ossimFilename theCurrentFrameName;
+ ossimFilename theCurrentFrameNameTmp;
+
+TYPE_DATA
+};
+
+#endif /* End of "#ifndef ossimVirtualImageTiffWriter_HEADER" */
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageWriter.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageWriter.h
new file mode 100644
index 0000000000000000000000000000000000000000..4a87d3fc8f43db69b0da6bb61a8464aa0a77847f
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualImageWriter.h
@@ -0,0 +1,409 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for ossimVirtualImageWriter
+//*******************************************************************
+// $Id: ossimVirtualImageWriter.h 11181 2007-06-07 19:57:14Z dburken $
+
+#ifndef ossimVirtualImageWriter_HEADER
+#define ossimVirtualImageWriter_HEADER
+
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimOutputSource.h>
+#include <ossim/base/ossimProcessInterface.h>
+#include <ossim/base/ossimConnectableObjectListener.h>
+#include <ossim/imaging/ossimFilterResampler.h>
+#include <ossim/imaging/ossimImageSourceSequencer.h>
+
+class ossimImageHandler;
+class ossimStdOutProgress;
+
+#define OSSIM_DEFAULT_FRAME_HEIGHT ((ossim_int32)128)
+#define OSSIM_DEFAULT_FRAME_WIDTH ((ossim_int32)128)
+
+// Helper struct for organizing RPF frames.
+struct InputFrameInfo
+{
+ ossimFilename name;
+ ossim_uint32 entry;
+ ossim_uint32 row;
+ ossim_uint32 col;
+
+ // output frame indices
+ // calculated during execute()
+ std::vector<ossim_int32> xRangeMin;
+ std::vector<ossim_int32> xRangeMax;
+ std::vector<ossim_int32> yRangeMin;
+ std::vector<ossim_int32> yRangeMax;
+
+ bool isValid( ossim_uint32 resLevel=0 )
+ { return xRangeMin.size()>resLevel &&
+ xRangeMax.size()>resLevel &&
+ yRangeMin.size()>resLevel &&
+ yRangeMax.size()>resLevel;
+ }
+
+};
+
+/**
+ * Base class for writers of virtual images.
+ *
+ * There is normally one subclass of this class for each format supported
+ * for writing. This class works closely with the ossimVirtualOverviewBuilder
+ * class to provide it functionality for specific image formats. Format
+ * specific ossimVirtualImageWriters are normally instantiated by the
+ * ossimVirtualImageBuilder::setOverviewType() method.
+ * ossimVirtualImageWriters should not be directly instantiated by
+ * application code.
+ */
+class OSSIMDLLEXPORT ossimVirtualImageWriter : public ossimOutputSource,
+ public ossimProcessInterface,
+ public ossimConnectableObjectListener
+{
+public:
+
+ ossimVirtualImageWriter( const ossimFilename& filename = ossimFilename(),
+ ossimImageHandler* inputSource=0,
+ bool overviewFlag = false );
+
+ virtual ~ossimVirtualImageWriter();
+
+ /**
+ * Sets the output image tiling size if supported by the writer. If not
+ * supported this simply sets the sequencer(input) tile size.
+ */
+ virtual void setOutputTileSize( const ossimIpt& tileSize );
+
+ /**
+ * Number of pixels on a side of the output frames of the
+ * virtual image.
+ */
+ virtual void setOutputFrameSize( const ossimIpt& frameSize );
+
+ virtual void initialize();
+
+ virtual void setOutputImageType( ossim_int32 type );
+ virtual void setOutputImageType( const ossimString& type );
+ virtual ossim_int32 getOutputImageType() const;
+ virtual ossimString getOutputImageTypeString() const;
+
+ virtual void setOutputFile( const ossimFilename& file );
+ virtual const ossimFilename& getOutputFile()const;
+
+ virtual bool canConnectMyInputTo( ossim_int32 inputIndex,
+ const ossimConnectableObject* object )const;
+
+ /**
+ * @return Returns theAreaOfInterest.
+ */
+ virtual ossimIrect getAreaOfInterest() const;
+
+ virtual void setAreaOfInterest( const ossimIrect& inputAreaOfInterest );
+
+ /**
+ * Supports BOX or NEAREST NEIGHBOR.
+ * When indexed you should probably use nearest neighbor
+ */
+ void setResampleType( ossimFilterResampler::ossimFilterResamplerType t )
+ { theResampleType = t; }
+
+ ossimFilterResampler::ossimFilterResamplerType getResampleType() const
+ { return theResampleType; }
+
+ /**
+ * Sets the compression type to use when building virtual images.
+ */
+ virtual void setCompressionType( const ossimString& type ) = 0;
+
+ /**
+ * Sets the compression quality.
+ */
+ virtual void setCompressionQuality( ossim_int32 quality ) = 0;
+
+ /**
+ * @brief Method to return the flag that identifies whether or not the
+ * virtual image is an overview or not.
+ * @return The overview flag. If true the virtual image is an overview
+ * that contains missing resolution levels of another image.
+ */
+ bool getOverviewFlag() const;
+
+ /**
+ * @brief Method to set the flag that identifies whether or not the
+ * virtual image is an overview or not.
+ * @param flag The overview flag. If true the virtual image is an overview
+ * that contains missing resolution levels of another image.
+ */
+ void setOverviewFlag( bool flag );
+
+ /**
+ * @brief Method to return copy all flag.
+ * @return The copy all flag. If true all data will be written to the
+ * overview including R0.
+ */
+ bool getCopyAllFlag() const;
+
+ /**
+ * @brief Sets theCopyAllFlag.
+ * @param flag The flag. If true all data will be written to the
+ * overview including R0.
+ */
+ void setCopyAllFlag( bool flag );
+
+ /**
+ * @return ossimObject* to this object.
+ */
+ virtual ossimObject* getObject();
+
+ /**
+ * @return const ossimObject* to this object.
+ */
+ virtual const ossimObject* getObject() const;
+
+ /**
+ * Unused inherited function isOpen()
+ */
+ virtual bool isOpen() const { return false; }
+ /**
+ * Unused inherited function open()
+ */
+ virtual bool open() { return false; }
+ /**
+ * Unused inherited function close()
+ */
+ virtual void close() {}
+
+ /**
+ * @brief Sets the name of a frame for guiding a limited-scope virtual
+ * image update.
+ *
+ * @param name The name of an existing frame file of an RPF image.
+ */
+ void setDirtyFrame( const ossimString& name );
+
+ /**
+ * Manages the writing of the virtual image file.
+ * @return true on success, false on error.
+ */
+ virtual bool execute();
+
+protected:
+
+ /**
+ * Copy the full resolution image data to the output image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0();
+
+ /**
+ * Write reduced resolution data set to the file.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRn( ossim_uint32 resLevel );
+
+ /**
+ * Copy user-selected individual frames of the full resolution
+ * image data to the output virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Partial() { return false; }
+
+ /**
+ * Copy all of the full resolution image data to the output
+ * virtual image.
+ * @return true on success, false on error.
+ */
+ virtual bool writeR0Full() { return false; }
+
+ /**
+ * Write user-selected individual frames of the reduced resolution
+ * image data to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnPartial( ossim_uint32 resLevel )
+ { return false; }
+
+ /**
+ * Write all of the reduced resolution image data at the given
+ * resolution level to the output virtual image.
+ *
+ * @param resLevel The reduced resolution level to write.
+ * @return true on success, false on error.
+ */
+ virtual bool writeRnFull( ossim_uint32 resLevel )
+ { return false; }
+
+ /**
+ * Set the metadata tags for the appropriate resLevel.
+ * Level zero is the full resolution image.
+ *
+ * @param outputRect The dimensions (zero based) of res set.
+ * @param rrds_level The current reduced res level.
+ */
+ virtual bool setTags( ossim_int32 resLevel,
+ const ossimIrect& outputRect ) const = 0;
+
+ /**
+ * @brief Method to initialize output file name from image handler.
+ * @return true on success, false on error.
+ */
+ virtual bool initializeOutputFilenamFromHandler() = 0;
+
+ /**
+ * @brief Gets the zero based final reduced resolution data set.
+ *
+ * @param startResLevel The starting reduced resolution level.
+ * @param bPartialBuild If true, do calculation assuming a partial build.
+ * @return the final reduced resolution data set 0 being full res.
+ */
+ virtual ossim_uint32 getFinalResLevel( ossim_uint32 startResLevel,
+ bool bPartialBuild=false ) const;
+
+ /**
+ * @brief Gets the zero based starting reduced resolution data set.
+ *
+ * @return the starting reduced resolution data set 0 being full res.
+ */
+ virtual ossim_uint32 getStartingResLevel() const;
+
+ /**
+ * Set the header info into a keywordlist after the output
+ * frames have been output from the start to end resolution
+ * levels.
+ *
+ * @param kwl A keywordlist where the header info is stored.
+ * @param begin The starting reduced resolution level.
+ * @param end The final reduced resolution level.
+ * @return true on success, false on error.
+ */
+ virtual bool saveHeaderInfo( ossimKeywordlist& kwl,
+ ossim_uint32 begin,
+ ossim_uint32 end );
+
+ /**
+ * Set the virtual image -specific information for
+ * a single image entry to the keywordlist.
+ */
+ void saveNativeKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix,
+ ossim_uint32 resLevelBegin,
+ ossim_uint32 resLevelEnd ) const;
+
+ /**
+ * Set the geometry information for a single image entry
+ * to the keywordlist.
+ */
+ void saveGeometryKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix );
+
+ /**
+ * Set general image information for a single image entry
+ * to the keywordlist.
+ */
+ void saveGeneralKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix ) const;
+
+ /**
+ * @return true if the current entry of 'theImageHandler' represents
+ * an external overview.
+ */
+ bool isExternalOverview() const;
+
+ /**
+ * Calculates and returns the number of frames in x,y that the
+ * virtual image will contain at the requested resolution level.
+ *
+ * @param resLevel The reduced resolution level.
+ * @return the number of frames in the x,y directions.
+ */
+ ossimIpt getNumberOfOutputFrames( ossim_uint32 resLevel=0 ) const;
+
+ /**
+ * Calculates and returns the total number of frames that will be
+ * built at the requested resolution level.
+ *
+ * @param resLevel The reduced resolution level.
+ * @param bPartialBuild If true, do calculation assuming a partial build.
+ * @return the number of frames in the x,y directions.
+ */
+ ossim_int32 getNumberOfBuiltFrames( ossim_uint32 resLevel=0,
+ bool bPartialBuild=false ) const;
+
+ /**
+ * Calculates and returns the number of tiles in x,y that the
+ * output image will contain at the requested resolution level.
+ *
+ * @param resLevel The reduced resolution level.
+ * @return the number of tiles in the x,y directions.
+ */
+ ossimIpt getNumberOfOutputTiles( ossim_uint32 resLevel=0 ) const;
+
+ /**
+ * Calculates and returns the number of tiles in x,y that a
+ * single frame of the virtual image will contain.
+ *
+ * @return the number of tiles in x,y directions.
+ */
+ ossimIpt getNumberOfTilesPerOutputFrame() const;
+
+ /**
+ * Finds information about the RPF frame of the given name.
+ *
+ * @param name The name of an RPF frame file.
+ * @return a pointer to a InputFrameInfo struct.
+ */
+ InputFrameInfo* getInputFrameInfo( ossimFilename name ) const;
+
+ /**
+ * Returns true if the given output frame (frameX,frameY,resLevel)
+ * has already been generated by previous input RPF frames (i.e.
+ * at less than idx in theInputFrameInfoQueue).
+ */
+ bool isFrameAlreadyDone( ossim_uint32 idx, ossim_uint32 resLevel,
+ ossim_int32 frameX, ossim_int32 frameY ) const;
+
+ ossimFilename theOutputFile;
+ ossimFilename theOutputFileTmp;
+ ossimFilename theOutputSubdirectory;
+ ossimString theVirtualWriterType;
+ ossimString theOutputImageType;
+ ossimString theMajorVersion;
+ ossimString theMinorVersion;
+ ossim_uint16 theCompressType;
+ ossim_int32 theCompressQuality;
+ ossimIpt theOutputTileSize;
+ ossimIpt theOutputFrameSize;
+ ossimIpt theInputFrameSize;
+ ossim_int32 theBytesPerPixel;
+ ossim_int32 theBitsPerSample;
+ ossim_int32 theSampleFormat;
+ ossim_int32 theTileSizeInBytes;
+ std::vector<ossim_uint8> theNullDataBuffer;
+ ossimStdOutProgress* theProgressListener;
+ bool theCopyAllFlag;
+ bool theLimitedScopeUpdateFlag;
+ bool theOverviewFlag;
+ ossim_uint32 theCurrentEntry;
+ ossimMapProjection* theInputMapProjection;
+ std::vector<ossimFilename> theDirtyFrameList;
+ std::vector<InputFrameInfo*> theInputFrameInfoList;
+ std::vector<InputFrameInfo*> theInputFrameInfoQueue;
+ ossimFilterResampler::ossimFilterResamplerType theResampleType;
+ ossimRefPtr<ossimImageHandler> theImageHandler;
+ ossimRefPtr<ossimImageSourceSequencer> theInputConnection;
+ ossimRefPtr<ossimImageGeometry> theInputGeometry;
+ ossimRefPtr<ossimProjection> theInputProjection;
+ ossimIrect theAreaOfInterest;
+
+TYPE_DATA
+};
+#endif
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVirtualOverviewBuilder.h b/Utilities/otbossim/include/ossim/imaging/ossimVirtualOverviewBuilder.h
new file mode 100644
index 0000000000000000000000000000000000000000..d984e2993b945f36efa737ad517e2590330b678a
--- /dev/null
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVirtualOverviewBuilder.h
@@ -0,0 +1,215 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for VirtualOverviewBuilder.
+//
+//*******************************************************************
+// $Id: ossimVirtualOverviewBuilder.h 14780 2009-06-25 19:32:32Z dburken $
+
+#ifndef ossimVirtualOverviewBuilder_HEADER
+#define ossimVirtualOverviewBuilder_HEADER
+
+#include <vector>
+#include <ossim/imaging/ossimFilterResampler.h>
+#include <ossim/imaging/ossimOverviewBuilderBase.h>
+
+class ossimImageHandler;
+class ossimFilename;
+class ossimConnectableObject;
+class ossimStdOutProgress;
+
+class OSSIM_DLL ossimVirtualOverviewBuilder : public ossimOverviewBuilderBase
+{
+public:
+
+ enum WriterType
+ {
+ WRITER_TYPE_TIFF,
+ WRITER_TYPE_UNKNOWN
+ };
+
+ /** default constructor */
+ ossimVirtualOverviewBuilder();
+
+ /** virtual destructor */
+ virtual ~ossimVirtualOverviewBuilder();
+
+ /**
+ * Supports BOX or NEAREST NEIGHBOR.
+ * When indexed you should probably use nearest neighbor
+ */
+ void setResampleType( ossimFilterResampler::ossimFilterResamplerType resampleType );
+
+ /**
+ * Builds overview file and sets "theOutputFile" to that of
+ * the overview_file.
+ *
+ * @param overview_file The overview file name to output.
+ *
+ * @param copy_all If set to true the entire image will be
+ * copied. This can be used to convert an image to a tiled tif.
+ *
+ * @return true on success, false on error.
+ */
+ bool buildOverview( const ossimFilename& overview_file,
+ bool copy_all=false );
+
+ /**
+ * Calls buildOverview. This method uses "theOutputFile" for the file
+ * name.
+ *
+ * If the copy_all flag is set the entire image will be copied. This can
+ * be used to convert an image to a tiled tif.
+ *
+ * @return true on success, false on error.
+ *
+ * @note If setOutputFile was not called the output name will be derived
+ * from the image name. If image was "foo.tif" the overview file will
+ * be "foo.ovr".
+ */
+ virtual bool execute();
+
+ /**
+ * @brief Method to return copy all flag.
+ * @return The copy all flag. If true all data will be written to the
+ * overview including R0.
+ */
+ bool getCopyAllFlag() const;
+
+ /**
+ * @brief Sets theCopyAllFlag.
+ * @param flag The flag. If true all data will be written to the
+ * overview including R0.
+ */
+ void setCopyAllFlag( bool flag );
+
+ /**
+ * @return ossimObject* to this object.
+ */
+ virtual ossimObject* getObject();
+
+ /**
+ * @return const ossimObject* to this object.
+ */
+ virtual const ossimObject* getObject() const;
+
+ /**
+ * @return The output filename. This will be derived from the image
+ * handlers filename unless the method buildOverview has been called which
+ * takes a filename.
+ */
+ ossimFilename getOutputFile() const;
+
+ /**
+ * @return true if input is an image handler.
+ */
+ virtual bool canConnectMyInputTo( ossim_int32 index,
+ const ossimConnectableObject* obj ) const;
+
+ /**
+ * @brief Sets the input to the builder. Satisfies pure virtual from
+ * ossimOverviewBuilderBase.
+ *
+ * @param imageSource The input to the builder.
+ * @return True on successful initialization, false on error.
+ */
+ virtual bool setInputSource( ossimImageHandler* imageSource );
+
+ /**
+ * @brief Sets the output filename.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ * @param file The output file name.
+ */
+ virtual void setOutputFile( const ossimFilename& file );
+
+ void setOutputTileSize( const ossimIpt& tileSize );
+
+ /*
+ * Number of pixels on a side of the output frames of the
+ * virtual overview.
+ */
+ void setOutputFrameSize( const ossimIpt& frameSize );
+
+ /**
+ * @brief Sets the overview output type.
+ *
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ *
+ * @param type This should be the string representing the type. This method
+ * will do nothing if type is not handled and return false.
+ *
+ * @return true if type is handled, false if not.
+ */
+ virtual bool setOverviewType( const ossimString& type );
+
+ /**
+ * @brief Gets the overview type.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ * @return The overview output type as a string.
+ */
+ virtual ossimString getOverviewType() const;
+
+ /**
+ * @brief Method to populate class supported types.
+ * Satisfies pure virtual from ossimOverviewBuilderBase.
+ * @param typeList List of ossimStrings to add to.
+ */
+ virtual void getTypeNameList( std::vector<ossimString>& typeList )const;
+
+ /**
+ * @brief Method to set properties.
+ * @param prop Property to set.
+ *
+ * @note Currently supported property:
+ * name=levels, value should be list of levels separated by a comma with
+ * no spaces. Example: "2,4,8,16,32,64"
+ */
+ virtual void setProperty( ossimRefPtr<ossimProperty> prop );
+
+ /**
+ * @brief Method to populate the list of property names.
+ * @param propNames List to populate. This does not clear the list
+ * just adds to it.
+ */
+ virtual void getPropertyNames( std::vector<ossimString>& propNames )const;
+
+ /**
+ * @brief Sets the name of a frame for guiding a limited-scope virtual
+ * overview update.
+ *
+ * @param name The name of an existing frame file of an RPF image.
+ */
+ void setDirtyFrame( const ossimString& name );
+
+ static const char* OUTPUT_FRAME_SIZE_KW;
+
+private:
+
+ // Disallow these...
+ ossimVirtualOverviewBuilder( const ossimVirtualOverviewBuilder& source );
+ ossimVirtualOverviewBuilder& operator=( const ossimVirtualOverviewBuilder& rhs );
+
+ ossimRefPtr<ossimImageHandler> theImageHandler;
+ bool theOwnsImageHandlerFlag;
+ ossimFilename theOutputFile;
+ ossimIpt theOutputTileSize;
+ ossimIpt theOutputFrameSize;
+ ossimFilterResampler::ossimFilterResamplerType theResamplerType;
+ bool theCopyAllFlag;
+ ossimString theCompressType;
+ ossim_int32 theCompressQuality;
+ ossimStdOutProgress* theProgressListener;
+ WriterType theWriterType;
+ std::vector<ossimString> theDirtyFrameList;
+
+TYPE_DATA
+};
+
+#endif
diff --git a/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h b/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h
index 4f9bf0cfa943a31c6dfec24463b689d9f63aa5ae..480f9e18212de45e7430f03878993aa60f82f1fa 100644
--- a/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h
+++ b/Utilities/otbossim/include/ossim/imaging/ossimVpfAnnotationFeatureInfo.h
@@ -1,13 +1,16 @@
//*******************************************************************
//
-// LICENSE: LGPL see top level license.txt
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
//
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimVpfAnnotationFeatureInfo.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimVpfAnnotationFeatureInfo.h 15836 2009-10-30 12:29:09Z dburken $
#ifndef ossimVpfAnnotationFeatureInfo_HEADER
#define ossimVpfAnnotationFeatureInfo_HEADER
+#include <ossim/base/ossimRefPtr.h>
#include <ossim/base/ossimRgbVector.h>
#include <ossim/base/ossimString.h>
#include <ossim/base/ossimGeoPolygon.h>
@@ -170,13 +173,13 @@ protected:
ossimRgbVector theBrushColor;
ossimVpfCoverage theCoverage;
ossimDpt thePointRadius;
- int theThickness;
- bool theFillEnabledFlag;
- bool theEnabledFlag;
+ int theThickness;
+ bool theFillEnabledFlag;
+ bool theEnabledFlag;
ossimVpfAnnotationFeatureType theFeatureType;
ossimFontInformation theFontInformation;
- std::vector<ossimGeoAnnotationObject*> theAnnotationArray;
+ std::vector<ossimRefPtr<ossimGeoAnnotationObject> > theAnnotationArray;
void buildTxtFeature(const ossimFilename& table,
const ossimString& tableKey,
diff --git a/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h b/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h
index e31b1183ce0f9913fe98276fd71a7a6aedca14fc..58aeb2de75b6adfc2b0f973cb78ec5ec4c317191 100644
--- a/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h
+++ b/Utilities/otbossim/include/ossim/parallel/ossimOrthoIgen.h
@@ -1,4 +1,4 @@
-// $Id: ossimOrthoIgen.h 15785 2009-10-21 14:55:04Z dburken $
+// $Id: ossimOrthoIgen.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef ossimOrthoIgen_HEADER
#define ossimOrthoIgen_HEADER
#include <ossim/base/ossimObject.h>
@@ -124,6 +124,7 @@ protected:
ossimFilename theCombinerTemplate;
ossimFilename theAnnotationTemplate;
ossimFilename theWriterTemplate;
+ ossimFilename theSupplementaryDirectory;
ossimString theSlaveBuffers;
ossimOrthoIgen::OriginType theCutOriginType;
ossimDpt theCutOrigin;
diff --git a/Utilities/otbossim/include/ossim/projection/ossimTileMapModel.h b/Utilities/otbossim/include/ossim/projection/ossimTileMapModel.h
index 068bd75709794baedfddc35ff883736d4e5fc275..a0d0b9daa2679407d2bacd7b797d39de2ddc9483 100644
--- a/Utilities/otbossim/include/ossim/projection/ossimTileMapModel.h
+++ b/Utilities/otbossim/include/ossim/projection/ossimTileMapModel.h
@@ -46,8 +46,6 @@ public:
ossimTileMapModel(const ossimKeywordlist& geom_kwl);
ossimTileMapModel(const ossimTileMapModel& rhs);
- virtual ~ossimTileMapModel();
-
enum ProjectionType
{
UNKNOWN_PROJECTION = 0,
@@ -141,6 +139,8 @@ public:
protected:
+ virtual ~ossimTileMapModel();
+
/*!
* Initializes the model given a fast format header.
*/
diff --git a/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h b/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h
index bda548d26e012f905f53678a87ab3d7d766f6fdb..98ff881715c8fe764731a6dbd67ea1f5ab3b1c7b 100644
--- a/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h
+++ b/Utilities/otbossim/include/ossim/support_data/ossimGeoTiff.h
@@ -9,7 +9,7 @@
// information.
//
//***************************************************************************
-// $Id: ossimGeoTiff.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoTiff.h 15868 2009-11-06 22:30:38Z dburken $
#ifndef ossimGeoTiff_HEADER
#define ossimGeoTiff_HEADER 1
@@ -18,6 +18,7 @@
#include <ossim/base/ossimEndian.h>
#include <ossim/base/ossimString.h>
#include <ossim/projection/ossimMapProjectionInfo.h>
+#include <ossim/projection/ossimProjection.h>
#include <ossim/base/ossimRefPtr.h>
#include <vector>
@@ -29,6 +30,7 @@
class ossimFilename;
class ossimKeywordlist;
+class ossimProjection;
class ossimTieGptSet;
class OSSIM_DLL ossimGeoTiff : public ossimErrorStatusInterface
@@ -110,6 +112,23 @@ public:
static bool writeTags(TIFF* tiffOut,
const ossimRefPtr<ossimMapProjectionInfo> projectionInfo,
bool imagineNad27Flag=false);
+
+ /**
+ * @brief Writes a geotiff box to a buffer.
+ *
+ * This will write a degenerate GeoTIFF file to a temp file, copy file to
+ * the buffer and then delete the temp file.
+ *
+ * @param tmpFile The temporary filename.
+ * @param rect The output image rect.
+ * @param proj Pointer to output projection.
+ * @param buf The buffer to stuff with data.
+ * @return true on success, false on error.
+ */
+ static bool writeJp2GeotiffBox(const ossimFilename& tmpFile,
+ const ossimIrect& rect,
+ const ossimProjection* proj,
+ std::vector<ossim_uint8>& buf);
/**
* Reads tags.
diff --git a/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h b/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h
index 0ecece7ac2796ac55c7e9c240d5d1f4cc55d81c3..d6aae7b62bd7e44d84fbf78b9d701db679b69e98 100644
--- a/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h
+++ b/Utilities/otbossim/include/ossim/support_data/ossimIkonosMetaData.h
@@ -9,7 +9,7 @@
// This class parses a Space Imaging Ikonos meta data file.
//
//********************************************************************
-// $Id: ossimIkonosMetaData.h 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimIkonosMetaData.h 15828 2009-10-28 13:11:31Z dburken $
#ifndef ossimIkonosMetaData_HEADER
#define ossimIkonosMetaData_HEADER
diff --git a/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h b/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h
index 1a111b916c1d00080046ca91a6f48bb8d91d0001..53591766b6855c54c91961128cbb505ff95f4a7f 100644
--- a/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h
+++ b/Utilities/otbossim/include/ossim/support_data/ossimRpfToc.h
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimRpfToc.h 14535 2009-05-18 13:11:55Z dburken $
+// $Id: ossimRpfToc.h 15833 2009-10-29 01:41:53Z eshirschorn $
#ifndef osimRpfToc_HEADER
#define osimRpfToc_HEADER
@@ -49,13 +49,61 @@ public:
unsigned long getNumberOfEntries()const{return (ossim_uint32)theTocEntryList.size();}
const ossimRpfTocEntry* getTocEntry(unsigned long index)const;
- /*!
+ /**
* Returns -1 if not found.
*/
ossim_int32 getTocEntryIndex(const ossimRpfTocEntry* entry);
const ossimRpfHeader* getRpfHeader()const{return theRpfHeader;}
-
+
+ /**
+ * For the given entry index, this routine returns the number of
+ * frames that exist in the horizontal direction. If the entry index
+ * is invalid, 0 frames are returned.
+ *
+ * @param idx the entry index.
+ * @return number of frames in the horizontal direction
+ */
+ ossim_uint32 getNumberOfFramesHorizontal(ossim_uint32 idx)const;
+
+ /**
+ * For the given entry index, this routine returns the number of
+ * frames that exist in the vertical direction. If the entry index
+ * is invalid, 0 frames are returned.
+ *
+ * @param idx the entry index.
+ * @return number of frames in the vertical direction
+ */
+ ossim_uint32 getNumberOfFramesVertical(ossim_uint32 idx)const;
+
+ /**
+ * For the given entry index, frame row, and frame column, this
+ * routine returns the corresponding ossimRpfFrameEntry instance.
+ *
+ * @param entryIdx the entry index.
+ * @param row the frame row.
+ * @param col the frame col.
+ * @return true if successful
+ */
+ bool getRpfFrameEntry(ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col,
+ ossimRpfFrameEntry& result)const;
+
+ /**
+ * For the given entry index, frame row, and frame column, this
+ * routine returns the corresponding name of the frame image
+ * with respect to the location of the toc file.
+ *
+ * @param entryIdx the entry index.
+ * @param row the frame row.
+ * @param col the frame col.
+ * @return the name of the frame image
+ */
+ const ossimString getRelativeFramePath( ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col)const;
+
private:
void deleteAll();
void clearAll();
diff --git a/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp b/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp
index 51af222442da2671e13856d2473ff1ba48cc20c4..a07f941956b7b9740c0e2a20139d508ea6bf9e14 100644
--- a/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimAdjustableParameterInterface.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimAdjustableParameterInterface.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimAdjustableParameterInterface.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <ossim/base/ossimAdjustableParameterInterface.h>
#include <ossim/base/ossimKeywordNames.h>
@@ -40,7 +40,7 @@ void ossimAdjustableParameterInterface::newAdjustment(ossim_uint32 numberOfParam
theAdjustmentList[theAdjustmentList.size()-1].setDescription("Initial adjustment");
}
- theCurrentAdjustment = theAdjustmentList.size() - 1;
+ theCurrentAdjustment = (ossim_uint32)theAdjustmentList.size() - 1;
}
@@ -100,7 +100,7 @@ void ossimAdjustableParameterInterface::resetAdjustableParameters(bool notify)
setCurrentAdjustment(saveCurrent);
- eraseAdjustment(theAdjustmentList.size()-1, false);
+ eraseAdjustment((ossim_uint32)theAdjustmentList.size()-1, false);
if(notify)
{
@@ -120,7 +120,7 @@ void ossimAdjustableParameterInterface::copyAdjustment(ossim_uint32 idx, bool no
if(idx == theCurrentAdjustment)
{
- theCurrentAdjustment = theAdjustmentList.size() - 1;
+ theCurrentAdjustment = (ossim_uint32)theAdjustmentList.size() - 1;
}
if(notify)
{
@@ -204,7 +204,7 @@ void ossimAdjustableParameterInterface::eraseAdjustment(ossim_uint32 idx, bool n
}
else
{
- theCurrentAdjustment = theAdjustmentList.size() - 1;
+ theCurrentAdjustment = (ossim_uint32)theAdjustmentList.size() - 1;
}
}
@@ -643,7 +643,7 @@ void ossimAdjustableParameterInterface::getAdjustment(ossim_uint32 idx, ossimAdj
ossim_uint32 ossimAdjustableParameterInterface::getNumberOfAdjustments()const
{
- return theAdjustmentList.size();
+ return (ossim_uint32)theAdjustmentList.size();
}
ossim_uint32 ossimAdjustableParameterInterface::getCurrentAdjustmentIdx()const
diff --git a/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp b/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp
index 48d0558c9b8d9dc19a51cf86e283d11a0e9449b9..e71a10e269634d36c2ac635f8ae977473d256cd6 100644
--- a/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimAdjustmentInfo.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimAdjustmentInfo.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimAdjustmentInfo.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimAdjustmentInfo.h>
#include <ossim/base/ossimKeywordNames.h>
@@ -71,7 +71,7 @@ void ossimAdjustmentInfo::setNumberOfAdjustableParameters(ossim_uint32 numberOfA
ossim_uint32 ossimAdjustmentInfo::getNumberOfAdjustableParameters()const
{
- return theParameterList.size();
+ return (ossim_uint32)theParameterList.size();
}
ossimString ossimAdjustmentInfo::getDescription()const
diff --git a/Utilities/otbossim/src/ossim/base/ossimCommon.cpp b/Utilities/otbossim/src/ossim/base/ossimCommon.cpp
index c2c021a0ea908ac5b9bf4144fc81d733f515c0a8..d324af311237b98dc9cf7dd6031e803bc57ca892 100644
--- a/Utilities/otbossim/src/ossim/base/ossimCommon.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimCommon.cpp
@@ -9,7 +9,7 @@
// Description: Common file for global functions.
//
//*************************************************************************
-// $Id: ossimCommon.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimCommon.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <sstream>
@@ -659,22 +659,22 @@ void ossim::lexQuotedTokens(const std::string& str,
else
{
unbalancedQuotes = true;
- end = str.length();
+ end = (int)str.length();
}
}
else if (str[start] == closeQuote)
{
unbalancedQuotes = true;
- end = str.length();
+ end = (int)str.length();
}
else
{
- end = str.find_first_of(whitespace, start);
+ end = (int)str.find_first_of(whitespace, start);
tokens.push_back(str.substr(start, end-start));
}
- start = str.find_first_not_of(whitespace, end);
+ start = (ossim_uint32)str.find_first_not_of(whitespace, end);
}
}
diff --git a/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp b/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp
index 037a3cef2247a785a9d9e5f8f07184430681cd4b..dfefbcbc8fcdfc6efec2d90046b67b67e84d0346 100644
--- a/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimConnectableContainer.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimConnectableContainer.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimConnectableContainer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <stack>
@@ -582,9 +582,9 @@ bool ossimConnectableContainer::addAllObjects(std::map<ossimId,
ossimString regExpression = ossimString("^(") + copyPrefix + "object[0-9]+.)";
std::vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- long numberOfSources = keys.size();
+ long numberOfSources = (long)keys.size();
- int offset = (copyPrefix+"object").size();
+ int offset = (int)(copyPrefix+"object").size();
int idx = 0;
std::vector<int> theNumberList(numberOfSources);
for(idx = 0; idx < (int)theNumberList.size();++idx)
@@ -682,7 +682,7 @@ bool ossimConnectableContainer::connectAllObjects(const std::map<ossimId, std::v
if(currentObject)
{
- long upperBound = (*iter).second.size();
+ long upperBound = (long)(*iter).second.size();
for(long index = 0; index < upperBound; ++index)
{
ossimConnectableObject* inputObject = findObject((*iter).second[index]);
diff --git a/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp b/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp
index 585197dcf79ebeaa779f93e45dd9d2cf340b7c25..98924dd9820b3f2db7fb7ed7ea553b6a057f89b1 100644
--- a/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimConnectionEvent.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimConnectionEvent.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimConnectionEvent.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimConnectionEvent.h>
@@ -76,12 +76,12 @@ ossimConnectionEvent::ossimConnectionDirectionType ossimConnectionEvent::getDire
ossim_uint32 ossimConnectionEvent::getNumberOfNewObjects()const
{
- return theNewObjectList.size();
+ return (ossim_uint32)theNewObjectList.size();
}
ossim_uint32 ossimConnectionEvent::getNumberOfOldObjects()const
{
- return theOldObjectList.size();
+ return (ossim_uint32)theOldObjectList.size();
}
ossimConnectableObject* ossimConnectionEvent::getOldObject(ossim_uint32 i)
diff --git a/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp b/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp
index 69d349da88903ab5d2852d7a5b5bbe66c0e7df32..de5ba5a3f6b0601e01ab652ee50580a81a7d3b76 100644
--- a/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimContainerProperty.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimContainerProperty.cpp 12969 2008-06-03 17:17:43Z gpotts $
+// $Id: ossimContainerProperty.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimContainerProperty.h>
#include <ossim/base/ossimStringProperty.h>
@@ -163,7 +163,7 @@ void ossimContainerProperty::valueToString(ossimString& valueResult)const
ossim_uint32 ossimContainerProperty::getNumberOfProperties()const
{
- return theChildPropertyList.size();
+ return (ossim_uint32)theChildPropertyList.size();
}
ossimRefPtr<ossimProperty> ossimContainerProperty::getProperty(ossim_uint32 idx)
diff --git a/Utilities/otbossim/src/ossim/base/ossimDate.cpp b/Utilities/otbossim/src/ossim/base/ossimDate.cpp
index d969ab8f3bc7dad4dc35b154c60dbd887fd3f197..b0ad8b9580ef79f882080c05eb2483bd48394778 100644
--- a/Utilities/otbossim/src/ossim/base/ossimDate.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimDate.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//----------------------------------------------------------------------------
-// $Id: ossimDate.cpp 15067 2009-08-12 15:14:27Z dburken $
+// $Id: ossimDate.cpp 15853 2009-11-04 19:37:46Z gpotts $
#include <ossim/base/ossimDate.h>
#include <iomanip>
@@ -104,11 +104,11 @@ int ossimLocalTm::isValid (void) const
31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
};
- return (tm_year > 0 &&
- tm_mon >= 0 && tm_mon < 12 &&
- tm_mday > 0 && tm_mday <= maxd[tm_mon] &&
- tm_wday < 7 && tm_yday < 367 &&
- tm_sec < 60 && tm_min < 60 && tm_hour < 24);
+ return ((tm_year > 0) &&
+ (tm_mon >= 0) && (tm_mon < 12) &&
+ (tm_mday > 0) && (tm_mday <= maxd[tm_mon]) &&
+ (tm_wday < 7) && (tm_yday < 367) &&
+ (tm_sec < 60) && (tm_min < 60) && (tm_hour < 24));
}
void ossimLocalTm::now()
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimDms.cpp b/Utilities/otbossim/src/ossim/base/ossimDms.cpp
index 4d9a6c474eb2ba7ac0b3bc63de44104c8f712b72..bc5112710f3ae163193c46b74cf2ea887af818a7 100644
--- a/Utilities/otbossim/src/ossim/base/ossimDms.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimDms.cpp
@@ -8,7 +8,7 @@
//
// Contains class definition for Degrees Minutes Seconds (ossimDms)
//*******************************************************************
-// $Id: ossimDms.cpp 14482 2009-05-12 11:42:38Z gpotts $
+// $Id: ossimDms.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cmath>
#include <cstring> /* for strcpy */
@@ -368,7 +368,7 @@ ossimString ossimDms::toString(const ossimString& formatString)const
theIntDegs = static_cast<int>( std::abs(theDegrees) );
ossimString temp = ossimString::toString(theIntDegs);
ossimString prefix;
- d_s -= temp.length();
+ d_s -= (int)temp.length();
while(d_s > 0)
{
prefix += '0';
diff --git a/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp b/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp
index 9fb1ed0dfcd0213de79f77da1fd59dc60a75b9a4..53ae4dfb758fdc897261ffe71861d6d7c465188b 100644
--- a/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimDoubleGridProperty.cpp
@@ -143,7 +143,7 @@ ossim_uint32 ossimDoubleGridProperty::getNumberOfCols()const
{
if(getNumberOfRows())
{
- return theValues[0].size();
+ return (ossim_uint32)theValues[0].size();
}
return 0;
}
diff --git a/Utilities/otbossim/src/ossim/base/ossimFilename.cpp b/Utilities/otbossim/src/ossim/base/ossimFilename.cpp
index 4dfd5458cefcffe0455c144997cdf367ad2f0e24..63d3dc5e9284e0f75db3f368d5e890673e22bac9 100644
--- a/Utilities/otbossim/src/ossim/base/ossimFilename.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimFilename.cpp
@@ -7,7 +7,7 @@
// Description: This class provides manipulation of filenames.
//
//*************************************************************************
-// $Id: ossimFilename.cpp 14886 2009-07-15 15:40:50Z gpotts $
+// $Id: ossimFilename.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/ossimConfig.h> /* to pick up platform defines */
@@ -499,7 +499,7 @@ ossimFilename ossimFilename::expand() const
ossimFilename finalResult;
const char* tempPtr = result.c_str();
ossim_int32 startIdx = -1;
- ossim_int32 resultSize = result.size();
+ ossim_int32 resultSize = (ossim_uint32)result.size();
ossim_int32 scanIdx = 0;
while(scanIdx < resultSize)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp b/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp
index 59371abe50fd1f661477c73f3ec72245f5aaad50..5b3db2c222805d6091143088384535f6aa878f12 100644
--- a/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimFilenameProperty.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts (gpotts@imagelinks.com)
//
//*************************************************************************
-// $Id: ossimFilenameProperty.cpp 9963 2006-11-28 21:11:01Z gpotts $
+// $Id: ossimFilenameProperty.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimFilenameProperty.h>
RTTI_DEF1(ossimFilenameProperty, "ossimFilenameProperty", ossimProperty);
@@ -80,7 +80,7 @@ void ossimFilenameProperty::clearFilterList()
ossim_uint32 ossimFilenameProperty::getNumberOfFilters()const
{
- return theFilterList.size();
+ return (ossim_uint32)theFilterList.size();
}
void ossimFilenameProperty::setFilter(ossim_uint32 idx,
diff --git a/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp b/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp
index cb3a4e1b6ade1e78029eb9c43f173936b93d4c5f..70facf92ac6e661bd2fc427dfbbded56829c845e 100644
--- a/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimGeoPolygon.cpp
@@ -6,7 +6,7 @@
// AUTHOR: Garrett Potts
//
//*****************************************************************************
-// $Id: ossimGeoPolygon.cpp 13686 2008-10-07 02:13:52Z gpotts $
+// $Id: ossimGeoPolygon.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ostream>
#include <sstream>
@@ -188,7 +188,7 @@ void ossimGeoPolygon::stretchOut(ossimGeoPolygon& newPolygon,
newPolygon[0].height(theVertexList[i].height());
newPolygon[0].datum(datum);
- newPolygon[theVertexList.size()-1] = newPolygon[0];
+ newPolygon[(int)theVertexList.size()-1] = newPolygon[0];
}
}
}
@@ -199,7 +199,7 @@ double ossimGeoPolygon::area()const
double area = 0;
ossim_uint32 i=0;
ossim_uint32 j=0;
- ossim_uint32 size = theVertexList.size();
+ ossim_uint32 size = (ossim_uint32)theVertexList.size();
for (i=0;i<size;i++)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp b/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp
index a71fa9f9a5e67fa7ffc2f21e1c5507446ac8fbaf..7670aef0605c2a82d60b3f15e71fddd4977a06e6 100644
--- a/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimGeoref.cpp
@@ -255,7 +255,7 @@ long ossimGeoref::Convert_GEOREF_To_Geodetic (char *georef,
origin_long = (double)LONGITUDE_LOW;
origin_lat = (double)LATITUDE_LOW;
- georef_length = strlen(georef);
+ georef_length = (long)strlen(georef);
if ((georef_length < GEOREF_MINIMUM) || (georef_length > GEOREF_MAXIMUM)
|| ((georef_length % 2) != 0))
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp b/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp
index 9b4caef4a5c3959c1d05083c417945b6a345523a..ff703165d03d50d47ee7474f6e8152a60ffcc9fd 100644
--- a/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimHistogram.cpp
@@ -15,7 +15,7 @@
// frequency counts for each of these buckets.
//
//********************************************************************
-// $Id: ossimHistogram.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimHistogram.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
//
#include <stdio.h>
@@ -1396,7 +1396,7 @@ bool ossimHistogram::loadState(const ossimRefPtr<ossimXmlNode> xmlNode)
floatValues.push_back(vString.toFloat32());
}
}
- count = floatValues.size();
+ count = (ossim_uint32)floatValues.size();
if(count)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp b/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
index f0ed580f36f0fc15e3ac235d778a4d0a76ddb797..0e0afdc05ba766f95bf20fa0e1149e70bd90efce 100644
--- a/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
@@ -5,7 +5,7 @@
// Description: This class provides capabilities for keywordlists.
//
//********************************************************************
-// $Id: ossimKeywordlist.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimKeywordlist.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <fstream>
#include <list>
@@ -16,6 +16,7 @@
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimDirectory.h>
static ossimTrace traceDebug("ossimKeywordlist:debug");
static const ossim_int32 MAX_LINE_LENGTH = 256;
@@ -25,7 +26,7 @@ static const char NULL_KEY_NOTICE[]
#ifdef OSSIM_ID_ENABLED
static const bool TRACE = false;
-static const char OSSIM_ID[] = "$Id: ossimKeywordlist.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimKeywordlist.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
ossimKeywordlist::ossimKeywordlist(char delimiter)
@@ -820,16 +821,38 @@ bool ossimKeywordlist::parseFile(const ossimFilename& file,
std::ifstream is;
is.open(file.c_str(), std::ios::in | std::ios::binary);
- if (!is)
+ if ( !is.is_open() )
{
- if(traceDebug())
+ // ESH 07/2008, Trac #234: OSSIM is case sensitive
+ // when using worldfile templates during ingest
+ // -- If first you don't succeed with the user-specified
+ // filename, try again with the results of a case insensitive search.
+ ossimDirectory directory(file.path());
+ ossimFilename filename(file.file());
+
+ std::vector<ossimFilename> result;
+ bool bSuccess = directory.findCaseInsensitiveEquivalents( filename, result );
+ if ( bSuccess == true )
{
- // report all errors that aren't existance problems.
- // we want to know about things like permissions, too many open files, etc.
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "Error opening file: " << file.c_str() << std::endl;
+ int numResults = (int)result.size();
+ int i;
+ for ( i=0; i<numResults && !is.is_open(); ++i )
+ {
+ is.open( result[i].c_str(), std::ios::in | std::ios::binary );
+ }
+ }
+
+ if ( !is.is_open() )
+ {
+ if ( traceDebug() )
+ {
+ // report all errors that aren't existence problems.
+ // we want to know about things like permissions, too many open files, etc.
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "Error opening file: " << file.c_str() << std::endl;
+ }
+ return false;
}
- return false;
}
bool result = parseStream(is, ignoreBinaryChars);
@@ -1111,7 +1134,7 @@ void ossimKeywordlist::stripPrefixFromAll(const ossimString& regularExpression)
ossim_uint32 ossimKeywordlist::getSize()const
{
- return theMap.size();
+ return (ossim_uint32)theMap.size();
}
const ossimKeywordlist::KeywordMap& ossimKeywordlist::getMap()const
diff --git a/Utilities/otbossim/src/ossim/base/ossimNotify.cpp b/Utilities/otbossim/src/ossim/base/ossimNotify.cpp
index b85231ce458f14243c00f6468bfb0fd9e57bd57f..7b1fc61c57b478b22d37022b44e787f64f8ec971 100644
--- a/Utilities/otbossim/src/ossim/base/ossimNotify.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimNotify.cpp
@@ -7,7 +7,7 @@
//
// Contains class definition for ossimNotify.
//*******************************************************************
-// $Id: ossimNotify.cpp 12633 2008-04-07 20:07:37Z gpotts $
+// $Id: ossimNotify.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
#include <cstdio>
@@ -91,7 +91,7 @@ protected:
std::ios::app|std::ios::out);
if(outFile)
{
- outFile.write(tempString.c_str(), tempString.length());
+ outFile.write(tempString.c_str(), (std::streamsize)tempString.length());
}
tempString = "";
diff --git a/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp b/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp
index 7d87943e280df124426298dac1888d4963f57aa8..72cb123430f8f5192002bf6eed3011a512a36c98 100644
--- a/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimPolyLine.cpp
@@ -5,7 +5,7 @@
// AUTHOR: Garrett Potts (gpotts@imagelinks.com)
//
//*****************************************************************************
-// $Id: ossimPolyLine.cpp 13709 2008-10-14 14:55:11Z gpotts $
+// $Id: ossimPolyLine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
//
#include <ossim/base/ossimPolyLine.h>
#include <ossim/base/ossimCommon.h>
@@ -470,7 +470,7 @@ bool ossimPolyLine::operator==(const ossimPolyLine& polyLine) const
const ossimPolyLine& ossimPolyLine::operator *=(const ossimDpt& scale)
{
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
ossim_uint32 i = 0;
for(i = 0; i < upper; ++i)
@@ -487,7 +487,7 @@ ossimPolyLine ossimPolyLine::operator *(const ossimDpt& scale)const
ossimPolyLine result(*this);
ossim_uint32 i = 0;
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
for(i = 0; i < upper; ++i)
{
result.theVertexList[i].x*=scale.x;
diff --git a/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp b/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp
index ef92633a01b46d9b3478040725104cd8b2d3703c..3ce1a74756383914923e63404cb1fc37f4703d66 100644
--- a/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimPolygon.cpp
@@ -12,7 +12,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimPolygon.cpp 13686 2008-10-07 02:13:52Z gpotts $
+// $Id: ossimPolygon.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <iterator>
@@ -141,7 +141,7 @@ double ossimPolygon::area()const
double area = 0;
ossim_uint32 i=0;
ossim_uint32 j=0;
- ossim_uint32 size = theVertexList.size();
+ ossim_uint32 size = (ossim_uint32)theVertexList.size();
for (i=0;i<size;i++)
{
@@ -300,7 +300,7 @@ bool ossimPolygon::clipLineSegment(ossimDpt& P, ossimDpt& Q) const
ossimLine edge, edgeE, edgeL;
bool intersected=false;
double num, denom, t;
- ossim_uint32 npol = theVertexList.size();
+ ossim_uint32 npol = (ossim_uint32)theVertexList.size();
checkOrdering();
//***
@@ -533,7 +533,7 @@ bool ossimPolygon::operator==(const ossimPolygon& polygon) const
const ossimPolygon& ossimPolygon::operator *=(const ossimDpt& scale)
{
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
ossim_uint32 i = 0;
for(i = 0; i < upper; ++i)
{
@@ -548,7 +548,7 @@ ossimPolygon ossimPolygon::operator *(const ossimDpt& scale)const
{
ossimPolygon result(*this);
- ossim_uint32 upper = theVertexList.size();
+ ossim_uint32 upper = (ossim_uint32)theVertexList.size();
ossim_uint32 i = 0;
for(i = 0; i < upper; ++i)
{
diff --git a/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp b/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp
index f744ad4499e449dbebcc9cfb610298b3e1366a78..a98b4cd3e895f278fe7a515d52b02e5fa9465b89 100644
--- a/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimRectilinearDataObject.cpp
@@ -8,7 +8,7 @@
// Contributor: David A. Horner (DAH) - http://dave.thehorners.com
//
//*************************************************************************
-// $Id: ossimRectilinearDataObject.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimRectilinearDataObject.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/base/ossimRectilinearDataObject.h>
#include <ossim/base/ossimScalarTypeLut.h>
@@ -143,7 +143,7 @@ ossim_uint32 ossimRectilinearDataObject::getNumberOfDataComponents() const
ossim_uint32 ossimRectilinearDataObject::getNumberOfSpatialComponents() const
{
- return theSpatialExtents.size();
+ return (ossim_uint32)theSpatialExtents.size();
}
const ossim_uint32* ossimRectilinearDataObject::getSpatialExtents()const
diff --git a/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp b/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp
index a071b6dc349cec461416b113f38454ea50371925..9f1ffbb502ec1f034affa4eeb5fa441bfc8bea6b 100644
--- a/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp
+++ b/Utilities/otbossim/src/ossim/elevation/ossimDtedHandler.cpp
@@ -9,7 +9,7 @@
// from disk. This elevation files are memory mapped.
//
//*****************************************************************************
-// $Id: ossimDtedHandler.cpp 14296 2009-04-14 17:25:00Z gpotts $
+// $Id: ossimDtedHandler.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib>
#include <cstring> /* for memcpy */
@@ -218,7 +218,7 @@ void ossimDtedHandler::mapToMemory()
std::ifstream in(theFilename.c_str(),
std::ios::in|std::ios::binary);
theMemoryMap.resize(theFilename.fileSize());
- in.read((char*)(&theMemoryMap.front()), theMemoryMap.size());
+ in.read((char*)(&theMemoryMap.front()), (std::streamsize)theMemoryMap.size());
in.close();
}
diff --git a/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp b/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp
index 70a0a502073fdf505236c585bda9c32595bc148b..b99dd4ee4bbc4d3722328353342cdbec0554a91d 100644
--- a/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp
+++ b/Utilities/otbossim/src/ossim/elevation/ossimElevManager.cpp
@@ -19,7 +19,7 @@
// Initial coding.
//<
//**************************************************************************
-// $Id: ossimElevManager.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimElevManager.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
@@ -49,7 +49,7 @@ RTTI_DEF1(ossimElevManager, "ossimElevManager" , ossimElevSource)
static ossimTrace traceDebug ("ossimElevManager:debug");
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimElevManager.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimElevManager.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
ossimElevManager* ossimElevManager::theInstance = 0;
@@ -180,8 +180,8 @@ bool ossimElevManager::loadState(const ossimKeywordlist& kwl,
ossimString regExpression = ossimString("^(") + copyPrefix + "elevation_source[0-9]+.)";
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- long numberOfSources = keys.size();
- ossim_uint32 offset = (copyPrefix+"elevation_source").size();
+ long numberOfSources = (long)keys.size();
+ ossim_uint32 offset = (ossim_uint32)(copyPrefix+"elevation_source").size();
ossim_uint32 idx = 0;
std::vector<int> theNumberList(numberOfSources);
for(idx = 0; idx < theNumberList.size();++idx)
@@ -581,7 +581,7 @@ double ossimElevManager::getHeightAboveMSL(const ossimGpt& gpt)
// Search through the list of elevation sources for a valid elevation
// post.
//---
- ossim_uint32 size = theElevSourceList.size();
+ ossim_uint32 size = (ossim_uint32)theElevSourceList.size();
for (ossim_uint32 i = 0; i < size; ++i)
{
//---
@@ -799,7 +799,7 @@ void ossimElevManager::addElevSource(ossimElevSource* source)
ossim_uint32 ossimElevManager::getNumberOfFactories()const
{
- return theElevSourceFactoryList.size();
+ return (ossim_uint32)theElevSourceFactoryList.size();
}
const ossimRefPtr<ossimElevSourceFactory> ossimElevManager::getFactory(ossim_uint32 idx)const
@@ -1859,7 +1859,7 @@ ossimRefPtr<ossimElevSource> ossimElevManager::getElevSourceForPoint(
// Search through the list of elevation sources for a valid elevation
// post.
//---
- ossim_uint32 size = theElevSourceList.size();
+ ossim_uint32 size = (ossim_uint32)theElevSourceList.size();
for (ossim_uint32 i = 0; i < size; ++i)
{
//---
diff --git a/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp b/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp
index f25ced15e69a17e7aae64489b83abf46b74f2e0b..465f4bf77af5c45426220fb547700b0282f303ee 100644
--- a/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp
+++ b/Utilities/otbossim/src/ossim/font/ossimFreeTypeFont.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//********************************************************************
-// $Id: ossimFreeTypeFont.cpp 9099 2006-06-13 21:21:10Z dburken $
+// $Id: ossimFreeTypeFont.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
// ossimFreeTypeFont.h should be load prior to checking for OSSIM_HAS_FREETYPE.
#include <ossim/font/ossimFreeTypeFont.h>
@@ -172,7 +172,7 @@ void ossimFreeTypeFont::layoutGlyphs(const ossimString& s )
FT_UInt load_flags;
FT_UInt num_grays;
FT_UInt prev_index = 0;
- FT_UInt num_glyphs = s.size();
+ FT_UInt num_glyphs = (FT_UInt)s.size();
int error = 0;
deleteGlyphs(theStringLayout);
@@ -261,7 +261,7 @@ const ossim_uint8* ossimFreeTypeFont::rasterize()
setupForRasterization();
layoutGlyphs(theStringToRasterize);
- int num_glyphs = theStringLayout.size();
+ int num_glyphs = (int)theStringLayout.size();
int n;
FT_Vector delta;
int error;
@@ -371,7 +371,7 @@ void ossimFreeTypeFont::getBoundingBox(ossimIrect& box)
setupForRasterization();
layoutGlyphs(theStringToRasterize);
- int num_glyphs = theStringLayout.size();
+ int num_glyphs = (int)theStringLayout.size();
int n;
FT_Vector delta;
int error;
diff --git a/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp b/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp
index 448fdf84affe27dab79069831247fdbacbf9ff07..b896d85a4bde424dd55bf60cc74b227260f8bb77 100644
--- a/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp
+++ b/Utilities/otbossim/src/ossim/font/ossimGdBitmapFont.cpp
@@ -6,7 +6,7 @@
// Description:
//
//********************************************************************
-// $Id: ossimGdBitmapFont.cpp 12276 2008-01-07 19:58:43Z dburken $
+// $Id: ossimGdBitmapFont.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/font/ossimGdBitmapFont.h>
#include "string.h"
@@ -136,7 +136,7 @@ void ossimGdBitmapFont::rasterizeNormal()
{
ossimIrect outBox;
ossimIrect inBox(0,0,
- theStringToRasterize.length()*theGdFontPtr->w-1,
+ (ossim_int32)theStringToRasterize.length()*theGdFontPtr->w-1,
theGdFontPtr->h-1);
getBoundingBox(outBox);
@@ -164,7 +164,7 @@ void ossimGdBitmapFont::rasterizeNormal()
}
// which col do we start on
- bufOffset = character*theGdFontPtr->w;
+ bufOffset = (long)character*theGdFontPtr->w;
// get the starting offset to the bitmap
charOffset = charOffset*theGdFontPtr->w*theGdFontPtr->h;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp
index 5cd095a653ee9ee69bf963190ec4589a1e4f0f49..499b35f8bfc045cbe4193b6d722b4fd7000db0b7 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimCibCadrgTileSource.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//********************************************************************
-// $Id: ossimCibCadrgTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimCibCadrgTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
using namespace std;
@@ -33,6 +33,7 @@ using namespace std;
#include <ossim/support_data/ossimRpfCompressionSection.h>
#include <ossim/imaging/ossimTiffTileSource.h>
#include <ossim/imaging/ossimImageDataFactory.h>
+#include <ossim/imaging/ossimVirtualImageHandler.h>
#include <ossim/projection/ossimEquDistCylProjection.h>
#include <ossim/projection/ossimCylEquAreaProjection.h>
#include <ossim/base/ossimEndian.h>
@@ -41,7 +42,7 @@ using namespace std;
static ossimTrace traceDebug = ossimTrace("ossimCibCadrgTileSource:debug");
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimCibCadrgTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimCibCadrgTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
RTTI_DEF1(ossimCibCadrgTileSource, "ossimCibCadrgTileSource", ossimImageHandler)
@@ -284,12 +285,22 @@ bool ossimCibCadrgTileSource::getTile(ossimImageData* result,
result && (result->getNumberOfBands() == getNumberOfOutputBands()) &&
(theProductType != OSSIM_PRODUCT_TYPE_UNKNOWN) )
{
- //---
- // Check for overview tile. Some overviews can contain r0 so always
- // call even if resLevel is 0. Method returns true on success, false
- // on error.
- //---
- status = getOverviewTile(resLevel, result);
+ // See if the overview class is a virtual image handler. If so, do not
+ // check the overview tile when resLevel is 0: you cannot assume that the
+ // virtual overview is consistent with the parent image data, which can
+ // be partially updated.
+ ossimVirtualImageHandler* pVirtual = PTR_CAST( ossimVirtualImageHandler,
+ theOverview.get() );
+ if ( resLevel > 0 ||
+ (resLevel == 0 && pVirtual == NULL) )
+ {
+ //---
+ // Check for overview tile. Some overviews can contain r0 so always
+ // call even if resLevel is 0 (if overview is not virtual). Method
+ // returns true on success, false on error.
+ //---
+ status = getOverviewTile(resLevel, result);
+ }
if (!status) // Did not get an overview tile.
{
@@ -1062,7 +1073,7 @@ void ossimCibCadrgTileSource::fillSubTileCadrg(
// ESH 03/2009 -- Partial fix for ticket #646.
// Crash fix on reading RPFs: Make sure the colorTable vector
// has entries before trying to make use of them.
- int numTables = colorTable.size();
+ int numTables = (int)colorTable.size();
if ( numTables <= 0 )
{
return;
@@ -1207,7 +1218,7 @@ void ossimCibCadrgTileSource::fillSubTileCib(
// ESH 03/2009 -- Partial fix for ticket #646.
// Crash fix on reading RPFs: Make sure the colorTable vector
// has entries before trying to make use of them.
- int numTables = colorTable.size();
+ int numTables = (int)colorTable.size();
if ( numTables <= 0 )
{
return;
@@ -1544,7 +1555,7 @@ void ossimCibCadrgTileSource::populateLut()
// ESH 03/2009 -- Partial fix for ticket #646.
// Crash fix on reading RPFs: Make sure the colorTable vector
// has entries before trying to make use of them.
- int numTables = colorTable.size();
+ int numTables = (int)colorTable.size();
ossim_uint32 numElements = (numTables > 0) ? colorTable[0].getNumberOfElements() : 0;
if(numElements > 0)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp b/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp
index 8a9eab062e7d9573b9bdd0314e42a98232ede13a..0f38bea9e5b53355056806eb1b8f51c6f7027ba1 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimConvolutionFilter1D.cpp
@@ -3,7 +3,7 @@
//
// See LICENSE.txt file in the top level directory for more details.
//*************************************************************************
-// $Id: ossimConvolutionFilter1D.cpp 12912 2008-05-28 15:05:54Z gpotts $
+// $Id: ossimConvolutionFilter1D.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimConvolutionFilter1D.h>
@@ -420,7 +420,7 @@ ossimRefPtr<ossimProperty> ossimConvolutionFilter1D::getProperty(const ossimStri
if(name == PROPNAME_KERNEL)
{
ossimMatrixProperty* property = new ossimMatrixProperty(name);
- property->resize(1,theKernel.size());
+ property->resize(1,(int)theKernel.size());
for(ossim_uint32 i=0;i<theKernel.size();++i)
{
(*property)(0,i) = theKernel[i];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp b/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp
index c89ee7c5d1f940657a4b6ee8073a0224df9683a0..18d96f7100a22d27bb884bc226bcf62821a3d078 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimDdffielddefn.cpp
@@ -26,7 +26,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
- * $Id: ossimDdffielddefn.cpp 12978 2008-06-04 00:04:14Z dburken $
+ * $Id: ossimDdffielddefn.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
*/
#include <cstring>
@@ -118,7 +118,7 @@ void ossimDDFFieldDefn::AddSubfield( ossimDDFSubfieldDefn *poNewSFDefn,
_formatControls = strdup( "()" );
}
- int nOldLen = strlen(_formatControls);
+ int nOldLen = (int)strlen(_formatControls);
char *pszNewFormatControls = (char *)
malloc(nOldLen+3+strlen(poNewSFDefn->GetFormat()));
@@ -189,9 +189,9 @@ int ossimDDFFieldDefn::GenerateDDREntry( char **ppachData,
int *pnLength )
{
- *pnLength = 9 + strlen(_fieldName) + 1
- + strlen(_arrayDescr) + 1
- + strlen(_formatControls) + 1;
+ *pnLength = 9 + (int)strlen(_fieldName) + 1
+ + (int)strlen(_arrayDescr) + 1
+ + (int)strlen(_formatControls) + 1;
if( strlen(_formatControls) == 0 )
*pnLength -= 1;
@@ -580,14 +580,14 @@ char *ossimDDFFieldDefn::ExpandFormat( const char * pszSrc )
if( (int) (strlen(pszExpandedContents) + strlen(pszDest) + 1)
> nDestMax )
{
- nDestMax = 2 * (strlen(pszExpandedContents) + strlen(pszDest));
+ nDestMax = 2 * ((int)strlen(pszExpandedContents) + (int)strlen(pszDest));
pszDest = (char *) realloc(pszDest,nDestMax+1);
}
strcat( pszDest, pszExpandedContents );
- iDst = strlen(pszDest);
+ iDst = (int)strlen(pszDest);
- iSrc = iSrc + strlen(pszContents) + 2;
+ iSrc = iSrc + (int)strlen(pszContents) + 2;
free( pszContents );
free( pszExpandedContents );
@@ -613,7 +613,7 @@ char *ossimDDFFieldDefn::ExpandFormat( const char * pszSrc )
> nDestMax )
{
nDestMax =
- 2 * (strlen(pszExpandedContents) + strlen(pszDest));
+ 2 * ((int)strlen(pszExpandedContents) + (int)strlen(pszDest));
pszDest = (char *) realloc(pszDest,nDestMax+1);
}
@@ -622,12 +622,12 @@ char *ossimDDFFieldDefn::ExpandFormat( const char * pszSrc )
strcat( pszDest, "," );
}
- iDst = strlen(pszDest);
+ iDst = (int)strlen(pszDest);
if( pszNext[0] == '(' )
- iSrc = iSrc + strlen(pszContents) + 2;
+ iSrc = iSrc + (int)strlen(pszContents) + 2;
else
- iSrc = iSrc + strlen(pszContents);
+ iSrc = iSrc + (int)strlen(pszContents);
free( pszContents );
free( pszExpandedContents );
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp b/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp
index d3e304dec79dd5f54ab791c58f9459e1e3ec7662..5ad6efe0bd9a5d63f35682ff7a09790e893f2b68 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimDdfrecord.cpp
@@ -26,7 +26,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
- * $Id: ossimDdfrecord.cpp 12978 2008-06-04 00:04:14Z dburken $
+ * $Id: ossimDdfrecord.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
*/
#include <cstring>
@@ -34,7 +34,7 @@
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/base/ossimCplUtil.h>
-// CPL_CVSID("$Id: ossimDdfrecord.cpp 12978 2008-06-04 00:04:14Z dburken $");
+// CPL_CVSID("$Id: ossimDdfrecord.cpp 15833 2009-10-29 01:41:53Z eshirschorn $");
static const size_t nLeaderSize = 24;
@@ -266,7 +266,7 @@ int ossimDDFRecord::ReadHeader()
char achLeader[nLeaderSize];
int nReadBytes;
- nReadBytes = fread(achLeader,1,nLeaderSize,poModule->GetFP());
+ nReadBytes = (int)fread(achLeader,1,(int)nLeaderSize,poModule->GetFP());
if( nReadBytes == 0 && feof( poModule->GetFP() ) )
{
return false;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp b/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp
index 99cb75cada7c31fcfb3743753415185bdae9c9d9..0576d5add345089de50f032267999fb4ec8ad8fa 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimDdfsubfielddefn.cpp
@@ -26,7 +26,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
******************************************************************************
- * $Id: ossimDdfsubfielddefn.cpp 15261 2009-08-26 12:47:58Z dburken $
+ * $Id: ossimDdfsubfielddefn.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
*/
#include <cstring>
@@ -80,7 +80,7 @@ void ossimDDFSubfieldDefn::SetName( const char * pszNewName )
pszName = strdup( pszNewName );
- for( i = strlen(pszName)-1; i > 0 && pszName[i] == ' '; i-- )
+ for( i = (int)strlen(pszName)-1; i > 0 && pszName[i] == ' '; i-- )
pszName[i] = '\0';
}
@@ -801,7 +801,7 @@ int ossimDDFSubfieldDefn::FormatStringValue( char *pachData, int nBytesAvailable
int nSize;
if( nValueLength == -1 )
- nValueLength = strlen(pszValue);
+ nValueLength = (int)strlen(pszValue);
if( bIsVariable )
{
@@ -865,7 +865,7 @@ int ossimDDFSubfieldDefn::FormatIntValue( char *pachData, int nBytesAvailable,
if( bIsVariable )
{
- nSize = strlen(szWork) + 1;
+ nSize = (int)strlen(szWork) + 1;
}
else
{
@@ -954,7 +954,7 @@ int ossimDDFSubfieldDefn::FormatFloatValue( char *pachData, int nBytesAvailable,
if( bIsVariable )
{
- nSize = strlen(szWork) + 1;
+ nSize = (int)strlen(szWork) + 1;
}
else
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp
index 09f61973260485d153d18e4e7f1739abbac1eea8..5e46a45072f145b4c68e43d4b6693be96af643e3 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeneralRasterTileSource.cpp
@@ -10,7 +10,7 @@
//
// Contains class definition for ossimGeneralRasterTileSource.
//*******************************************************************
-// $Id: ossimGeneralRasterTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeneralRasterTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimGeneralRasterTileSource.h>
#include <ossim/base/ossimConstants.h>
@@ -324,7 +324,7 @@ bool ossimGeneralRasterTileSource::fillBIP(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[0]->read((char*)buf, buffer_width);
+ theFileStrList[0]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[0]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
@@ -409,7 +409,7 @@ bool ossimGeneralRasterTileSource::fillBIL(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[0]->read((char*)buf, buffer_width);
+ theFileStrList[0]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[0]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
@@ -512,7 +512,7 @@ bool ossimGeneralRasterTileSource::fillBSQ(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[0]->read((char*)buf, buffer_width);
+ theFileStrList[0]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[0]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
@@ -616,7 +616,7 @@ bool ossimGeneralRasterTileSource::fillBsqMultiFile(const ossimIpt& origin,
//***
// Read the line of image data.
//***
- theFileStrList[band]->read((char*)buf, buffer_width);
+ theFileStrList[band]->read((char*)buf, (std::streamsize)buffer_width);
if ((long)theFileStrList[band]->gcount() != (long)buffer_width)
{
theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp
index b2a3bc3458e766a8756a5afcfe7ef2040dbec80b..436c60b6cb488dee103679ad36fd8e710d9e0061 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationMultiEllipseObject.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimGeoAnnotationMultiEllipseObject.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoAnnotationMultiEllipseObject.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimGeoAnnotationMultiEllipseObject.h>
#include <ossim/imaging/ossimAnnotationMultiEllipseObject.h>
@@ -64,10 +64,10 @@ void ossimGeoAnnotationMultiEllipseObject::transform(
ossimImageGeometry* projection)
{
const std::vector<ossimGpt>::size_type BOUNDS = thePointList.size();
- theProjectedObject->resize(BOUNDS);
+ theProjectedObject->resize((ossim_uint32)BOUNDS);
for(std::vector<ossimGpt>::size_type i = 0; i < BOUNDS; ++i)
{
- projection->worldToLocal(thePointList[i], (*theProjectedObject)[i]);
+ projection->worldToLocal(thePointList[(int)i], (*theProjectedObject)[(int)i]);
}
computeBoundingRect();
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp
index 273d5ee1792be686ce5ea50fac1316b93c777c6b..d8b92e602f4eb6c7238b5cd33b6f5d9a32652e9d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeoAnnotationPolyObject.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimGeoAnnotationPolyObject.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoAnnotationPolyObject.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <sstream>
@@ -112,7 +112,7 @@ void ossimGeoAnnotationPolyObject::transform(ossimImageGeometry* projection)
for(std::vector<ossimGpt>::size_type index=0; index < BOUNDS; ++index)
{
- projection->worldToLocal(thePolygon[index], poly[index]);
+ projection->worldToLocal(thePolygon[(int)index], poly[(int)index]);
}
// update the bounding rect
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp
index d8785618427b72868e8301162d981e6480625aa4..f8b796c90b369ad81977d9806fd97eb51196ed24 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGeoPolyCutter.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts (gpotts@imagelinks.com)
//
//*************************************************************************
-// $Id: ossimGeoPolyCutter.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoPolyCutter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <ossim/imaging/ossimGeoPolyCutter.h>
#include <ossim/projection/ossimProjection.h>
@@ -72,7 +72,7 @@ bool ossimGeoPolyCutter::loadState(const ossimKeywordlist& kwl,
ossimString polygons = ossimString("^(") + copyPrefix + "geo_polygon[0-9]+.)";
vector<ossimString> keys =
kwl.getSubstringKeyList( polygons );
- int offset = (copyPrefix+"geo_polygon").size();
+ int offset = (int)(copyPrefix+"geo_polygon").size();
std::vector<int> numberList(keys.size());
for(int idx = 0; idx < (int)numberList.size();++idx)
@@ -177,7 +177,7 @@ void ossimGeoPolyCutter::addPolygon(const vector<ossimIpt>& polygon)
{
ossimPolyCutter::addPolygon(polygon);
theGeoPolygonList.push_back(ossimGeoPolygon());
- invertPolygon(thePolygonList.size()-1);
+ invertPolygon((int)thePolygonList.size()-1);
}
}
@@ -187,7 +187,7 @@ void ossimGeoPolyCutter::addPolygon(const vector<ossimDpt>& polygon)
{
ossimPolyCutter::addPolygon(polygon);
theGeoPolygonList.push_back(ossimGeoPolygon());
- invertPolygon(thePolygonList.size()-1);
+ invertPolygon((int)thePolygonList.size()-1);
}
}
@@ -197,7 +197,7 @@ void ossimGeoPolyCutter::addPolygon(const ossimPolygon& polygon)
{
ossimPolyCutter::addPolygon(polygon);
theGeoPolygonList.push_back(ossimGeoPolygon());
- invertPolygon(thePolygonList.size()-1);
+ invertPolygon((int)thePolygonList.size()-1);
}
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp
index 2b8a0b69b9eaf496faf617dc21903afda66472e3..5c4dad6cda4638a086988c435f8bc3c06fe6f918 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimGridRemapSource.cpp
@@ -14,7 +14,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimGridRemapSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGridRemapSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimGridRemapSource.h>
@@ -299,7 +299,7 @@ bool ossimGridRemapSource::saveState(ossimKeywordlist& kwl,
void ossimGridRemapSource::setGridNode(const ossimDpt& view_pt,
const double* value)
{
- int numGrids = theGrids.size();
+ int numGrids = (int)theGrids.size();
for (int i=0; i<numGrids; i++)
theGrids[i]->setNearestNode(view_pt, value[i]);
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp b/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp
index c253ffd068346e49e15502b16e944e07f0e9787c..2a4448ff1d9fa60d0581b6d3efe5ef49704f2775 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimHistoMatchRemapper.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimHistoMatchRemapper.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimHistoMatchRemapper.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimHistoMatchRemapper.h>
#include <ossim/imaging/ossimImageData.h>
#include <ossim/imaging/ossimImageSource.h>
@@ -62,7 +62,7 @@ ossimRefPtr<ossimImageData> ossimHistoMatchRemapper::getTile(
}
theBlankTile->setOrigin(tileRect.ul());
- ossim_uint32 numberOfBands = theInputMeanPerBand.size();
+ ossim_uint32 numberOfBands = (ossim_uint32)theInputMeanPerBand.size();
numberOfBands = numberOfBands>tile->getNumberOfBands()?tile->getNumberOfBands():numberOfBands;
double result = 0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp b/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp
index f39204a7f9b1ad4543ffc24d0b0e3a567003c5ef..ec735297e0270df6e2c49fc0c220dc7ff3870ac0 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimHsvGridRemapEngine.cpp
@@ -14,7 +14,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimHsvGridRemapEngine.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimHsvGridRemapEngine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimHsvGridRemapEngine.h>
@@ -162,7 +162,7 @@ void ossimHsvGridRemapEngine::assignRemapValues (
// Declare a 2D array that will contain all of the contributing sources'
// HSV mean values. Also declare the accumulator target vector.
//***
- int num_contributors = sources_list.size();
+ int num_contributors = (int)sources_list.size();
double** contributor_pixel = new double* [num_contributors];
for (i=0; i<num_contributors; i++)
contributor_pixel[i] = new double[3];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp
index 6e0dd2cc3d1e8cc7aa85aee3f8bae7e784ae85db..17e63b8ee5a69054a745faf377e719a3ff47a748 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageChain.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimImageChain.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageChain.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <iostream>
#include <iterator>
@@ -539,7 +539,7 @@ bool ossimImageChain::removeChild(ossimConnectableObject* object)
ossimConnectableObject::ConnectableObjectList output = object->getOutputList();
// remember the old size before removing
- ossim_uint32 chainSize = theImageChainList.size();
+ ossim_uint32 chainSize = (ossim_uint32)theImageChainList.size();
current = theImageChainList.erase(current);
// Clear connections between this object and child.
@@ -1294,9 +1294,9 @@ bool ossimImageChain::addAllSources(map<ossimId, vector<ossimId> >& idMapping,
ossimString regExpression = ossimString("^(") + copyPrefix + "object[0-9]+.)";
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- long numberOfSources = keys.size();//kwl.getNumberOfSubstringKeys(regExpression);
+ long numberOfSources = (long)keys.size();//kwl.getNumberOfSubstringKeys(regExpression);
- int offset = (copyPrefix+"object").size();
+ int offset = (int)(copyPrefix+"object").size();
int idx = 0;
std::vector<int> theNumberList(numberOfSources);
for(idx = 0; idx < (int)theNumberList.size();++idx)
@@ -1398,8 +1398,8 @@ void ossimImageChain::findInputConnectionIds(vector<ossimId>& result,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- ossim_int32 offset = (copyPrefix+"input_connection").size();
- ossim_uint32 numberOfKeys = keys.size();
+ ossim_int32 offset = (ossim_int32)(copyPrefix+"input_connection").size();
+ ossim_uint32 numberOfKeys = (ossim_uint32)keys.size();
std::vector<int> theNumberList(numberOfKeys);
for(idx = 0; idx < theNumberList.size();++idx)
{
@@ -1433,7 +1433,7 @@ bool ossimImageChain::connectAllSources(const map<ossimId, vector<ossimId> >& id
if(currentSource)
{
- long upperBound = (*iter).second.size();
+ long upperBound = (long)(*iter).second.size();
for(long index = 0; index < upperBound; ++index)
{
if((*iter).second[index].getId() > -1)
@@ -1471,7 +1471,7 @@ bool ossimImageChain::saveState(ossimKeywordlist& kwl,
{
return result;
}
- ossim_uint32 upper = theImageChainList.size();
+ ossim_uint32 upper = (ossim_uint32)theImageChainList.size();
ossim_uint32 counter = 1;
if (upper)
@@ -1526,7 +1526,7 @@ void ossimImageChain::initialize()
static const char* MODULE = "ossimImageChain::initialize()";
if (traceDebug()) CLOG << " Entered..." << std::endl;
- long upper = theImageChainList.size();
+ long upper = (ossim_uint32)theImageChainList.size();
for(long index = upper - 1; index >= 0; --index)
{
@@ -1574,7 +1574,7 @@ void ossimImageChain::enableSource()
void ossimImageChain::disableSource()
{
- long upper = theImageChainList.size();
+ long upper = (ossim_uint32)theImageChainList.size();
for(long index = upper - 1; index >= 0; --index)
{
@@ -1614,7 +1614,7 @@ bool ossimImageChain::deleteLast()
if (theImageChainList.size() == 0) return false;
// Clear any listeners, memory.
- ossim_uint32 index = theImageChainList.size() - 1;
+ ossim_uint32 index = (ossim_uint32)theImageChainList.size() - 1;
theImageChainList[index]->
removeListener((ossimConnectableObjectListener*)this);
theImageChainList[index]->removeListener(theChildListener);
@@ -1628,7 +1628,7 @@ bool ossimImageChain::deleteLast()
void ossimImageChain::deleteList()
{
- long upper = theImageChainList.size();
+ long upper = (long)theImageChainList.size();
for(long index = 0; index < upper; ++index)
{
theImageChainList[index]->removeListener((ossimConnectableObjectListener*)this);
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp
index bae8c9315666886d6c224a035e4f6d19d4d345aa..452674b53e1595fae09ca8d88b7c789da4697b1d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageCombiner.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimImageCombiner.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageCombiner.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimImageCombiner.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimIrect.h>
@@ -56,15 +56,15 @@ ossimImageCombiner::ossimImageCombiner(ossimObject* owner,
ossimImageCombiner::ossimImageCombiner(ossimConnectableObject::ConnectableObjectList& inputSources)
:ossimImageSource(NULL,
- inputSources.size(),
+ (ossim_uint32)inputSources.size(),
0,
false,
false),
- theLargestNumberOfInputBands(0),
- theInputToPassThrough(0),
- theHasDifferentInputs(false),
- theNormTile(NULL),
- theCurrentIndex(0)
+ theLargestNumberOfInputBands(0),
+ theInputToPassThrough(0),
+ theHasDifferentInputs(false),
+ theNormTile(NULL),
+ theCurrentIndex(0)
{
theComputeFullResBoundsFlag = true;
for(ossim_uint32 index = 0; index < inputSources.size(); ++index)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp
index 8a69bbb4b56ccee2ffe390f3251e115f85e446fe..11e9d43975694a3177202b11edb3456e800e8d51 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageData.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimImageData.cpp 15792 2009-10-22 18:03:13Z dburken $
+// $Id: ossimImageData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iterator>
@@ -4801,18 +4801,15 @@ ossimImageData::unloadBandToBsqTemplate(T, // dummy template arg...
{
T d_dest_band = d[d_dest_band_pixel_offset];
- for ( band=0; band<num_bands; ++band )
+ for ( band=0; band<num_bands && band!=dest_band; ++band )
{
- if (band!=dest_band)
+ T d_other_band = d[d_pixel_offset + (band * d_band_offset)];
+
+ // test for the color discrepancy
+ if ( d_other_band != d_dest_band )
{
- T d_other_band = d[d_pixel_offset + (band * d_band_offset)];
-
- // test for the color discrepancy
- if ( d_other_band != d_dest_band )
- {
- d[d_dest_band_pixel_offset] = s[src_band][i];
- break;
- }
+ d[d_dest_band_pixel_offset] = s[src_band][i];
+ break;
}
}
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp
index 0ba911847a9fce81afade87baaf9bc7ff950cf29..27ffdf858df3d3a711560bb40d8e1801a8fd4fa9 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandler.cpp
@@ -12,7 +12,7 @@
// derive from.
//
//*******************************************************************
-// $Id: ossimImageHandler.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageHandler.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
@@ -47,7 +47,7 @@ RTTI_DEF1(ossimImageHandler, "ossimImageHandler", ossimImageSource)
static ossimTrace traceDebug("ossimImageHandler:debug");
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimImageHandler.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimImageHandler.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
// GARRETT! All of the decimation factors are scattered throughout. We want to fold that into
@@ -62,6 +62,7 @@ ossimImageHandler::ossimImageHandler()
:
ossimImageSource(0, 0, 0, true, false /* output list is not fixed */ ),
theImageFile(ossimFilename::NIL),
+theSupplementaryDirectory(ossimFilename::NIL),
theOverview(0),
//theSubImageOffset(0, 0),
theValidImageVertices(0),
@@ -379,7 +380,21 @@ void ossimImageHandler::getDecimationFactor(ossim_uint32 resLevel,
}
else
{
- result.x = 1.0 / ((ossim_float64)(1<<resLevel));
+ /*
+ ESH 02/2009 -- No longer assume powers of 2 reduction
+ in linear size from resLevel 0 (Tickets # 467,529).
+ */
+ ossim_int32 x = getNumberOfLines(resLevel);
+ ossim_int32 x0 = getNumberOfLines(0);
+
+ if ( x > 0 && x0 > 0 )
+ {
+ result.x = ((double)x) / x0;
+ }
+ else
+ {
+ result.x = 1.0 / (1<<resLevel);
+ }
result.y = result.x;
}
}
@@ -1092,7 +1107,7 @@ ossim_uint32 ossimImageHandler::getNumberOfEntries()const
std::vector<ossim_uint32> tempList;
getEntryList(tempList);
- return tempList.size();
+ return (ossim_uint32)tempList.size();
}
@@ -1124,6 +1139,15 @@ const ossimFilename& ossimImageHandler::getFilename()const
return theImageFile;
}
+void ossimImageHandler::setSupplementaryDirectory(const ossimFilename& dir)
+{
+ theSupplementaryDirectory = dir;
+}
+
+const ossimFilename& ossimImageHandler::getSupplementaryDirectory()const
+{
+ return theSupplementaryDirectory;
+}
void ossimImageHandler::setProperty(ossimRefPtr<ossimProperty> property)
{
@@ -1236,6 +1260,16 @@ ossimFilename ossimImageHandler::getFilenameWithThisExtension(
// Get the image file.
ossimFilename f = getFilename();
+ // If the supplementary directory is set, find the extension
+ // at that location instead of at the default.
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ ossimFilename fname = f.file();
+
+ f.setPath( theSupplementaryDirectory );
+ f.dirCat( fname );
+ }
+
// Wipe out the extension.
f.setExtension("");
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
index 21a53e76e8889718dc05dde771d1a191d33e0dbc..400b01d3a962c46ebf2f96d3d3463163381e70c0 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
@@ -1,11 +1,11 @@
//----------------------------------------------------------------------------
//
// License: LGPL
-//
+//
// See LICENSE.txt file in the top level directory for more details.
//
//----------------------------------------------------------------------------
-// $Id: ossimImageHandlerFactory.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageHandlerFactory.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimImageHandlerFactory.h>
#include <ossim/imaging/ossimAdrgTileSource.h>
#include <ossim/imaging/ossimCcfTileSource.h>
@@ -23,6 +23,7 @@
#include <ossim/imaging/ossimERSTileSource.h>
#include <ossim/imaging/ossimVpfTileSource.h>
#include <ossim/imaging/ossimTileMapTileSource.h>
+#include <ossim/imaging/ossimVirtualImageHandler.h>
#include <ossim/base/ossimTrace.h>
#include <ossim/base/ossimKeywordNames.h>
#include <ossim/imaging/ossimJpegTileSource.h>
@@ -47,8 +48,8 @@ ossimImageHandlerFactory* ossimImageHandlerFactory::instance()
theInstance = new ossimImageHandlerFactory;
// let's turn off tiff error reporting
- TIFFSetErrorHandler(NULL);
- TIFFSetWarningHandler(NULL);
+ TIFFSetErrorHandler(0);
+ TIFFSetWarningHandler(0);
}
return theInstance;
@@ -58,7 +59,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(
const ossimFilename& fileName)const
{
ossimFilename copyFilename = fileName;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -81,7 +82,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(
if(!copyFilename.exists()) return 0;
ossimString ext = copyFilename.ext().downcase();
-
+
if(ext == "gz")
{
copyFilename = copyFilename.setExtension("");
@@ -101,6 +102,18 @@ ossimImageHandler* ossimImageHandlerFactory::open(
// readers...
//---
+ if(traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "trying OSSIM Virtual Image" << std::endl;
+ }
+ result = new ossimVirtualImageHandler;
+ if(result->open(copyFilename))
+ {
+ return result.release();
+ }
+ result = 0;
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -344,16 +357,16 @@ ossimImageHandler* ossimImageHandlerFactory::open(
ossimNotify(ossimNotifyLevel_DEBUG)
<< "trying adrg" << std::endl;
}
-
+
// test if ADRG
result = new ossimAdrgTileSource();
-
+
if(result->open(copyFilename))
{
return result.release();
}
result = 0;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -365,14 +378,14 @@ ossimImageHandler* ossimImageHandlerFactory::open(
{
return result.release();
}
-
+
result = 0;
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "ossimImageHandlerFactory::open(filename) DEBUG: returning..." << std::endl;
}
- return (ossimImageHandler*)NULL;
+ return (ossimImageHandler*)0;
}
ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
@@ -398,7 +411,7 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
return result.release();
}
result = 0;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -558,9 +571,9 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
{
return result.release();
}
-
+
result = 0;
-
+
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -677,7 +690,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
}
result = 0;
}
-
+
if ( (ext == "tif") || (ext == "tiff") )
{
// this must be checked first before the TIFF handler
@@ -723,7 +736,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
}
result = 0;
}
-
+
if ( (ext == "jpg") || (ext == "jpeg") )
{
result = new ossimJpegTileSource;
@@ -733,7 +746,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
}
result = 0;
}
-
+
if ( (ext == "doq") || (ext == "doqq") )
{
result = new ossimDoqqTileSource;
@@ -763,7 +776,7 @@ ossimImageHandler* ossimImageHandlerFactory::openFromExtension(
return result.release();
}
result = 0;
- }
+ }
if (ext == "dem")
{
@@ -884,7 +897,7 @@ ossimObject* ossimImageHandlerFactory::createObject(const ossimString& typeName)
void ossimImageHandlerFactory::getSupportedExtensions(ossimImageHandlerFactoryBase::UniqueStringList& extensionList)const
{
extensionList.push_back("img");
- extensionList.push_back("ccf");
+ extensionList.push_back("ccf");
extensionList.push_back("toc");
extensionList.push_back("tif");
extensionList.push_back("tiff");
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp
index ea2cc3f538f47958d01be1d431675678c4023ea8..abf7a6205c954a28a33c2192f7c82aa3bc86d92a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageMetaData.cpp
@@ -10,7 +10,7 @@
// Contains class definition for ossimImageMetaData.
//
//*******************************************************************
-// $Id: ossimImageMetaData.cpp 12246 2008-01-03 19:41:35Z dburken $
+// $Id: ossimImageMetaData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <vector>
#include <algorithm>
#include <ossim/imaging/ossimImageMetaData.h>
@@ -230,7 +230,7 @@ void ossimImageMetaData::loadBandInfo(const ossimKeywordlist& kwl,
std::vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
- ossim_uint32 numberOfBands = keys.size();
+ ossim_uint32 numberOfBands = (ossim_uint32)keys.size();
theMinValuesValidFlag = true;
theMaxValuesValidFlag = true;
@@ -249,7 +249,7 @@ void ossimImageMetaData::loadBandInfo(const ossimKeywordlist& kwl,
setNumberOfBands(numberOfBands);
}
- int offset = (copyPrefix+"band").size();
+ int offset = (int)(copyPrefix+"band").size();
int idx = 0;
std::vector<int> theNumberList(numberOfBands);
for(idx = 0; idx < (int)theNumberList.size();++idx)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp
index c766b81e645786d5f8f2a7cf7c848ca6e337fe69..00e01eacefccab11da45f6b7d4a74c1baead5fe6 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageModel.cpp
@@ -137,7 +137,7 @@ void ossimImageModel::getBoundingRectangle(ossim_uint32 rrds,
}
ossim_uint32 ossimImageModel::getNumberOfDecimationLevels()const
{
- return theDecimationFactors.size();
+ return (ossim_uint32)theDecimationFactors.size();
}
void ossimImageModel::setTargetRrds(ossim_uint32 rrds)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp
index 94c0587b22db4a6c3aa058824bbd38fa39e12de7..68736894b57b38b402ee8f6df775febda15de34a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageRenderer.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimImageRenderer.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimImageRenderer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
using namespace std;
@@ -41,7 +41,7 @@ using namespace std;
#include <ossim/projection/ossimEquDistCylProjection.h>
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimImageRenderer.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimImageRenderer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
static ossimTrace traceDebug("ossimImageRenderer:debug");
@@ -926,7 +926,7 @@ void ossimImageRenderer::fillTile(ossimRefPtr<ossimImageData> outputData,
ossimDpt decimation;
decimation.makeNan(); // initialize to nan.
theInputConnection->getDecimationFactor(resLevel, decimation);
- double requestScale = 1.0 / pow( (double)2.0, (double)resLevel );
+ double requestScale = 1.0 / (1<<resLevel);
double closestScale = decimation.hasNans() ? requestScale : decimation.x;
double differenceTest = 0.0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp
index 735572c7d8ac52b84fdebb2d6ddb8434345f6bcf..0cd2732a937cb095e546cd779a363edd84d31300 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimLandsatTileSource.cpp
@@ -9,7 +9,7 @@
// Contains class implementaiton for the class "ossim LandsatTileSource".
//
//*******************************************************************
-// $Id: ossimLandsatTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimLandsatTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimLandsatTileSource.h>
#include <ossim/base/ossimDirectory.h>
@@ -158,7 +158,7 @@ bool ossimLandsatTileSource::open()
ossimGeneralRasterInfo generalRasterInfo(fileList,
OSSIM_UINT8,
OSSIM_BSQ_MULTI_FILE,
- fileList.size(),
+ (ossim_uint32)fileList.size(),
theFfHdr->getLinesPerBand(),
theFfHdr->getPixelsPerLine(),
0,
@@ -169,7 +169,7 @@ bool ossimLandsatTileSource::open()
generalRasterInfo = ossimGeneralRasterInfo(fileList,
OSSIM_UINT8,
OSSIM_BSQ,
- fileList.size(),
+ (ossim_uint32)fileList.size(),
theFfHdr->getLinesPerBand(),
theFfHdr->getPixelsPerLine(),
0,
@@ -178,7 +178,7 @@ bool ossimLandsatTileSource::open()
}
theMetaData.clear();
theMetaData.setScalarType(OSSIM_UINT8);
- theMetaData.setNumberOfBands(fileList.size());
+ theMetaData.setNumberOfBands((ossim_uint32)fileList.size());
theImageData = generalRasterInfo;
if(initializeHandler())
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp b/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp
index 2e65780dbad0c6cd33856318df027d4763416241..b04aba115cbd805883e338d42e972e6602872ed7 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimLocalCorrelationFusion.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimLocalCorrelationFusion.cpp 11347 2007-07-23 13:01:59Z gpotts $
+// $Id: ossimLocalCorrelationFusion.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimLocalCorrelationFusion.h>
#include <ossim/matrix/newmat.h>
#include <ossim/matrix/newmatio.h>
@@ -160,7 +160,7 @@ ossimRefPtr<ossimImageData> ossimLocalCorrelationFusion::getTile(const ossimIrec
}
double panAttenuator = computeParameterOffset(REGRESSION_COEFFICIENT_ATTENUATOR_OFFSET);
double delta = 0.0;
- ossim_uint32 bandsSize = bands.size();
+ ossim_uint32 bandsSize = (ossim_uint32)bands.size();
ossim_float64 slopeClamp = computeParameterOffset(REGRESSION_COEFFICIENT_CLAMP_OFFSET);
ossim_float64 minSlope = -slopeClamp;
ossim_float64 maxSlope = slopeClamp;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp
index 33511c88e8ab25e30c6982d1a2f96c703d83f4fe..ce9382c1c860def5acd4aca2685ec6023a88dabd 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimMemoryImageSource.cpp
@@ -181,7 +181,7 @@ void ossimMemoryImageSource::getDecimationFactor(ossim_uint32 resLevel,
}
else
{
- result.x = 1.0 / pow((double)2, (double)resLevel);
+ result.x = 1.0 / (1<<resLevel);
result.y = result.x;
}
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp b/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
index cc4352a0d997f8f4bde1120314832e03164483c3..83bafd1e3ac0cfefd3deb1de1dd6ade1c3e88c67 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimMonoGridRemapEngine.cpp
@@ -16,7 +16,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimMonoGridRemapEngine.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimMonoGridRemapEngine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimMonoGridRemapEngine.h>
@@ -259,7 +259,7 @@ void ossimMonoGridRemapEngine::assignRemapValues (
// Declare a 2D array that will contain all of the contributing sources'
// MONO mean values. Also declare the accumulator target vector.
//***
- int num_contributors = sources_list.size();
+ int num_contributors = (int)sources_list.size();
double** contributor_pixel = new double* [num_contributors];
for (i=0; i<num_contributors; i++)
contributor_pixel[i] = new double[1];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp
index 245184c961fe2a2f56440ed92cd34f0dc75ebbc8..24c727a236183c05a3029273b13353e85bb5c2a5 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimMultiBandHistogramTileSource.cpp
@@ -5,7 +5,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimMultiBandHistogramTileSource.cpp 11721 2007-09-13 13:19:34Z gpotts $
+// $Id: ossimMultiBandHistogramTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimMultiBandHistogramTileSource.h>
#include <ossim/base/ossimMultiResLevelHistogram.h>
#include <ossim/base/ossimMultiBandHistogram.h>
@@ -184,7 +184,7 @@ void ossimMultiBandHistogramTileSource::allocate()
}
if(numberOfBands > theMinValuePercentArray.size())
{
- for(i = theMinValuePercentArray.size(); i < numberOfBands; ++i)
+ for(i = (ossim_uint32)theMinValuePercentArray.size(); i < numberOfBands; ++i)
{
theMinValuePercentArray[i] = 0.0;
theMaxValuePercentArray[i] = 0.0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp
index 3ad59cecbd8db4b7cc5751e79f5109b89effec76..dab0107fdfdbabd0d5bf14c6b2921e74be1ab595 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimNitfTileSource.cpp
@@ -9,7 +9,7 @@
// Description: Contains class definition for ossimNitfTileSource.
//
//*******************************************************************
-// $Id: ossimNitfTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimNitfTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <jerror.h>
#include <algorithm> /* for std::fill */
@@ -45,7 +45,7 @@
RTTI_DEF1_INST(ossimNitfTileSource, "ossimNitfTileSource", ossimImageHandler)
#ifdef OSSIM_ID_ENABLED
- static const char OSSIM_ID[] = "$Id: ossimNitfTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+ static const char OSSIM_ID[] = "$Id: ossimNitfTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
//---
@@ -298,7 +298,7 @@ bool ossimNitfTileSource::parseFile()
theCurrentEntry = theEntryList[0];
}
- theNumberOfImages = theNitfImageHeader.size();
+ theNumberOfImages = (ossim_uint32)theNitfImageHeader.size();
if (theNitfImageHeader.size() != theNumberOfImages)
{
@@ -2177,7 +2177,7 @@ ossim_uint32 ossimNitfTileSource::getCurrentEntry() const
ossim_uint32 ossimNitfTileSource::getNumberOfEntries() const
{
- return theEntryList.size();
+ return (ossim_uint32)theEntryList.size();
}
void ossimNitfTileSource::getEntryList(std::vector<ossim_uint32>& entryList)const
@@ -2599,7 +2599,7 @@ void ossimNitfTileSource::vqUncompress(ossimRefPtr<ossimImageData> destination,
ossim_uint32 compressionIdx = 0;
ossim_uint32 uncompressIdx = 0;
ossim_uint32 uncompressYidx = 0;
- ossim_uint32 rows = table.size();
+ ossim_uint32 rows = (ossim_uint32)table.size();
ossim_uint32 cols = 0;
ossim_uint32 rowIdx = 0;
ossim_uint32 colIdx = 0;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp
index 32697a60f907511aa29b1a25b648abe4ff74a40c..e04c0ab3ea19de2f04aeb00e5fc0bc9fe0f39fc2 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimOverviewBuilderFactory.cpp
@@ -7,12 +7,13 @@
// Description: .
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewBuilderFactory.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimOverviewBuilderFactory.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstddef> /* for NULL */
#include <ossim/imaging/ossimOverviewBuilderFactory.h>
#include <ossim/imaging/ossimTiffOverviewBuilder.h>
+#include <ossim/imaging/ossimVirtualOverviewBuilder.h>
ossimOverviewBuilderFactory*
ossimOverviewBuilderFactory::theInstance = NULL;
@@ -34,17 +35,20 @@ ossimOverviewBuilderFactory::~ossimOverviewBuilderFactory()
ossimOverviewBuilderBase* ossimOverviewBuilderFactory::createBuilder(
const ossimString& typeName) const
{
- ossimRefPtr<ossimOverviewBuilderBase> result = new ossimTiffOverviewBuilder();
- if ( result->hasOverviewType(typeName) == true )
+ ossimRefPtr<ossimOverviewBuilderBase> result = new ossimTiffOverviewBuilder();
+ if ( result->hasOverviewType(typeName) == false )
{
- // Capture the type. (This builder has more than one.)
- result->setOverviewType(typeName);
+ result = new ossimVirtualOverviewBuilder();
}
- else
+ if ( result->hasOverviewType(typeName) == false )
{
result = 0;
}
-
+
+ if ( result.get() )
+ {
+ result->setOverviewType(typeName);
+ }
return result.release();
}
@@ -53,6 +57,9 @@ void ossimOverviewBuilderFactory::getTypeNameList(
{
ossimRefPtr<ossimOverviewBuilderBase> builder = new ossimTiffOverviewBuilder();
builder->getTypeNameList(typeList);
+
+ builder = new ossimVirtualOverviewBuilder();
+ builder->getTypeNameList(typeList);
builder = 0;
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp b/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp
index 62a278e8897ef864bebd1648a23fd88b15769d57..15b1d691806e916f438ad2356fc76609b5450981 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimOverviewSequencer.cpp
@@ -7,7 +7,7 @@
// Description: Sequencer for building overview files.
//
//----------------------------------------------------------------------------
-// $Id: ossimOverviewSequencer.cpp 15794 2009-10-23 12:30:26Z dburken $
+// $Id: ossimOverviewSequencer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimOverviewSequencer.h>
#include <ossim/base/ossimNotify.h>
@@ -21,7 +21,7 @@
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimOverviewSequencer.cpp 15794 2009-10-23 12:30:26Z dburken $";
+static const char OSSIM_ID[] = "$Id: ossimOverviewSequencer.cpp 15833 2009-10-29 01:41:53Z eshirschorn $";
#endif
static ossimTrace traceDebug("ossimOverviewSequencer:debug");
@@ -192,6 +192,18 @@ void ossimOverviewSequencer::setToStartOfSequence()
theCurrentTileNumber = 0;
}
+// ESH 08/2009: Adding support for non-sequential tile access, which is needed by the virtual image writer classes.
+ossim_uint32 ossimOverviewSequencer::getCurrentTileNumber() const
+{
+ return theCurrentTileNumber;
+}
+
+// ESH 08/2009: Adding support for non-sequential tile access, which is needed by the virtual image writer classes.
+void ossimOverviewSequencer::setCurrentTileNumber( ossim_uint32 tileNumber )
+{
+ theCurrentTileNumber = tileNumber;
+}
+
ossimRefPtr<ossimImageData> ossimOverviewSequencer::getNextTile()
{
if ( theDirtyFlag )
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp b/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp
index a19cc76264857b07d96b140767dc5b7ea2e39418..2ce292330a76db6e6f204cbfe608761e86ce1538 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimRgbGridRemapEngine.cpp
@@ -14,7 +14,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimRgbGridRemapEngine.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimRgbGridRemapEngine.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimRgbGridRemapEngine.h>
@@ -166,7 +166,7 @@ void ossimRgbGridRemapEngine::assignRemapValues (
// Declare a 2D array that will contain all of the contributing sources'
// RGB mean values. Also declare the accumulator target vector.
//***
- int num_contributors = sources_list.size();
+ int num_contributors = (int)sources_list.size();
double** contributor_pixel = new double* [num_contributors];
for (i=0; i<num_contributors; i++)
contributor_pixel[i] = new double[3];
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp b/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp
index 296abd0392a1cbf0154f461907a478c7bc1d576d..437db1b1a9f6b4c7473899229622337dd99448be 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimRgbImage.cpp
@@ -58,7 +58,7 @@
// END OF COPYRIGHT STATEMENT
//*************************************************************************
-// $Id: ossimRgbImage.cpp 12984 2008-06-04 01:26:24Z dburken $
+// $Id: ossimRgbImage.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib>
#include <cmath>
@@ -978,7 +978,7 @@ void ossimRgbImage::drawPolygon(const std::vector<ossimIpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
int lx, ly;
@@ -1005,7 +1005,7 @@ void ossimRgbImage::drawPolygon(const std::vector<ossimDpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
double lx, ly;
@@ -1499,7 +1499,7 @@ void ossimRgbImage::drawFilledPolygon(const std::vector<ossimIpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
int y;
int miny, maxy;
@@ -1589,7 +1589,7 @@ void ossimRgbImage::drawFilledPolygon(const std::vector<ossimDpt> &p)
{
return;
}
- int n = p.size();
+ int n = (int)p.size();
int i;
int y;
int miny, maxy;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp b/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp
index 7a5d300920af15ba283038c326f31c6c8dffd83e..ea85aef0e68915ced70c6aacbf9a2f46f1caa9ff 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimSFIMFusion.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimSFIMFusion.cpp 13371 2008-08-02 13:42:42Z gpotts $
+// $Id: ossimSFIMFusion.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimSFIMFusion.h>
#include <ossim/matrix/newmat.h>
#include <ossim/matrix/newmatio.h>
@@ -152,7 +152,7 @@ ossimRefPtr<ossimImageData> ossimSFIMFusion::getTile(const ossimIrect& rect,
bands[idx] = (ossim_float32*)normColorOutputData->getBuf(idx);
}
// double delta = 0.0;
- ossim_uint32 bandsSize = bands.size();
+ ossim_uint32 bandsSize = (ossim_uint32)bands.size();
double normMinPix = 0.0;
for(y = 0; y < h; ++y)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp
index 25d3622c708349a2c7ed59d376653144d91524be..8205112f385f16e85177c5aec4a5f443e0b1831d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimTiffTileSource.cpp
@@ -12,7 +12,7 @@
// Contains class definition for TiffTileSource.
//
//*******************************************************************
-// $Id: ossimTiffTileSource.cpp 15825 2009-10-27 15:31:44Z dburken $
+// $Id: ossimTiffTileSource.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib> /* for abs(int) */
#include <ossim/imaging/ossimTiffTileSource.h>
@@ -673,7 +673,11 @@ bool ossimTiffTileSource::open()
openValidVertices();
loadMetaData();
- initializeBuffers();
+ // ESH 05/2009 -- If memory allocations failed, then
+ // let's bail out of this driver and hope another one
+ // can handle the image ok. I.e. InitializeBuffers()
+ // was changed to return a boolean success/fail flag.
+ bool bSuccess = initializeBuffers();
if (traceDebug())
{
@@ -682,7 +686,7 @@ bool ossimTiffTileSource::open()
}
// Finished...
- return true;
+ return bSuccess;
}
ossim_uint32 ossimTiffTileSource::getNumberOfLines(
@@ -1641,6 +1645,7 @@ bool ossimTiffTileSource::allocateBuffer()
theBufferRect.makeNan();
theBufferRLevel = theCurrentDirectory;
+ bool bSuccess = true;
if (buffer_size != theBufferSize)
{
theBufferSize = buffer_size;
@@ -1648,10 +1653,33 @@ bool ossimTiffTileSource::allocateBuffer()
{
delete [] theBuffer;
}
- theBuffer = new ossim_uint8[buffer_size];
+
+ // ESH 05/2009 -- Fix for ticket #738:
+ // image_info crashing on aerial_ortho image during ingest
+ try
+ {
+ theBuffer = new ossim_uint8[buffer_size];
+ }
+ catch(...)
+ {
+ if (theBuffer)
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ }
+
+ bSuccess = false;
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimTiffTileSource::allocateBuffer WARN:"
+ << "\nNot enough memory: buffer_size: " << buffer_size
+ << endl;
+ }
+ }
}
- return true;
+ return bSuccess;
}
ossim_uint32 ossimTiffTileSource::getNumberOfDirectories() const
@@ -1867,7 +1895,7 @@ void ossimTiffTileSource::setReadMethod()
setTiffDirectory(0);
}
-void ossimTiffTileSource::initializeBuffers()
+bool ossimTiffTileSource::initializeBuffers()
{
if(theBuffer)
{
@@ -1892,7 +1920,7 @@ void ossimTiffTileSource::initializeBuffers()
theCurrentTileWidth = theTile->getWidth();
theCurrentTileHeight = theTile->getHeight();
- allocateBuffer();
+ return allocateBuffer();
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimTileMapTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimTileMapTileSource.cpp
index 4399131a843117729d984e9a0ae8c8faddc2e4cb..ae938fef67196aae39f585925d640a64f9bf019d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimTileMapTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimTileMapTileSource.cpp
@@ -16,8 +16,6 @@
#include <ossim/base/ossimTrace.h>
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/base/ossimKeywordNames.h>
-#include <ossim/support_data/ossimFfL7.h>
-#include <ossim/support_data/ossimFfL5.h>
#include <ossim/projection/ossimTileMapModel.h>
RTTI_DEF1_INST(ossimTileMapTileSource,
@@ -32,8 +30,7 @@ static ossimTrace traceDebug("ossimTileMapTileSource:debug");
//*******************************************************************
ossimTileMapTileSource::ossimTileMapTileSource()
:
- ossimGeneralRasterTileSource(),
- theFfHdr(NULL)
+ ossimGeneralRasterTileSource()
{
}
@@ -43,8 +40,7 @@ ossimTileMapTileSource::ossimTileMapTileSource()
ossimTileMapTileSource::ossimTileMapTileSource(const ossimKeywordlist& kwl,
const char* prefix)
:
- ossimGeneralRasterTileSource(),
- theFfHdr(NULL)
+ ossimGeneralRasterTileSource()
{
if (loadState(kwl, prefix) == false)
{
@@ -57,7 +53,7 @@ ossimTileMapTileSource::ossimTileMapTileSource(const ossimKeywordlist& kwl,
//*******************************************************************
ossimTileMapTileSource::~ossimTileMapTileSource()
{
- theFfHdr = NULL;
+// theFfHdr = NULL;
}
bool ossimTileMapTileSource::open()
@@ -76,36 +72,6 @@ bool ossimTileMapTileSource::open()
return false;
}
-void ossimTileMapTileSource::openHeader(const ossimFilename& file)
-{
- //***
- // TileMap file name example: l71024031_03119990929_hpn.fst
- // Three header header file type substrings:
- // HPN = Pan
- // HRF = VNIR/SWIR (visible near infrared/shortwave infrared)
- // HTM = Thermal
- //***
-
- ossimFilename hdr = file.file();
- hdr.downcase();
- if ( hdr.contains("hpn") || hdr.contains("hrf") || hdr.contains("htm") )
- {
- theFfHdr = new ossimFfL7(file.c_str());
- } else if (hdr.contains("header.dat"))
- {
- theFfHdr = new ossimFfL5(file.c_str());
- } else {
- theFfHdr = NULL;
- return;
- }
- if (theFfHdr->getErrorStatus() != ossimErrorCodes::OSSIM_OK)
- {
- theFfHdr = 0;
- }
- return;
-
-}
-
ossimImageGeometry* ossimTileMapTileSource::getImageGeometry()
{
@@ -113,10 +79,10 @@ ossimImageGeometry* ossimTileMapTileSource::getImageGeometry()
if (result->getProjection())
return theGeometry.get();
- if (!theFfHdr) return result;
+// if (!theFfHdr) return result;
// Make a model
- ossimTileMapModel* model = new ossimTileMapModel (*theFfHdr);
+ ossimTileMapModel* model = new ossimTileMapModel ();
if (model->getErrorStatus() != ossimErrorCodes::OSSIM_OK)
return false;
@@ -134,33 +100,6 @@ bool ossimTileMapTileSource::loadState(const ossimKeywordlist& kwl,
}
-ossimRefPtr<ossimProperty> ossimTileMapTileSource::getProperty(
- const ossimString& name)const
-{
- ossimRefPtr<ossimProperty> result = 0;
-
- if (theFfHdr.valid())
- {
- result = theFfHdr->getProperty(name);
- }
-
- if ( result.valid() == false )
- {
- result = ossimGeneralRasterTileSource::getProperty(name);
- }
-
- return result;
-}
-
-void ossimTileMapTileSource::getPropertyNames(
- std::vector<ossimString>& propertyNames)const
-{
- if (theFfHdr.valid())
- {
- theFfHdr->getPropertyNames(propertyNames);
- }
- ossimGeneralRasterTileSource::getPropertyNames(propertyNames);
-}
ossimString ossimTileMapTileSource::getShortName() const
{
@@ -177,76 +116,5 @@ ossimString ossimTileMapTileSource::className() const
return ossimString("ossimTileMapTileSource");
}
-double ossimTileMapTileSource::getNullPixelValue(ossim_uint32)const
-{
- return 0.0;
-}
-
-double ossimTileMapTileSource::getMinPixelValue(ossim_uint32)const
-{
- return 1.0;
-}
-
-double ossimTileMapTileSource::getMaxPixelValue(ossim_uint32)const
-{
- return 255.0;
-}
-
-ossimScalarType ossimTileMapTileSource::getOutputScalarType() const
-{
- return OSSIM_UINT8;
-}
-
-bool ossimTileMapTileSource::getAcquisitionDate(ossimDate& date)const
-{
- if(!theFfHdr) return false;
-
- theFfHdr->getAcquisitionDate(date);
-
- return true;
-}
-
-ossimString ossimTileMapTileSource::getSatelliteName()const
-{
- if(!theFfHdr) return "";
-
- return theFfHdr->getSatelliteName();
-}
-
-ossimFilename ossimTileMapTileSource::getBandFilename(ossim_uint32 idx)const
-{
- ossim_uint32 maxIdx = getNumberOfInputBands();
-
- if(!theFfHdr||(idx > maxIdx))
- {
- return "";
- }
-
- ossimFilename path = getFilename().path();
- ossimString filename = theFfHdr->getBandFilename(idx);
- filename = filename.trim();
- ossimFilename file = path.dirCat(filename);
-
- if (file.exists())
- {
- return file;
- }
-
- // Try downcased name.
- file = path.dirCat(filename.downcase());
- if (file.exists())
- {
- return file;
- }
-
- // Try upcase name.
- file = path.dirCat(filename.upcase());
- if (file.exists())
- {
- return file;
- }
-
- return ossimFilename();
-}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp
index 282cc86848937b344bd6023ae1230ad740495cd9..3a92c3589e50fdbf4eeb1a9783e49de0d291354f 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimTopographicCorrectionFilter.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimTopographicCorrectionFilter.cpp 13312 2008-07-27 01:26:52Z gpotts $
+// $Id: ossimTopographicCorrectionFilter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <sstream>
#include <ossim/imaging/ossimTopographicCorrectionFilter.h>
@@ -169,7 +169,7 @@ void ossimTopographicCorrectionFilter::allocate()
int arraySize = theTile->getNumberOfBands();
if(theGain.size() > 0)
{
- arraySize = theGain.size();
+ arraySize = (int)theGain.size();
}
// we will do a non destructive resize onf the arrays
//
@@ -186,7 +186,7 @@ void ossimTopographicCorrectionFilter::allocate()
{
if(theBandMapping[idx] >= theBias.size())
{
- theBandMapping[idx] = theBias.size()-1;
+ theBandMapping[idx] = (unsigned int)theBias.size()-1;
}
}
else
@@ -853,7 +853,7 @@ void ossimTopographicCorrectionFilter::resizeArrays(ossim_uint32 newSize)
ossim_uint32 tempIdx = 0;
if(tempC.size() > 0 && (theC.size() > 0))
{
- int numberOfElements = ossim::min(tempC.size(),theC.size());
+ int numberOfElements = ossim::min((int)tempC.size(),(int)theC.size());
std::copy(tempC.begin(), tempC.begin()+numberOfElements,
theC.begin());
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp
index 352ca6f39dcab0ac25656ef28732992cf800ceed..d5b6398583a7b8b35d94a01c5bb8091aba7a0e8f 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimUsgsDemTileSource.cpp
@@ -9,7 +9,7 @@
// Contains class declaration for ossimUsgsDemTileSource.
//
//********************************************************************
-// $Id: ossimUsgsDemTileSource.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimUsgsDemTileSource.cpp 15837 2009-10-30 12:41:08Z dburken $
#include <iostream>
#include <fstream>
@@ -42,8 +42,8 @@ static const char USGS_DEM_KW[] = "usgs_dem";
ossimUsgsDemTileSource::ossimUsgsDemTileSource()
:
ossimImageHandler(),
- theDem(NULL),
- theTile(NULL),
+ theDem(0),
+ theTile(0),
theNullValue(0.0),
theMinHeight(0.0),
theMaxHeight(0.0),
@@ -59,9 +59,9 @@ ossimUsgsDemTileSource::~ossimUsgsDemTileSource()
if (theDem)
{
delete theDem;
- theDem = NULL;
+ theDem = 0;
}
- theTile = NULL;
+ theTile = 0;
}
ossimRefPtr<ossimImageData> ossimUsgsDemTileSource::getTile(
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp
index e0df6bf1377dd1365dc85221caee1e9db8a93780..c310cbaef1971fbbf310b3512ef84de02588f79a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimValueAssignImageSourceFilter.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimValueAssignImageSourceFilter.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimValueAssignImageSourceFilter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimValueAssignImageSourceFilter.h>
#include <ossim/imaging/ossimImageData.h>
#include <ossim/imaging/ossimImageDataFactory.h>
@@ -135,8 +135,8 @@ void ossimValueAssignImageSourceFilter::validateArrays()
{
if(theOutputValueArray.size() != theInputValueArray.size())
{
- ossim_uint32 index = std::min(theOutputValueArray.size(),
- theInputValueArray.size());
+ ossim_uint32 index = std::min((ossim_uint32)theOutputValueArray.size(),
+ (ossim_uint32)theInputValueArray.size());
vector<double> copyVector(theOutputValueArray.begin(),
theOutputValueArray.begin() + index);
@@ -171,7 +171,7 @@ template <class T> void ossimValueAssignImageSourceFilter::executeAssignSeparate
ossimRefPtr<ossimImageData>& data)
{
ossim_uint32 numberOfBands = std::min((ossim_uint32)data->getNumberOfBands(),
- (ossim_uint32)theInputValueArray.size());
+ (ossim_uint32)theInputValueArray.size());
ossim_uint32 maxOffset = data->getWidth()*data->getHeight();
for(ossim_uint32 band = 0; band<numberOfBands; ++band)
@@ -195,7 +195,7 @@ template <class T> void ossimValueAssignImageSourceFilter::executeAssignGroup(
ossimRefPtr<ossimImageData>& data)
{
ossim_uint32 numberOfBands = std::min((ossim_uint32)data->getNumberOfBands(),
- (ossim_uint32)theInputValueArray.size());
+ (ossim_uint32)theInputValueArray.size());
ossim_uint32 maxOffset = data->getWidth()*data->getHeight();
ossim_uint32 band = 0;
bool equalFlag = false;
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp
index 1bb7a4045e72818bb6a920a8e59d035ca66fe161..e2be39044d380b86fec0afb081c8d611cde8817d 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVertexExtractor.cpp
@@ -6,7 +6,7 @@
// TR # 136 kminear Fix extractVertices method
//
//*************************************************************************
-// $Id: ossimVertexExtractor.cpp 9963 2006-11-28 21:11:01Z gpotts $
+// $Id: ossimVertexExtractor.cpp 15836 2009-10-30 12:29:09Z dburken $
#include <fstream>
using namespace std;
@@ -24,7 +24,7 @@ RTTI_DEF2(ossimVertexExtractor, "ossimVertexExtractor",
ossimVertexExtractor::ossimVertexExtractor(ossimImageSource* inputSource)
:
- ossimOutputSource(NULL, // owner
+ ossimOutputSource(0, // owner
1,
0,
true,
@@ -34,10 +34,10 @@ ossimVertexExtractor::ossimVertexExtractor(ossimImageSource* inputSource)
theFilename(ossimFilename::NIL),
theFileStream(),
theVertice(4),
- theLeftEdge(NULL),
- theRightEdge(NULL)
+ theLeftEdge(0),
+ theRightEdge(0)
{
- if (inputSource == NULL)
+ if (inputSource == 0)
{
ossimNotify(ossimNotifyLevel_WARN) << "ossimVertexExtractor::ossimVertexExtractor ERROR"
<< "\nNULL input image source passed to constructor!"
@@ -54,12 +54,12 @@ ossimVertexExtractor::~ossimVertexExtractor()
if (theLeftEdge)
{
delete [] theLeftEdge;
- theLeftEdge = NULL;
+ theLeftEdge = 0;
}
if (theRightEdge)
{
delete [] theRightEdge;
- theRightEdge = NULL;
+ theRightEdge = 0;
}
}
@@ -1797,12 +1797,12 @@ bool ossimVertexExtractor::extractVertices()
if (leftSlope)
{
delete [] leftSlope;
- leftSlope = NULL;
+ leftSlope = 0;
}
if (rightSlope)
{
delete [] rightSlope;
- rightSlope = NULL;
+ rightSlope = 0;
}
if(traceDebug())
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageHandler.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageHandler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6709b8a4ef8bfa4ef310e249c941ba5335220792
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageHandler.cpp
@@ -0,0 +1,1389 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class definition for VirtualImageHandler.
+//
+//*******************************************************************
+// $Id: ossimVirtualImageHandler.cpp 14655 2009-06-05 11:58:56Z dburken $
+
+#include <xtiffio.h>
+#include <cstdlib> /* for abs(int) */
+#include <ossim/imaging/ossimVirtualImageHandler.h>
+#include <ossim/support_data/ossimGeoTiff.h>
+#include <ossim/base/ossimConstants.h>
+#include <ossim/base/ossimCommon.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimIpt.h>
+#include <ossim/base/ossimDpt.h>
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimKeywordlist.h>
+#include <ossim/base/ossimKeywordNames.h>
+#include <ossim/base/ossimEllipsoid.h>
+#include <ossim/base/ossimDatum.h>
+#include <ossim/base/ossimBooleanProperty.h>
+#include <ossim/base/ossimStringProperty.h>
+#include <ossim/imaging/ossimImageDataFactory.h>
+#include <ossim/imaging/ossimTiffTileSource.h>
+
+RTTI_DEF1( ossimVirtualImageHandler, "ossimVirtualImageHandler", ossimImageHandler )
+
+static ossimTrace traceDebug( "ossimVirtualImageHandler:debug" );
+
+//*******************************************************************
+// Public Constructor:
+//*******************************************************************
+ossimVirtualImageHandler::ossimVirtualImageHandler()
+ :
+ ossimImageHandler(),
+ theBuffer(0),
+ theBufferSize(0),
+ theBufferRect(0, 0, 0, 0),
+ theNullBuffer(0),
+ theSampleFormatUnit(0),
+ theMaxSampleValue(0),
+ theMinSampleValue(0),
+ theBitsPerSample(0),
+ theBytesPerPixel(0),
+ theImageSubdirectory(""),
+ theCurrentFrameName(""),
+ theVirtualWriterType(""),
+ theMajorVersion(""),
+ theMinorVersion(""),
+ theCompressType(1),
+ theCompressQuality(75),
+ theOverviewFlag(false),
+ theOpenedFlag(false),
+ theR0isFullRes(false),
+ theEntryIndex(-1),
+ theResLevelStart(0),
+ theResLevelEnd(0),
+ theSamplesPerPixel(0),
+ theNumberOfResLevels(0),
+ thePlanarConfig(PLANARCONFIG_SEPARATE),
+ theScalarType(OSSIM_SCALAR_UNKNOWN),
+ theNumberOfFrames(0),
+ theReadMethod(READ_TILE),
+ theImageTileWidth(-1),
+ theImageTileLength(-1),
+ theImageFrameWidth(-1),
+ theImageFrameLength(-1),
+ theR0NumberOfLines(-1),
+ theR0NumberOfSamples(-1),
+ thePhotometric(PHOTOMETRIC_MINISBLACK),
+ theTif(0),
+ theTile(0),
+ theImageWidth(0),
+ theImageLength(0)
+{}
+
+ossimVirtualImageHandler::~ossimVirtualImageHandler()
+{
+ close();
+}
+
+bool ossimVirtualImageHandler::open( const ossimFilename& image_file )
+{
+ theImageFile = image_file;
+ return open();
+}
+
+void ossimVirtualImageHandler::close()
+{
+ theOpenedFlag = false;
+
+ theImageWidth.clear();
+ theImageLength.clear();
+
+ if (theBuffer)
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ theBufferSize = 0;
+ }
+ if (theNullBuffer)
+ {
+ delete [] theNullBuffer;
+ theNullBuffer = 0;
+ }
+ ossimImageHandler::close();
+}
+
+bool ossimVirtualImageHandler::open()
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::open";
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " Entered..."
+ << "\nFile: " << theImageFile.c_str() << std::endl;
+ }
+
+ if(isOpen())
+ {
+ close();
+ }
+
+ if ( theImageFile.empty() )
+ {
+ return false;
+ }
+ if ( theImageFile.isReadable() == false )
+ {
+ return false;
+ }
+
+ ossimKeywordlist header_kwl( theImageFile );
+
+ if ( header_kwl.getErrorStatus() == ossimErrorCodes::OSSIM_ERROR )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << " Keywordlist open error detected." << endl;
+ }
+ return false;
+ }
+
+ theOpenedFlag = loadHeaderInfo( header_kwl ) && initializeBuffers();
+
+ return theOpenedFlag;
+}
+
+bool ossimVirtualImageHandler::openTiff( int resLevel, int row, int col )
+{
+ static const char* MODULE = "ossimVirtualImageHandler::openTiff";
+
+ closeTiff();
+
+ // Check for empty file name.
+ if (theImageFile.empty())
+ {
+ return false;
+ }
+
+ ossimString driveString;
+ ossimString pathString;
+ ossimString fileString;
+ ossimString extString;
+ theImageFile.split( driveString, pathString, fileString, extString );
+
+ // If the virtual image header filename is image.ovr, the current frame
+ // name is e.g. ./ossim-virtual-tiff/res0/row0/col0.tif
+
+ ossimFilename pathFName( pathString );
+ ossimFilename subdirFName1( "." );
+ ossimFilename subdirFName2( subdirFName1.dirCat(theImageSubdirectory) );
+ ossimFilename subdirFName3( subdirFName2.dirCat("res") );
+ subdirFName3.append( ossimString::toString( resLevel ) );
+ ossimFilename subdirFName4( subdirFName3.dirCat("row") );
+ subdirFName4.append( ossimString::toString( row ) );
+ ossimString newPathString( pathFName.dirCat( subdirFName4 ) );
+
+ ossimFilename driveFName( driveString );
+ ossimFilename newPathFName( newPathString );
+ ossimFilename newDirFName( driveFName.dirCat( newPathFName ) );
+
+ ossimString newFileString( "col" );
+ newFileString.append( ossimString::toString(col) );
+
+ ossimString newExtString( "tif" );
+
+ theCurrentFrameName.merge( driveString, newPathString, newFileString, newExtString );
+
+ // First we do a quick test to see if the file looks like a tiff file.
+ unsigned char header[2];
+
+ FILE* fp = fopen( theCurrentFrameName.c_str(), "rb" );
+ if ( fp == NULL )
+ return false;
+
+ fread( header, 2, 1, fp );
+ fclose( fp );
+
+ if( (header[0] != 'M' || header[1] != 'M')
+ && (header[0] != 'I' || header[1] != 'I') )
+ return false;
+
+ //---
+ // See if the file can be opened for reading.
+ //---
+ ossimString openMode = "rm";
+
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ theTif = XTIFFOpen( theCurrentFrameName, openMode );
+# else
+ theTif = TIFFOpen( theCurrentFrameName, openMode );
+# endif
+#else
+ theTif = TIFFOpen( theCurrentFrameName, openMode );
+#endif
+
+ if ( !theTif )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:\n"
+ << "could not open tiff file: "
+ << theCurrentFrameName
+ << std::endl;
+ }
+ return false;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageHandler::closeTiff()
+{
+ if ( theTif )
+ {
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ XTIFFClose( theTif );
+# else
+ TIFFClose( theTif );
+# endif
+#else
+ TIFFClose( theTif );
+#endif
+ theTif = 0;
+ }
+
+ return true;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+bool ossimVirtualImageHandler::loadHeaderInfo( const ossimKeywordlist& kwl )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadHeaderInfo";
+
+ bool bRetVal = true;
+
+ // Virtual images currently can only have 1 entry.
+ ossimString lookupStr = kwl.find( ossimKeywordNames::NUMBER_ENTRIES_KW );
+ if ( lookupStr.empty() == false )
+ {
+ ossim_int16 numEntries = lookupStr.toInt16();
+ if ( numEntries != 1 )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: Number of entries (" << numEntries << ") in virtual image header != 1."
+ << std::endl;
+
+ bRetVal = false;
+ }
+ else
+ {
+ std::vector<ossimString> keyList = kwl.findAllKeysThatContains(
+ ossimKeywordNames::ENTRY_KW );
+
+ int numKeys = (int)keyList.size();
+ if ( numKeys != 1 )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: Number of entry lines (" << numKeys << ") in virtual image header != 1."
+ << std::endl;
+
+ bRetVal = false;
+ }
+ else
+ {
+ ossimString key = keyList[0];
+ ossimString lookupStr = kwl.find( key );
+ if ( lookupStr.empty() == false )
+ {
+ theEntryIndex = lookupStr.toInt16();
+ }
+ else
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: No valid entries found in virtual image header."
+ << std::endl;
+
+ bRetVal = false;
+ }
+ }
+ }
+ }
+ else
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE
+ << "\nERROR: Number of entries not found in virtual image header."
+ << std::endl;
+ }
+
+ bRetVal = false;
+ }
+
+ if ( theEntryIndex > -1 )
+ {
+ ossimString prefix = "image";
+ prefix += ossimString::toString( theEntryIndex ) + ".";
+
+ loadGeometryKeywordEntry( kwl, prefix );
+ loadGeneralKeywordEntry ( kwl, prefix );
+ loadNativeKeywordEntry ( kwl, prefix );
+ }
+
+ return bRetVal;
+}
+
+void ossimVirtualImageHandler::loadNativeKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadNativeKeywordEntry";
+
+ ossimString extPrefix = prefix + ossimString( "virtual" ) + ".";
+
+ ossimString lookupStr = kwl.find( extPrefix, "subdirectory" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageSubdirectory = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "writer_type" );
+ if ( lookupStr.empty() == false )
+ {
+ theVirtualWriterType = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "frame_size_x" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageFrameWidth = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "frame_size_y" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageFrameLength = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "tile_size_x" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageTileWidth = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "tile_size_y" );
+ if ( lookupStr.empty() == false )
+ {
+ theImageTileLength = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "version_major" );
+ if ( lookupStr.empty() == false )
+ {
+ theMajorVersion = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "version_minor" );
+ if ( lookupStr.empty() == false )
+ {
+ theMinorVersion = lookupStr;
+ }
+ lookupStr = kwl.find( extPrefix, "overview_flag" );
+ if ( lookupStr.empty() == false )
+ {
+ theOverviewFlag = lookupStr.toBool();
+ setStartingResLevel( theOverviewFlag ? 1 : 0 );
+ }
+ lookupStr = kwl.find( extPrefix, "includes_r0" );
+ if ( lookupStr.empty() == false )
+ {
+ theR0isFullRes = lookupStr.toBool();
+ }
+ lookupStr = kwl.find( extPrefix, "bits_per_sample" );
+ if ( lookupStr.empty() == false )
+ {
+ theBitsPerSample = lookupStr.toUInt16();
+ }
+ lookupStr = kwl.find( extPrefix, "bytes_per_pixel" );
+ if ( lookupStr.empty() == false )
+ {
+ theBytesPerPixel = lookupStr.toUInt32();
+ }
+ lookupStr = kwl.find( extPrefix, "resolution_level_starting" );
+ if ( lookupStr.empty() == false )
+ {
+ theResLevelStart = lookupStr.toUInt16();
+ }
+ lookupStr = kwl.find( extPrefix, "resolution_level_ending" );
+ if ( lookupStr.empty() == false )
+ {
+ theResLevelEnd = lookupStr.toUInt16();
+ }
+
+ // number of resolution levels available in the virtual image
+ theNumberOfResLevels = theResLevelEnd - theResLevelStart + 1;
+
+ theImageWidth.resize(theNumberOfResLevels);
+ theImageLength.resize(theNumberOfResLevels);
+ theNumberOfFrames.resize(theNumberOfResLevels);
+
+ extPrefix += ossimString( "resolution_level_" );
+
+ ossim_uint32 r;
+ ossim_uint32 d=0;
+ for ( r=theResLevelStart; r<=theResLevelEnd; ++r )
+ {
+ theImageWidth [d] = theR0NumberOfSamples >> r;
+ theImageLength[d] = theR0NumberOfLines >> r;
+
+ ossimString fullPrefix = extPrefix + ossimString::toString( r ) + ".";
+
+ ossimIpt nFrames;
+ lookupStr = kwl.find( fullPrefix, "number_of_frames_x" );
+ if ( lookupStr.empty() == false )
+ {
+ nFrames.x = lookupStr.toInt32();
+ }
+ lookupStr = kwl.find( fullPrefix, "number_of_frames_y" );
+ if ( lookupStr.empty() == false )
+ {
+ nFrames.y = lookupStr.toInt32();
+
+ }
+
+ theNumberOfFrames[d++] = nFrames;
+ }
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nVirtual image information:"
+ << "\nSubdirectory for frames: " << theImageSubdirectory
+ << "\nWriter type: " << theVirtualWriterType
+ << "\nFrame size (x): " << theImageFrameWidth
+ << "\nFrame size (y): " << theImageFrameLength
+ << "\nTile size (x): " << theImageTileWidth
+ << "\nTile size (y): " << theImageTileLength
+ << "\nMajor version: " << theMajorVersion
+ << "\nMinor version: " << theMinorVersion
+ << "\nOverview flag (boolean): " << theOverviewFlag
+ << "\nStarting reduced res set: " << theResLevelStart
+ << "\nEnding reduced res sets: " << theResLevelEnd
+ << std::endl;
+
+ d=0;
+ for ( r=theResLevelStart; r<=theResLevelEnd; ++r )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Number of frames[" << r << "].x: " << theNumberOfFrames[d].x
+ << "\nNumber of frames[" << r << "].y: " << theNumberOfFrames[d].y
+ << "\nVirtual image width[" << r << "]: " << theImageWidth[d]
+ << "\nVirtual image length[" << r << "]: " << theImageLength[d]
+ << std::endl;
+ ++d;
+ }
+ }
+}
+
+void ossimVirtualImageHandler::loadGeometryKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadGeometryKeywordEntry";
+
+ ossimKeywordlist tempKwl(kwl);
+ tempKwl.stripPrefixFromAll( prefix );
+
+ const char* lookup = tempKwl.find(ossimKeywordNames::TYPE_KW);
+ if ( lookup )
+ {
+ if ( !theGeometry.get() )
+ {
+ // allocate an empty geometry if nothing present
+ theGeometry = new ossimImageGeometry();
+ }
+ theGeometry->loadState( tempKwl );
+ }
+ else
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nNo projection type found in: "
+ << theImageFile
+ << std::endl;
+ }
+ }
+}
+
+void ossimVirtualImageHandler::loadGeneralKeywordEntry( const ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadGeneralKeywordEntry";
+
+ /* Get the nul, min, max values, as a function of band index */
+ loadMetaData( kwl );
+
+ ossimString lookupStr = kwl.find( prefix, ossimKeywordNames::NUMBER_INPUT_BANDS_KW );
+ if ( lookupStr.empty() == false )
+ {
+ theSamplesPerPixel = lookupStr.toUInt16();
+
+ if( theSamplesPerPixel == 3 )
+ thePhotometric = PHOTOMETRIC_RGB;
+ else
+ thePhotometric = PHOTOMETRIC_MINISBLACK;
+ }
+
+ lookupStr = kwl.find( prefix, ossimKeywordNames::NUMBER_LINES_KW );
+ if ( lookupStr.empty() == false )
+ {
+ theR0NumberOfLines = lookupStr.toInt32();
+ }
+
+ lookupStr = kwl.find( prefix, ossimKeywordNames::NUMBER_SAMPLES_KW );
+ if ( lookupStr.empty() == false )
+ {
+ theR0NumberOfSamples = lookupStr.toInt32();
+ }
+
+ lookupStr = kwl.find( prefix, "radiometry" );
+ theScalarType = OSSIM_SCALAR_UNKNOWN;
+ if ( lookupStr.empty() == false )
+ {
+ if ( lookupStr.contains("8-bit") )
+ {
+ theScalarType = OSSIM_UINT8;
+ }
+ else
+ if ( lookupStr.contains("11-bit") )
+ {
+ theScalarType = OSSIM_USHORT11;
+ }
+ else
+ if ( lookupStr.contains("16-bit unsigned") )
+ {
+ theScalarType = OSSIM_UINT16;
+ }
+ else
+ if ( lookupStr.contains("16-bit signed") )
+ {
+ theScalarType = OSSIM_SINT16;
+ }
+ else
+ if ( lookupStr.contains("32-bit unsigned") )
+ {
+ theScalarType = OSSIM_UINT32;
+ }
+ else
+ if ( lookupStr.contains("float") )
+ {
+ theScalarType = OSSIM_FLOAT32;
+ }
+ else
+ if ( lookupStr.contains("normalized float") )
+ {
+ theScalarType = OSSIM_FLOAT32;
+ }
+ else
+ {
+ /* Do nothing */
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nERROR: Unrecognized pixel scalar type description: "
+ << lookupStr
+ << std::endl;
+ }
+ }
+}
+
+void ossimVirtualImageHandler::loadMetaData( const ossimKeywordlist& kwl )
+{
+ theMetaData.clear();
+ theMetaData.loadState( kwl );
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfLines( ossim_uint32 resLevel ) const
+{
+ ossim_uint32 result = 0;
+
+ if ( theOpenedFlag && isValidRLevel(resLevel) )
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if ( !theStartingResLevel || theR0isFullRes ) // not an overview or has r0.
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if (resLevel < theNumberOfResLevels)
+ {
+ result = theImageLength[resLevel];
+ }
+ }
+ else // this is an overview without r0
+ if (resLevel >= theStartingResLevel)
+ {
+ //---
+ // Adjust the level to be relative to the reader using this as
+ // overview.
+ //---
+ ossim_uint32 level = resLevel - theStartingResLevel;
+ if (level < theNumberOfResLevels)
+ {
+ result = theImageLength[level];
+ }
+ }
+ }
+ else
+ if ( resLevel < theStartingResLevel &&
+ theStartingResLevel > 0 &&
+ !theR0isFullRes &&
+ theNumberOfResLevels > 0 )
+ {
+ result = theImageLength[0] * (1<<(theStartingResLevel-resLevel));
+ }
+
+ return result;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfSamples( ossim_uint32 resLevel ) const
+{
+ ossim_uint32 result = 0;
+
+ if ( theOpenedFlag && isValidRLevel(resLevel) )
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if ( !theStartingResLevel || theR0isFullRes ) // not an overview or has r0.
+ {
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if (resLevel < theNumberOfResLevels)
+ {
+ result = theImageWidth[resLevel];
+ }
+ }
+ else // this is an overview without r0
+ if (resLevel >= theStartingResLevel)
+ {
+ //---
+ // Adjust the level to be relative to the reader using this as
+ // overview.
+ //---
+ ossim_uint32 level = resLevel - theStartingResLevel;
+ if (level < theNumberOfResLevels)
+ {
+ result = theImageWidth[level];
+ }
+ }
+ }
+ else
+ if ( resLevel < theStartingResLevel &&
+ theStartingResLevel > 0 &&
+ !theR0isFullRes &&
+ theNumberOfResLevels > 0 )
+ {
+ result = theImageWidth[0] * (1<<(theStartingResLevel-resLevel));
+ }
+
+ return result;
+}
+
+ossimIrect ossimVirtualImageHandler::getImageRectangle(ossim_uint32 resLevel) const
+{
+ ossimIrect result;
+
+ if( theOpenedFlag && isValidRLevel(resLevel) )
+ {
+ ossim_int32 lines = getNumberOfLines(resLevel);
+ ossim_int32 samples = getNumberOfSamples(resLevel);
+ if( !lines || !samples )
+ {
+ result.makeNan();
+ }
+ else
+ {
+ result = ossimIrect(0, 0, samples-1, lines-1);
+ }
+ }
+ else
+ if ( resLevel < theStartingResLevel &&
+ theStartingResLevel > 0 &&
+ !theR0isFullRes &&
+ theNumberOfResLevels > 0 )
+ {
+ ossim_uint32 scale = (1<<(theStartingResLevel-resLevel));
+ ossim_uint32 lines = theImageLength[0] * scale;
+ ossim_uint32 samples = theImageWidth[0] * scale;
+
+ result = ossimIrect(0, 0, samples-1, lines-1);
+ }
+ else
+ {
+ result.makeNan();
+ }
+
+ return result;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfDecimationLevels() const
+{
+ ossim_uint32 result = theNumberOfResLevels;
+
+ if ( theOverviewFlag && theR0isFullRes )
+ {
+ // Don't count r0.
+ --result;
+ }
+
+ return result;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossimScalarType ossimVirtualImageHandler::getOutputScalarType() const
+{
+ return theScalarType;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getTileWidth() const
+{
+ if( isOpen() )
+ {
+ return theImageTileWidth;
+ }
+
+ return 0;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getTileHeight() const
+{
+ if( isOpen() )
+ {
+ return theImageTileLength;
+ }
+
+ return 0;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getFrameWidth() const
+{
+ if( isOpen() )
+ {
+ return theImageFrameWidth;
+ }
+
+ return 0;
+}
+
+//*******************************************************************
+// Public method:
+//*******************************************************************
+ossim_uint32 ossimVirtualImageHandler::getFrameHeight() const
+{
+ if( isOpen() )
+ {
+ return theImageFrameLength;
+ }
+
+ return 0;
+}
+
+ossimRefPtr<ossimImageData> ossimVirtualImageHandler::getTile(
+ const ossimIrect& tile_rect, ossim_uint32 resLevel )
+{
+ if (theTile.valid())
+ {
+ // Image rectangle must be set prior to calling getTile.
+ theTile->setImageRectangle(tile_rect);
+
+ if ( getTile( *(theTile.get()), resLevel ) == false )
+ {
+ if (theTile->getDataObjectStatus() != OSSIM_NULL)
+ {
+ theTile->makeBlank();
+ }
+ }
+ }
+
+ theTile->setImageRectangle(tile_rect);
+ return theTile;
+}
+
+bool ossimVirtualImageHandler::getTile( ossimImageData& result,
+ ossim_uint32 resLevel )
+{
+ static const char MODULE[] ="ossimVirtualImageHandler::getTile(ossimImageData&,ossim_uint32)";
+
+ bool status = false;
+
+ //---
+ // Not open, this tile source bypassed, or invalid res level,
+ // return a blank tile.
+ //---
+ if( isOpen() && isSourceEnabled() && isValidRLevel(resLevel) )
+ {
+ ossimIrect tile_rect = result.getImageRectangle();
+
+ // This should be the zero base image rectangle for this res level.
+ ossimIrect image_rect = getImageRectangle(resLevel);
+
+ //---
+ // See if any point of the requested tile is in the image.
+ //---
+ if ( tile_rect.intersects(image_rect) )
+ {
+ // Initialize the tile if needed as we're going to stuff it.
+ if (result.getDataObjectStatus() == OSSIM_NULL)
+ {
+ result.initialize();
+ }
+
+ ossimIrect clip_rect = tile_rect.clipToRect(image_rect);
+
+ if ( !tile_rect.completely_within(clip_rect) )
+ {
+ //---
+ // We're not going to fill the whole tile so start with a
+ // blank tile.
+ //---
+ result.makeBlank();
+ }
+
+ // Load the tile buffer with data from the tif.
+ if ( loadTile( tile_rect, result, resLevel ) )
+ {
+ result.validate();
+ status = true;
+ }
+ else
+ {
+ // Would like to change this to throw ossimException.(drb)
+ status = false;
+ if(traceDebug())
+ {
+ // Error in filling buffer.
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << " Error filling buffer. Return status = false..."
+ << std::endl;
+ }
+ }
+ } // matches: if ( tile_rect.intersects(image_rect) )
+ else
+ {
+ // No part of requested tile within the image rectangle.
+ status = true; // Not an error.
+ result.makeBlank();
+ }
+
+ } // matches: if( isOpen() && isSourceEnabled() && isValidRLevel(resLevel) )
+
+ return status;
+}
+
+bool ossimVirtualImageHandler::loadTile( const ossimIrect& virtual_clip_rect,
+ ossimImageData& result,
+ ossim_uint32 resLevel )
+{
+ static const char MODULE[] = "ossimVirtualImageHandler::loadTile";
+
+ ossimInterleaveType type = ( thePlanarConfig == PLANARCONFIG_CONTIG ) ?
+ OSSIM_BIP : OSSIM_BIL;
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerFrame();
+
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ ossim_int32 virtual_minx, virtual_miny, virtual_maxx, virtual_maxy;
+ virtual_clip_rect.getBounds( virtual_minx, virtual_miny,
+ virtual_maxx, virtual_maxy );
+
+ // Get the indices of the frame that contains the top-left corner
+ ossim_int32 rowFrameIdxI = virtual_miny / theImageFrameLength;
+ ossim_int32 colFrameIdxI = virtual_minx / theImageFrameWidth;
+
+ // Get the indices of the frame that contains the bottom-right corner
+ ossim_int32 rowFrameIdxF = virtual_maxy / theImageFrameLength;
+ ossim_int32 colFrameIdxF = virtual_maxx / theImageFrameWidth;
+
+ // Get the virtual line,sample of the frame origin
+ ossimIpt frame_shiftI( colFrameIdxI * theImageFrameWidth,
+ rowFrameIdxI * theImageFrameLength );
+
+ ossimIrect clip_rectI( virtual_clip_rect );
+ clip_rectI -= frame_shiftI;
+
+ result.setImageRectangle( clip_rectI );
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 rowFrameIdx;
+ for( rowFrameIdx = rowFrameIdxI; rowFrameIdx <= rowFrameIdxF; ++rowFrameIdx )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originOF(0, 0);
+ originOF.y = (rowFrameIdx-rowFrameIdxI) * theImageFrameLength;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 colFrameIdx;
+ for( colFrameIdx = colFrameIdxI; colFrameIdx <= colFrameIdxF; ++colFrameIdx )
+ {
+ originOF.x = (colFrameIdx-colFrameIdxI) * theImageFrameWidth;
+
+ // Open a single frame file for reading.
+ bool bOpenedTiff = openTiff( resLevel, rowFrameIdx, colFrameIdx );
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single input frame.
+ ossimIpt originIF(0, 0);
+ originIF.y = iT * theImageTileLength;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originIF.x = jT * theImageTileWidth;
+
+ ossimIrect tile_rectOF( originOF.x + originIF.x,
+ originOF.y + originIF.y,
+ originOF.x + originIF.x + theImageTileWidth - 1,
+ originOF.y + originIF.y + theImageTileLength - 1 );
+
+ if ( tile_rectOF.intersects(clip_rectI) )
+ {
+ ossimIrect tile_clip_rect = tile_rectOF.clipToRect(clip_rectI);
+
+ if ( thePlanarConfig == PLANARCONFIG_CONTIG )
+ {
+ if ( bOpenedTiff )
+ {
+ ossim_int32 tileSizeRead = TIFFReadTile( theTif,
+ theBuffer,
+ originIF.x,
+ originIF.y,
+ 0, 0 );
+ if ( tileSizeRead > 0 )
+ {
+ result.loadTile( theBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ type );
+ }
+ else
+ if( tileSizeRead < 0 )
+ {
+ if( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " Read Error!"
+ << "\nReturning error... " << endl;
+ }
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ else
+ {
+ // fill with NULLs
+ result.loadTile( theNullBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ type );
+ }
+ }
+ else
+ {
+ // band separate tiles...
+ for ( ossim_uint32 band=0; band<theSamplesPerPixel; ++band )
+ {
+ if ( bOpenedTiff )
+ {
+ ossim_int32 tileSizeRead = TIFFReadTile( theTif,
+ theBuffer,
+ originIF.x,
+ originIF.y,
+ 0,
+ band );
+ if ( tileSizeRead > 0 )
+ {
+ result.loadBand( theBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ band );
+ }
+ else
+ if ( tileSizeRead < 0 )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " Read Error!"
+ << "\nReturning error... " << endl;
+ }
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ else
+ {
+ // fill with NULLs
+ result.loadBand( theNullBuffer,
+ tile_rectOF,
+ tile_clip_rect,
+ band );
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // All done with the current frame file.
+ closeTiff();
+ return true;
+}
+
+ossimIpt ossimVirtualImageHandler::getNumberOfTilesPerFrame() const
+{
+ ossim_int32 frameSamples = theImageFrameWidth;
+ ossim_int32 frameLines = theImageFrameLength;
+
+ ossim_int32 tileSamples = theImageTileWidth;
+ ossim_int32 tileLines = theImageTileLength;
+
+ ossim_int32 tilesWide = (frameSamples % tileSamples) ?
+ (frameSamples / tileSamples) + 1 : (frameSamples / tileSamples);
+ ossim_int32 tilesHigh = (frameLines % tileLines) ?
+ (frameLines / tileLines) + 1 : (frameLines / tileLines);
+
+ return ossimIpt( tilesWide, tilesHigh );
+}
+
+bool ossimVirtualImageHandler::isValidRLevel( ossim_uint32 resLevel ) const
+{
+ bool result = false;
+
+ //---
+ // If we have r0 our reslevels are the same as the callers so
+ // no adjustment necessary.
+ //---
+ if ( !theStartingResLevel || theR0isFullRes) // Not an overview or has r0.
+ {
+ result = (resLevel < theNumberOfResLevels);
+ }
+ else if (resLevel >= theStartingResLevel) // Used as overview.
+ {
+ result = ( (resLevel - theStartingResLevel) < theNumberOfResLevels);
+ }
+
+ return result;
+}
+
+bool ossimVirtualImageHandler::allocateBuffer()
+{
+ //***
+ // Allocate memory for a buffer to hold data grabbed from the tiff file.
+ //***
+ ossim_uint32 buffer_size=0;
+ switch ( theReadMethod )
+ {
+ case READ_TILE:
+ if ( thePlanarConfig == PLANARCONFIG_CONTIG )
+ {
+ buffer_size = theImageTileWidth *
+ theImageTileLength *
+ theBytesPerPixel *
+ theSamplesPerPixel;
+ }
+ else
+ {
+ buffer_size = theImageTileWidth *
+ theImageTileLength *
+ theBytesPerPixel;
+ }
+ break;
+
+ case READ_RGBA_U8_TILE:
+ case READ_RGBA_U8_STRIP:
+ case READ_RGBA_U8A_STRIP:
+ case READ_SCAN_LINE:
+ default:
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Read method not implemented!" << endl;
+ print(ossimNotify(ossimNotifyLevel_WARN));
+ return false;
+ }
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageHandler::allocateBuffer DEBUG:"
+ << "\nbuffer_size: " << buffer_size
+ << endl;
+ }
+
+ theBufferRect.makeNan();
+
+ bool bSuccess = true;
+ if ( buffer_size != theBufferSize )
+ {
+ theBufferSize = buffer_size;
+ if ( theBuffer )
+ {
+ delete [] theBuffer;
+ }
+ if ( theNullBuffer )
+ {
+ delete [] theNullBuffer;
+ }
+
+ // ESH 05/2009 -- Fix for ticket #738:
+ // image_info crashing on aerial_ortho image during ingest
+ try
+ {
+ theBuffer = new ossim_uint8[buffer_size];
+ theNullBuffer = new ossim_uint8[buffer_size];
+ }
+ catch(...)
+ {
+ if ( theBuffer )
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ }
+ if ( theNullBuffer )
+ {
+ delete [] theNullBuffer;
+ theNullBuffer = 0;
+ }
+
+ bSuccess = false;
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimVirtualImageHandler::allocateBuffer WARN:"
+ << "\nNot enough memory: buffer_size: " << buffer_size
+ << endl;
+ }
+ }
+ }
+
+ // initialize the NULL buffer
+ ossim_uint32 b;
+ for ( b=0; b<buffer_size; ++b )
+ {
+ theNullBuffer[b] = 0;
+ }
+
+ return bSuccess;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getImageTileWidth() const
+{
+ return theImageTileWidth;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getImageTileHeight() const
+{
+ return theImageTileLength;
+}
+
+ossimString ossimVirtualImageHandler::getLongName() const
+{
+ return ossimString( "Virtual Image Handler" );
+}
+
+ossimString ossimVirtualImageHandler::getShortName() const
+{
+ return ossimString( "Virtual Image Handler" );
+}
+
+std::ostream& ossimVirtualImageHandler::print( std::ostream& os ) const
+{
+ //***
+ // Use a keyword format.
+ //***
+ os << "image_file: " << theImageFile
+ << "\nsamples_per_pixel: " << theSamplesPerPixel
+ << "\nbits_per_sample: " << theBitsPerSample
+ << "\nsample_format_unit: " << theSampleFormatUnit
+ << "\nmin_sample_value: " << theMinSampleValue
+ << "\nmax_sample_value: " << theMaxSampleValue
+ << "\ntheNumberOfResLevels: " << theNumberOfResLevels
+ << "\ntile_width: " << theImageTileWidth
+ << "\ntile_length: " << theImageTileLength
+ << "\nphotometric: " << thePhotometric
+ << "\nr0_is_full_res: " << theR0isFullRes;
+
+ for ( ossim_uint32 i=0; i<theNumberOfResLevels; ++i )
+ {
+ os << "\ndirectory[" << i << "]"
+ << "\nimage width: " << theImageWidth[i]
+ << "\nimage_length: " << theImageLength[i];
+ os << endl;
+ }
+
+ if ( theTile.valid() )
+ {
+ os << "\nOutput tile dump:\n" << *theTile << endl;
+ }
+
+ os << endl;
+
+ return ossimSource::print( os );
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfInputBands() const
+{
+ return theSamplesPerPixel;
+}
+
+ossim_uint32 ossimVirtualImageHandler::getNumberOfOutputBands () const
+{
+ return getNumberOfInputBands();
+}
+
+bool ossimVirtualImageHandler::isOpen() const
+{
+ return theOpenedFlag;
+}
+
+bool ossimVirtualImageHandler::hasR0() const
+{
+ return theR0isFullRes;
+}
+
+double ossimVirtualImageHandler::getMinPixelValue( ossim_uint32 band ) const
+{
+ if( theMetaData.getNumberOfBands() )
+ {
+ return ossimImageHandler::getMinPixelValue( band );
+ }
+ return theMinSampleValue;
+}
+
+double ossimVirtualImageHandler::getMaxPixelValue( ossim_uint32 band ) const
+{
+ if( theMetaData.getNumberOfBands() )
+ {
+ return ossimImageHandler::getMaxPixelValue( band );
+ }
+ return theMaxSampleValue;
+}
+
+bool ossimVirtualImageHandler::initializeBuffers()
+{
+ if( theBuffer )
+ {
+ delete [] theBuffer;
+ theBuffer = 0;
+ }
+ if( theNullBuffer )
+ {
+ delete [] theNullBuffer;
+ theNullBuffer = 0;
+ }
+
+ ossimImageDataFactory* idf = ossimImageDataFactory::instance();
+
+ theTile = idf->create( this, this );
+
+ // The width and height must be set prior to call to allocateBuffer.
+ theTile->setWidth (theImageTileWidth);
+ theTile->setHeight(theImageTileLength);
+
+ //
+ // Tiles are constructed with no buffer storage. Call initialize for
+ // "theTile" to allocate memory. Leave "theBlankTile" with a
+ // ossimDataObjectStatus of OSSIM_NULL since no data will ever be
+ // stuffed in it.
+ //
+ theTile->initialize();
+
+ return allocateBuffer();
+}
+
+
+void ossimVirtualImageHandler::setProperty( ossimRefPtr<ossimProperty> property )
+{
+ if( !property.valid() )
+ {
+ return;
+ }
+
+ ossimImageHandler::setProperty( property );
+}
+
+ossimRefPtr<ossimProperty> ossimVirtualImageHandler::getProperty( const ossimString& name )const
+{
+ if( name == "file_type" )
+ {
+ return new ossimStringProperty( name, "TIFF" );
+ }
+
+ return ossimImageHandler::getProperty( name );
+}
+
+void ossimVirtualImageHandler::getPropertyNames( std::vector<ossimString>& propertyNames )const
+{
+ ossimImageHandler::getPropertyNames( propertyNames );
+ propertyNames.push_back( "file_type" );
+}
+
+void ossimVirtualImageHandler::validateMinMax()
+{
+ double tempNull = ossim::defaultNull( theScalarType );
+ double tempMax = ossim::defaultMax ( theScalarType );
+ double tempMin = ossim::defaultMin ( theScalarType );
+
+ if( ( theMinSampleValue == tempNull ) || ossim::isnan( theMinSampleValue ) )
+ {
+ theMinSampleValue = tempMin;
+ }
+ if( ( theMaxSampleValue == tempNull ) || ossim::isnan( theMaxSampleValue ) )
+ {
+ theMaxSampleValue = tempMax;
+ }
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageTiffWriter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageTiffWriter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f6e9f707b0c7e729088fe6cf0c974b364a6a51a5
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageTiffWriter.cpp
@@ -0,0 +1,1779 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+//*******************************************************************
+// $Id: ossimVirtualImageTiffWriter.cpp 11971 2007-11-01 16:44:19Z gpotts $
+
+#include <algorithm>
+#include <sstream>
+
+#include <tiffio.h>
+#include <xtiffio.h>
+
+#include <ossim/ossimConfig.h>
+#include <ossim/init/ossimInit.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimStdOutProgress.h>
+#include <ossim/base/ossimScalarTypeLut.h>
+#include <ossim/parallel/ossimMpi.h>
+#include <ossim/parallel/ossimMpiMasterOverviewSequencer.h>
+#include <ossim/parallel/ossimMpiSlaveOverviewSequencer.h>
+#include <ossim/projection/ossimMapProjection.h>
+#include <ossim/projection/ossimProjectionFactoryRegistry.h>
+#include <ossim/support_data/ossimGeoTiff.h>
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageHandlerRegistry.h>
+#include <ossim/imaging/ossimOverviewSequencer.h>
+#include <ossim/imaging/ossimImageSourceSequencer.h>
+#include <ossim/imaging/ossimCibCadrgTileSource.h>
+#include <ossim/imaging/ossimVirtualImageTiffWriter.h>
+
+static ossimTrace traceDebug("ossimVirtualImageTiffWriter:debug");
+
+static const long DEFAULT_COMPRESS_QUALITY = 75;
+
+RTTI_DEF1( ossimVirtualImageTiffWriter, "ossimVirtualImageTiffWriter", ossimVirtualImageWriter );
+
+#ifdef OSSIM_ID_ENABLED
+static const char OSSIM_ID[] = "$Id: ossimVirtualImageTiffWriter.cpp 11971 2007-11-01 16:44:19Z gpotts $";
+#endif
+
+ossimVirtualImageTiffWriter::ossimVirtualImageTiffWriter( const ossimFilename& file,
+ ossimImageHandler* inputSource,
+ bool overviewFlag )
+ :
+ ossimVirtualImageWriter( file, inputSource, overviewFlag ),
+ theTif(0),
+ theProjectionInfo(0),
+ theCurrentFrameName(""),
+ theCurrentFrameNameTmp("")
+{
+ static const char* MODULE = "ossimVirtualImageTiffWriter::ossimVirtualImageTiffWriter";
+
+ theOutputSubdirectory = "_cache";
+ theVirtualWriterType = "ossim-virtual-tiff"; // this is fixed.
+ theMinorVersion = "1.00"; // for derived writers to set uniquely
+
+ if ( theOutputFile == ossimFilename::NIL )
+ {
+ initializeOutputFilenamFromHandler();
+ }
+ else
+ {
+ // Temporary header file used to help build Rn for n>1.
+ theOutputFileTmp = theOutputFile + ".tmp";
+ }
+
+ ossimString driveString;
+ ossimString pathString;
+ ossimString fileString;
+ ossimString extString;
+ theOutputFile.split( driveString, pathString, fileString, extString );
+
+ theOutputSubdirectory = fileString + theOutputSubdirectory;
+
+ theOutputImageType = "tiff_tiled_band_separate";
+#ifdef OSSIM_ID_ENABLED /* to quell unused variable warning. */
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)<< "OSSIM_ID: " << OSSIM_ID << endl;
+ }
+#endif
+
+ switch( theImageHandler->getOutputScalarType() )
+ {
+ case OSSIM_UINT8:
+ theBitsPerSample = 8;
+ theBytesPerPixel = 1;
+ theSampleFormat = SAMPLEFORMAT_UINT;
+ break;
+
+ case OSSIM_USHORT11:
+ case OSSIM_UINT16:
+ theBitsPerSample = 16;
+ theBytesPerPixel = 2;
+ theSampleFormat = SAMPLEFORMAT_UINT;
+ break;
+
+ case OSSIM_SINT16:
+ theBitsPerSample = 16;
+ theBytesPerPixel = 2;
+ theSampleFormat = SAMPLEFORMAT_INT;
+ break;
+
+ case OSSIM_UINT32:
+ theBitsPerSample = 32;
+ theBytesPerPixel = 4;
+ theSampleFormat = SAMPLEFORMAT_UINT;
+ break;
+
+ case OSSIM_FLOAT32:
+ theBitsPerSample = 32;
+ theBytesPerPixel = 4;
+ theSampleFormat = SAMPLEFORMAT_IEEEFP;
+ break;
+
+ case OSSIM_NORMALIZED_DOUBLE:
+ case OSSIM_FLOAT64:
+ theBitsPerSample = 64;
+ theBytesPerPixel = 8;
+ theSampleFormat = SAMPLEFORMAT_IEEEFP;
+ break;
+
+ default:
+ {
+ // Set the error...
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nUnknown pixel type: "
+ << ( ossimScalarTypeLut::instance()->getEntryString( theImageHandler->getOutputScalarType() ) )
+ << std::endl;
+
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "Unknown pixel type!",
+ __FILE__,
+ __LINE__ );
+ }
+ break;
+ }
+}
+
+ossimVirtualImageTiffWriter::~ossimVirtualImageTiffWriter()
+{
+}
+
+bool ossimVirtualImageTiffWriter::openTiff( int resLevel, int row, int col )
+{
+ static const char* MODULE = "ossimVirtualImageTiffWriter::openTiff";
+
+ if ( theTif ) // Close the existing file pointer.
+ {
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ XTIFFClose( theTif );
+# else
+ TIFFClose( theTif );
+# endif
+#else
+ TIFFClose( theTif );
+#endif
+ }
+
+ // Check for empty file name.
+ if (theOutputFile.empty())
+ {
+ return false;
+ }
+
+ ossimString driveString;
+ ossimString pathString;
+ ossimString fileString;
+ ossimString extString;
+ theOutputFile.split( driveString, pathString, fileString, extString );
+
+ // If the virtual image header filename is image.ovr, the current frame
+ // name is e.g. ./ossim-virtual-tiff/res0/row0/col0.tif
+
+ ossimFilename pathFName( pathString );
+ ossimFilename subdirFName1( "." );
+ ossimFilename subdirFName2( subdirFName1.dirCat(theOutputSubdirectory) );
+ ossimFilename subdirFName3( subdirFName2.dirCat("res") );
+ subdirFName3.append( ossimString::toString( resLevel ) );
+ ossimFilename subdirFName4( subdirFName3.dirCat("row") );
+ subdirFName4.append( ossimString::toString( row ) );
+ ossimString newPathString( pathFName.dirCat( subdirFName4 ) );
+
+ ossimFilename driveFName( driveString );
+ ossimFilename newPathFName( newPathString );
+ ossimFilename newDirFName( driveFName.dirCat( newPathFName ) );
+ newDirFName.createDirectory(true);
+
+ ossimString newFileString( "col" );
+ newFileString.append( ossimString::toString(col) );
+
+ ossimString newExtString( "tif" );
+
+ theCurrentFrameName.merge( driveString, newPathString, newFileString, newExtString );
+
+ theCurrentFrameNameTmp = theCurrentFrameName + ".tmp";
+
+ ossim_uint64 fourGigs = (static_cast<ossim_uint64>(1024)*
+ static_cast<ossim_uint64>(1024)*
+ static_cast<ossim_uint64>(1024)*
+ static_cast<ossim_uint64>(4));
+ ossimIrect bounds = theInputConnection->getBoundingRect();
+ ossim_uint64 byteCheck = (static_cast<ossim_uint64>(bounds.width())*
+ static_cast<ossim_uint64>(bounds.height())*
+ static_cast<ossim_uint64>(theInputConnection->getNumberOfOutputBands())*
+ static_cast<ossim_uint64>(ossim::scalarSizeInBytes(theInputConnection->getOutputScalarType())));
+ ossimString openMode = "w";
+ if( (byteCheck * static_cast<ossim_uint64>(2)) > fourGigs )
+ {
+ openMode += "8";
+ }
+
+ //---
+ // See if the file can be opened for writing.
+ // Note: If this file existed previously it will be overwritten.
+ //---
+
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ theTif = XTIFFOpen( theCurrentFrameNameTmp, openMode );
+# else
+ theTif = TIFFOpen( theCurrentFrameNameTmp, openMode );
+# endif
+#else
+ theTif = TIFFOpen( theCurrentFrameNameTmp, openMode );
+#endif
+
+ if ( !theTif )
+ {
+ setErrorStatus(); // base class
+ ossimSetError( getClassName().c_str(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "File %s line %d Module %s Error:\n Error opening file: %s\n",
+ __FILE__,
+ __LINE__,
+ MODULE,
+ theCurrentFrameNameTmp.c_str() );
+
+ return false;
+ }
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::closeTiff()
+{
+ if ( theTif )
+ {
+#ifdef OSSIM_HAS_GEOTIFF
+# if OSSIM_HAS_GEOTIFF
+ XTIFFClose( theTif );
+# else
+ TIFFClose( theTif );
+# endif
+#else
+ TIFFClose( theTif );
+#endif
+ theTif = 0;
+ }
+
+ return true;
+}
+
+// Flush the currently open tiff file
+void ossimVirtualImageTiffWriter::flushTiff()
+{
+ if(theTif)
+ {
+ TIFFFlush(theTif);
+ }
+}
+
+// Rename the currently open tiff file
+void ossimVirtualImageTiffWriter::renameTiff()
+{
+ theCurrentFrameNameTmp.rename( theCurrentFrameName );
+ if(traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_INFO)
+ << "Wrote file: " << theCurrentFrameName.c_str() << std::endl;
+ }
+}
+
+ossimIpt ossimVirtualImageTiffWriter::getOutputTileSize()const
+{
+ return theOutputTileSize;
+}
+
+void ossimVirtualImageTiffWriter::setOutputTileSize( const ossimIpt& tileSize )
+{
+ if ( (tileSize.x % 16) || (tileSize.y % 16) )
+ {
+ if(traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageTiffWriter::changeTileSize ERROR:"
+ << "\nTile size must be a multiple of 32!"
+ << "\nSize remains: " << theOutputTileSize
+ << std::endl;
+ }
+ return;
+ }
+
+ ossimVirtualImageWriter::setOutputTileSize( tileSize );
+}
+
+void ossimVirtualImageTiffWriter::setCompressionType( const ossimString& type )
+{
+ if( type == "jpeg" )
+ {
+ theCompressType = COMPRESSION_JPEG;
+ }
+ else
+ if( type == "lzw" )
+ {
+ theCompressType = COMPRESSION_LZW;
+ }
+ else
+ if( type == "deflate" )
+ {
+ theCompressType = COMPRESSION_DEFLATE;
+ }
+ else
+ if( type == "packbits" )
+ {
+ theCompressType = COMPRESSION_PACKBITS;
+ }
+ else
+ {
+ theCompressType = COMPRESSION_NONE;
+ if (traceDebug())
+ {
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_WARNING,
+ "ossimVirtualImageTiffWriter::setCompressionType\nfile %s line %d\n\
+ Unsupported compression type: %d Defaulting to none.",
+ __FILE__,
+ __LINE__,
+ theCompressType );
+ }
+ }
+}
+
+void ossimVirtualImageTiffWriter::setCompressionQuality( ossim_int32 quality )
+{
+ if ( quality > 1 && quality < 101 )
+ {
+ theCompressQuality = quality;
+ }
+ else
+ {
+ theCompressQuality = DEFAULT_COMPRESS_QUALITY;
+
+ if (traceDebug())
+ {
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_WARNING,
+ "\
+ ossimVirtualImageTiffWriter::setCompressionQuality\n%s file %s \
+ line %d Compression quality of %d is out of range!\nis out of range!\n\
+ Range is 100 to 1. Current quality set to default of 75.",
+ __FILE__,
+ __LINE__,
+ quality );
+ }
+ }
+}
+
+ossimString ossimVirtualImageTiffWriter::getOverviewType(
+ ossimFilterResampler::ossimFilterResamplerType resamplerType )
+{
+ ossimString overviewType("unknown");
+
+ if ( resamplerType == ossimFilterResampler::ossimFilterResampler_NEAREST_NEIGHBOR )
+ {
+ overviewType = "ossim_virtual_tiff_nearest";
+ }
+ else
+ {
+ overviewType = "ossim_virtual_tiff_box";
+ }
+
+ return overviewType;
+}
+
+ossimFilterResampler::ossimFilterResamplerType
+ ossimVirtualImageTiffWriter::getResamplerType( const ossimString& type )
+{
+ ossimFilterResampler::ossimFilterResamplerType resamplerType =
+ ossimFilterResampler::ossimFilterResampler_NEAREST_NEIGHBOR;
+
+ if (type == "ossim_virtual_tiff_nearest")
+ {
+ resamplerType =
+ ossimFilterResampler::ossimFilterResampler_NEAREST_NEIGHBOR;
+
+ }
+ else
+ if (type == "ossim_virtual_tiff_box")
+ {
+ resamplerType = ossimFilterResampler::ossimFilterResampler_BOX;
+ }
+
+ return resamplerType;
+}
+
+bool ossimVirtualImageTiffWriter::isOverviewTypeHandled( const ossimString& type )
+{
+ bool bIsHandled = false;
+ if (type == "ossim_virtual_tiff_nearest")
+ {
+ bIsHandled = true;
+ }
+ else
+ if (type == "ossim_virtual_tiff_box")
+ {
+ bIsHandled = true;
+ }
+
+ return bIsHandled;
+}
+
+void ossimVirtualImageTiffWriter::getTypeNameList(
+ std::vector<ossimString>& typeList )
+{
+ typeList.push_back( ossimString("ossim_virtual_tiff_box") );
+ typeList.push_back( ossimString("ossim_virtual_tiff_nearest") );
+}
+
+bool ossimVirtualImageTiffWriter::writeR0Partial()
+{
+ static const char MODULE[] = "ossimVirtualImageBuilder::writeR0Partial";
+
+ ossim_int32 numberOfFrames = getNumberOfBuiltFrames( 0, true ); // Frames per image
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame();
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nresolution level : " << 0
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ setProcessStatus(ossimProcessInterface::PROCESS_STATUS_EXECUTING);
+ setPercentComplete(0.0);
+
+ setCurrentMessage(ossimString("Copying r0..."));
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+ bool bIsFrameAlreadyDone = false;
+
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid() )
+ {
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ ossim_int32 yRangeMin = pInfo->yRangeMin[0];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[0];
+ for( iF = yRangeMin; iF <= yRangeMax; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ ossim_int32 xRangeMin = pInfo->xRangeMin[0];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[0];
+ for( jF = xRangeMin; jF <= xRangeMax; ++jF )
+ {
+ // Add check here to see if (jF,iF) has already been processed for
+ // a previous input frame in the queue.
+ bIsFrameAlreadyDone = isFrameAlreadyDone( idxQ, 0, jF, iF );
+
+ if ( bIsFrameAlreadyDone == false )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ ossim_int32 tileNumber = 0;
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // Origin of a tile with respect to the entire image.
+ ossimIpt originT(originI);
+ originT += originF;
+
+ ossimRefPtr<ossimImageData> t =
+ theImageHandler->getTile( ossimIrect( originT.x,
+ originT.y,
+ originT.x + (theOutputTileSize.x-1),
+ originT.y + (theOutputTileSize.y-1) ) );
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( 0, iF, jF );
+
+ ossimIrect rect( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x-1,
+ originI.y + theOutputFrameSize.y-1 );
+
+ if ( !setTags( 0, rect ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ return false;
+ }
+ if ( 1 )
+ {
+ ossimDrect areaOfInterest(rect);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection,
+ areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+ else
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ ossimIptList.push_back( originF );
+ }
+
+ ++tileNumber;
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // is frame already done check
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ return true;
+ }
+ else
+ if ( bIsFrameAlreadyDone == false )
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ } // End of pInfo NULL check
+
+ } // End of queue loop
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::writeR0Full()
+{
+ static const char MODULE[] = "ossimVirtualImageBuilder::writeR0Full";
+
+ ossimIpt framesPerImage = getNumberOfOutputFrames();
+ ossim_int32 framesWide = framesPerImage.x;
+ ossim_int32 framesHigh = framesPerImage.y;
+ ossim_int32 numberOfFrames = framesWide * framesHigh; // Frames per image
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame();
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (horz) : " << framesWide
+ << "\nframes per image (vert) : " << framesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ setProcessStatus(ossimProcessInterface::PROCESS_STATUS_EXECUTING);
+ setPercentComplete(0.0);
+
+ setCurrentMessage(ossimString("Copying r0..."));
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ for( iF = 0; iF < framesHigh; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ for( jF = 0; jF < framesWide; ++jF )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ ossim_int32 tileNumber = 0;
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // Origin of a tile with respect to the entire image.
+ ossimIpt originT(originI);
+ originT += originF;
+
+ ossimRefPtr<ossimImageData> t =
+ theImageHandler->getTile( ossimIrect( originT.x,
+ originT.y,
+ originT.x + (theOutputTileSize.x-1),
+ originT.y + (theOutputTileSize.y-1) ) );
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( 0, iF, jF );
+
+ ossimIrect rect( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x-1,
+ originI.y + theOutputFrameSize.y-1 );
+
+ if ( !setTags( 0, rect ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ return false;
+ }
+ if ( 1 )
+ {
+ ossimDrect areaOfInterest(rect);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection, areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+ else
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ ossimIptList.push_back( originF );
+ }
+
+ ++tileNumber;
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Write the tile.
+ int bytesWritten = 0;
+ bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ break;
+ }
+ else
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::writeRnPartial( ossim_uint32 resLevel )
+{
+ static const char MODULE[] = "ossimVirtualImageTiffWriter::writeRnPartial";
+
+ if ( resLevel == 0 )
+ {
+ return false;
+ }
+
+ ossimRefPtr<ossimImageHandler> imageHandler;
+
+ //---
+ // If we copied r0 to the virtual image use it instead of the
+ // original image handler as it is probably faster.
+ //---
+ if ( resLevel <= theImageHandler->getNumberOfDecimationLevels() )
+ {
+ imageHandler = theImageHandler.get();
+ }
+ else
+ {
+ imageHandler = ossimImageHandlerRegistry::instance()->open( theOutputFileTmp );
+ if ( !imageHandler.valid() )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_OPEN_FILE_ERROR,
+ "%s file %s line %d\nCannot open file: %s",
+ MODULE,
+ __FILE__,
+ __LINE__,
+ theOutputFileTmp.c_str() );
+ return false;
+ }
+ }
+
+ // If the image handler was created in this member function,
+ // make sure we delete it on return.
+ bool bLocalImageHandler = (theImageHandler.get() != imageHandler.get());
+
+ //---
+ // Set up the sequencer. This will be one of three depending on if we're
+ // running mpi and if we are a master process or a slave process.
+ //---
+ ossimRefPtr<ossimOverviewSequencer> sequencer;
+
+ if( ossimMpi::instance()->getNumberOfProcessors() > 1 )
+ {
+ if ( ossimMpi::instance()->getRank() == 0 )
+ {
+ sequencer = new ossimMpiMasterOverviewSequencer();
+ }
+ else
+ {
+ sequencer = new ossimMpiSlaveOverviewSequencer();
+ }
+ }
+ else
+ {
+ sequencer = new ossimOverviewSequencer();
+ }
+
+ sequencer->setImageHandler( imageHandler.get() );
+
+ //---
+ // If the source image had built in overviews then we must subtract from the
+ // resLevel given to the sequencer or it will get the wrong image rectangle
+ // for the area of interest.
+ //---
+ ossim_uint32 sourceResLevel = ( bLocalImageHandler == false ) ?
+ resLevel - 1 :
+ resLevel - theImageHandler->getNumberOfDecimationLevels();
+
+ sequencer->setSourceLevel( sourceResLevel );
+ sequencer->setResampleType( theResampleType );
+ sequencer->setTileSize( ossimIpt( theOutputTileSize.x, theOutputTileSize.y ) );
+ sequencer->initialize();
+
+ // If we are a slave process start the resampling of tiles.
+ if ( ossimMpi::instance()->getRank() != 0 )
+ {
+ sequencer->slaveProcessTiles();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return true;
+ }
+
+ //---
+ // The rest of the method on master node only.
+ //---
+
+ setProcessStatus( ossimProcessInterface::PROCESS_STATUS_EXECUTING );
+ setPercentComplete( 0.0 );
+
+ ostringstream os;
+ os << "creating r" << resLevel << "...";
+ setCurrentMessage( os.str() );
+
+ ossim_int32 numberOfFrames = getNumberOfBuiltFrames( resLevel, true ); // partial build
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame(); // resLevel independent
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ ossimIpt tilesPerImage = getNumberOfOutputTiles( resLevel ); // assumes full build
+ ossim_int32 tilesWideAcrossImage = tilesPerImage.x;
+ ossim_int32 tilesHighAcrossImage = tilesPerImage.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nresolution level : " << resLevel
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+ bool bIsFrameAlreadyDone = false;
+
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid(resLevel) )
+ {
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ ossim_int32 yRangeMin = pInfo->yRangeMin[resLevel];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[resLevel];
+ for( iF = yRangeMin; iF <= yRangeMax; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ ossim_int32 xRangeMin = pInfo->xRangeMin[resLevel];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[resLevel];
+ for( jF = xRangeMin; jF <= xRangeMax; ++jF )
+ {
+ // Add check here to see if (jF,iF) has already been processed for
+ // a previous input frame in the queue for this resolution level.
+ bIsFrameAlreadyDone = isFrameAlreadyDone( idxQ, resLevel, jF, iF );
+
+ if ( bIsFrameAlreadyDone == false )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // tile index with respect to the image at resLevel
+ ossim_int32 iI = iF * tilesHigh + iT;
+ ossim_int32 jI = jF * tilesWide + jT;
+
+ ossim_uint32 tileNumber = -1;
+ ossimRefPtr<ossimImageData> t;
+ bool bWritingImageData = false;
+ if ( iI < tilesHighAcrossImage && jI < tilesWideAcrossImage )
+ {
+ tileNumber = iI * tilesWideAcrossImage + jI;
+
+ // Grab the resampled tile.
+ sequencer->setCurrentTileNumber( tileNumber );
+ t = sequencer->getNextTile();
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ bWritingImageData = true;
+
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( resLevel, iF, jF );
+
+ ossimIrect bounding_area( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x - 1,
+ originI.y + theOutputFrameSize.y - 1 );
+
+ if ( !setTags( resLevel, bounding_area ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ if ( 1 )
+ {
+ ossim_uint32 pixelSizeScale = (ossim_uint32)(1<<resLevel);
+
+ // Rescale pixel size based on the resolution level.
+ ossimDpt degPerPix = theInputMapProjection->getDecimalDegreesPerPixel();
+ ossimDpt degPerPixScaled = degPerPix * pixelSizeScale;
+
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPixScaled );
+
+ ossimDrect areaOfInterest(bounding_area);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection,
+ areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+
+ // reset to resLevel 0 value
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPix );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+ }
+ else
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ if ( bWritingImageData == false )
+ {
+ ossimIptList.push_back( originF );
+ }
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // is output frame already done check
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return true;
+ }
+ else
+ if ( bIsFrameAlreadyDone == false )
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ } // End of pInfo NULL check
+
+ } // End of queue loop
+
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::writeRnFull( ossim_uint32 resLevel )
+{
+ static const char MODULE[] = "ossimVirtualImageTiffWriter::writeRnFull";
+
+ if ( resLevel == 0 )
+ {
+ return false;
+ }
+
+ ossimRefPtr<ossimImageHandler> imageHandler;
+
+ //---
+ // If we copied r0 to the virtual image use it instead of the
+ // original image handler as it is probably faster.
+ //---
+ if ( resLevel <= theImageHandler->getNumberOfDecimationLevels() )
+ {
+ imageHandler = theImageHandler.get();
+ }
+ else
+ {
+ imageHandler = ossimImageHandlerRegistry::instance()->open( theOutputFileTmp );
+ if ( !imageHandler.valid() )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_OPEN_FILE_ERROR,
+ "%s file %s line %d\nCannot open file: %s",
+ MODULE,
+ __FILE__,
+ __LINE__,
+ theOutputFileTmp.c_str() );
+ return false;
+ }
+ }
+
+ // If the image handler was created in this member function,
+ // make sure we delete it on return.
+ bool bLocalImageHandler = (theImageHandler.get() != imageHandler.get());
+
+ //---
+ // Set up the sequencer. This will be one of three depending on if we're
+ // running mpi and if we are a master process or a slave process.
+ //---
+ ossimRefPtr<ossimOverviewSequencer> sequencer;
+
+ if( ossimMpi::instance()->getNumberOfProcessors() > 1 )
+ {
+ if ( ossimMpi::instance()->getRank() == 0 )
+ {
+ sequencer = new ossimMpiMasterOverviewSequencer();
+ }
+ else
+ {
+ sequencer = new ossimMpiSlaveOverviewSequencer();
+ }
+ }
+ else
+ {
+ sequencer = new ossimOverviewSequencer();
+ }
+
+ sequencer->setImageHandler( imageHandler.get() );
+
+ //---
+ // If the source image had built in overviews then we must subtract from the
+ // resLevel given to the sequencer or it will get the wrong image rectangle
+ // for the area of interest.
+ //---
+ ossim_uint32 sourceResLevel = ( bLocalImageHandler == false ) ?
+ resLevel - 1 :
+ resLevel - theImageHandler->getNumberOfDecimationLevels();
+
+ sequencer->setSourceLevel( sourceResLevel );
+ sequencer->setResampleType( theResampleType );
+ sequencer->setTileSize( ossimIpt( theOutputTileSize.x, theOutputTileSize.y ) );
+ sequencer->initialize();
+
+ // If we are a slave process start the resampling of tiles.
+ if ( ossimMpi::instance()->getRank() != 0 )
+ {
+ sequencer->slaveProcessTiles();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return true;
+ }
+
+ //---
+ // The rest of the method on master node only.
+ //---
+
+ setProcessStatus( ossimProcessInterface::PROCESS_STATUS_EXECUTING );
+ setPercentComplete( 0.0 );
+
+ ostringstream os;
+ os << "creating r" << resLevel << "...";
+ setCurrentMessage( os.str() );
+
+ ossimIpt framesPerImage = getNumberOfOutputFrames( resLevel ); // full build
+ ossim_int32 framesWide = framesPerImage.x;
+ ossim_int32 framesHigh = framesPerImage.y;
+ ossim_int32 numberOfFrames = framesWide * framesHigh; // Frames per image
+
+ ossimIpt tilesPerFrame = getNumberOfTilesPerOutputFrame(); // resLevel independent
+ ossim_int32 tilesWide = tilesPerFrame.x;
+ ossim_int32 tilesHigh = tilesPerFrame.y;
+
+ ossimIpt tilesPerImage = getNumberOfOutputTiles( resLevel ); // assumes full build
+ ossim_int32 tilesWideAcrossImage = tilesPerImage.x;
+ ossim_int32 tilesHighAcrossImage = tilesPerImage.y;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nresolution level : " << resLevel
+ << "\ntiles per frame (horz) : " << tilesWide
+ << "\ntiles per frame (vert) : " << tilesHigh
+ << "\nframes per image (horz) : " << framesWide
+ << "\nframes per image (vert) : " << framesHigh
+ << "\nframes per image (total): " << numberOfFrames
+ << std::endl;
+ }
+
+ ossim_int32 frameNumber = 0;
+ std::vector<ossimIpt> ossimIptList;
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ for( iF = 0; iF < framesHigh; ++iF )
+ {
+ // Origin of a frame with respect to the entire image.
+ ossimIpt originI(0, 0);
+ originI.y = iF * theOutputFrameSize.y;
+
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ for( jF = 0; jF < framesWide; ++jF )
+ {
+ originI.x = jF * theOutputFrameSize.x;
+
+ // Only create an output image frame if data is found
+ // in the input image to write to it. E.g. if the input image
+ // is RPF, there can be missing input frames.
+ bool bCreatedFrame = false;
+
+ ossimIptList.clear();
+
+ //***
+ // Tile loop in the line direction.
+ //***
+ ossim_int32 iT;
+ for( iT = 0; iT < tilesHigh; ++iT )
+ {
+ // Origin of a tile within a single output frame.
+ ossimIpt originF(0, 0);
+ originF.y = iT * theOutputTileSize.y;
+
+ //***
+ // Tile loop in the sample (width) direction.
+ //***
+ ossim_int32 jT;
+ for( jT = 0; jT < tilesWide; ++jT )
+ {
+ originF.x = jT * theOutputTileSize.x;
+
+ // tile index with respect to the image at resLevel
+ ossim_int32 iI = iF * tilesHigh + iT;
+ ossim_int32 jI = jF * tilesWide + jT;
+
+ ossim_uint32 tileNumber = -1;
+ ossimRefPtr<ossimImageData> t;
+ bool bWritingImageData = false;
+ if ( iI < tilesHighAcrossImage && jI < tilesWideAcrossImage )
+ {
+ tileNumber = iI * tilesWideAcrossImage + jI;
+
+ // Grab the resampled tile.
+ sequencer->setCurrentTileNumber( tileNumber );
+ t = sequencer->getNextTile();
+
+ ossimDataObjectStatus doStatus = t->getDataObjectStatus();
+ if ( t.valid() &&
+ (doStatus == OSSIM_PARTIAL || doStatus == OSSIM_FULL) )
+ {
+ bWritingImageData = true;
+
+ if ( bCreatedFrame == false )
+ {
+ // Open a single frame file.
+ openTiff( resLevel, iF, jF );
+
+ ossimIrect bounding_area( originI.x,
+ originI.y,
+ originI.x + theOutputFrameSize.x - 1,
+ originI.y + theOutputFrameSize.y - 1 );
+
+ if ( !setTags( resLevel, bounding_area ) )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nError writing tags!" << std::endl;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ if ( 1 )
+ {
+ ossim_uint32 pixelSizeScale = (ossim_uint32)(1<<resLevel);
+
+ // Rescale pixel size based on the resolution level.
+ ossimDpt degPerPix = theInputMapProjection->getDecimalDegreesPerPixel();
+ ossimDpt degPerPixScaled = degPerPix * pixelSizeScale;
+
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPixScaled );
+
+ ossimDrect areaOfInterest(bounding_area);
+ ossimRefPtr<ossimMapProjectionInfo> projInfo =
+ new ossimMapProjectionInfo( theInputMapProjection,
+ areaOfInterest );
+ ossimGeoTiff::writeTags( theTif, projInfo );
+
+ // reset to resLevel 0 value
+ theInputMapProjection->setDecimalDegreesPerPixel( degPerPix );
+ }
+
+ bCreatedFrame = true;
+ }
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ // Grab a pointer to the tile for the band.
+ tdata_t data = static_cast<tdata_t>(t->getBuf(band));
+
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+ }
+ else
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nNo data found for tiff tile: " << tileNumber
+ << " of frame: " << frameNumber
+ << std::endl;
+ }
+
+ if ( bWritingImageData == false )
+ {
+ ossimIptList.push_back( originF );
+ }
+
+ } // End of tile loop in the sample (width) direction.
+
+ } // End of tile loop in the line (height) direction.
+
+ // Write NULL data into partially occupied output frame.
+ if ( bCreatedFrame == true )
+ {
+ tdata_t data = static_cast<tdata_t>(&(theNullDataBuffer.front()));
+ ossim_uint32 numIpts = (ossim_uint32)ossimIptList.size();
+ ossim_uint32 i;
+ for ( i=0; i<numIpts; ++i )
+ {
+ ossimIpt originF = ossimIptList[i];
+
+ uint32 band;
+ for ( band=0; band<theImageHandler->getNumberOfInputBands(); ++band )
+ {
+ int bytesWritten = TIFFWriteTile( theTif,
+ data,
+ originF.x,
+ originF.y,
+ 0, // z
+ band ); // sample
+
+ if ( bytesWritten != theTileSizeInBytes )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError returned writing tiff frame: " << frameNumber
+ << "\nExpected bytes written: " << theTileSizeInBytes
+ << "\nBytes written: " << bytesWritten
+ << std::endl;
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ closeTiff();
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+ return false;
+ }
+ }
+ }
+
+ // Close and rename the new frame file.
+ closeTiff();
+ renameTiff();
+ }
+
+ ++frameNumber;
+
+ } // End of frame loop in the sample (width) direction.
+
+ if (needsAborting())
+ {
+ setPercentComplete(100.0);
+ break;
+ }
+ else
+ {
+ double frame = frameNumber;
+ setPercentComplete(frame / numberOfFrames * 100.0);
+ }
+
+ } // End of frame loop in the line (height) direction.
+
+ if ( bLocalImageHandler == true )
+ {
+ imageHandler = 0;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::setTags( ossim_int32 resLevel,
+ const ossimIrect& outputRect ) const
+{
+ if ( theTif == 0 )
+ {
+ return false;
+ }
+
+ int16 samplesPerPixel = theImageHandler->getNumberOfOutputBands();
+ ossim_float64 minSampleValue = theImageHandler->getMinPixelValue();
+ ossim_float64 maxSampleValue = theImageHandler->getMaxPixelValue();
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageBuilder::setTags DEBUG:"
+ << "\nrrds_level: " << resLevel
+ << "\nminSampleValue: " << minSampleValue
+ << "\nmaxSampleValue: " << maxSampleValue
+ << std::endl;
+ }
+
+ TIFFSetField( theTif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_SEPARATE );
+ TIFFSetField( theTif, TIFFTAG_IMAGEWIDTH, theOutputFrameSize.x );
+ TIFFSetField( theTif, TIFFTAG_IMAGELENGTH, theOutputFrameSize.y );
+ TIFFSetField( theTif, TIFFTAG_BITSPERSAMPLE, theBitsPerSample );
+ TIFFSetField( theTif, TIFFTAG_SAMPLEFORMAT, theSampleFormat );
+ TIFFSetField( theTif, TIFFTAG_SAMPLESPERPIXEL, samplesPerPixel );
+
+ if( theImageHandler->getNumberOfInputBands() == 3 )
+ TIFFSetField( theTif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB );
+ else
+ TIFFSetField( theTif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK );
+
+ TIFFSetField( theTif, TIFFTAG_TILEWIDTH, theOutputTileSize.x );
+ TIFFSetField( theTif, TIFFTAG_TILELENGTH, theOutputTileSize.y );
+
+ // Set the compression related tags...
+ TIFFSetField( theTif, TIFFTAG_COMPRESSION, theCompressType );
+ if ( theCompressType == COMPRESSION_JPEG )
+ {
+ TIFFSetField( theTif, TIFFTAG_JPEGQUALITY, theCompressQuality );
+ }
+
+ // Set the min/max values.
+ switch( theImageHandler->getOutputScalarType() )
+ {
+ case OSSIM_SINT16:
+ case OSSIM_FLOAT32:
+ case OSSIM_FLOAT64:
+ case OSSIM_NORMALIZED_DOUBLE:
+ TIFFSetField( theTif, TIFFTAG_SMINSAMPLEVALUE, minSampleValue );
+ TIFFSetField( theTif, TIFFTAG_SMAXSAMPLEVALUE, maxSampleValue );
+ break;
+
+ case OSSIM_UINT8:
+ case OSSIM_USHORT11:
+ case OSSIM_UINT16:
+ case OSSIM_UINT32:
+ default:
+ TIFFSetField( theTif, TIFFTAG_MINSAMPLEVALUE, static_cast<int>(minSampleValue) );
+ TIFFSetField( theTif, TIFFTAG_MAXSAMPLEVALUE, static_cast<int>(maxSampleValue) );
+ break;
+ }
+
+ return true;
+}
+
+bool ossimVirtualImageTiffWriter::initializeOutputFilenamFromHandler()
+{
+ if ( !theImageHandler )
+ {
+ return false;
+ }
+
+ // Set the output filename to a default.
+ theOutputFile = theImageHandler->getFilename();
+ if( theImageHandler->getNumberOfEntries() > 1 )
+ {
+ ossim_uint32 currentEntry = theImageHandler->getCurrentEntry();
+ theOutputFile.setExtension( "" );
+ theOutputFile += "_e";
+ theOutputFile += ossimString::toString( currentEntry );
+
+ // .ovr: file extension for all overview files in OSSIM.
+ // .ovi: "ossim virtual image" for non-overview output images.
+ theOutputFile += theOverviewFlag ? ".ovr" : "ovi";
+ }
+ else
+ {
+ // .ovr: file extension for all overview files in OSSIM.
+ // .ovi: "ossim virtual image" for non-overview output images.
+ theOutputFile.setExtension( theOverviewFlag ? ".ovr" : "ovi" );
+ }
+
+ if ( theOutputFile == theImageHandler->getFilename() )
+ {
+ // Don't allow this.
+ theOutputFile = ossimFilename::NIL;
+ }
+
+ // Temporary header file used to help build Rn for n>1.
+ theOutputFileTmp = theOutputFile + ".tmp";
+
+ if ( theOutputFile.empty() )
+ {
+ return false;
+ }
+
+ return true;
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageWriter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageWriter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bead02b7894fdcfcebce1a4b81e76b2020d25295
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualImageWriter.cpp
@@ -0,0 +1,1300 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class declaration for ossimVirtualImageWriter.
+//*******************************************************************
+// $Id: ossimVirtualImageWriter.cpp 13312 2008-07-27 01:26:52Z gpotts $
+
+#include <ossim/ossimConfig.h>
+#include <ossim/base/ossimKeywordlist.h>
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimKeywordNames.h>
+#include <ossim/base/ossimErrorContext.h>
+#include <ossim/base/ossimImageTypeLut.h>
+#include <ossim/base/ossimUnitTypeLut.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimStdOutProgress.h>
+#include <ossim/parallel/ossimMpi.h>
+#include <ossim/projection/ossimMapProjection.h>
+#include <ossim/projection/ossimMapProjectionInfo.h>
+#include <ossim/projection/ossimProjectionFactoryRegistry.h>
+#include <ossim/imaging/ossimScalarRemapper.h>
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageHandlerRegistry.h>
+#include <ossim/imaging/ossimImageSourceSequencer.h>
+#include <ossim/imaging/ossimCibCadrgTileSource.h>
+#include <ossim/imaging/ossimVirtualImageHandler.h>
+#include <ossim/imaging/ossimVirtualImageWriter.h>
+#include <ossim/support_data/ossimRpfToc.h>
+#include <ossim/support_data/ossimRpfTocEntry.h>
+
+static ossimTrace traceDebug("ossimVirtualImageWriter:debug");
+
+#if OSSIM_ID_ENABLED
+static const char OSSIM_ID[] = "$Id: ossimVirtualImageWriter.cpp 13312 2008-07-27 01:26:52Z gpotts $";
+#endif
+
+RTTI_DEF3( ossimVirtualImageWriter,
+ "ossimVirtualImageWriter",
+ ossimOutputSource,
+ ossimProcessInterface,
+ ossimConnectableObjectListener )
+
+ossimVirtualImageWriter::ossimVirtualImageWriter( const ossimFilename& file,
+ ossimImageHandler* inputSource,
+ bool overviewFlag )
+ : ossimOutputSource(0,
+ 1,
+ 0,
+ true,
+ true),
+ theOutputFile(file),
+ theOutputFileTmp(""),
+ theOutputSubdirectory("unknown"),
+ theVirtualWriterType("unknown"),
+ theOutputImageType(ossimImageTypeLut().getEntryString(OSSIM_IMAGE_TYPE_UNKNOWN)),
+ theMajorVersion("1.00"), // for the ossimVirtualImageWriter class only
+ theMinorVersion("0.00"), // for derived writers to set uniquely
+ theCompressType(1),
+ theCompressQuality(75),
+ theOutputTileSize(OSSIM_DEFAULT_TILE_WIDTH, OSSIM_DEFAULT_TILE_HEIGHT),
+ theOutputFrameSize(OSSIM_DEFAULT_FRAME_WIDTH, OSSIM_DEFAULT_FRAME_HEIGHT),
+ theInputFrameSize(OSSIM_DEFAULT_FRAME_WIDTH, OSSIM_DEFAULT_FRAME_HEIGHT),
+ theBytesPerPixel(0),
+ theBitsPerSample(0),
+ theSampleFormat(0),
+ theTileSizeInBytes(0),
+ theNullDataBuffer(0),
+ theProgressListener(0),
+ theCopyAllFlag(false),
+ theLimitedScopeUpdateFlag(false),
+ theOverviewFlag(overviewFlag),
+ theCurrentEntry(0),
+ theInputMapProjection(0),
+ theDirtyFrameList(0),
+ theInputFrameInfoList(0),
+ theInputFrameInfoQueue(0),
+ theResampleType(ossimFilterResampler::ossimFilterResampler_BOX),
+ theImageHandler(0),
+ theInputConnection(0),
+ theInputGeometry(0),
+ theInputProjection(0),
+ theAreaOfInterest(0,0,0,0)
+{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualImageWriter::ossimVirtualImageWriter entered..."
+ << std::endl;
+ }
+
+ ossim::defaultTileSize( theOutputTileSize );
+
+ theImageHandler = inputSource;
+ theInputConnection = new ossimImageSourceSequencer(
+ static_cast<ossimImageSource*>( inputSource ) );
+ theInputGeometry = theImageHandler.valid() ? theImageHandler->getImageGeometry() : 0;
+ theInputProjection = theInputGeometry.valid() ? theInputGeometry->getProjection() : 0;
+
+ // Retrieve the map projection object from the input image.
+ theInputMapProjection = theInputProjection.valid() ?
+ PTR_CAST( ossimMapProjection, theInputProjection.get() ) : 0;
+
+ // The current entry of the input image handler stays the same
+ // throughout the lifetime of this virtual image writer.
+ theCurrentEntry = theImageHandler->getCurrentEntry();
+
+ // now map the sequencer to the same input
+ connectMyInputTo(0, inputSource);
+ initialize();
+
+ theInputConnection->connectMyInputTo( 0, inputSource, false );
+ theAreaOfInterest.makeNan();
+
+ //---
+ // Check for a listeners. If the list is empty, add a standard out
+ // listener so that command line apps like img2rr will get some
+ // progress.
+ //---
+ if (theListenerList.empty())
+ {
+ theProgressListener = new ossimStdOutProgress( 0, true );
+ addListener( theProgressListener );
+ setCurrentMessage(ossimString( "Starting virtual image write...") );
+ }
+
+ // See if the input image format is RPF. If it is, do some config.
+ ossimCibCadrgTileSource* pRpf = PTR_CAST( ossimCibCadrgTileSource, theImageHandler.get() );
+ if ( pRpf != NULL )
+ {
+ theInputFrameSize.x = ossimCibCadrgTileSource::CIBCADRG_FRAME_WIDTH;
+ theInputFrameSize.y = ossimCibCadrgTileSource::CIBCADRG_FRAME_HEIGHT;
+
+ // Collect the frame file names of RPF image
+ int nFramesFound = 0;
+
+ const ossimRpfToc* pRpfToc = pRpf->getToc();
+
+ // Number of directories of images
+ unsigned long nEntries = pRpfToc->getNumberOfEntries();
+ ossim_uint32 iE;
+ for ( iE=0; iE<nEntries; ++iE )
+ {
+ // Retrieve directory info
+ const ossimRpfTocEntry* pEntry = pRpfToc->getTocEntry( iE );
+ if ( pEntry != NULL )
+ {
+ ossim_uint32 nRows = pEntry->getNumberOfFramesVertical();
+ ossim_uint32 nCols = pEntry->getNumberOfFramesHorizontal();
+
+ ossim_uint32 iV,iH;
+ for ( iV=0; iV<nRows; ++iV )
+ {
+ for ( iH=0; iH<nCols; ++iH )
+ {
+ ossimRpfFrameEntry frameEntry;
+ bool bResult = pEntry->getEntry( iV, iH, frameEntry );
+ if ( bResult == true )
+ {
+ ossimString framePath = frameEntry.getPathToFrameFileFromRoot();
+ if ( framePath.length() > 0 )
+ {
+ InputFrameInfo* info = new InputFrameInfo();
+ if ( info != 0 )
+ {
+ info->name = framePath;
+ info->entry = iE;
+ info->row = iV;
+ info->col = iH;
+
+ theInputFrameInfoList.push_back( info );
+ }
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Frame file(" << ++nFramesFound << "): "
+ << framePath
+ << " (entry: " << iE << ", row: " << iV << ", col: " << iH << ")"
+ << std::endl;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+ossimVirtualImageWriter::~ossimVirtualImageWriter()
+{
+ int numFrames = (int)theInputFrameInfoList.size();
+ int i;
+ for ( i=0; i<numFrames; ++i )
+ {
+ InputFrameInfo* info = theInputFrameInfoList[i];
+ if ( info != 0 )
+ {
+ delete info;
+ }
+ }
+ theInputFrameInfoList.clear();
+
+ theInputConnection = 0;
+ theInputGeometry = 0;
+ theInputProjection = 0;
+
+ if ( theProgressListener )
+ {
+ setCurrentMessage( ossimString("Finished virtual image write...") );
+ removeListener( theProgressListener );
+ delete theProgressListener;
+ theProgressListener = 0;
+ }
+}
+
+void ossimVirtualImageWriter::initialize()
+{
+ if( theInputConnection.valid() )
+ {
+ theInputConnection->initialize();
+ setAreaOfInterest( theInputConnection->getBoundingRect() );
+ }
+}
+
+InputFrameInfo* ossimVirtualImageWriter::getInputFrameInfo( ossimFilename name ) const
+{
+ static const char MODULE[] = "ossimVirtualImageWriter::getInputFrameInfo";
+
+ // First test: do an unfiltered name compare to find the InputFrameInfo.
+ int numFrames = (int)theInputFrameInfoList.size();
+ int i;
+ for ( i=0; i<numFrames; ++i )
+ {
+ InputFrameInfo* info = theInputFrameInfoList[i];
+ if ( info != 0 )
+ {
+ if ( (theCurrentEntry == info->entry) &&
+ (name == info->name) )
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nRPF frame found: " << name
+ << " using full unfiltered name compare:"
+ << " info->entry=" << info->entry
+ << " info->row=" << info->row
+ << " info->col=" << info->col
+ << std::endl;
+ }
+
+ return info;
+ }
+ }
+ }
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nRPF frame not found: " << name
+ << " in full unfiltered name compare."
+ << "/nWill now try less stringent test."
+ << std::endl;
+ }
+
+ // Second test: just check the filename and extension with no path check
+ // to find an InputFrameInfo candidate.
+ ossimString driveStringIn;
+ ossimString pathStringIn;
+ ossimString fileStringIn;
+ ossimString extStringIn;
+ name.split( driveStringIn,
+ pathStringIn,
+ fileStringIn,
+ extStringIn );
+
+ for ( i=0; i<numFrames; ++i )
+ {
+ InputFrameInfo* info = theInputFrameInfoList[i];
+ if ( info != 0 )
+ {
+ if ( theCurrentEntry == info->entry )
+ {
+ ossimString driveStringRPF;
+ ossimString pathStringRPF;
+ ossimString fileStringRPF;
+ ossimString extStringRPF;
+ info->name.split( driveStringRPF,
+ pathStringRPF,
+ fileStringRPF,
+ extStringRPF );
+
+ if ( (fileStringRPF == fileStringIn) &&
+ (extStringRPF == extStringIn) )
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE << " DEBUG:"
+ << "\nRPF frame candidate found: " << name
+ << " using stripped name compare:"
+ << " info->name=" << info->name
+ << " info->entry=" << info->entry
+ << " info->row=" << info->row
+ << " info->col=" << info->col
+ << std::endl;
+ }
+
+ return info;
+ }
+ }
+ }
+ }
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nRPF frame not found: " << name
+ << std::endl;
+ }
+
+ return 0;
+}
+
+ossim_int32 ossimVirtualImageWriter::getNumberOfBuiltFrames( ossim_uint32 resLevel,
+ bool bPartialBuild ) const
+{
+ ossim_int32 numFrames = 0;
+
+ if ( bPartialBuild )
+ {
+ // Since the input frames have potentially overlapping output
+ // frame ranges, we make the count accurate by making use of the
+ // isFrameAlreadyDone() member function which allows us to discard
+ // the duplicates.
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid(resLevel) )
+ {
+ ossim_int32 xRangeMin = pInfo->xRangeMin[resLevel];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[resLevel];
+ ossim_int32 yRangeMin = pInfo->yRangeMin[resLevel];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[resLevel];
+
+ //***
+ // Frame loop in the line (height) direction.
+ //***
+ ossim_int32 iF;
+ for( iF = yRangeMin; iF <= yRangeMax; ++iF )
+ {
+ //***
+ // Frame loop in the sample (width) direction.
+ //***
+ ossim_int32 jF;
+ for( jF = xRangeMin; jF <= xRangeMax; ++jF )
+ {
+ // Add check here to see if (jF,iF) has already been processed for
+ // a previous input frame in the queue.
+ bool bIsFrameAlreadyDone = isFrameAlreadyDone( idxQ, resLevel, jF, iF );
+
+ if ( bIsFrameAlreadyDone == false )
+ {
+ ++numFrames;
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ ossim_int32 imageSamples = theImageHandler->getNumberOfSamples();
+ ossim_int32 imageLines = theImageHandler->getNumberOfLines();
+
+ ossim_uint32 resLevelPow = (ossim_uint32)(1<<resLevel);
+ imageSamples /= resLevelPow;
+ imageLines /= resLevelPow;
+
+ ossim_int32 frameSamples = theOutputFrameSize.x;
+ ossim_int32 frameLines = theOutputFrameSize.y;
+
+ ossim_int32 framesWide = (imageSamples % frameSamples) ?
+ (imageSamples / frameSamples) + 1 : (imageSamples / frameSamples);
+ ossim_int32 framesHigh = (imageLines % frameLines) ?
+ (imageLines / frameLines) + 1 : (imageLines / frameLines);
+
+ numFrames = framesWide * framesHigh;
+ }
+
+ return numFrames;
+}
+
+ossimIpt ossimVirtualImageWriter::getNumberOfOutputFrames( ossim_uint32 resLevel ) const
+{
+ ossim_int32 imageSamples = theImageHandler->getNumberOfSamples();
+ ossim_int32 imageLines = theImageHandler->getNumberOfLines();
+
+ ossim_uint32 resLevelPow = (ossim_uint32)(1<<resLevel);
+ imageSamples /= resLevelPow;
+ imageLines /= resLevelPow;
+
+ ossim_int32 frameSamples = theOutputFrameSize.x;
+ ossim_int32 frameLines = theOutputFrameSize.y;
+
+ ossim_int32 framesWide = (imageSamples % frameSamples) ?
+ (imageSamples / frameSamples) + 1 : (imageSamples / frameSamples);
+ ossim_int32 framesHigh = (imageLines % frameLines) ?
+ (imageLines / frameLines) + 1 : (imageLines / frameLines);
+
+ return ossimIpt( framesWide, framesHigh );
+}
+
+ossimIpt ossimVirtualImageWriter::getNumberOfOutputTiles( ossim_uint32 resLevel ) const
+{
+ ossim_int32 imageSamples = theImageHandler->getNumberOfSamples();
+ ossim_int32 imageLines = theImageHandler->getNumberOfLines();
+
+ ossim_uint32 resLevelPow = (ossim_uint32)(1<<resLevel);
+ imageSamples /= resLevelPow;
+ imageLines /= resLevelPow;
+
+ ossim_int32 tileSamples = theOutputTileSize.x;
+ ossim_int32 tileLines = theOutputTileSize.y;
+
+ ossim_int32 tilesWide = (imageSamples % tileSamples) ?
+ (imageSamples / tileSamples) + 1 :
+ (imageSamples / tileSamples);
+ ossim_int32 tilesHigh = (imageLines % tileLines) ?
+ (imageLines / tileLines) + 1 :
+ (imageLines / tileLines);
+
+ return ossimIpt( tilesWide, tilesHigh );
+}
+
+ossimIpt ossimVirtualImageWriter::getNumberOfTilesPerOutputFrame() const
+{
+ ossim_int32 frameSamples = theOutputFrameSize.x;
+ ossim_int32 frameLines = theOutputFrameSize.y;
+
+ ossim_int32 tileSamples = theOutputTileSize.x;
+ ossim_int32 tileLines = theOutputTileSize.y;
+
+ ossim_int32 tilesWide = (frameSamples % tileSamples) ?
+ (frameSamples / tileSamples) + 1 : (frameSamples / tileSamples);
+ ossim_int32 tilesHigh = (frameLines % tileLines) ?
+ (frameLines / tileLines) + 1 : (frameLines / tileLines);
+
+ return ossimIpt( tilesWide, tilesHigh );
+}
+
+ossimObject* ossimVirtualImageWriter::getObject()
+{
+ return this;
+}
+
+const ossimObject* ossimVirtualImageWriter::getObject() const
+{
+ return this;
+}
+
+void ossimVirtualImageWriter::setOutputImageType( const ossimString& type )
+{
+ theOutputImageType = type;
+}
+
+void ossimVirtualImageWriter::setOutputImageType( ossim_int32 type )
+{
+ ossimImageTypeLut lut;
+ theOutputImageType = lut.getEntryString( type );
+}
+
+ossimString ossimVirtualImageWriter::getOutputImageTypeString() const
+{
+ return theOutputImageType;
+}
+
+ossim_int32 ossimVirtualImageWriter::getOutputImageType() const
+{
+ ossimImageTypeLut lut;
+ return lut.getEntryNumber( theOutputImageType );
+}
+
+bool ossimVirtualImageWriter::getOverviewFlag() const
+{
+ return theOverviewFlag;
+}
+
+void ossimVirtualImageWriter::setOverviewFlag( bool flag )
+{
+ theOverviewFlag = flag;
+}
+
+ossimIrect ossimVirtualImageWriter::getAreaOfInterest() const
+{
+ return theAreaOfInterest;
+}
+
+void ossimVirtualImageWriter::setAreaOfInterest( const ossimIrect& inputRect )
+{
+ theAreaOfInterest = inputRect;
+ if( theInputConnection.valid() )
+ {
+ theInputConnection->setAreaOfInterest( inputRect );
+ }
+}
+
+void ossimVirtualImageWriter::setOutputFile( const ossimFilename& file )
+{
+ theOutputFile = file;
+}
+
+const ossimFilename& ossimVirtualImageWriter::getOutputFile()const
+{
+ return theOutputFile;
+}
+
+bool ossimVirtualImageWriter::canConnectMyInputTo( ossim_int32 inputIndex,
+ const ossimConnectableObject* object ) const
+{
+ return ( object &&
+ ( (PTR_CAST(ossimImageSource, object) && (inputIndex == 0)) ) );
+}
+
+void ossimVirtualImageWriter::setOutputTileSize( const ossimIpt& tileSize )
+{
+ if ( theInputConnection.valid() )
+ {
+ theInputConnection->setTileSize( tileSize );
+ }
+
+ theOutputTileSize = tileSize;
+
+ theTileSizeInBytes = theOutputTileSize.x * theOutputTileSize.y * theBytesPerPixel;
+
+ //---
+ // Make a buffer to pass to pass to the write tile methods when an image
+ // handler returns a null tile.
+ //---
+ theNullDataBuffer.resize( theTileSizeInBytes );
+
+ // Fill it with zeroes.
+ std::fill( theNullDataBuffer.begin(), theNullDataBuffer.end(), 0 );
+}
+
+void ossimVirtualImageWriter::setOutputFrameSize( const ossimIpt& frameSize )
+{
+ theOutputFrameSize = frameSize;
+}
+
+bool ossimVirtualImageWriter::getCopyAllFlag() const
+{
+ return theCopyAllFlag;
+}
+
+void ossimVirtualImageWriter::setCopyAllFlag( bool flag )
+{
+ theCopyAllFlag = flag;
+}
+
+ossim_uint32 ossimVirtualImageWriter::getFinalResLevel( ossim_uint32 startRLevel,
+ bool bPartialBuild ) const
+{
+ // Note we always have one rset
+ ossim_uint32 rLevel = startRLevel;
+
+ ossimIpt nFrames = getNumberOfOutputFrames( rLevel );
+ ossim_uint32 largest = ( nFrames.x > nFrames.y ) ? nFrames.x : nFrames.y;
+
+ while( largest > 1 )
+ {
+ ++rLevel;
+
+ nFrames = getNumberOfOutputFrames( rLevel );
+ largest = (nFrames.x > nFrames.y) ? nFrames.x : nFrames.y;
+ }
+
+ return rLevel;
+}
+
+ossim_uint32 ossimVirtualImageWriter::getStartingResLevel() const
+{
+ return theCopyAllFlag ? 0 : 1;
+}
+
+// After 1 or more dirty frames are set, an update to the image will
+// be of limited scope to areas of the RPF image that come from the
+// frame files found in theDirtyFrameList.
+void ossimVirtualImageWriter::setDirtyFrame( const ossimString& name )
+{
+ // Add the name of a frame to the dirty frame list.
+ theDirtyFrameList.push_back(name);
+}
+
+bool ossimVirtualImageWriter::isFrameAlreadyDone( ossim_uint32 mQ,
+ ossim_uint32 resLevel,
+ ossim_int32 frameX,
+ ossim_int32 frameY ) const
+{
+ bool bFoundIt = false;
+ ossim_uint32 nQ = (ossim_uint32)theInputFrameInfoQueue.size();
+ ossim_uint32 idxQ;
+ for ( idxQ=0; idxQ<nQ && idxQ<mQ; ++idxQ )
+ {
+ InputFrameInfo* pInfo = theInputFrameInfoQueue[idxQ];
+ if ( pInfo && pInfo->isValid() )
+ {
+ ossim_int32 xRangeMin = pInfo->xRangeMin[resLevel];
+ ossim_int32 xRangeMax = pInfo->xRangeMax[resLevel];
+ ossim_int32 yRangeMin = pInfo->yRangeMin[resLevel];
+ ossim_int32 yRangeMax = pInfo->yRangeMax[resLevel];
+
+ if ( xRangeMin <= frameX && frameX <= xRangeMax &&
+ yRangeMin <= frameY && frameY <= yRangeMax )
+ {
+ bFoundIt = true;
+ break;
+ }
+ }
+ }
+
+ return bFoundIt;
+}
+
+bool ossimVirtualImageWriter::execute()
+{
+ static const char MODULE[] = "ossimVirtualImageWriter::execute";
+
+ // If the virtual header file already exists,
+ // let's try to stay consistent with its parameters.
+ bool bExists = theOutputFile.exists();
+ if ( bExists )
+ {
+ ossimRefPtr<ossimImageHandler> pHand = ossimImageHandlerRegistry::instance()->open( theOutputFile );
+ if ( pHand.valid() )
+ {
+ ossimVirtualImageHandler* pVirt = PTR_CAST( ossimVirtualImageHandler, pHand.get() );
+ if ( pVirt != NULL )
+ {
+ ossimIpt outputFrameSize;
+ outputFrameSize.x = pVirt->getFrameWidth();
+ outputFrameSize.y = pVirt->getFrameHeight();
+
+ if ( outputFrameSize.x != theOutputFrameSize.x )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output frame size(x): "
+ << theOutputFrameSize.x
+ << " -> "
+ << outputFrameSize.x
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputFrameSize.x = outputFrameSize.x;
+ }
+ if ( outputFrameSize.y != theOutputFrameSize.y )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output frame size(y): "
+ << theOutputFrameSize.y
+ << " -> "
+ << outputFrameSize.y
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputFrameSize.y = outputFrameSize.y;
+ }
+
+ ossimIpt outputTileSize;
+ outputTileSize.x = pVirt->getTileWidth();
+ outputTileSize.y = pVirt->getTileHeight();
+
+ if ( outputTileSize.x != theOutputTileSize.x )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output tile size(x): "
+ << theOutputTileSize.x
+ << " -> "
+ << outputTileSize.x
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputTileSize.x = outputTileSize.x;
+ }
+ if ( outputTileSize.y != theOutputTileSize.y )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "The requested output tile size(y): "
+ << theOutputTileSize.y
+ << " -> "
+ << outputTileSize.y
+ << ", overridden by pre-existing value found in: "
+ << theOutputFile
+ << std::endl;
+
+ theOutputTileSize.y = outputTileSize.y;
+ }
+ }
+
+ pHand = 0;
+ }
+ }
+
+ // Adjust the x-dimensional output frame size to be an integer
+ // multiple of the output tile size (e.g. x1,x2,x3,...) if it isn't
+ // already.
+ ossim_int32 modX = theOutputFrameSize.x % theOutputTileSize.x;
+ if ( modX != 0 )
+ {
+ ossim_int32 mulX = (theOutputFrameSize.x / theOutputTileSize.x) + 1;
+ if ( mulX == 0 )
+ {
+ mulX = 1;
+ }
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Adjusting the requested output frame size("
+ << theOutputFrameSize.x
+ << ") in x-dim to "
+ << mulX << " times the output tile size("
+ << theOutputTileSize.x
+ << ")"
+ << std::endl;
+
+ theOutputFrameSize.x = theOutputTileSize.x * mulX;
+ }
+
+ // Adjust the y-dimensional output frame size to be an integer
+ // multiple of the output tile size (e.g. x1,x2,x3,...) if it isn't
+ // already.
+ ossim_int32 modY = theOutputFrameSize.y % theOutputTileSize.y;
+ if ( modY != 0 )
+ {
+ ossim_int32 mulY = (theOutputFrameSize.y / theOutputTileSize.y) + 1;
+ if ( mulY== 0 )
+ {
+ mulY = 1;
+ }
+
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Adjusting the requested output frame size("
+ << theOutputFrameSize.y
+ << ") in y-dim to "
+ << mulY << " times the output tile size("
+ << theOutputTileSize.y
+ << ")"
+ << std::endl;
+
+ theOutputFrameSize.y = theOutputTileSize.y * mulY;
+ }
+
+ // Zero base starting resLevel.
+ ossim_uint32 startRLev = getStartingResLevel();
+
+ // Zero base final resLevel.
+ ossim_uint32 finalRLev = getFinalResLevel( startRLev );
+
+ // Print out the dirty frames.
+ ossimCibCadrgTileSource* pRpf = PTR_CAST( ossimCibCadrgTileSource, theImageHandler.get() );
+ if ( pRpf != NULL )
+ {
+ // Make sure the queue is empty before we start adding in.
+ theInputFrameInfoQueue.clear();
+
+ int nFrames = (int)theDirtyFrameList.size();
+ if ( nFrames > 0 )
+ {
+ ossim_uint32 inputFrameNx = theInputFrameSize.x;
+ ossim_uint32 inputFrameNy = theInputFrameSize.y;
+ ossim_uint32 outputFrameNx = theOutputFrameSize.x;
+ ossim_uint32 outputFrameNy = theOutputFrameSize.y;
+
+ int idx;
+ for( idx=0; idx<nFrames; ++idx )
+ {
+ ossimFilename frameTestName = theDirtyFrameList[idx];
+ InputFrameInfo* info = getInputFrameInfo( frameTestName );
+ if ( info )
+ {
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "\nRange processing input frame file(" << info->name << "): "
+ << "\n(entry: " << info->entry << ", row: " << info->row << ", col: " << info->col << ")"
+ << std::endl;
+ }
+
+ ossim_uint32 inputFrameI = info->col;
+ ossim_uint32 inputFrameJ = info->row;
+
+ // set the output frame index ranges
+ ossim_uint32 r;
+ for ( r=0; r<=finalRLev; ++r )
+ {
+ ossim_uint32 scale = (ossim_uint32)(1<<r);
+ ossim_uint32 scaledOutputFrameNx = scale * outputFrameNx;
+ ossim_uint32 scaledOutputFrameNy = scale * outputFrameNy;
+
+ ossim_uint32 inputNthFramePixelBeginX = inputFrameI * inputFrameNx;
+ ossim_uint32 inputNthFramePixelEndX = inputNthFramePixelBeginX + inputFrameNx - 1;
+
+ ossim_uint32 inputNthFramePixelBeginY = inputFrameJ * inputFrameNy;
+ ossim_uint32 inputNthFramePixelEndY = inputNthFramePixelBeginY + inputFrameNy - 1;
+
+ double xRangeMinD = (double)inputNthFramePixelBeginX / scaledOutputFrameNx;
+ double xRangeMaxD = (double)inputNthFramePixelEndX / scaledOutputFrameNx;
+ double yRangeMinD = (double)inputNthFramePixelBeginY / scaledOutputFrameNy;
+ double yRangeMaxD = (double)inputNthFramePixelEndY / scaledOutputFrameNy;
+
+ ossim_uint32 xRangeMin = (ossim_uint32)xRangeMinD;
+ ossim_uint32 xRangeMax = (ossim_uint32)xRangeMaxD;
+ ossim_uint32 yRangeMin = (ossim_uint32)yRangeMinD;
+ ossim_uint32 yRangeMax = (ossim_uint32)yRangeMaxD;
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "\nOutput frame ranges at resLevel: " << r
+ << "\nxRangeMin: " << xRangeMin << ", xRangeMax: " << xRangeMax
+ << "\nyRangeMin: " << yRangeMin << ", yRangeMax: " << yRangeMax
+ << "\n"
+ << std::endl;
+ }
+
+ info->xRangeMin.push_back( xRangeMin );
+ info->xRangeMax.push_back( xRangeMax );
+ info->yRangeMin.push_back( yRangeMin );
+ info->yRangeMax.push_back( yRangeMax );
+ }
+
+ // add frames to process to queue
+ theInputFrameInfoQueue.push_back( info );
+ }
+
+ if ( traceDebug() )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nFrame file(" << idx+1 << "): "
+ << theDirtyFrameList[idx]
+ << (info ? " will" : " will not")
+ << " be processed."
+ << std::endl;
+ }
+ }
+
+ if ( theInputFrameInfoQueue.size() > 0 )
+ {
+ theLimitedScopeUpdateFlag = true;
+
+ // If all the frames for the current input image handler entry have
+ // been entered, we don't have to set theLimitedScopeUpdateFlag to true.
+ // So a check to see if all frames have been added to the list or not
+ // can be added.
+ }
+ else
+ {
+ // No frames have been found for the current entry of the
+ // input image handler. So there's no work to be done and we
+ // should bail...
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "There is nothing to do, so exiting overview write of entry: "
+ << theCurrentEntry
+ << std::endl;
+ return false;
+ }
+ }
+ else
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Building entire image..."
+ << std::endl;
+ }
+ }
+ else
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "\nInput image (" << theImageHandler->getFilename() << ") not an RPF, "
+ << "so the entire image is being rebuilt."
+ << std::endl;
+ }
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << MODULE
+ << "\nCurrent number of reduced res sets: "
+ << theImageHandler->getNumberOfDecimationLevels()
+ << "\nStarting reduced res set: " << startRLev
+ << "\nEnding reduced res sets: " << finalRLev
+ << "\nResampling type: " << theResampleType
+ << std::endl;
+ }
+
+ if ( ossimMpi::instance()->getRank() == 0 )
+ {
+ if ( startRLev == 0 )
+ {
+ if ( !writeR0() )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "File %s line %d\nError copying image!",
+ __FILE__,
+ __LINE__ );
+ return false;
+ }
+ else
+ {
+ ossimKeywordlist temp_header_kwl;
+ saveHeaderInfo( temp_header_kwl, startRLev, startRLev );
+ temp_header_kwl.write( theOutputFileTmp );
+ }
+ }
+ }
+
+ ossim_uint32 writeRnStartRLev = (startRLev==0) ? startRLev+1 : startRLev;
+ for ( ossim_uint32 i = writeRnStartRLev; i <= finalRLev; ++i )
+ {
+ // Sync all processes...
+ ossimMpi::instance()->barrier();
+
+ if ( !writeRn( i ) )
+ {
+ // Set the error...
+ ossimSetError( getClassName(),
+ ossimErrorCodes::OSSIM_WRITE_FILE_ERROR,
+ "%s file %s line %d\nError creating reduced res set!",
+ MODULE,
+ __FILE__,
+ __LINE__ );
+
+ if ( theOutputFileTmp.exists() )
+ {
+ theOutputFileTmp.remove();
+ }
+
+ cout << "Writing header file for up to R" << i-1 << ": " << theOutputFile << endl;
+
+ ossimKeywordlist error_header_kwl;
+ saveHeaderInfo( error_header_kwl, startRLev, i-1 );
+ error_header_kwl.write( theOutputFile );
+ return false;
+ }
+ else
+ {
+ if ( theOutputFileTmp.exists() )
+ {
+ theOutputFileTmp.remove();
+ }
+ ossimKeywordlist temp_header_kwl;
+ saveHeaderInfo( temp_header_kwl, startRLev, i );
+ temp_header_kwl.write( theOutputFileTmp );
+ }
+ }
+
+ if ( theOutputFileTmp.exists() )
+ {
+ theOutputFileTmp.remove();
+ }
+
+ cout << "Writing header file: " << theOutputFile << " for virtual image." << endl;
+
+ ossimKeywordlist header_kwl;
+ saveHeaderInfo( header_kwl, startRLev, finalRLev );
+ return header_kwl.write( theOutputFile );
+}
+
+bool ossimVirtualImageWriter::writeR0()
+{
+ if ( theLimitedScopeUpdateFlag == true )
+ {
+ return writeR0Partial();
+ }
+ else
+ {
+ return writeR0Full();
+ }
+}
+
+bool ossimVirtualImageWriter::writeRn( ossim_uint32 resLevel )
+{
+ if ( theLimitedScopeUpdateFlag == true )
+ {
+ return writeRnPartial( resLevel );
+ }
+ else
+ {
+ return writeRnFull( resLevel );
+ }
+}
+
+bool ossimVirtualImageWriter::saveHeaderInfo( ossimKeywordlist& kwl,
+ ossim_uint32 rLevBegin,
+ ossim_uint32 rLevEnd )
+{
+ ossim_uint32 entryIdx = theImageHandler->getCurrentEntry();
+
+ ossimString prefix = "image";
+ prefix += ossimString::toString( entryIdx ) + ".";
+
+ kwl.add( prefix,
+ ossimKeywordNames::ENTRY_KW,
+ entryIdx,
+ true );
+
+ saveGeometryKeywordEntry( kwl, prefix );
+ saveGeneralKeywordEntry ( kwl, prefix );
+ saveNativeKeywordEntry ( kwl, prefix,
+ rLevBegin,
+ rLevEnd );
+
+ kwl.add( ossimKeywordNames::NUMBER_ENTRIES_KW, 1, true );
+
+ return true;
+}
+
+// Note be sure to theImageHandler->setCurrentEntry before calling.
+bool ossimVirtualImageWriter::isExternalOverview() const
+{
+ bool result = false; // Have to prove it.
+
+ ossimString s = "imag";
+ ossimRefPtr<ossimProperty> prop = theImageHandler->getProperty( s );
+ if ( prop.valid() )
+ {
+ ossimString s;
+ prop->valueToString( s );
+ if ( s.toFloat32() < 1.0 )
+ {
+ result = true;
+ }
+ }
+
+ return result;
+}
+
+void ossimVirtualImageWriter::saveNativeKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix,
+ ossim_uint32 rLevBegin,
+ ossim_uint32 rLevEnd ) const
+{
+ ossimString nativeStr = ossimString( "virtual" ) + ".";
+
+ kwl.add( prefix,
+ nativeStr+"subdirectory",
+ theOutputSubdirectory,
+ true );
+ kwl.add( prefix,
+ nativeStr+"writer_type",
+ theVirtualWriterType,
+ true );
+ kwl.add( prefix,
+ nativeStr+"frame_size_x",
+ theOutputFrameSize.x,
+ true );
+ kwl.add( prefix,
+ nativeStr+"frame_size_y",
+ theOutputFrameSize.y,
+ true );
+ kwl.add( prefix,
+ nativeStr+"tile_size_x",
+ theOutputTileSize.x,
+ true );
+ kwl.add( prefix,
+ nativeStr+"tile_size_y",
+ theOutputTileSize.y,
+ true );
+ kwl.add( prefix,
+ nativeStr+"version_major",
+ theMajorVersion,
+ true );
+ kwl.add( prefix,
+ nativeStr+"version_minor",
+ theMinorVersion,
+ true );
+ kwl.add( prefix,
+ nativeStr+"overview_flag",
+ theOverviewFlag ? "true" : "false",
+ true );
+ kwl.add( prefix,
+ nativeStr+"includes_r0",
+ theCopyAllFlag ? "true" : "false",
+ true );
+ kwl.add( prefix,
+ nativeStr+"bits_per_sample",
+ theBitsPerSample,
+ true );
+ kwl.add( prefix,
+ nativeStr+"bytes_per_pixel",
+ theBytesPerPixel,
+ true );
+ kwl.add( prefix,
+ nativeStr+"resolution_level_starting",
+ rLevBegin,
+ true );
+ kwl.add( prefix,
+ nativeStr+"resolution_level_ending",
+ rLevEnd,
+ true );
+
+ nativeStr += ossimString( "resolution_level_" );
+
+ ossim_uint32 r;
+ for ( r=rLevBegin; r<=rLevEnd; ++r )
+ {
+ ossimString fullStr = nativeStr + ossimString::toString( r ) + ".";
+
+ ossimIpt nFrames = getNumberOfOutputFrames( r );
+
+ kwl.add( prefix,
+ fullStr+"number_of_frames_x",
+ nFrames.x,
+ true );
+ kwl.add( prefix,
+ fullStr+"number_of_frames_y",
+ nFrames.y,
+ true );
+ }
+}
+
+// Modified from image_info.cpp outputGeometryEntry() routine
+void ossimVirtualImageWriter::saveGeometryKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix )
+{
+ if( theInputProjection.valid() )
+ {
+ ossimDrect outputRect = theImageHandler->getBoundingRect();
+ theInputProjection->saveState( kwl, prefix );
+
+ ossimGpt ulg,llg,lrg,urg;
+ theInputProjection->lineSampleToWorld( outputRect.ul(), ulg );
+ theInputProjection->lineSampleToWorld( outputRect.ll(), llg );
+ theInputProjection->lineSampleToWorld( outputRect.lr(), lrg );
+ theInputProjection->lineSampleToWorld( outputRect.ur(), urg );
+
+ kwl.add( prefix, "ul_lat", ulg.latd(), true );
+ kwl.add( prefix, "ul_lon", ulg.lond(), true );
+ kwl.add( prefix, "ll_lat", llg.latd(), true );
+ kwl.add( prefix, "ll_lon", llg.lond(), true );
+ kwl.add( prefix, "lr_lat", lrg.latd(), true );
+ kwl.add( prefix, "lr_lon", lrg.lond(), true );
+ kwl.add( prefix, "ur_lat", urg.latd(), true );
+ kwl.add( prefix, "ur_lon", urg.lond(), true );
+
+ // ESH 01/2009: The following are still needed by EW 4.4.
+ if( !kwl.find( ossimKeywordNames::TIE_POINT_LAT_KW ) )
+ {
+ kwl.add( prefix,
+ ossimKeywordNames::TIE_POINT_LAT_KW,
+ ulg.latd(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::TIE_POINT_LON_KW,
+ ulg.lond(),
+ true );
+
+ if ( outputRect.height()-1.0 > DBL_EPSILON )
+ {
+ kwl.add( prefix,
+ ossimKeywordNames::DECIMAL_DEGREES_PER_PIXEL_LAT,
+ fabs( ulg.latd()-llg.latd() ) / (outputRect.height()-1.0),
+ true );
+ }
+ if ( outputRect.width()-1.0 > DBL_EPSILON )
+ {
+ kwl.add( prefix,
+ ossimKeywordNames::DECIMAL_DEGREES_PER_PIXEL_LON,
+ fabs( ulg.lond()-urg.lond()) / (outputRect.width()-1.0),
+ true );
+ }
+ }
+
+ ossimDpt gsd = theInputProjection->getMetersPerPixel();
+ kwl.add( prefix,
+ ossimKeywordNames::METERS_PER_PIXEL_X_KW,
+ gsd.x,
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::METERS_PER_PIXEL_Y_KW,
+ gsd.y,
+ true );
+ }
+ else
+ {
+ cerr << "No projection geometry for file " << theImageHandler->getFilename() << endl;
+ }
+}
+
+// Modified from image_info.cpp outputGeneralImageInfo() routine
+void ossimVirtualImageWriter::saveGeneralKeywordEntry( ossimKeywordlist& kwl,
+ const ossimString& prefix ) const
+{
+ ossimDrect boundingRect = theImageHandler->getBoundingRect();
+
+ kwl.add( prefix, ossimKeywordNames::UL_X_KW, boundingRect.ul().x, true );
+ kwl.add( prefix, ossimKeywordNames::UL_Y_KW, boundingRect.ul().y, true );
+ kwl.add( prefix, ossimKeywordNames::LR_X_KW, boundingRect.lr().x, true );
+ kwl.add( prefix, ossimKeywordNames::LR_Y_KW, boundingRect.lr().y, true );
+
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_INPUT_BANDS_KW,
+ theImageHandler->getNumberOfInputBands(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_OUTPUT_BANDS_KW,
+ theImageHandler->getNumberOfOutputBands(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_LINES_KW,
+ boundingRect.height(),
+ true );
+ kwl.add( prefix,
+ ossimKeywordNames::NUMBER_SAMPLES_KW,
+ boundingRect.width(),
+ true );
+
+ int i;
+ for( i = 0; i < (int)theImageHandler->getNumberOfInputBands(); ++i )
+ {
+ ossimString band = ossimString( "band" ) + ossimString::toString( i ) + ".";
+
+ kwl.add( prefix,
+ band+"null_value",
+ theImageHandler->getNullPixelValue( i ),
+ true );
+ kwl.add( prefix,
+ band+"min_value",
+ theImageHandler->getMinPixelValue( i ),
+ true );
+ kwl.add( prefix,
+ band+"max_value",
+ theImageHandler->getMaxPixelValue( i ),
+ true );
+ }
+
+ // Output Radiometry.
+ ossimString scalarStr("unknown");
+ ossimScalarType scalar = theImageHandler->getOutputScalarType();
+ switch( scalar )
+ {
+ case OSSIM_UINT8:
+ {
+ scalarStr = "8-bit";
+ break;
+ }
+ case OSSIM_USHORT11:
+ {
+ scalarStr = "11-bit";
+ break;
+ }
+ case OSSIM_UINT16:
+ {
+ scalarStr = "16-bit unsigned";
+ break;
+ }
+ case OSSIM_SINT16:
+ {
+ scalarStr = "16-bit signed";
+ break;
+ }
+ case OSSIM_UINT32:
+ {
+ scalarStr = "32-bit unsigned";
+ break;
+ }
+ case OSSIM_FLOAT32:
+ {
+ scalarStr = "float";
+ break;
+ }
+ case OSSIM_NORMALIZED_FLOAT:
+ {
+ scalarStr = "normalized float";
+ break;
+ }
+ default:
+ {
+ /* Do nothing */
+ break;
+ }
+ }
+
+ kwl.add( prefix, "radiometry", scalarStr, true );
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVirtualOverviewBuilder.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVirtualOverviewBuilder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b32db6b05fb1419d4da0ea9f4a8720ad2862db5d
--- /dev/null
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVirtualOverviewBuilder.cpp
@@ -0,0 +1,438 @@
+//*******************************************************************
+//
+// License: LGPL
+//
+// See LICENSE.txt file in the top level directory for more details.
+//
+// Author: Eric Hirschorn
+//
+// Description:
+//
+// Contains class definition for VirtualOverviewBuilder
+//
+//*******************************************************************
+// $Id: ossimVirtualOverviewBuilder.cpp 14780 2009-06-25 19:32:32Z dburken $
+
+#include <algorithm> /* for std::fill */
+using namespace std;
+
+#include <tiffio.h>
+#include <xtiffio.h>
+
+#include <ossim/base/ossimCommon.h>
+#include <ossim/base/ossimErrorCodes.h>
+#include <ossim/base/ossimErrorContext.h>
+#include <ossim/base/ossimNotify.h>
+#include <ossim/base/ossimStdOutProgress.h>
+#include <ossim/base/ossimIpt.h>
+#include <ossim/base/ossimDpt3d.h>
+#include <ossim/base/ossimIrect.h>
+#include <ossim/base/ossimFilename.h>
+#include <ossim/base/ossimTrace.h>
+#include <ossim/base/ossimKeywordNames.h>
+#include <ossim/parallel/ossimMpi.h>
+#include <ossim/support_data/ossimRpfToc.h>
+#include <ossim/support_data/ossimRpfTocEntry.h>
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageData.h>
+#include <ossim/imaging/ossimImageMetaData.h>
+#include <ossim/imaging/ossimImageDataFactory.h>
+#include <ossim/imaging/ossimCibCadrgTileSource.h>
+#include <ossim/imaging/ossimVirtualImageTiffWriter.h>
+#include <ossim/imaging/ossimVirtualOverviewBuilder.h>
+
+const char* ossimVirtualOverviewBuilder::OUTPUT_FRAME_SIZE_KW =
+ "output_frame_size";
+
+RTTI_DEF1(ossimVirtualOverviewBuilder,
+ "ossimVirtualOverviewBuilder",
+ ossimOverviewBuilderBase)
+
+static ossimTrace traceDebug("ossimVirtualOverviewBuilder:debug");
+
+// Property keywords.
+static const char COPY_ALL_KW[] = "copy_all_flag";
+
+#ifdef OSSIM_ID_ENABLED
+static const char OSSIM_ID[] = "$Id: ossimVirtualOverviewBuilder.cpp 14780 2009-06-25 19:32:32Z dburken $";
+#endif
+
+//*******************************************************************
+// Public Constructor:
+//*******************************************************************
+ossimVirtualOverviewBuilder::ossimVirtualOverviewBuilder()
+ :
+ ossimOverviewBuilderBase(),
+ theImageHandler(0),
+ theOutputFile(ossimFilename::NIL),
+ theOutputTileSize(OSSIM_DEFAULT_TILE_WIDTH, OSSIM_DEFAULT_TILE_HEIGHT),
+ theOutputFrameSize(OSSIM_DEFAULT_FRAME_WIDTH, OSSIM_DEFAULT_FRAME_HEIGHT),
+ theResamplerType(ossimFilterResampler::ossimFilterResampler_BOX),
+ theCopyAllFlag(false),
+ theCompressType(""),
+ theCompressQuality(0),
+ theProgressListener(0),
+ theWriterType(WRITER_TYPE_UNKNOWN)
+{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualOverviewBuilder::ossimVirtualOverviewBuilder DEBUG:\n";
+#ifdef OSSIM_ID_ENABLED
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "OSSIM_ID: "
+ << OSSIM_ID
+ << "\n";
+#endif
+ }
+
+ //---
+ // Check for a listeners. If the list is empty, add a standard out
+ // listener so that command line apps like img2rr will get some
+ // progress.
+ //---
+ if ( theListenerList.empty() )
+ {
+ theProgressListener = new ossimStdOutProgress( 0, true );
+ addListener(theProgressListener);
+ }
+
+ ossim::defaultTileSize(theOutputTileSize);
+}
+
+ossimVirtualOverviewBuilder::~ossimVirtualOverviewBuilder()
+{
+ theImageHandler = 0;
+
+ if (theProgressListener)
+ {
+ removeListener(theProgressListener);
+ delete theProgressListener;
+ theProgressListener = 0;
+ }
+}
+
+void ossimVirtualOverviewBuilder::setResampleType(
+ ossimFilterResampler::ossimFilterResamplerType resampleType )
+{
+ theResamplerType = resampleType;
+}
+
+bool ossimVirtualOverviewBuilder::buildOverview(
+ const ossimFilename& overview_file, bool copy_all )
+{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimVirtualOverviewBuilder::buildOverview DEBUG:"
+ << "\noverview file: " << overview_file.c_str()
+ << "\ncopy_all flag: " << (copy_all?"true":"false")
+ << std::endl;
+ }
+
+ theOutputFile = overview_file;
+ theCopyAllFlag = copy_all;
+
+ return execute();
+}
+
+bool ossimVirtualOverviewBuilder::execute()
+{
+ static const char MODULE[] = "ossimVirtualOverviewBuilder::execute";
+
+ if (theErrorStatus == ossimErrorCodes::OSSIM_ERROR)
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError status has been previously set! Returning..."
+ << std::endl;
+ return false;
+ }
+
+ if ( !theImageHandler.valid() )
+ {
+ return false;
+ }
+
+ // Let's initialize our helper class...
+ ossimRefPtr<ossimVirtualImageWriter> pWriter = 0;
+ switch( theWriterType )
+ {
+ case WRITER_TYPE_TIFF:
+ pWriter = new ossimVirtualImageTiffWriter( theOutputFile,
+ theImageHandler.get(),
+ true );
+ break;
+
+ case WRITER_TYPE_UNKNOWN:
+ default:
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError The overview type has not been set to a known value..."
+ << std::endl;
+ return false;
+ }
+
+ // Configure the writer
+ pWriter->setOutputTileSize ( theOutputTileSize );
+ pWriter->setOutputFrameSize ( theOutputFrameSize );
+ pWriter->setResampleType ( theResamplerType );
+ pWriter->setCompressionType ( theCompressType );
+ pWriter->setCompressionQuality( theCompressQuality );
+
+ // The setCopyAllFlag() call forces the building of R0 in the virtual
+ // image. Keep in ming that OSSIM does not count of number of decimation
+ // levels correctly when the virtual image is labeled as an overview in
+ // the header .ovr file but is loaded directly into OSSIM (i.e. not
+ // used as an overview but as a standalone image).
+ pWriter->setCopyAllFlag( theCopyAllFlag );
+
+ // Set the RPF frames to update to the virtual writer.
+ ossimCibCadrgTileSource* pRpf = PTR_CAST( ossimCibCadrgTileSource, theImageHandler.get() );
+ int nFrames = (int)theDirtyFrameList.size();
+ if ( pRpf != NULL && nFrames > 0 )
+ {
+ int idx;
+ for( idx=0; idx<nFrames; ++idx )
+ {
+ // Add the name of a frame to the dirty frame list of
+ // the virtual image writer.
+ pWriter->setDirtyFrame( theDirtyFrameList[idx] );
+ }
+ }
+
+ // Check the output filename. Disallow same file overview building.
+ theOutputFile = pWriter->getOutputFile();
+ if ( theImageHandler->getFilename() == theOutputFile )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "Source image file and overview file cannot be the same!"
+ << std::endl;
+ return false;
+ }
+
+ // Have the writer build the virtual overview
+ bool bResult = pWriter->execute();
+
+ /* Let's delete our helper class... */
+ pWriter = 0;
+
+ return bResult;
+}
+
+bool ossimVirtualOverviewBuilder::getCopyAllFlag() const
+{
+ return theCopyAllFlag;
+}
+
+void ossimVirtualOverviewBuilder::setCopyAllFlag( bool flag )
+{
+ theCopyAllFlag = flag;
+}
+
+ossimObject* ossimVirtualOverviewBuilder::getObject()
+{
+ return this;
+}
+
+const ossimObject* ossimVirtualOverviewBuilder::getObject() const
+{
+ return this;
+}
+
+ossimFilename ossimVirtualOverviewBuilder::getOutputFile() const
+{
+ return theOutputFile;
+}
+
+void ossimVirtualOverviewBuilder::setOutputFile( const ossimFilename& file )
+{
+ theOutputFile = file;
+}
+
+void ossimVirtualOverviewBuilder::setOutputTileSize( const ossimIpt& tileSize )
+{
+ theOutputTileSize = tileSize;
+}
+
+void ossimVirtualOverviewBuilder::setOutputFrameSize( const ossimIpt& frameSize )
+{
+ theOutputFrameSize = frameSize;
+}
+
+bool ossimVirtualOverviewBuilder::setInputSource( ossimImageHandler* imageSource )
+{
+ static const char MODULE[] =
+ "ossimVirtualOverviewBuilder::setInputSource";
+
+ theImageHandler = imageSource;
+
+ if ( !theImageHandler.valid() )
+ {
+ // Set the error...
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nNull image handler pointer passed to constructor! Returning..."
+ << std::endl;
+ ossimSetError(getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "%s File %s line %d\nNULL pointer passed to constructor!",
+ MODULE,
+ __FILE__,
+ __LINE__);
+ return false;
+ }
+ else if (theImageHandler->getErrorStatus() ==
+ ossimErrorCodes::OSSIM_ERROR)
+ {
+ // Set the error...
+ theErrorStatus = ossimErrorCodes::OSSIM_ERROR;
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError detected in image handler! Returning..."
+ << std::endl;
+ ossimSetError(getClassName(),
+ ossimErrorCodes::OSSIM_ERROR,
+ "%s file %s line %d\nImageHandler error detected!",
+ MODULE,
+ __FILE__,
+ __LINE__);
+ return false;
+ }
+
+ if (traceDebug())
+ {
+ CLOG << "DEBUG:"
+ << "\nTile Width: " << theOutputTileSize.x
+ << "\nTile Height: " << theOutputTileSize.y
+ << "\nFrame Width: " << theOutputFrameSize.x
+ << "\nFrame Height: " << theOutputFrameSize.y
+ << "\nSource image is tiled: "
+ << (theImageHandler->isImageTiled()?"true":"false")
+ << "\ntheImageHandler->getTileWidth(): "
+ << theImageHandler->getTileWidth()
+ << "\ntheImageHandler->getTileHeight(): "
+ << theImageHandler->getTileHeight()
+ << "\ntheImageHandler->getImageTileWidth(): "
+ << theImageHandler->getImageTileWidth()
+ << "\ntheImageHandler->getImageTileHeight(): "
+ << theImageHandler->getImageTileHeight()
+ << std::endl;
+ }
+
+ return true;
+}
+
+bool ossimVirtualOverviewBuilder::setOverviewType( const ossimString& type )
+{
+ bool result = true;
+ if ( ossimVirtualImageTiffWriter::isOverviewTypeHandled(type) )
+ {
+ theWriterType = WRITER_TYPE_TIFF;
+ theResamplerType = ossimVirtualImageTiffWriter::getResamplerType(type);
+ }
+ else
+ {
+ result = false;
+ }
+
+ return result;
+}
+
+ossimString ossimVirtualOverviewBuilder::getOverviewType() const
+{
+ static const char MODULE[] = "ossimVirtualOverviewBuilder::getOverviewType";
+
+ ossimString overviewType("unknown");
+
+ // Let's initialize our helper class...
+ switch( theWriterType )
+ {
+ case WRITER_TYPE_TIFF:
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError The tiff-based virtual overview type has not been implemented yet..."
+ << std::endl;
+ }
+ overviewType = ossimVirtualImageTiffWriter::getOverviewType( theResamplerType );
+ break;
+
+ case WRITER_TYPE_UNKNOWN:
+ default:
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE << " ERROR:"
+ << "\nError The overview type has not been set to a known value..."
+ << std::endl;
+ }
+ break;
+ }
+
+ return overviewType;
+}
+
+void ossimVirtualOverviewBuilder::getTypeNameList(
+ std::vector<ossimString>& typeList )const
+{
+ ossimVirtualImageTiffWriter::getTypeNameList( typeList );
+}
+
+void ossimVirtualOverviewBuilder::setProperty( ossimRefPtr<ossimProperty> prop )
+{
+ if( prop->getName() == ossimKeywordNames::COMPRESSION_QUALITY_KW )
+ {
+ theCompressQuality = prop->valueToString().toInt32();
+ }
+ else
+ if( prop->getName() == ossimKeywordNames::COMPRESSION_TYPE_KW )
+ {
+ ossimString tempStr = prop->valueToString();
+ theCompressType = tempStr.downcase();
+ }
+ else
+ if( prop->getName() == COPY_ALL_KW )
+ {
+ theCopyAllFlag = prop->valueToString().toBool();
+ }
+ else
+ if( prop->getName() == ossimKeywordNames::OUTPUT_TILE_SIZE_KW )
+ {
+ ossimIpt ipt;
+
+ ipt.toPoint( prop->valueToString() );
+
+ setOutputTileSize( ipt );
+ }
+ else
+ if( prop->getName() == ossimVirtualOverviewBuilder::OUTPUT_FRAME_SIZE_KW)
+ {
+ ossimIpt ipt;
+
+ ipt.toPoint( prop->valueToString() );
+
+ setOutputFrameSize(ipt);
+ }
+}
+
+void ossimVirtualOverviewBuilder::getPropertyNames( std::vector<ossimString>& propNames )const
+{
+ propNames.push_back( ossimKeywordNames::COMPRESSION_QUALITY_KW );
+ propNames.push_back( ossimKeywordNames::COMPRESSION_TYPE_KW );
+ propNames.push_back( COPY_ALL_KW );
+ propNames.push_back( ossimOverviewBuilderBase::OVERVIEW_STOP_DIMENSION_KW );
+}
+
+bool ossimVirtualOverviewBuilder::canConnectMyInputTo(
+ ossim_int32 index,
+ const ossimConnectableObject* obj ) const
+{
+ return ( ( index == 0 ) && PTR_CAST( ossimImageHandler, obj ) ) ? true : false;
+}
+
+void ossimVirtualOverviewBuilder::setDirtyFrame( const ossimString& name )
+{
+ // Add the name of a frame to the dirty frame list.
+ theDirtyFrameList.push_back(name);
+}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp
index 5b457016d12f96c6aa070884c87f41bb9bf6c06c..a7f1d928746d127827b11cfef4c40d876db8476a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationCoverageInfo.cpp
@@ -8,7 +8,7 @@
// Author: Garrett Potts
//
//**************************************************************************
-// $Id: ossimVpfAnnotationCoverageInfo.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimVpfAnnotationCoverageInfo.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <vector>
#include <algorithm>
@@ -182,7 +182,7 @@ bool ossimVpfAnnotationCoverageInfo::loadState(const ossimKeywordlist& kwl,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
std::vector<int> theNumberList(keys.size());
- int offset = (ossimString(prefix)+"feature").size();
+ int offset = (int)(ossimString(prefix)+"feature").size();
int idx = 0;
for(idx = 0; idx < (int)theNumberList.size();++idx)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp
index 8c986aeffd6e9afe426856d6da01f3bd633aff67..5d423d39a7b6e08e2db4f1c6479508d851a09fc1 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationFeatureInfo.cpp
@@ -35,7 +35,9 @@ ossimVpfAnnotationFeatureInfo::ossimVpfAnnotationFeatureInfo(const ossimString&
theThickness(thickness),
theFillEnabledFlag(false),
theEnabledFlag(enabledFlag),
- theFeatureType(ossimVpfAnnotationFeatureType_UNKNOWN)
+ theFeatureType(ossimVpfAnnotationFeatureType_UNKNOWN),
+ theFontInformation(),
+ theAnnotationArray(0)
{
ossimFont* font = ossimFontFactoryRegistry::instance()->getDefaultFont();
@@ -64,7 +66,7 @@ void ossimVpfAnnotationFeatureInfo::transform(ossimImageGeometry* proj)
{
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- if(theAnnotationArray[idx])
+ if(theAnnotationArray[idx].valid())
{
theAnnotationArray[idx]->transform(proj);
theAnnotationArray[idx]->computeBoundingRect();
@@ -81,7 +83,7 @@ ossimIrect ossimVpfAnnotationFeatureInfo::getBoundingProjectedRect()const
{
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- if(theAnnotationArray[idx])
+ if(theAnnotationArray[idx].valid())
{
ossimIrect tempRect = theAnnotationArray[idx]->getBoundingRect();
if(!tempRect.hasNans())
@@ -417,7 +419,7 @@ ossimVpfAnnotationFeatureInfo::ossimVpfAnnotationFeatureType ossimVpfAnnotationF
void ossimVpfAnnotationFeatureInfo::deleteAllObjects()
{
- theAnnotationArray.clear();
+ theAnnotationArray.clear();
}
void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
@@ -426,10 +428,10 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
{
case ossimVpfAnnotationFeatureType_POINT:
{
- ossimGeoAnnotationMultiEllipseObject* annotation = NULL;
+ ossimGeoAnnotationMultiEllipseObject* annotation = 0;
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationMultiEllipseObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationMultiEllipseObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
@@ -443,12 +445,12 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
}
case ossimVpfAnnotationFeatureType_TEXT:
{
- ossimGeoAnnotationFontObject* annotation = NULL;
+ ossimGeoAnnotationFontObject* annotation = 0;
ossimRefPtr<ossimFont> font = ossimFontFactoryRegistry::instance()->createFont(theFontInformation);
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationFontObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationFontObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
thePenColor.getB());
@@ -467,10 +469,10 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
}
case ossimVpfAnnotationFeatureType_LINE:
{
- ossimGeoAnnotationMultiPolyLineObject* annotation = NULL;
+ ossimGeoAnnotationMultiPolyLineObject* annotation = 0;
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationMultiPolyLineObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationMultiPolyLineObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
thePenColor.getB());
@@ -481,10 +483,10 @@ void ossimVpfAnnotationFeatureInfo::setDrawingFeaturesToAnnotation()
}
case ossimVpfAnnotationFeatureType_POLYGON:
{
- ossimGeoAnnotationMultiPolyObject* annotation = NULL;
+ ossimGeoAnnotationMultiPolyObject* annotation = 0;
for(int idx = 0; idx < (int)theAnnotationArray.size();++idx)
{
- annotation = (ossimGeoAnnotationMultiPolyObject*)theAnnotationArray[idx];
+ annotation = (ossimGeoAnnotationMultiPolyObject*)theAnnotationArray[idx].get();
annotation->setColor(thePenColor.getR(),
thePenColor.getG(),
thePenColor.getB());
@@ -983,112 +985,112 @@ ossimDpt *ossimVpfAnnotationFeatureInfo::getXy(vpf_table_type table,
long pos,
long *count)
{
- long i;
- ossimDpt *coord = NULL;
+ long i;
+ ossimDpt *coord = 0;
- switch (table.header[pos].type)
- {
- case 'C':
+ switch (table.header[pos].type)
+ {
+ case 'C':
{
- coordinate_type temp, *ptr;
- ptr = (coordinate_type*)get_table_element(pos, row, table, &temp, count);
- coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (coordinate_type*)NULL))
- {
+ coordinate_type temp, *ptr;
+ ptr = (coordinate_type*)get_table_element(pos, row, table, &temp, count);
+ coord = new ossimDpt[*count];
+ if ((*count == 1) && (ptr == (coordinate_type*)0))
+ {
coord->x = (double)temp.x;
coord->y = (double)temp.y;
- }
- else
- {
+ }
+ else
+ {
for (i=0; i<*count; i++)
- {
- coord[i].x = (double)ptr[i].x;
- coord[i].y = (double)ptr[i].y;
- }
- }
- if (ptr)
- {
+ {
+ coord[i].x = (double)ptr[i].x;
+ coord[i].y = (double)ptr[i].y;
+ }
+ }
+ if (ptr)
+ {
free((char *)ptr);
- }
- break;
+ }
+ break;
}
- case 'Z':
+ case 'Z':
{
tri_coordinate_type temp, *ptr;
ptr = (tri_coordinate_type*)get_table_element (pos, row, table, &temp, count);
coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (tri_coordinate_type*)NULL))
- {
- coord->x = (double)temp.x;
- coord->y = (double)temp.y;
- }
+ if ((*count == 1) && (ptr == (tri_coordinate_type*)0))
+ {
+ coord->x = (double)temp.x;
+ coord->y = (double)temp.y;
+ }
else
- {
- for (i=0; i<*count; i++)
- {
- coord[i].x = (double)ptr[i].x;
- coord[i].y = (double)ptr[i].y;
- }
- }
+ {
+ for (i=0; i<*count; i++)
+ {
+ coord[i].x = (double)ptr[i].x;
+ coord[i].y = (double)ptr[i].y;
+ }
+ }
if (ptr)
- {
- free ((char*)ptr);
- }
+ {
+ free ((char*)ptr);
+ }
break;
}
- case 'B':
+ case 'B':
{
- double_coordinate_type temp, *ptr;
- ptr = (double_coordinate_type*)get_table_element (pos, row, table, &temp, count);
- coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (double_coordinate_type*)NULL))
- {
+ double_coordinate_type temp, *ptr;
+ ptr = (double_coordinate_type*)get_table_element (pos, row, table, &temp, count);
+ coord = new ossimDpt[*count];
+ if ((*count == 1) && (ptr == (double_coordinate_type*)0))
+ {
coord->x = temp.x;
coord->y = temp.y;
- }
- else
- {
+ }
+ else
+ {
for (i=0; i<*count; i++)
- {
- coord[i].x = ptr[i].x;
- coord[i].y = ptr[i].y;
- }
- }
- if (ptr)
- {
+ {
+ coord[i].x = ptr[i].x;
+ coord[i].y = ptr[i].y;
+ }
+ }
+ if (ptr)
+ {
free ((char*)ptr);
- }
- break;
+ }
+ break;
}
- case 'Y':
+ case 'Y':
{
- double_tri_coordinate_type temp, *ptr;
- ptr = (double_tri_coordinate_type*)get_table_element (pos, row, table, &temp, count);
- coord = new ossimDpt[*count];
- if ((*count == 1) && (ptr == (double_tri_coordinate_type*)NULL))
- {
+ double_tri_coordinate_type temp, *ptr;
+ ptr = (double_tri_coordinate_type*)get_table_element (pos, row, table, &temp, count);
+ coord = new ossimDpt[*count];
+ if ((*count == 1) && (ptr == (double_tri_coordinate_type*)0))
+ {
coord->x = temp.x;
coord->y = temp.y;
- }
- else
- {
+ }
+ else
+ {
for (i=0; i<*count; i++)
- {
- coord[i].x = ptr[i].x;
- coord[i].y = ptr[i].y;
- }
- }
- if (ptr)
- {
+ {
+ coord[i].x = ptr[i].x;
+ coord[i].y = ptr[i].y;
+ }
+ }
+ if (ptr)
+ {
free((char*)ptr);
- }
- break;
+ }
+ break;
}
- default:
- break;
- } /* switch type */
- return (coord);
+ default:
+ break;
+ } /* switch type */
+ return (coord);
}
int ossimVpfAnnotationFeatureInfo::readTableCellAsInt (int rowNumber,
@@ -1379,30 +1381,33 @@ void ossimVpfAnnotationFeatureInfo::readGeoPolygon(ossimGeoPolygon& polygon,
&count);
if(ptArray)
- {
- int rightFace = getEdgeKeyId( *edgTable.getVpfTableData(), row, rightFaceCol );
-
- if (rightFace == faceId) {
+ {
+ int rightFace = getEdgeKeyId( *edgTable.getVpfTableData(), row, rightFaceCol );
+
+ if (rightFace == faceId)
+ {
for(int p = 0; p < count; ++p)
- {
- if((fabs(ptArray[p].x) <= 180.0)&&
- (fabs(ptArray[p].y) <= 90.0))
- {
- polygon.addPoint(ptArray[p].y, ptArray[p].x);
- }
- }
- } else {
+ {
+ if((fabs(ptArray[p].x) <= 180.0)&&
+ (fabs(ptArray[p].y) <= 90.0))
+ {
+ polygon.addPoint(ptArray[p].y, ptArray[p].x);
+ }
+ }
+ }
+ else
+ {
for(int p = count - 1; p >= 0; --p)
- {
- if((fabs(ptArray[p].x) <= 180.0)&&
- (fabs(ptArray[p].y) <= 90.0))
- {
- polygon.addPoint(ptArray[p].y, ptArray[p].x);
- }
- }
- }
- delete [] ptArray;
- }
+ {
+ if((fabs(ptArray[p].x) <= 180.0)&&
+ (fabs(ptArray[p].y) <= 90.0))
+ {
+ polygon.addPoint(ptArray[p].y, ptArray[p].x);
+ }
+ }
+ }
+ delete [] ptArray;
+ }
}
free_row(row, *edgTable.getVpfTableData());
}
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp
index 4f8385afbf371ca6bd3a924cc908e7a63839497b..dcb2134f7092a85e8fd72ad2f97faeaeeb7b8ce7 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationLibraryInfo.cpp
@@ -1,5 +1,4 @@
//*************************************************************************
-// Copyright (C) 2004 Intelligence Data Systems, Inc. All rights reserved.
//
// License: LGPL
//
@@ -8,7 +7,7 @@
// Author: Garrett Potts
//
//**************************************************************************
-// $Id: ossimVpfAnnotationLibraryInfo.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimVpfAnnotationLibraryInfo.cpp 15836 2009-10-30 12:29:09Z dburken $
#include <algorithm>
@@ -233,7 +232,7 @@ bool ossimVpfAnnotationLibraryInfo::loadState(const ossimKeywordlist& kwl,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
std::vector<int> theNumberList(keys.size());
- int offset = (ossimString(prefix)+"coverage").size();
+ int offset = (int)(ossimString(prefix)+"coverage").size();
int idx = 0;
for(idx = 0; idx < (int)theNumberList.size();++idx)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp
index 847a7e920fa3ab096779f5a8b8eddffb45f79051..a63a1b4ec5d7f5ca4094036c0e006a14405e68f3 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimVpfAnnotationSource.cpp
@@ -223,7 +223,7 @@ bool ossimVpfAnnotationSource::loadState(const ossimKeywordlist& kwl,
vector<ossimString> keys =
kwl.getSubstringKeyList( regExpression );
std::vector<int> theNumberList(keys.size());
- int offset = (ossimString(prefix)+"library").size();
+ int offset = (int)(ossimString(prefix)+"library").size();
for(idx = 0; idx < (int)theNumberList.size();++idx)
{
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp b/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp
index d54612788e15ac9260a71caa682a452fe544ce2d..ecf4771571ba2d587451967a984537114d928a1b 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimWorldFileWriter.cpp
@@ -6,7 +6,7 @@
// Author: Kenneth Melero (kmelero@sanz.com)
//
//*******************************************************************
-// $Id: ossimWorldFileWriter.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimWorldFileWriter.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/imaging/ossimWorldFileWriter.h>
#include <ossim/base/ossimKeywordNames.h>
@@ -15,6 +15,8 @@
#include <ossim/projection/ossimMapProjection.h>
#include <ossim/projection/ossimMapProjectionInfo.h>
#include <ossim/projection/ossimProjectionFactoryRegistry.h>
+#include <ossim/projection/ossimStatePlaneProjectionInfo.h>
+#include <ossim/projection/ossimStatePlaneProjectionFactory.h>
#include <ossim/base/ossimUnitConversionTool.h>
#include <ossim/base/ossimUnitTypeLut.h>
#include <ossim/imaging/ossimImageSource.h>
@@ -84,6 +86,20 @@ bool ossimWorldFileWriter::writeFile()
// Convert projection info to proper units:
ossimDpt gsd = mapProj->getMetersPerPixel();
ossimDpt ul = mapProj->getUlEastingNorthing();
+
+ // ESH 05/2008 -- If the pcs code has been given, we
+ // make use of the implied units.
+ ossim_uint16 pcsCode = mapProj->getPcsCode();
+ if ( pcsCode > 0 )
+ {
+ const ossimStatePlaneProjectionInfo* info =
+ ossimStatePlaneProjectionFactory::instance()->getInfo(pcsCode);
+ if (info)
+ {
+ theUnits = info->getUnitType();
+ }
+ }
+
if (theUnits == OSSIM_FEET)
{
gsd.x = ossimUnitConversionTool(gsd.x, OSSIM_METERS).getFeet();
diff --git a/Utilities/otbossim/src/ossim/matrix/myexcept.cpp b/Utilities/otbossim/src/ossim/matrix/myexcept.cpp
index bd2d1fb705298c4443a05cb6a7f62c5e537db195..653de264cf59c1d73e8621b848561a3c206dfcc4 100644
--- a/Utilities/otbossim/src/ossim/matrix/myexcept.cpp
+++ b/Utilities/otbossim/src/ossim/matrix/myexcept.cpp
@@ -68,7 +68,7 @@ void BaseException::AddMessage(const char* a_what)
{
if (a_what)
{
- int l = strlen(a_what); int r = LastOne - SoFar;
+ int l = (int)strlen(a_what); int r = LastOne - SoFar;
if (l < r) { strcpy(what_error+SoFar, a_what); SoFar += l; }
else if (r > 0)
{
diff --git a/Utilities/otbossim/src/ossim/matrix/newmatex.cpp b/Utilities/otbossim/src/ossim/matrix/newmatex.cpp
index fc8618248c91ca44416700a51946cbd16e31ffe6..541696dfc6a0b72884d9b9ff0655bbd1e4f3ac15 100644
--- a/Utilities/otbossim/src/ossim/matrix/newmatex.cpp
+++ b/Utilities/otbossim/src/ossim/matrix/newmatex.cpp
@@ -4,6 +4,9 @@
#define WANT_STREAM // include.h will get stream fns
+#include <iostream>
+#include <iomanip>
+
#include <ossim/matrix/include.h>
#include <ossim/matrix/newmat.h>
@@ -277,9 +280,9 @@ ExeCounter::ExeCounter(int xl, int xf) : line(xl), fileid(xf), nexe(0) {}
ExeCounter::~ExeCounter()
{
nreports++;
- cout << "REPORT " << setw(6) << nreports << " "
- << setw(6) << fileid << " " << setw(6) << line
- << " " << setw(6) << nexe << "\n";
+ std::cout << "REPORT " << std::setw(6) << nreports << " "
+ << std::setw(6) << fileid << " " << std::setw(6) << line
+ << " " << std::setw(6) << nexe << "\n";
}
#endif
diff --git a/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp b/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
index 12c2cb0e61a80d8b2eeeea96ab2352a57af9d603..32c2a1cf6afa2355235e3664ff0249c58a61e8a9 100644
--- a/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
+++ b/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
@@ -1,4 +1,13 @@
-// $Id: ossimOrthoIgen.cpp 15785 2009-10-21 14:55:04Z dburken $
+// $Id: ossimOrthoIgen.cpp 15849 2009-11-04 15:19:35Z dburken $
+
+// In Windows, standard output is ASCII by default.
+// Let's include the following in case we have
+// to change it over to binary mode.
+#if defined(_WIN32)
+#include <io.h>
+#include <fcntl.h>
+#endif
+
#include <sstream>
#include <ossim/parallel/ossimOrthoIgen.h>
#include <ossim/parallel/ossimIgen.h>
@@ -80,6 +89,7 @@ ossimOrthoIgen::ossimOrthoIgen()
theCombinerTemplate(""),
theAnnotationTemplate(""),
theWriterTemplate(""),
+ theSupplementaryDirectory(""),
theSlaveBuffers("2"),
theCutOriginType(ossimOrthoIgen::OSSIM_CENTER_ORIGIN),
theCutOrigin(ossim::nan(), ossim::nan()),
@@ -132,6 +142,8 @@ void ossimOrthoIgen::addArguments(ossimArgumentParser& argumentParser)
argumentParser.getApplicationUsage()->addCommandLineOption("--hist-auto-minmax","uses the automatic search for the best min and max clip values");
+ argumentParser.getApplicationUsage()->addCommandLineOption("--supplementary-directory","Specify the supplementary directory path where overviews are located");
+
argumentParser.getApplicationUsage()->addCommandLineOption("--scale-to-8-bit","Scales output to eight bits if not already.");
argumentParser.getApplicationUsage()->addCommandLineOption("--writer-prop","Passes a name=value pair to the writer for setting it's property. Any number of these can appear on the line.");
@@ -273,6 +285,20 @@ void ossimOrthoIgen::initialize(ossimArgumentParser& argumentParser)
if (argumentParser.read("--stdout"))
{
+#if defined(_WIN32)
+ // In Windows, cout is ASCII by default.
+ // Let's change it over to binary mode.
+ int result = _setmode( _fileno(stdout), _O_BINARY );
+ if( result == -1 )
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimOrthoIgen::initialize WARNING:"
+ << "\nCannot set standard output mode to binary."
+ << std::endl;
+ return;
+ }
+#endif
+
theStdoutFlag = true;
}
@@ -351,6 +377,10 @@ void ossimOrthoIgen::initialize(ossimArgumentParser& argumentParser)
{
theResamplerType = tempString;
}
+ if(argumentParser.read("--supplementary-directory", stringParam))
+ {
+ theSupplementaryDirectory = ossimFilename(tempString);
+ }
if(traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -407,11 +437,8 @@ bool ossimOrthoIgen::execute()
{
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "ossimOrthoIgen::execute DEBUG: setupIgenKwl caught exception."
- << std::endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
}
-
throw; // re-throw exception
}
@@ -426,7 +453,7 @@ bool ossimOrthoIgen::execute()
}
}
}
-
+
ossimIgen *igen = new ossimIgen;
igen->initialize(igenKwl);
@@ -436,18 +463,15 @@ bool ossimOrthoIgen::execute()
}
catch(const ossimException& e)
{
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
+ }
delete igen;
igen = 0;
throw; // re-throw
}
-// if(ossimMpi::instance()->getRank() == 0)
-// {
-// stop = ossimMpi::instance()->getTime();
-// ossimNotify(ossimNotifyLevel_NOTICE)
-// << "Time elapsed: " << (stop-start)
-// << std::endl;
-// }
delete igen;
igen = 0;
@@ -496,6 +520,7 @@ void ossimOrthoIgen::setDefaultValues()
theResamplerType = "nearest neighbor";
theTilingTemplate = "";
theTilingFilename = "";
+ theSupplementaryDirectory = "";
theSlaveBuffers = "2";
clearFilenameList();
theLowPercentClip = ossim::nan();
@@ -593,9 +618,7 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
{
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "ossimOrthoIgen::execute DEBUG: setupView through exception!"
- << std::endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
}
throw; // re-throw exception
}
@@ -670,7 +693,7 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
chain = tempChain;
}
- ossim_uint32 fileSize = theFilenames.size()-1;
+ ossim_uint32 fileSize = (ossim_uint32)theFilenames.size()-1;
ossim_uint32 idx;
ossim_uint32 chainIdx = 1;
ossimRefPtr<ossimImageChain> rootChain = new ossimImageChain;
@@ -684,6 +707,13 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
ossimHistogramRemapper* histRemapper = 0;
if(handler.valid())
{
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ handler->setSupplementaryDirectory( theSupplementaryDirectory );
+ ossimFilename overviewFilename = handler->getFilenameWithThisExtension(ossimString(".ovr"));
+ handler->openOverview( overviewFilename );
+ }
+
std::vector<ossim_uint32> entryList;
if(theFilenames[idx].theEntry >-1)
{
@@ -699,6 +729,13 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
{
ossimImageHandler* h = (ossimImageHandler*)handler->dup();
h->setCurrentEntry(entryList[entryIdx]);
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ h->setSupplementaryDirectory( theSupplementaryDirectory );
+ ossimFilename overviewFilename = h->getFilenameWithThisExtension(ossimString(".ovr"));
+ h->openOverview( overviewFilename );
+ }
+
ossimImageChain* tempChain = (ossimImageChain*)chain->dup();
tempChain->addLast(h);
if( ( (ossim::isnan(theHighPercentClip) == false) &&
@@ -810,9 +847,7 @@ void ossimOrthoIgen::setupIgenKwl(ossimKeywordlist& kwl)
{
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "ossimOrthoIgen::execute DEBUG: setupWriter returned false..."
- << std::endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << e.what() << std::endl;
}
throw; // re-throw exception
}
@@ -1169,6 +1204,13 @@ void ossimOrthoIgen::setupView(ossimKeywordlist& kwl)
throw(ossimException(errMsg));
}
+ if ( theSupplementaryDirectory.empty() == false )
+ {
+ handler->setSupplementaryDirectory( theSupplementaryDirectory );
+ ossimFilename overviewFilename = handler->getFilenameWithThisExtension(ossimString(".ovr"));
+ handler->openOverview( overviewFilename );
+ }
+
const ossimProjection* inputProj = 0;
const ossimImageGeometry* inputGeom = handler->getImageGeometry();
if (inputGeom)
diff --git a/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp b/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp
index 68ba8b2e0eb18c1d4414d57510db5118efe1b8fd..d584d39176e8d78f0e319e15bb563dd958d912d0 100644
--- a/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp
+++ b/Utilities/otbossim/src/ossim/plugin/ossimSharedPluginRegistry.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimSharedPluginRegistry.cpp 14046 2009-03-03 02:23:38Z gpotts $
+// $Id: ossimSharedPluginRegistry.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <iterator>
#include <ossim/plugin/ossimSharedPluginRegistry.h>
@@ -179,7 +179,7 @@ const ossimPluginLibrary* ossimSharedPluginRegistry::getPlugin(ossim_uint32 idx)
ossim_uint32 ossimSharedPluginRegistry::getNumberOfPlugins()const
{
- return theLibraryList.size();
+ return (ossim_uint32)theLibraryList.size();
}
diff --git a/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp b/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp
index 1f1d846fbffca52d23e4a4eab92e54b919ac9a4f..21a0be01ecfcfcc8afafd79b0147defcfd781535 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimBngProjection.cpp
@@ -6,7 +6,7 @@
// Author: Garrett Potts
//
//*******************************************************************
-// $Id: ossimBngProjection.cpp 11949 2007-10-31 14:33:29Z gpotts $
+// $Id: ossimBngProjection.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/projection/ossimBngProjection.h>
#include <ossim/projection/ossimTranmerc.h>
#include <ossim/base/ossimDatumFactory.h>
@@ -183,7 +183,7 @@ long ossimBngProjection::Find_Index (char letter,
*/
ossim_uint32 i = 0;
ossim_uint32 not_Found = 1;
- ossim_uint32 length = strlen(letter_Array);
+ ossim_uint32 length = (ossim_uint32)strlen(letter_Array);
ossim_uint32 Error_Code = BNG_NO_ERROR;
while ((i < length) && (not_Found))
@@ -267,7 +267,7 @@ long ossimBngProjection::Break_BNG_String (char* BNG,
long num_digits = 0;
long num_letters;
long temp_error = 0;
- long length = strlen(BNG);
+ long length = (long)strlen(BNG);
long error_code = BNG_NO_ERROR;
string_Broken = 1;
diff --git a/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp b/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
index 854745f7b278deeea127273b050a1cbf3877a5d2..4da387c6cc8e6b17593afecf4f95287c3a425a74 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimIkonosRpcModel.cpp
@@ -13,7 +13,7 @@
// LIMITATIONS: None.
//
//*****************************************************************************
-// $Id: ossimIkonosRpcModel.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimIkonosRpcModel.cpp 15828 2009-10-28 13:11:31Z dburken $
#include <cstdlib>
#include <ossim/projection/ossimIkonosRpcModel.h>
@@ -425,14 +425,24 @@ void ossimIkonosRpcModel::parseMetaData(const ossimFilename& data_file)
//*****************************************************************************
bool ossimIkonosRpcModel::parseHdrData(const ossimFilename& data_file)
{
- if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimIkonosRpcModel::parseHdrData(data_file): entering..." << std::endl;
+ if (traceExec())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "DEBUG ossimIkonosRpcModel::parseHdrData(data_file): entering..."
+ << std::endl;
+ }
- if( !data_file.exists() )
- {
- if (traceExec()) ossimNotify(ossimNotifyLevel_WARN)<< "ossimIkonosRpcModel::parseHdrData(data_file) WARN:"<< "\nrpc data file <" << data_file << ">. "<< "doesn't exist..." << std::endl;
+ if( !data_file.exists() )
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimIkonosRpcModel::parseHdrData(data_file) WARN:"
+ << "\nrpc data file <" << data_file << ">. "<< "doesn't exist..."
+ << std::endl;
+ }
return false;
- }
-
+ }
FILE* fptr = fopen (data_file, "r");
if (!fptr)
@@ -543,24 +553,36 @@ bool ossimIkonosRpcModel::parseHdrData(const ossimFilename& data_file)
//*****************************************************************************
void ossimIkonosRpcModel::parseRpcData(const ossimFilename& data_file)
{
- if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimIkonosRpcModel::parseRpcData(data_file): entering..." << std::endl;
-
+ if (traceExec())
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "DEBUG ossimIkonosRpcModel::parseRpcData(data_file): entering..."
+ << std::endl;
+ }
+
if( !data_file.exists() )
- {
- if (traceExec()) ossimNotify(ossimNotifyLevel_WARN)<< "ossimIkonosRpcModel::parseRpcData(data_file) WARN:"<< "\nrpc data file <" << data_file << ">. "<< "doesn't exist..." << std::endl;
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimIkonosRpcModel::parseRpcData(data_file) WARN:"
+ << "\nrpc data file <" << data_file << ">. "<< "doesn't exist..."
+ << std::endl;
+ }
return;
}
-
+
//***
// The Ikonos RPC data file is conveniently formatted as KWL file:
//***
ossimKeywordlist kwl (data_file);
if (kwl.getErrorStatus())
{
- ossimNotify(ossimNotifyLevel_FATAL) << "ERROR ossimIkonosRpcModel::parseRpcData(data_file): Could not open RPC data file <" << data_file << ">. "
- << "Aborting..." << std::endl;
+ ossimNotify(ossimNotifyLevel_FATAL)
+ << "ERROR ossimIkonosRpcModel::parseRpcData(data_file): Could not open RPC data file <" << data_file << ">. " << "Aborting..." << std::endl;
theErrorStatus++;
- if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "returning with error..." << std::endl;
+ if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG)
+ << "returning with error..." << std::endl;
return;
}
@@ -658,6 +680,12 @@ void ossimIkonosRpcModel::parseRpcData(const ossimFilename& data_file)
<< keyword << std::endl;
return;
}
+ else
+ {
+ // copy ossimIkonosMetada-sensor into ossimIkonosRpcModel-sensorId
+ theSensorID = theSupportData->getSensorID();
+ }
+
theLatScale = atof(buf);
diff --git a/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp b/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp
index a8ff9fb6053cbec66d66b71f3ea2e65452154509..5962b90a0c3fdf57595deefbd6be3760d28ffb39 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimPolynomProjection.cpp
@@ -526,7 +526,7 @@ ossim_uint32
ossimPolynomProjection::degreesOfFreedom()const
{
//is number of desired monoms * 2
- return theExpSet.size() * 2;
+ return (ossim_uint32)theExpSet.size() * 2;
}
bool
diff --git a/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp b/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp
index b20b5fb9aa1edd7fbbafbbdfb3fb00d7ef33eb22..148869c5b14d4b25e725d23eb968ba9d5dd0b07e 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimRpcSolver.cpp
@@ -8,7 +8,7 @@
// AUTHOR: Garrett Potts
//
//*****************************************************************************
-// $Id: ossimRpcSolver.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimRpcSolver.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cstdlib>
#include <ctime>
@@ -546,7 +546,7 @@ void ossimRpcSolver::solveCoefficients(NEWMAT::ColumnVector& coeff,
ossim_uint32 idx = 0;
NEWMAT::Matrix m;
- NEWMAT::ColumnVector r(f.size());
+ NEWMAT::ColumnVector r((int)f.size());
for(idx = 0; idx < f.size(); ++idx)
{
@@ -554,7 +554,7 @@ void ossimRpcSolver::solveCoefficients(NEWMAT::ColumnVector& coeff,
}
NEWMAT::ColumnVector tempCoeff;
- NEWMAT::DiagonalMatrix weights(f.size());
+ NEWMAT::DiagonalMatrix weights((int)f.size());
NEWMAT::ColumnVector denominator(20);
// initialize the weight matrix to the identity
diff --git a/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp b/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp
index 45e8a0a5bb215c872bf47a95ac185bd9872d9f81..7d099479fa3d9bf25a050408e25d92efc360e404 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimStatePlaneProjectionFactory.cpp
@@ -4,7 +4,7 @@
//
// Author: Garrett Potts
//*******************************************************************
-// $Id: ossimStatePlaneProjectionFactory.cpp 15080 2009-08-15 19:32:07Z dburken $
+// $Id: ossimStatePlaneProjectionFactory.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <fstream>
#include <sstream>
@@ -411,10 +411,13 @@ bool ossimStatePlaneProjectionFactory::findLine(
return false;
}
+#define EPSG_CODE_MAX 32767
bool ossimStatePlaneProjectionFactory::findLine(
const ossimString& name, std::vector<ossimString> &result) const
{
OpenThreads::ScopedReadLock lock(theMutex);
+ std::string savedLine;
+ bool bSavedLine = false;
// Iterate throught the cvs files to try and find pcs code.
std::vector<ossimFilename>::const_iterator i = theCsvFiles.begin();
while (i != theCsvFiles.end())
@@ -449,11 +452,28 @@ bool ossimStatePlaneProjectionFactory::findLine(
if (result[NAME_INDEX] == name)
{
- return true;
+ // ESH 05/2008 -- Return EPSG codes preferentially
+ if ( result[PCS_CODE_INDEX].toInt() < EPSG_CODE_MAX )
+ return true;
+ else
+ {
+ savedLine.assign(line.c_str());
+ bSavedLine = true;
+ break;
+ }
}
}
++i; // go to next csv file
}
+
+ // ESH 05/2008 -- If we've found an ESRI-style or user-defined
+ // pcs code and nothing else, we'll try to make do with it.
+ if ( bSavedLine == true )
+ {
+ // Split the line between commas stripping quotes.
+ splitLine(savedLine, result);
+ return ( (result.size() == KEYS_SIZE) && (result[NAME_INDEX] == name) );
+ }
return false;
}
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp b/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp
index f29fe5354f915c941854beb670e14478389dfdde..95c18e5beb314de8cb24321db160d12fbdff88fc 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimEnviHeader.cpp
@@ -10,7 +10,7 @@
// Images) header file.
//
//----------------------------------------------------------------------------
-// $Id: ossimEnviHeader.cpp 11347 2007-07-23 13:01:59Z gpotts $
+// $Id: ossimEnviHeader.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <fstream>
#include <string>
@@ -265,7 +265,7 @@ std::ostream& ossimEnviHeader::print(std::ostream& out) const
{
out << "\nband names = {";
ossim_uint32 i;
- ossim_uint32 size = theBandName.size();
+ ossim_uint32 size = (ossim_uint32)theBandName.size();
for (i = 0; i < size; ++i)
{
out << "\n " << theBandName[i];
@@ -301,7 +301,7 @@ std::ostream& ossimEnviHeader::print(std::ostream& out) const
{
out << "\nwavelength = {\n";
ossim_uint32 i;
- ossim_uint32 size = theWavelength.size();
+ ossim_uint32 size = (ossim_uint32)theWavelength.size();
for (i = 0; i < size; ++i)
{
out << theWavelength[i];
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp b/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp
index 7dbc220fe847212d12ab8a590a14591575c8e369..c00bb13f09b363e804a0b52b45495f31de926c32 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimFfL7.cpp
@@ -8,7 +8,7 @@
// Description: Container class for LandSat7 Fast Format header files.
//
//********************************************************************
-// $Id: ossimFfL7.cpp 13663 2008-10-02 18:47:32Z gpotts $
+// $Id: ossimFfL7.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
// #include <cstdlib>
@@ -692,7 +692,7 @@ unsigned int ossimFfL7::getBandCount()const
{
ossimString tmp(theBandsPresentString);
tmp.trim(); //remove spaces
- return tmp.length();
+ return (unsigned int)tmp.length();
// return strlen(tmp.chars()); //beurk! should implement length in ossimString
}
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp b/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp
index 4cd33ecf20b9f8ed47d0eeeade4521f1ce0b0ad4..e9be23b9f047507f70feb787905224c624bd1a55 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimGeoTiff.cpp
@@ -9,7 +9,7 @@
// information.
//
//***************************************************************************
-// $Id: ossimGeoTiff.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimGeoTiff.cpp 15868 2009-11-06 22:30:38Z dburken $
#include <ossim/support_data/ossimGeoTiff.h>
#include <ossim/base/ossimTrace.h>
@@ -23,6 +23,7 @@
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/base/ossimNotifyContext.h>
#include <ossim/projection/ossimMapProjection.h>
+#include <ossim/projection/ossimProjection.h>
#include <ossim/projection/ossimUtmProjection.h>
#include <ossim/projection/ossimPcsCodeProjectionFactory.h>
#include <ossim/projection/ossimStatePlaneProjectionFactory.h>
@@ -50,7 +51,7 @@ static const ossimGeoTiffDatumLut DATUM_LUT;
OpenThreads::Mutex ossimGeoTiff::theMutex;
#ifdef OSSIM_ID_ENABLED
-static const char OSSIM_ID[] = "$Id: ossimGeoTiff.cpp 15766 2009-10-20 12:37:09Z gpotts $";
+static const char OSSIM_ID[] = "$Id: ossimGeoTiff.cpp 15868 2009-11-06 22:30:38Z dburken $";
#endif
//---
@@ -377,7 +378,7 @@ bool ossimGeoTiff::writeTags(TIFF* tifPtr,
gcs = USER_DEFINED;
std::ostringstream os;
- os << "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 15766 $ $Date: 2009-10-20 20:37:09 +0800 (Tue, 20 Oct 2009) $\nUnable to match Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)";
+ os << "IMAGINE GeoTIFF Support\nCopyright 1991 - 2001 by ERDAS, Inc. All Rights Reserved\n@(#)$RCSfile$ $Revision: 15868 $ $Date: 2009-11-07 06:30:38 +0800 (Sat, 07 Nov 2009) $\nUnable to match Ellipsoid (Datum) to a GeographicTypeGeoKey value\nEllipsoid = Clarke 1866\nDatum = NAD27 (CONUS)";
GTIFKeySet(gtif,
GeogCitationGeoKey,
@@ -853,10 +854,118 @@ bool ossimGeoTiff::writeTags(TIFF* tifPtr,
return true;
}
-bool ossimGeoTiff::readTags(const ossimFilename& file, ossim_uint32 entryIdx)
+bool ossimGeoTiff::writeJp2GeotiffBox(const ossimFilename& tmpFile,
+ const ossimIrect& rect,
+ const ossimProjection* proj,
+ std::vector<ossim_uint8>& buf)
{
- OpenThreads::ScopedLock<OpenThreads::Mutex> lock(theMutex);
+ //---
+ // Snip from The "GeoTIFF Box" Specification for JPEG 2000 Metadata:
+ // This box contains a valid GeoTIFF image. The image is "degenerate", in
+ // that it represents a very simple image with specific constraints:
+ // . the image height and width are both 1
+ // . the datatype is 8-bit
+ // . the colorspace is grayscale
+ // . the (single) pixel must have a value of 0 for its (single) sample
+ //
+ // NOTE: It also states little endian but I think libtiff writes whatever
+ // endianesss the host is.
+ //
+ // Also assuming class tiff for now. Not big tiff.
+ //---
+ bool result = true;
+
+ TIFF* tiff = XTIFFOpen(tmpFile.c_str(), "w");
+ if (tiff)
+ {
+ // Write the projection info out.
+ ossimMapProjection* mapProj = PTR_CAST(ossimMapProjection, proj);
+ if(mapProj)
+ {
+ ossimRefPtr<ossimMapProjectionInfo> projectionInfo
+ = new ossimMapProjectionInfo(mapProj, rect);
+ ossimGeoTiff::writeTags(tiff, projectionInfo, false);
+ }
+
+ // Basic tiff tags.
+ TIFFSetField( tiff, TIFFTAG_IMAGEWIDTH, 1 );
+ TIFFSetField( tiff, TIFFTAG_IMAGELENGTH, 1 );
+ TIFFSetField( tiff, TIFFTAG_BITSPERSAMPLE, 8 );
+ TIFFSetField( tiff, TIFFTAG_SAMPLESPERPIXEL, 1 );
+ TIFFSetField( tiff, TIFFTAG_ROWSPERSTRIP, 1 );
+ TIFFSetField( tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG );
+ TIFFSetField( tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK );
+ // One pixel image:
+ ossim_uint8 pixel = 0;
+ TIFFWriteEncodedStrip( tiff, 0, (char *) &pixel, 1 );
+
+ TIFFWriteDirectory( tiff );
+ XTIFFClose( tiff );
+
+ // Get the size. Note 16 bytes added for the JP2 UUID:
+ const std::vector<ossim_uint8>::size_type UUID_SIZE = 16;
+ const std::vector<ossim_uint8>::size_type BOX_SIZE = UUID_SIZE +
+ static_cast<std::vector<ossim_uint8>::size_type>(tmpFile.fileSize());
+
+ // Create the buffer.
+ buf.resize( BOX_SIZE );
+
+ if ( BOX_SIZE == buf.size() )
+ {
+ const ossim_uint8 GEOTIFF_UUID[UUID_SIZE] =
+ {
+ 0xb1, 0x4b, 0xf8, 0xbd,
+ 0x08, 0x3d, 0x4b, 0x43,
+ 0xa5, 0xae, 0x8c, 0xd7,
+ 0xd5, 0xa6, 0xce, 0x03
+ };
+
+ // Copy the UUID.
+ std::vector<ossim_uint8>::size_type i;
+ for (i = 0; i < UUID_SIZE; ++i)
+ {
+ buf[i] = GEOTIFF_UUID[i];
+ }
+
+ // Copy the tiff.
+ std::ifstream str;
+ str.open(tmpFile.c_str(), ios::in | ios::binary);
+ if (str.is_open())
+ {
+ char ch;
+ for (; i < BOX_SIZE; ++i)
+ {
+ str.get(ch);
+ buf[i] = static_cast<ossim_uint8>(ch);
+ }
+ }
+ }
+ else
+ {
+ result = false;
+ }
+
+ // Remove the temp file.
+ tmpFile.remove();
+
+ }
+ else
+ {
+ result = false;
+
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << "ossimGeoTiff::writeJp2GeotiffBox ERROR:\n"
+ << "Could not open " << tmpFile << std::endl;
+ }
+ }
+ return result;
+}
+
+bool ossimGeoTiff::readTags(const ossimFilename& file, ossim_uint32 entryIdx)
+{
bool result = false;
TIFF* tiff = XTIFFOpen(file.c_str(), "r");
@@ -1307,7 +1416,7 @@ bool ossimGeoTiff::addImageGeometry(ossimKeywordlist& kwl,
ossimString copyPrefix(prefix);
double x_tie_point = 0.0;
double y_tie_point = 0.0;
- ossim_uint32 tieCount = theTiePoint.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)theTiePoint.size()/6;
if( (theScale.size() == 3) && (tieCount == 1))
{
@@ -2215,7 +2324,7 @@ bool ossimGeoTiff::getModelTransformFlag() const
void ossimGeoTiff::getTieSet(ossimTieGptSet& tieSet) const
{
ossim_uint32 idx = 0;
- ossim_uint32 tieCount = theTiePoint.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)theTiePoint.size()/6;
const double* tiePointsPtr = &theTiePoint.front();
double offset = 0;
if (hasOneBasedTiePoints())
@@ -2249,7 +2358,7 @@ bool ossimGeoTiff::hasOneBasedTiePoints() const
ossim_float64 maxX = 0.0;
ossim_float64 maxY = 0.0;
- const ossim_uint32 SIZE = theTiePoint.size();
+ const ossim_uint32 SIZE = (ossim_uint32)theTiePoint.size();
ossim_uint32 tieIndex = 0;
while (tieIndex < SIZE)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp b/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
index 1e29290bb0dfcca2d3fcd883a29c51719e4d47bf..bd8f108e34dddf6f51de613170fac55688240674 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimIkonosMetaData.cpp
@@ -11,7 +11,7 @@
// This class parses a Space Imaging Ikonos meta data file.
//
//********************************************************************
-// $Id: ossimIkonosMetaData.cpp 14546 2009-05-18 18:58:05Z dburken $
+// $Id: ossimIkonosMetaData.cpp 15828 2009-10-28 13:11:31Z dburken $
#include <cstdio>
#include <iostream>
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp
index f0c8a6e75749d30a793f57357622246587f7cffa..9541d1d613e240ee4927d93001230594ac30a5bf 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfEngrdaTag.cpp
@@ -110,7 +110,7 @@ void ossimNitfEngrdaTag::parseStream(std::istream& in)
// ENGDATA - Engineering Data
element.theEngDat.resize(engDatC);
- in.read((char*)&(element.theEngDat.front()), element.theEngDat.size());
+ in.read((char*)&(element.theEngDat.front()), (std::streamsize)element.theEngDat.size());
theTreLength += engDatC;
theData.push_back(element);
@@ -136,7 +136,7 @@ void ossimNitfEngrdaTag::writeStream(std::ostream& out)
out.write(s.data(), ENGLN_SIZE);
// ENGLBL - label field
- out.write(theData[i].theEngLbl.data(), theData[i].theEngLbl.size());
+ out.write(theData[i].theEngLbl.data(), (std::streamsize)theData[i].theEngLbl.size());
// ENGMTXC - data column count
getValueAsString(theData[i].theEngMtxC, ENGMTXC_SIZE, s);
@@ -161,7 +161,7 @@ void ossimNitfEngrdaTag::writeStream(std::ostream& out)
// ENGDATA - Engineering Data NOTE: should be big endian...
out.write((char*)&(theData[i].theEngDat.front()),
- theData[i].theEngDat.size());
+ (std::streamsize)theData[i].theEngDat.size());
} // Matches: for (ossim_uint16 i = 0; i < ELEMENT_COUNT; ++i)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp
index 463c7321fdceef2b43340b0fd79f141f66e250ed..e617963bc44d8157655f0e3e108e4f189e4595f7 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeader.cpp
@@ -9,7 +9,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfFileHeader.cpp 14241 2009-04-07 19:59:23Z dburken $
+// $Id: ossimNitfFileHeader.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/support_data/ossimNitfFileHeader.h>
#include <ossim/base/ossimContainerProperty.h>
#include <iostream>
@@ -116,7 +116,7 @@ bool ossimNitfFileHeader::getTagInformation(ossimNitfTagInformation& tag,
int ossimNitfFileHeader::getNumberOfTags()const
{
- return theTagList.size();
+ return (int)theTagList.size();
}
ossim_uint32 ossimNitfFileHeader::getTotalTagLength()const
@@ -142,7 +142,7 @@ ossimRefPtr<ossimProperty> ossimNitfFileHeader::getProperty(const ossimString& n
if(name == TAGS_KW)
{
- ossim_uint32 idxMax = theTagList.size();
+ ossim_uint32 idxMax = (ossim_uint32)theTagList.size();
if(idxMax > 0)
{
ossimContainerProperty* containerProperty = new ossimContainerProperty;
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp
index a6feb8621f00f4eb498627f6d6442110ba7384c2..4b713712b077b0c2befbef5c08c86b95f57d427c 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_0.cpp
@@ -9,7 +9,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfFileHeaderV2_0.cpp 14662 2009-06-07 16:15:23Z dburken $
+// $Id: ossimNitfFileHeaderV2_0.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <sstream>
@@ -980,17 +980,17 @@ bool ossimNitfFileHeaderV2_0::isEncrypted()const
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfImages()const
{
- return theNitfImageInfoRecords.size();
+ return (ossim_int32)theNitfImageInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfLabels()const
{
- return (theNitfLabelInfoRecords.size());
+ return ((ossim_int32)theNitfLabelInfoRecords.size());
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfSymbols()const
{
- return (theNitfSymbolInfoRecords.size());
+ return ((ossim_int32)theNitfSymbolInfoRecords.size());
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfGraphics()const
@@ -1000,12 +1000,12 @@ ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfGraphics()const
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfTextSegments()const
{
- return theNitfTextInfoRecords.size();
+ return (ossim_int32)theNitfTextInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_0::getNumberOfDataExtSegments()const
{
- return theNitfDataExtSegInfoRecords.size();
+ return (ossim_int32)theNitfDataExtSegInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_0::getHeaderSize()const
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp
index a07c25a0481165bcec021dce227c81d87c421a44..725e2568028ede23e3410b702ecae6864560412c 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfFileHeaderV2_1.cpp
@@ -9,7 +9,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfFileHeaderV2_1.cpp 15411 2009-09-11 19:46:32Z dburken $
+// $Id: ossimNitfFileHeaderV2_1.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
#include <iomanip>
@@ -674,7 +674,7 @@ bool ossimNitfFileHeaderV2_1::isEncrypted()const
ossim_int32 ossimNitfFileHeaderV2_1::getNumberOfImages()const
{
- return theNitfImageInfoRecords.size();
+ return (ossim_int32)theNitfImageInfoRecords.size();
}
ossim_int32 ossimNitfFileHeaderV2_1::getNumberOfTextSegments()const
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp
index 78a2d3e9bfdd1f698a2d3f94f073e52f42ab3478..8f3048fc74296f0149a51357393d985d45bc9260 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfProjectionParameterTag.cpp
@@ -8,7 +8,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfProjectionParameterTag.cpp 15766 2009-10-20 12:37:09Z gpotts $
+// $Id: ossimNitfProjectionParameterTag.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/support_data/ossimNitfProjectionParameterTag.h>
#include <sstream>
#include <iomanip>
@@ -75,7 +75,7 @@ void ossimNitfProjectionParameterTag::writeStream(std::ostream& out)
ossim_uint32 ossimNitfProjectionParameterTag::getSizeInBytes()const
{
- return (113 + theProjectionParameters.size()*15);
+ return (113 + (ossim_uint32)theProjectionParameters.size()*15);
}
std::ostream& ossimNitfProjectionParameterTag::print(
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp b/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp
index 0399a59f26d1d3d7118ee54b16774ee46bc0bd5b..7ba5dae1d06780bad1d1cd5d213ee588a04d906f 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimNitfVqCompressionHeader.cpp
@@ -7,7 +7,7 @@
// Description: Nitf support class
//
//********************************************************************
-// $Id: ossimNitfVqCompressionHeader.cpp 9094 2006-06-13 19:12:40Z dburken $
+// $Id: ossimNitfVqCompressionHeader.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
@@ -250,7 +250,7 @@ ossim_uint32 ossimNitfVqCompressionHeader::getImageCodeBitLength()const
ossim_uint32 ossimNitfVqCompressionHeader::getNumberOfTables()const
{
- return theTable.size();
+ return (ossim_uint32)theTable.size();
}
const std::vector<ossimNitfVqCompressionOffsetTableData>& ossimNitfVqCompressionHeader::getTable()const
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp b/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp
index 8cada97275312699d32c6561a7bdfc386930eff6..829462ca23e8e68fd97b8ef613357d784a60c886 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimRpfToc.cpp
@@ -9,7 +9,7 @@
// Description: Rpf support class
//
//********************************************************************
-// $Id: ossimRpfToc.cpp 15810 2009-10-24 14:54:27Z dburken $
+// $Id: ossimRpfToc.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
@@ -231,6 +231,54 @@ ossim_int32 ossimRpfToc::getTocEntryIndex(const ossimRpfTocEntry* entry)
return -1;
}
+ossim_uint32 ossimRpfToc::getNumberOfFramesHorizontal(ossim_uint32 idx) const
+{
+ ossim_uint32 nFrames = 0;
+ const ossimRpfTocEntry* pEntry = getTocEntry( idx );
+ if ( pEntry != NULL )
+ {
+ nFrames = pEntry->getNumberOfFramesHorizontal();
+ }
+ return nFrames;
+}
+
+ossim_uint32 ossimRpfToc::getNumberOfFramesVertical(ossim_uint32 idx) const
+{
+ ossim_uint32 nFrames = 0;
+ const ossimRpfTocEntry* pEntry = getTocEntry( idx );
+ if ( pEntry != NULL )
+ {
+ nFrames = pEntry->getNumberOfFramesVertical();
+ }
+ return nFrames;
+}
+
+bool ossimRpfToc::getRpfFrameEntry(ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col,
+ ossimRpfFrameEntry& result)const
+{
+ const ossimRpfTocEntry* pEntry = getTocEntry( entryIdx );
+ if ( pEntry != NULL )
+ {
+ return pEntry->getEntry( row, col, result );
+ }
+ return false;
+}
+
+const ossimString ossimRpfToc::getRelativeFramePath( ossim_uint32 entryIdx,
+ ossim_uint32 row,
+ ossim_uint32 col) const
+{
+ ossimRpfFrameEntry frameEntry;
+ bool bResult = getRpfFrameEntry( entryIdx, row, col, frameEntry );
+ if ( bResult == true )
+ {
+ return frameEntry.getPathToFrameFileFromRoot();
+ }
+ return ossimString("");
+}
+
void ossimRpfToc::deleteAll()
{
if(theRpfHeader)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp b/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp
index 0a58b0359b66c4213065d891f49aa41a3aa19597..00a7587ddbcd9c156f8d91306748abfe638d7435 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimRpfTocEntry.cpp
@@ -7,7 +7,7 @@
// Author: Garrett Potts
//
//*************************************************************************
-// $Id: ossimRpfTocEntry.cpp 14241 2009-04-07 19:59:23Z dburken $
+// $Id: ossimRpfTocEntry.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <istream>
#include <ostream>
@@ -79,9 +79,9 @@ void ossimRpfTocEntry::setEntry(const ossimRpfFrameEntry& entry,
long row,
long col)
{
- if(row < (long)theFrameEntryArray.size())
+ if(row < (long)theFrameEntryArray.size() && row >= 0)
{
- if(col < (long)theFrameEntryArray[row].size())
+ if(col < (long)theFrameEntryArray[row].size() && col >= 0)
{
theFrameEntryArray[row][col] = entry;
}
@@ -92,9 +92,9 @@ bool ossimRpfTocEntry::getEntry(long row,
long col,
ossimRpfFrameEntry& result)const
{
- if(row < (long)theFrameEntryArray.size())
+ if(row < (long)theFrameEntryArray.size() && row >= 0)
{
- if(col < (long)theFrameEntryArray[row].size())
+ if(col < (long)theFrameEntryArray[row].size() && col >= 0)
{
result = theFrameEntryArray[row][col];
}
@@ -117,11 +117,11 @@ bool ossimRpfTocEntry::getEntry(long row,
*/
bool ossimRpfTocEntry::isEmpty()const
{
- long rows = theFrameEntryArray.size();
+ long rows = (long)theFrameEntryArray.size();
long cols = 0;
if(rows > 0)
{
- cols = theFrameEntryArray[0].size();
+ cols = (long)theFrameEntryArray[0].size();
for(long rowIndex = 0; rowIndex < rows; ++ rowIndex)
{
for(long colIndex = 0; colIndex < cols; ++colIndex)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp b/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp
index 1a2a07a556a6b0695f2061e63ad1c7b5e14c5881..526a247e5e3ecca69f44364eb21e3ffdfc9eef3e 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimSpotDimapSupportData.cpp
@@ -9,7 +9,7 @@
// Contains definition of class ossimSpotDimapSupportData.
//
//*****************************************************************************
-// $Id: ossimSpotDimapSupportData.cpp 14208 2009-04-01 18:18:06Z dburken $
+// $Id: ossimSpotDimapSupportData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
@@ -267,7 +267,7 @@ bool ossimSpotDimapSupportData::loadXmlFile(const ossimFilename& file,
if(testString.contains("xml"))
{
in.seekg(0);
- in.read(&fullBuffer.front(), fullBuffer.size());
+ in.read(&fullBuffer.front(), (std::streamsize)fullBuffer.size());
if(!in.fail())
{
bufferedIo = ossimString(fullBuffer.begin(),
@@ -437,7 +437,7 @@ void ossimSpotDimapSupportData::getPositionEcf(ossim_uint32 sample,
ossim_uint32 idxEnd = (ossim_uint32)ceil(tempIdx);
if(idxEnd >= thePosEcfSamples.size())
{
- idxEnd = thePosEcfSamples.size()-1;
+ idxEnd = (ossim_uint32)thePosEcfSamples.size()-1;
}
if(idxStart > idxEnd)
{
@@ -496,7 +496,7 @@ void ossimSpotDimapSupportData::getVelocityEcf(ossim_uint32 sample, ossimEcefPoi
ossim_uint32 idxEnd = (ossim_uint32)ceil(tempIdx);
if(idxEnd >= theVelEcfSamples.size())
{
- idxEnd = theVelEcfSamples.size()-1;
+ idxEnd = (ossim_uint32)theVelEcfSamples.size()-1;
}
if(idxStart > idxEnd)
{
@@ -555,7 +555,7 @@ void ossimSpotDimapSupportData::getEphSampTime(ossim_uint32 sample,
ossim_uint32 idxEnd = (ossim_uint32)ceil(tempIdx);
if(idxEnd >= theEphSampTimes.size())
{
- idxEnd = theEphSampTimes.size()-1;
+ idxEnd = (ossim_uint32)theEphSampTimes.size()-1;
}
if(idxStart > idxEnd)
{
@@ -740,7 +740,7 @@ void ossimSpotDimapSupportData::getLagrangeInterpolation(
if(T.size() <= filter_size)
{
- filter_size = T.size()/2;
+ filter_size = (ossim_uint32)T.size()/2;
lagrange_half_filter = filter_size/2;
}
if ((time < T[lagrange_half_filter]) ||
@@ -1015,17 +1015,17 @@ void ossimSpotDimapSupportData::getRefLineTimeLine(ossim_float64& rtl) const
ossim_uint32 ossimSpotDimapSupportData::getNumEphSamples() const
{
- return theEphSampTimes.size();
+ return (ossim_uint32)theEphSampTimes.size();
}
ossim_uint32 ossimSpotDimapSupportData::getNumAttSamples() const
{
- return theAttSampTimes.size();
+ return (ossim_uint32)theAttSampTimes.size();
}
ossim_uint32 ossimSpotDimapSupportData::getNumGeoPosPoints() const
{
- return theGeoPosImagePoints.size();
+ return (ossim_uint32)theGeoPosImagePoints.size();
}
void ossimSpotDimapSupportData::getUlCorner(ossimGpt& pt) const
@@ -1257,6 +1257,11 @@ bool ossimSpotDimapSupportData::saveState(ossimKeywordlist& kwl,
theNumBands,
true);
+ kwl.add(prefix,
+ "image_id",
+ theImageID,
+ true);
+
kwl.add(prefix,
"instrument",
theInstrument,
@@ -1514,6 +1519,7 @@ bool ossimSpotDimapSupportData::loadState(const ossimKeywordlist& kwl,
theNumBands = ossimString(kwl.find(prefix, ossimKeywordNames::NUMBER_BANDS_KW)).toUInt32();
theAcquisitionDate = kwl.find(prefix, ossimKeywordNames::IMAGE_DATE_KW);
theProductionDate = kwl.find(prefix, "production_date");
+ theImageID = kwl.find(prefix, "image_id");
theInstrument = kwl.find(prefix, "instrument");
theInstrumentIndex = ossimString(kwl.find(prefix, "instrument_index")).toUInt32();
theStepCount = ossimString(kwl.find(prefix, "step_count")).toInt32();
@@ -1937,7 +1943,7 @@ bool ossimSpotDimapSupportData::parsePart2(
sub_nodes.clear();
xml_nodes[band_index]->findChildNodes(xpath, sub_nodes);
- theDetectorCount = sub_nodes.size();
+ theDetectorCount = (ossim_uint32)sub_nodes.size();
if (theMetadataVersion == OSSIM_SPOT_METADATA_VERSION_1_1)
{
@@ -1980,7 +1986,7 @@ bool ossimSpotDimapSupportData::parsePart2(
idxEnd = (ossim_int32)ceil(tempIdx);
if(idxEnd >= (ossim_int32)sub_nodes.size())
{
- idxEnd = sub_nodes.size()-1;
+ idxEnd = (ossim_int32)sub_nodes.size()-1;
}
thePixelLookAngleX.push_back(tempV[idxStart] + tempIdxFraction*(tempV[idxEnd] - tempV[idxStart]));
@@ -2037,7 +2043,7 @@ bool ossimSpotDimapSupportData::parsePart2(
idxEnd = (ossim_int32)ceil(tempIdx);
if(idxEnd >= (ossim_int32)sub_nodes.size())
{
- idxEnd = sub_nodes.size()-1;
+ idxEnd = (ossim_int32)sub_nodes.size()-1;
}
if(idxStart > idxEnd)
{
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp b/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp
index 34beacc26ec654046775cc27c26d13a3ef057ab7..7b5616f792b77d601e7abc397964b0b4de076281 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimSrtmSupportData.cpp
@@ -9,7 +9,7 @@
// Support data class for a Shuttle Radar Topography Mission (SRTM) file.
//
//----------------------------------------------------------------------------
-// $Id: ossimSrtmSupportData.cpp 13094 2008-06-27 15:41:45Z dburken $
+// $Id: ossimSrtmSupportData.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <cmath>
#include <fstream>
@@ -871,7 +871,7 @@ bool ossimSrtmSupportData::computeMinMaxTemplate(T dummy,
ossimByteOrder endianType = ossim::byteOrder();
for (ossim_uint32 line = 0; line < theNumberOfLines; ++line)
{
- theFileStream->read(char_buf, BYTES_IN_LINE);
+ theFileStream->read(char_buf, (std::streamsize)BYTES_IN_LINE);
if(endianType == OSSIM_LITTLE_ENDIAN)
{
swapper.swap(line_buf, theNumberOfSamples);
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp b/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp
index aa5468cc91e38c5c9cc30614661eb953ead3602a..677bcee6ce1a5d596176fa4cd80abce1891d21d6 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimTiffInfo.cpp
@@ -1047,7 +1047,7 @@ bool ossimTiffInfo::getImageGeometry(std::ifstream& inStr,
// NOTE: It takes six doubles to make one tie point ie:
// x,y,z,longitude,latitude,height or x,y,z,easting,northing,height
//---
- ossim_uint32 tieCount = ties.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)ties.size()/6;
// Get the model transform.
std::vector<ossim_float64> xfrm;
@@ -3338,7 +3338,7 @@ void ossimTiffInfo::getTieSets(const std::vector<ossim_float64>& ties,
ossimTieGptSet& tieSet) const
{
ossim_uint32 idx = 0;
- ossim_uint32 tieCount = ties.size()/6;
+ ossim_uint32 tieCount = (ossim_uint32)ties.size()/6;
const double* tiePointsPtr = &ties.front();
double offset = 0;
if (hasOneBasedTiePoints(ties, width, height))
@@ -3374,7 +3374,7 @@ bool ossimTiffInfo::hasOneBasedTiePoints(
ossim_float64 maxX = 0.0;
ossim_float64 maxY = 0.0;
- const ossim_uint32 SIZE = ties.size();
+ const ossim_uint32 SIZE = (ossim_uint32)ties.size();
ossim_uint32 tieIndex = 0;
while (tieIndex < SIZE)
diff --git a/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp b/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp
index 860a156312dd0c0149dcbac76afe03a439074a00..1dcb76d1b0376a8d15633a71a99a0f8e42c5fbf9 100644
--- a/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp
+++ b/Utilities/otbossim/src/ossim/support_data/ossimTiffWorld.cpp
@@ -9,7 +9,7 @@
// Description: Container class for a tiff world file data.
//
//********************************************************************
-// $Id: ossimTiffWorld.cpp 14777 2009-06-25 14:43:52Z dburken $
+// $Id: ossimTiffWorld.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <iostream>
#include <fstream>
@@ -72,7 +72,7 @@ ossimTiffWorld::ossimTiffWorld(const char* file,
filename, result );
if ( bSuccess == true )
{
- int numResults = result.size();
+ int numResults = (int)result.size();
int i;
for ( i=0; i<numResults && !is.is_open(); ++i )
{
diff --git a/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp b/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp
index 65387362d5b3a3a08a4302402e35cbfd1dd0c756..5ee204f19e28dff15d5c1051317bebd1d8535e96 100644
--- a/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp
+++ b/Utilities/otbossim/src/ossim/vec/ossimVpfLibrary.cpp
@@ -6,7 +6,7 @@
// Description: This class extends the stl's string class.
//
//********************************************************************
-// $Id: ossimVpfLibrary.cpp 13023 2008-06-10 16:26:24Z dburken $
+// $Id: ossimVpfLibrary.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <algorithm>
#include <ossim/vec/ossimVpfLibrary.h>
@@ -55,7 +55,7 @@ bool ossimVpfLibrary::openLibrary(ossimVpfDatabase* database,
ossimVpfTable table;
- theNumberOfCoverages = theCoverageNames.size();
+ theNumberOfCoverages = (ossim_uint32)theCoverageNames.size();
returnCode = (theNumberOfCoverages> 0);
}
diff --git a/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp b/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp
index a965559fa8890f86d55d01859c252eab0d35af27..43cfef2df3fe2b4188f45ff687fb6aea38f6c337 100644
--- a/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp
+++ b/Utilities/otbossim/src/ossim/vec/ossimVpfTable.cpp
@@ -9,7 +9,7 @@
// vpf file.
//
//********************************************************************
-// $Id: ossimVpfTable.cpp 13025 2008-06-13 17:06:30Z sbortman $
+// $Id: ossimVpfTable.cpp 15833 2009-10-29 01:41:53Z eshirschorn $
#include <ossim/vec/ossimVpfTable.h>
#include <ossim/vec/vpf.h>
#include <ossim/base/ossimErrorCodes.h>
@@ -496,7 +496,7 @@ void ossimVpfTable::print(std::ostream& out)const
else
{
buf = (char *)get_table_element(j,row,table,NULL,&n);
- n = strlen(table.header[j].name) + 2;
+ n = (long)strlen(table.header[j].name) + 2;
for (k=0;k<(long)strlen(buf);k++)
{
out << buf[k];
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c b/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c
index 9f16ab3ea7bc5e5276883b34ed32081345ed1542..82590bf41280c7851aab2af60307cfb678f978a9 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfcntnt.c
@@ -134,7 +134,7 @@ void vpf_dump_table( char *tablename, char *outname )
fprintf(fp,"%c\n",ch);
} else {
buf = (char *)get_table_element(j,row,table,NULL,&n);
- n = strlen(table.header[j].name) + 2;
+ n = (long)strlen(table.header[j].name) + 2;
for (k=0;(unsigned int)k<strlen(buf);k++) {
fprintf(fp,"%c",buf[k]);
n++;
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c b/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c
index 143f36a015b062c658756eda6e8734d4bfa8b5bb..adb1bb3367585e28745dac8270681ec0adf50b8e 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfptply.c
@@ -437,7 +437,7 @@ static void dirpath( char *path )
{
register unsigned int i;
- i = strlen(path)-1;
+ i = (int)strlen(path)-1;
while ( (i>0) && (path[i] != '\\') ) i--;
if (i<(strlen(path)-1)) i++;
path[i] = '\0';
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c b/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c
index c319cc8e919e962922ea6c4e4825ad64b6969666..6622865a37cb4e31fc43cb302d344c5f19aa4d91 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfquery.c
@@ -175,7 +175,7 @@ static void return_token( char *expr, char *token )
stopflag=0;
while (expr[0] == ' ') {
for (i=0;i<ndelim;i++)
- if (ossim_strncasecmp(expr,delimstr[i],strlen(delimstr[i])) == 0) {
+ if (ossim_strncasecmp(expr,delimstr[i],(unsigned int)strlen(delimstr[i])) == 0) {
stopflag=1;
break;
}
@@ -185,7 +185,7 @@ static void return_token( char *expr, char *token )
strcpy(token,expr);
for (i=0;(unsigned int)i<strlen(token);i++) {
for (j=0;j<ndelim;j++) {
- if (ossim_strncasecmp(expr,delimstr[j],strlen(delimstr[j]))==0) {
+ if (ossim_strncasecmp(expr,delimstr[j],(unsigned int)strlen(delimstr[j]))==0) {
if (n>0)
token[i] = '\0';
else
@@ -270,7 +270,7 @@ static char *get_token( char *expression,
stopflag = 0;
while ((expression[0] == '\"') || (expression[0] == ' ')) {
for (i=0;i<ndelim;i++)
- if (ossim_strncasecmp(expression,delimstr[i],strlen(delimstr[i]))==0) {
+ if (ossim_strncasecmp(expression,delimstr[i],(unsigned int)strlen(delimstr[i]))==0) {
stopflag=1;
break;
}
@@ -324,7 +324,7 @@ static char *get_token( char *expression,
expression++;
token[i] = '\0';
*token_type = STRING;
- *token_value = strlen(token);
+ *token_value = (int)strlen(token);
return expression;
}
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfread.c b/Utilities/otbossim/src/ossim/vpfutil/vpfread.c
index 1fc007d7bfccb5f78878e0f4e118f893e138c0e1..ff929d1f27b3125ecd2755da782c452298d0f527 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfread.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfread.c
@@ -156,14 +156,14 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
switch ( type ) {
case VpfChar:
- retval = fread ( to, sizeof (char), count, from ) ;
+ retval = (long)fread ( to, sizeof (char), count, from ) ;
break ;
case VpfShort:
{
short int stemp ,
*sptr = (short *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &stemp, sizeof (short), 1, from ) ;
+ retval = (long)fread ( &stemp, sizeof (short), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER)
swap_two ( (char*)&stemp, (char*)sptr ) ;
else
@@ -178,12 +178,12 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
long int itemp,
*iptr = (long int *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &itemp, sizeof (long int), 1, from ) ;
+ retval = (long)fread ( &itemp, sizeof (long int), 1, from ) ;
swap_four ( (char*)&itemp, (char*)iptr ) ;
iptr++ ;
}
} else {
- retval = fread ( to, sizeof (long int), count, from ) ;
+ retval = (long)fread ( to, sizeof (long int), count, from ) ;
}
}
break ;
@@ -192,7 +192,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
float ftemp ,
*fptr = (float *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &ftemp, sizeof (float), 1, from ) ;
+ retval = (long)fread ( &ftemp, sizeof (float), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER)
swap_four ( (char*)&ftemp, (char*)fptr ) ;
else
@@ -206,7 +206,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
double dtemp ,
*dptr = (double *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &dtemp, sizeof (double), 1, from ) ;
+ retval = (long)fread ( &dtemp, sizeof (double), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER)
swap_eight ( (char*)&dtemp, (char*)dptr ) ;
else
@@ -218,7 +218,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
case VpfDate:
{
date_type *dp = (date_type *) to ;
- retval = fread(dp,sizeof(date_type)-1,count,from);
+ retval = (long)fread(dp,sizeof(date_type)-1,count,from);
}
break ;
case VpfCoordinate:
@@ -227,13 +227,13 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
coordinate_type ctemp ,
*cptr = (coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &ctemp, sizeof (coordinate_type), 1, from ) ;
+ retval = (long)fread ( &ctemp, sizeof (coordinate_type), 1, from ) ;
swap_four ( (char*)&ctemp.x, (char*)&cptr->x ) ;
swap_four ( (char*)&ctemp.y, (char*)&cptr->y ) ;
cptr++ ;
}
} else {
- retval = fread ( to, sizeof (coordinate_type), count, from ) ;
+ retval = (long)fread ( to, sizeof (coordinate_type), count, from ) ;
}
}
break ;
@@ -242,7 +242,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
double_coordinate_type dctemp ,
*dcptr = (double_coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &dctemp, sizeof (double_coordinate_type), 1, from ) ;
+ retval = (long)fread ( &dctemp, sizeof (double_coordinate_type), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER) {
swap_eight ( (char*)&dctemp.x, (char*)&dcptr->x ) ;
swap_eight ( (char*)&dctemp.y, (char*)&dcptr->y ) ;
@@ -259,7 +259,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
tri_coordinate_type ttemp ,
*tptr = (tri_coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &ttemp, sizeof (tri_coordinate_type), 1, from ) ;
+ retval = (long)fread ( &ttemp, sizeof (tri_coordinate_type), 1, from ) ;
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER) {
swap_four ( (char*)&ttemp.x, (char*)&tptr->x ) ;
swap_four ( (char*)&ttemp.y, (char*)&tptr->y ) ;
@@ -278,7 +278,7 @@ long int VpfRead ( void *to, VpfDataType type, long int count, FILE *from )
double_tri_coordinate_type dttemp ,
*dtptr = (double_tri_coordinate_type *) to ;
for ( i=0; i < count; i++ ) {
- retval = fread ( &dttemp,sizeof (double_tri_coordinate_type), 1, from);
+ retval = (long)fread ( &dttemp, sizeof (double_tri_coordinate_type), 1, from);
if (STORAGE_BYTE_ORDER != MACHINE_BYTE_ORDER) {
swap_eight ( (char*)&dttemp.x, (char*)&dtptr->x ) ;
swap_eight ( (char*)&dttemp.y, (char*)&dtptr->y ) ;
@@ -394,7 +394,7 @@ int add_null_values ( char *name, vpf_table_type table, FILE *fpout )
case 'T':
cval = get_string ( &ptr, line, FIELD_SEPERATOR ) ;
free ( table.header[i].nullval.Char ) ; /* get rid of default */
- table.header[i].nullval.Char = (char *) vpfmalloc ( strlen (cval)+1) ;
+ table.header[i].nullval.Char = (char *) vpfmalloc ( (unsigned long)strlen (cval)+1) ;
strcpy ( table.header[i].nullval.Char, cval ) ;
free (cval) ;
break ;
@@ -492,11 +492,11 @@ long int index_length( long int row_number,
fseek( table.xfp, (long int)(row_number*recsize), SEEK_SET );
if ( ! Read_Vpf_Int(&pos,table.xfp,1) ) {
- len = (long int)NULL ;
+ len = (long int)0 ;
}
if ( ! Read_Vpf_Int(&ulen,table.xfp,1) ) {
- return (long int)NULL ;
+ return (long int)0 ;
}
len = ulen;
break;
@@ -508,7 +508,7 @@ long int index_length( long int row_number,
/* Just an error check, should never get here in writing */
fprintf(stderr,"\nindex_length: error trying to access row %d",
(int)row_number ) ;
- len = (long int)NULL ;
+ len = (long int)0 ;
}
break;
}
@@ -581,7 +581,7 @@ long int index_pos( long int row_number,
recsize = sizeof(index_cell);
fseek( table.xfp, (long int)(row_number*recsize), SEEK_SET );
if ( ! Read_Vpf_Int(&pos,table.xfp,1) ) {
- pos = (unsigned long int)NULL ;
+ pos = (unsigned long int)0 ;
}
break;
case RAM:
@@ -592,7 +592,7 @@ long int index_pos( long int row_number,
/* Just an error check, should never get here in writing */
fprintf(stderr,"\nindex_length: error trying to access row %d",
(int)row_number ) ;
- pos = (unsigned long int)NULL;
+ pos = (unsigned long int)0;
}
break;
}
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpftable.c b/Utilities/otbossim/src/ossim/vpfutil/vpftable.c
index b5f5ad51bd596636103a4135ac4f7ebb6bdc75a8..cfac3dab0219109359c2c9901618e240a3c44699 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpftable.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpftable.c
@@ -215,7 +215,7 @@ static char *cpy_del(char *src, char delimiter, long int *ind )
/* Start with temporary string value */
- tempstr = (char *)vpfmalloc ( strlen ( temp ) + 10 ) ;
+ tempstr = (char *)vpfmalloc ( (unsigned long)strlen ( temp ) + 10 ) ;
if ( *temp == '"' ) { /* If field is quoted, do no error checks */
@@ -371,7 +371,7 @@ long int parse_data_def( vpf_table_type *table )
swap_four((char *)&k,(char *)&ddlen);
}
if ( ddlen < 0 ) {
- return (long int)NULL ;
+ return (long int)0 ;
}
STORAGE_BYTE_ORDER = table->byte_order;
@@ -382,7 +382,7 @@ long int parse_data_def( vpf_table_type *table )
buf[0] = byte; /* already have the first byte of the buffer */
Read_Vpf_Char(&buf[1],table->fp,ddlen-1) ;
} else {
- table->ddlen = strlen ( table->defstr ) ;
+ table->ddlen = (long)strlen ( table->defstr ) ;
ddlen = table->ddlen ;
buf = (char *)vpfmalloc((ddlen+3)*sizeof(char));
strncpy ( buf, table->defstr, ddlen ) ;
@@ -435,7 +435,7 @@ long int parse_data_def( vpf_table_type *table )
if ( i == 0 )
if ( ossim_strcasecmp ( table->header[0].name, "ID" ) ) {
- return (long int)NULL ;
+ return (long int)0 ;
}
if(table->header[i].count == -1)
@@ -521,7 +521,7 @@ long int parse_data_def( vpf_table_type *table )
break ;
} /** switch type **/
- if (status) return (long int)NULL;
+ if (status) return (long int)0;
table->header[i].keytype = vpf_get_char (&p,buf);
des = get_string(&p,buf, FIELD_SEPERATOR );
@@ -544,7 +544,7 @@ long int parse_data_def( vpf_table_type *table )
end_of_rec = TRUE;
} else {
if (strcmp(tdx,"-") != 0) {
- table->header[i].tdx =(char*) vpfmalloc ( strlen ( tdx ) +1 ) ;
+ table->header[i].tdx =(char*) vpfmalloc ( (unsigned long)strlen ( tdx ) +1 ) ;
strcpy (table->header[i].tdx, tdx );
} else table->header[i].tdx = (char *)NULL;
}
@@ -556,7 +556,7 @@ long int parse_data_def( vpf_table_type *table )
end_of_rec = TRUE;
} else {
if (strcmp(doc,"-") != 0) {
- table->header[i].narrative = (char*)vpfmalloc ( strlen(doc) +1) ;
+ table->header[i].narrative = (char*)vpfmalloc ( (unsigned long)strlen(doc) +1) ;
strcpy (table->header[i].narrative, doc );
} else table->header[i].narrative = (char *)NULL;
}
@@ -780,7 +780,7 @@ vpf_table_type vpf_open_table( const char * tablename,
/* Parse out name and path */
j = -1;
- i=strlen(tablepath);
+ i=(long)strlen(tablepath);
while (i>0) {
#ifdef __MSDOS__
if (tablepath[i] == '\\') {
@@ -795,7 +795,7 @@ vpf_table_type vpf_open_table( const char * tablename,
strncpy(table.name,&(tablepath[j+1]),12);
rightjust(table.name);
strupr(table.name);
- table.path = (char *)vpfmalloc((strlen(tablepath)+5)*sizeof(char));
+ table.path = (char *)vpfmalloc(((unsigned long)strlen(tablepath)+5)*(unsigned long)sizeof(char));
strcpy(table.path, tablepath);
table.path[j+1] = '\0';
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c b/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c
index 0f9d5144398179444b25d14acec690764c915222..5e323ce9f32591b3d88389f538a9c5a5467dd7da 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpftidx.c
@@ -109,7 +109,7 @@
void *vpfmalloc(unsigned long size);
#define Whimper(str) {\
- return ((long int)NULL) ; }
+ return ((long int)0) ; }
#define SWhimper(str) {\
set_type err; err = set_init (1) ;\
@@ -376,8 +376,8 @@ long int create_thematic_index ( char indextype,
/* initialize */
buf = (char *) table_element (tablepos,1,table,NULL,&n);
REALLOC_DIRECTORY ( 0 ) ;
- d[0].value.strval = (char *) vpfmalloc ( strlen ( buf ) +1) ;
- memcpy( d[0].value.strval, buf, strlen(buf) ) ;
+ d[0].value.strval = (char *) vpfmalloc ( (unsigned long)strlen ( buf ) +1) ;
+ memcpy( d[0].value.strval, buf, (unsigned long)strlen(buf) ) ;
free (buf) ;
h.nbins++ ;
@@ -393,7 +393,7 @@ long int create_thematic_index ( char indextype,
if ( k == h.nbins ) { /* New value in column */
REALLOC_DIRECTORY ( k ) ;
- d[k].value.strval = (char *) vpfmalloc ( strlen ( buf ) +1) ;
+ d[k].value.strval = (char *) vpfmalloc ( (unsigned long)strlen ( buf ) +1) ;
memcpy( d[0].value.strval, buf, strlen(buf) ) ;
h.nbins++ ;
}
@@ -496,14 +496,14 @@ long int create_thematic_index ( char indextype,
/* only write the table name, no pathname */
- for ( i = strlen ( tablename ); i > 0; i-- )
+ for ( i = (unsigned int)strlen ( tablename ); i > 0; i-- )
if ( tablename[i] == '/' ) break ;
if ( i && i < strlen (tablename) )
strcpy ( h.vpf_table_name, strupr ( &tablename[i+1] ) ) ;
else
strcpy( h.vpf_table_name, strupr ( tablename) );
- for ( i=strlen(h.vpf_table_name); i < 12 ; i++ )
+ for ( i=(unsigned int)strlen(h.vpf_table_name); i < 12 ; i++ )
h.vpf_table_name[i] = ' ' ;
h.vpf_table_name[11] = '\0';
@@ -511,12 +511,12 @@ long int create_thematic_index ( char indextype,
h.table_nrows = table.nrows ;
- if ( write_thematic_index_header ( h, ifp ) == (long int)NULL )
+ if ( write_thematic_index_header ( h, ifp ) == (long int)0 )
Whimper ( "error writing index header" ) ;
/* Now write out the rest of the header directory */
- if ( write_thematic_index_directory ( h, d, idsize, ifp ) == (long int)NULL )
+ if ( write_thematic_index_directory ( h, d, idsize, ifp ) == (long int)0 )
Whimper ( "error writing index directory" ) ;
/* now write the data */
@@ -619,7 +619,7 @@ set_type read_thematic_index ( char *idxname,
SWhimper ( hack ) ;
}
- if ( read_thematic_index_header ( &h, ifp ) == (long int)NULL )
+ if ( read_thematic_index_header ( &h, ifp ) == (long int)0 )
SWhimper ( "error reading index header" ) ;
if ( h.index_type == 'G' ) {
@@ -803,15 +803,14 @@ ThematicIndex open_thematic_index ( char *idxname )
OWhimper ( hack ) ;
}
- if ( read_thematic_index_header ( &idx.h, idx.fp ) == (long int)NULL )
+ if ( read_thematic_index_header ( &idx.h, idx.fp ) == (long int)0 )
OWhimper ( "error reading index header" ) ;
if ( idx.h.index_type == 'G' ) {
/* gazetteer_index */
- if (read_gazetteer_index_directory(&idx.gid,&idx.h,idx.fp)
- ==(long int)NULL) {
- fclose(idx.fp);
- idx.fp = NULL;
+ if (read_gazetteer_index_directory(&idx.gid,&idx.h,idx.fp) == (long int)0) {
+ fclose(idx.fp);
+ idx.fp = NULL;
}
}
@@ -1156,7 +1155,7 @@ long int create_gazetteer_index (char *tablename,
/* only write out the table name, not the rest */
- for ( i = strlen ( tablename ); i > 0; i-- )
+ for ( i = (long)strlen ( tablename ); i > 0; i-- )
if ( tablename[i] == '/' ) break ;
if ( i && (unsigned int)i < strlen (tablename) )
strcpy ( gi.vpf_table_name, strupr ( &tablename[i+1] ) ) ;
@@ -1168,7 +1167,7 @@ long int create_gazetteer_index (char *tablename,
gi.index_type = 'G';
gi.type_count = 1 ;
gi.id_data_type = 'S' ;
- gi.nbins = strlen(idx_set);
+ gi.nbins = (long)strlen(idx_set);
gi.table_nrows = t.nrows;
set_byte_size = (unsigned int)ceil(t.nrows/8.0);
@@ -1216,7 +1215,7 @@ long int create_gazetteer_index (char *tablename,
vpf_close_table(&t);
- if (write_thematic_index_header(gi, idx_fp) == (long int)NULL) {
+ if (write_thematic_index_header(gi, idx_fp) == (long int)0) {
fclose(idx_fp);
for (i = 0; i < gi.nbins; i++)
set_nuke(&idx_bit_sets[i]);
@@ -1337,7 +1336,7 @@ set_type read_gazetteer_index (char *idx_fname, char *query_str )
set_type query_set = {0, 0},
xsect_set,
result_set;
- register int query_len = strlen(query_str),
+ register int query_len = (int)strlen(query_str),
i,
j;
unsigned long set_byte_size;
@@ -1348,12 +1347,12 @@ set_type read_gazetteer_index (char *idx_fname, char *query_str )
if (idx_fp == NULL)
return query_set;
- if (read_thematic_index_header (&gi, idx_fp) == (long int)NULL) {
+ if (read_thematic_index_header (&gi, idx_fp) == (long int)0) {
fclose(idx_fp);
return query_set;
}
- if (read_gazetteer_index_directory (&gid, &gi, idx_fp) == (long int)NULL) {
+ if (read_gazetteer_index_directory (&gid, &gi, idx_fp) == (long int)0) {
fclose(idx_fp);
return query_set;
}
@@ -1478,7 +1477,7 @@ set_type search_gazetteer_index (ThematicIndex *idx, char *query_str )
set_type query_set = {0, 0, 0, 0},
xsect_set,
result_set;
- register int query_len = strlen(query_str),
+ register int query_len = (int)strlen(query_str),
i,
j;
unsigned long set_byte_size;
@@ -1608,7 +1607,7 @@ long int read_gazetteer_index_directory(
if ( ( ! Read_Vpf_Char( &( (*gid)[i].value.cval ), idx_fp, 1) ) ||
( ! Read_Vpf_Int( &( (*gid)[i].start_offset ), idx_fp, 1) ) ||
( ! Read_Vpf_Int( &( (*gid)[i].num_items ), idx_fp, 1) )) {
- return (long int)NULL ;
+ return (long int)0 ;
}
}
return 1;
@@ -1659,7 +1658,7 @@ long int read_gazetteer_index_directory(
*************************************************************************/
#define RWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int read_thematic_index_header ( ThematicIndexHeader *h, FILE *ifp )
{
@@ -1733,7 +1732,7 @@ long int read_thematic_index_header ( ThematicIndexHeader *h, FILE *ifp )
*************************************************************************/
#define WWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int write_thematic_index_header ( ThematicIndexHeader h, FILE *ifp )
{
@@ -1812,7 +1811,7 @@ long int write_thematic_index_header ( ThematicIndexHeader h, FILE *ifp )
*************************************************************************/
#define WTWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int write_thematic_index_directory ( ThematicIndexHeader h,
ThematicIndexDirectory *d,
@@ -1921,7 +1920,7 @@ long int write_thematic_index_directory ( ThematicIndexHeader h,
*************************************************************************/
#define WTGWhimper() {\
- return (long int)NULL ; }
+ return (long int)0 ; }
long int write_gazetteer_index_directory ( ThematicIndexHeader h,
ThematicIndexDirectory *d,
diff --git a/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c b/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c
index 5ad3610e6d305095273780d01ea70fc8bb6586e3..612dd3fa58506ef87bde4b38e9c04afbc4825f59 100644
--- a/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c
+++ b/Utilities/otbossim/src/ossim/vpfutil/vpfwrite.c
@@ -582,7 +582,7 @@ long int put_table_element( long int field,
str = (char *) vpfmalloc( len + 1 );
row[field].ptr = (char *) vpfmalloc ( len + 1 ) ;
strcpy( (char*)str, (char*)value );
- for ( i = strlen((char*)value) ; i < table.header[field].count; i++ )
+ for ( i = (long)strlen((char*)value) ; i < table.header[field].count; i++ )
str[i] = SPACE ;
str[len] = '\0';
memcpy(row[field].ptr, str, len+1);
@@ -701,7 +701,7 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
switch ( type ) {
case VpfChar:
- retval = fwrite ( from, sizeof (char), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (char), count, to ) ;
break ;
case VpfShort:
{
@@ -710,10 +710,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*sptr = (short *) from ;
for ( i=0; i < count; i++, sptr++ ) {
swap_two ( (char*)sptr, (char*)&stemp ) ;
- retval = fwrite ( &stemp, sizeof (short), 1, to ) ;
+ retval = (long)fwrite ( &stemp, sizeof (short), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (short), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (short), count, to ) ;
}
}
break ;
@@ -724,10 +724,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*iptr = (long int *) from ;
for ( i=0; i < count; i++, iptr++ ) {
swap_four ( (char*)iptr, (char*)&itemp ) ;
- retval = fwrite ( &itemp, sizeof (long int), 1, to ) ;
+ retval = (long)fwrite ( &itemp, sizeof (long int), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (long int), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (long int), count, to ) ;
}
}
break ;
@@ -738,10 +738,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*fptr = (float *) from ;
for ( i=0; i < count; i++, fptr++ ) {
swap_four ( (char*)fptr, (char*)&ftemp ) ;
- retval = fwrite ( &ftemp, sizeof (float), 1, to ) ;
+ retval = (long)fwrite ( &ftemp, sizeof (float), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (long int), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (long int), count, to ) ;
}
}
break ;
@@ -752,15 +752,15 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
*dptr = (double *) from ;
for ( i=0; i < count; i++, dptr++ ) {
swap_eight ( (char*)dptr, (char*)&dtemp ) ;
- retval = fwrite ( &dtemp, sizeof (double), 1, to ) ;
+ retval = (long)fwrite ( &dtemp, sizeof (double), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (double), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (double), count, to ) ;
}
}
break ;
case VpfDate: /* only write out 20, not 21 chars */
- retval = fwrite ( from, sizeof ( date_type ) - 1, count, to ) ;
+ retval = (long)fwrite ( from, sizeof ( date_type ) - 1, count, to ) ;
break ;
case VpfCoordinate:
{
@@ -770,10 +770,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
for ( i=0; i < count; i++, cptr++ ) {
swap_four ( (char*)&cptr->x, (char*)&ctemp.x ) ;
swap_four ( (char*)&cptr->y, (char*)&ctemp.y ) ;
- retval = fwrite ( &ctemp, sizeof (coordinate_type), 1, to ) ;
+ retval = (long)fwrite ( &ctemp, sizeof (coordinate_type), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (coordinate_type), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (coordinate_type), count, to ) ;
}
}
break ;
@@ -785,11 +785,11 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
for ( i=0; i < count; i++, dcptr++ ) {
swap_eight ( (char*)&dcptr->x, (char*)&dctemp.x ) ;
swap_eight ( (char*)&dcptr->y, (char*)&dctemp.y ) ;
- retval = fwrite ( &dctemp, sizeof (double_coordinate_type),
+ retval = (long)fwrite ( &dctemp, sizeof (double_coordinate_type),
1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (double_coordinate_type),
+ retval = (long)fwrite ( from, sizeof (double_coordinate_type),
count, to ) ;
}
}
@@ -803,10 +803,10 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
swap_four ( (char*)&tptr->x, (char*)&ttemp.x ) ;
swap_four ( (char*)&tptr->y, (char*)&ttemp.y ) ;
swap_four ( (char*)&tptr->z, (char*)&ttemp.z ) ;
- retval = fwrite ( &ttemp, sizeof (tri_coordinate_type), 1, to ) ;
+ retval = (long)fwrite ( &ttemp, sizeof (tri_coordinate_type), 1, to ) ;
}
} else {
- retval = fwrite ( from, sizeof (tri_coordinate_type), count, to ) ;
+ retval = (long)fwrite ( from, sizeof (tri_coordinate_type), count, to ) ;
}
}
break ;
@@ -819,11 +819,11 @@ long int VpfWrite ( void *from, VpfDataType type, long int count, FILE *to )
swap_eight ( (char*)&dtptr->x, (char*)&dttemp.x ) ;
swap_eight ( (char*)&dtptr->y, (char*)&dttemp.y ) ;
swap_eight ( (char*)&dtptr->z, (char*)&dttemp.z ) ;
- retval = fwrite ( &dttemp,sizeof (double_tri_coordinate_type),
+ retval = (long)fwrite ( &dttemp,sizeof (double_tri_coordinate_type),
1, to);
}
} else {
- retval = fwrite ( from,sizeof (double_tri_coordinate_type),
+ retval = (long)fwrite ( from,sizeof (double_tri_coordinate_type),
count, to);
}
}
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index 84bc230def37c7a7c325e85f364b7b10892aaf37..b2e4ac195b3a8719b7707a764a346ef726153f54 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -5,6 +5,8 @@ SET(ossimplugins_VERSION_MINOR "7")
SET(ossimplugins_VERSION_PATCH "15")
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ossim ${CMAKE_CURRENT_SOURCE_DIR}/ossim/otb
+${OTB_SOURCE_DIR}/Utilities/otbossim/include
+${OTB_BINARY_DIR}/Utilities/otbossim/include
# ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection
# ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection/otb
)
@@ -21,9 +23,8 @@ SET(ossimplugins_SOURCES
${ossimplugins_ossim_SRCS}
)
-
ADD_LIBRARY(otbossimplugins ${ossimplugins_SOURCES} )
-TARGET_LINK_LIBRARIES(otbossimplugins otbossim ${GDAL_LIBRARY})
+#TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} otbossim)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(otbossimplugins PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp b/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp
index eb2fffd2a7b19684e78a37131fc24fd87859e649..19b24dd7d03757cc6271b72f9a45015f141ae8e4 100644
--- a/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimRadarSat2Model.cpp
@@ -1069,15 +1069,16 @@ bool ossimRadarSat2Model::loadState (const ossimKeywordlist &kwl,
}
}
- // Load the base class.
- bool result = ossimGeometricSarSensorModel::loadState(kwl, prefix);
-
//---
// Temp: This must be cleared or you end up with a bounding rect of all
// zero's.
//---
theBoundGndPolygon.clear();
+ // Load the base class.
+ bool result = ossimGeometricSarSensorModel::loadState(kwl, prefix);
+
+
if (result)
{
lookup = kwl.find(prefix, NUMBER_SRGR_COEFFICIENTS_KW);
diff --git a/Utilities/otbossimplugins/ossim/ossimTerraSarModel.cpp b/Utilities/otbossimplugins/ossim/ossimTerraSarModel.cpp
index 1f9d754896d875cd30f8cc799f43b2ed98991d7c..7ac33e4b9d7549199862640cf4d7320cb6f1ed64 100644
--- a/Utilities/otbossimplugins/ossim/ossimTerraSarModel.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimTerraSarModel.cpp
@@ -13,6 +13,7 @@
#include <ossimPluginCommon.h>
#include <ossimTerraSarProductDoc.h>
#include <ossim/base/ossimKeywordNames.h>
+#include <ossim/base/ossimDirectory.h>
#include <ossim/base/ossimRefPtr.h>
#include <ossim/base/ossimTrace.h>
#include <ossim/base/ossimXmlDocument.h>
@@ -39,6 +40,9 @@ static const char ALT_SR_GR_COEFFICIENT1_KW[] = "alt_sr_gr_coeff1";
static const char ALT_SR_GR_COEFFICIENT2_KW[] = "alt_sr_gr_coeff2";
static const char PRODUCT_TYPE[] = "product_type";
static const char RADIOMETRIC_CORRECTION[] = "radiometricCorrection";
+static const char AZ_START_TIME[] = "azimuth_start_time";
+static const char AZ_STOP_TIME[] = "azimuth_stop_time";
+static const char GENERATION_TIME[] = "generation_time";
static const char ACQUISITION_INFO[] = "acquisitionInfo.";
static const char IMAGING_MODE[] = "imagingMode";
@@ -80,6 +84,9 @@ ossimplugins::ossimTerraSarModel::ossimTerraSarModel()
_polLayer(),
_noise(0),
_calFactor(0.),
+ _azStartTime(),
+ _azStopTime(),
+ _generationTime(),
theProductXmlFile()
{
}
@@ -102,6 +109,9 @@ ossimplugins::ossimTerraSarModel::ossimTerraSarModel(
_polLayer(rhs._polLayer),
_noise(rhs._noise),
_calFactor(rhs._calFactor),
+ _azStartTime(rhs._azStartTime),
+ _azStopTime(rhs._azStopTime),
+ _generationTime(rhs._generationTime),
theProductXmlFile(rhs.theProductXmlFile)
{
}
@@ -154,14 +164,16 @@ bool ossimplugins::ossimTerraSarModel::open(const ossimFilename& file)
}
bool result = false;
+ ossimFilename xmlfile;
+ bool findMeatadataFile = findTSXLeader(file, xmlfile);
- if ( file.exists() && (file.ext().downcase() == "xml") )
+ if(findMeatadataFile)
{
//---
// Instantiate the XML parser:
//---
ossimXmlDocument* xdoc = new ossimXmlDocument();
- if ( xdoc->openFile(file) )
+ if ( xdoc->openFile(xmlfile) )
{
ossimTerraSarProductDoc tsDoc;
@@ -170,7 +182,6 @@ bool ossimplugins::ossimTerraSarModel::open(const ossimFilename& file)
if (debug)
cout << "result of IsTSX " << result << endl;
-
if (result)
{
if (traceDebug())
@@ -204,18 +215,18 @@ bool ossimplugins::ossimTerraSarModel::open(const ossimFilename& file)
{
result = tsDoc.getSceneId(xdoc, theImageID);
if (debug)
- cout << "result of getting SceneIDe" << result << endl;
+ cout << "result of getting SceneID" << result << endl;
}
// Set the sensor ID to the mission ID.
if (result)
{
result = tsDoc.getMission(xdoc, theSensorID);
+
+ if (debug)
+ cout << "result of getting MissionID...." << result << endl;
}
- if (debug)
- cout << "result of getting MissionID...." << result << endl;
-
// Set the base class gsd:
result = tsDoc.initGsd(xdoc, theGSD);
@@ -272,14 +283,23 @@ bool ossimplugins::ossimTerraSarModel::open(const ossimFilename& file)
ossimString s;
result = tsDoc.getCalFactor(xdoc, s);
_calFactor = s.toFloat64();
+ if (result)
+ {
+ result = tsDoc.getAzimuthStartTime(xdoc, _azStartTime);
+ if (result)
+ {
+ result = tsDoc.getAzimuthStopTime(xdoc, _azStopTime);
+ if (result)
+ {
+ result = tsDoc.getGenerationTime(xdoc, _generationTime);
+ }
+ }
+ }
}
}
}
}
-
}
-
-
}
}
}
@@ -301,10 +321,10 @@ bool ossimplugins::ossimTerraSarModel::open(const ossimFilename& file)
if (result)
{
- theProductXmlFile = file;
+ theProductXmlFile = xmlfile;
if (debug)
- cout << "theProductXmlFile : " << file << endl;
+ cout << "theProductXmlFile : " << xmlfile << endl;
// Assign the ossimSensorModel::theBoundGndPolygon
ossimGpt ul;
@@ -397,6 +417,7 @@ bool ossimplugins::ossimTerraSarModel::saveState(ossimKeywordlist& kwl,
}
kwl.add(prefix, PRODUCT_TYPE, _productType.c_str());
+
kwl.add(prefix, RADIOMETRIC_CORRECTION, _radiometricCorrection.c_str());
ossimString kw = ACQUISITION_INFO;
@@ -415,6 +436,10 @@ bool ossimplugins::ossimTerraSarModel::saveState(ossimKeywordlist& kwl,
_noise->saveState(kwl,prefix);
kwl.add(prefix, CALIBRATION_CALFACTOR, ossimString::toString(_calFactor).c_str());
+ kwl.add(prefix, AZ_START_TIME, _azStartTime.c_str());
+ kwl.add(prefix, AZ_STOP_TIME, _azStopTime.c_str());
+ kwl.add(prefix, GENERATION_TIME, _generationTime.c_str());
+
if (traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
@@ -451,6 +476,7 @@ bool ossimplugins::ossimTerraSarModel::loadState (const ossimKeywordlist &kwl,
// Get the product.xml file name.
lookup = kwl.find(prefix, PRODUCT_XML_FILE_KW);
+
if (lookup)
{
theProductXmlFile = lookup;
@@ -468,8 +494,6 @@ bool ossimplugins::ossimTerraSarModel::loadState (const ossimKeywordlist &kwl,
}
}
- // Load the base class.
- bool result = ossimGeometricSarSensorModel::loadState(kwl, prefix);
//---
// Temp: This must be cleared or you end up with a bounding rect of all
@@ -477,6 +501,9 @@ bool ossimplugins::ossimTerraSarModel::loadState (const ossimKeywordlist &kwl,
//---
theBoundGndPolygon.clear();
+ // Load the base class.
+ bool result = ossimGeometricSarSensorModel::loadState(kwl, prefix);
+
if (result)
{
lookup = kwl.find(prefix,SR_GR_R0_KW);
@@ -719,6 +746,57 @@ bool ossimplugins::ossimTerraSarModel::loadState (const ossimKeywordlist &kwl,
result = false;
}
+ lookup = kwl.find(prefix, AZ_START_TIME);
+ if (lookup)
+ {
+ _azStartTime = lookup;
+ }
+ else
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nRequired keyword not found: "
+ << AZ_START_TIME << "\n";
+ }
+ result = false;
+ }
+
+ lookup = kwl.find(prefix, AZ_STOP_TIME);
+ if (lookup)
+ {
+ _azStopTime = lookup;
+ }
+ else
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nRequired keyword not found: "
+ << AZ_STOP_TIME << "\n";
+ }
+ result = false;
+ }
+
+ lookup = kwl.find(prefix, GENERATION_TIME);
+ if (lookup)
+ {
+ _generationTime = lookup;
+ }
+ else
+ {
+ if (traceDebug())
+ {
+ ossimNotify(ossimNotifyLevel_WARN)
+ << MODULE
+ << "\nRequired keyword not found: "
+ << GENERATION_TIME << "\n";
+ }
+ result = false;
+ }
+
if (traceDebug())
{
@@ -782,8 +860,11 @@ std::ostream& ossimplugins::ossimTerraSarModel::print(std::ostream& out) const
}
out << CALIBRATION_CALFACTOR << ": " << _calFactor << "\n";
- // Reset flags.
+ out << AZ_START_TIME << ": " << _azStartTime << "\n";
+ out << AZ_STOP_TIME << ": " << _azStopTime << "\n";
+ out << GENERATION_TIME << ": " << _generationTime << "\n";
+ // Reset flags.
ossimString kw = ACQUISITION_INFO;
ossimString kw2 = kw + IMAGING_MODE;
@@ -1689,5 +1770,50 @@ bool ossimplugins::ossimTerraSarModel::initNoise(
return result;
}
+bool ossimplugins::ossimTerraSarModel::findTSXLeader(const ossimFilename& file, ossimFilename& metadataFile)
+{
+ bool res = false;
+ if ( file.exists() && (file.ext().downcase() == "xml") )
+ {
+ metadataFile = file;
+ res = true;
+ }
+ else
+ {
+ ossimFilename filePath = ossimFilename(file.path());
+ ossimDirectory directory = ossimDirectory(filePath.path());
+
+ std::vector<ossimFilename> vectName;
+ ossimString reg = ".xml";
+ directory.findAllFilesThatMatch( vectName, reg, 1 );
+ bool goodFileFound = false;
+ unsigned int loop = 0;
+ while(loop<vectName.size() && !goodFileFound)
+ {
+ ossimFilename curFile = vectName[loop];
+ if(curFile.file().beforePos(3) == ossimString("TSX"))
+ goodFileFound = true;
+ else
+ loop++;
+ }
+ if(goodFileFound)
+ {
+ metadataFile = vectName[loop];
+ res = true;
+ }
+ else
+ {
+ if (traceDebug())
+ {
+ this->print(ossimNotify(ossimNotifyLevel_DEBUG));
+
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "ossimplugins::ossimTerraSarModel::findTSXLeader " << " exit status = " << (res?"true":"false\n")
+ << std::endl;
+ }
+ }
+ }
+ return res;
+}
diff --git a/Utilities/otbossimplugins/ossim/ossimTerraSarModel.h b/Utilities/otbossimplugins/ossim/ossimTerraSarModel.h
index b6ad8b6af7a6fc0c5477d97729b3b8c94c08b3c7..3e2125527aaf7cd467468ebb51aceca5631ca7f8 100644
--- a/Utilities/otbossimplugins/ossim/ossimTerraSarModel.h
+++ b/Utilities/otbossimplugins/ossim/ossimTerraSarModel.h
@@ -156,6 +156,14 @@ namespace ossimplugins
bool initNoise(
const ossimXmlDocument* xdoc, const ossimTerraSarProductDoc& tsDoc);
+ /**
+ * @brief Method to find the metadata file
+ * TerraSAR file (image or xml).
+ * @param file image or metadata path.
+ * @param metadataFile matadata path.
+ * @return ture if mateadata found, false otherwise.
+ */
+ bool findTSXLeader(const ossimFilename& file, ossimFilename& metadataFile);
/**
* @brief Slant Range TO Ground Range Projection reference point
@@ -231,6 +239,21 @@ namespace ossimplugins
*/
double _calFactor;
+ /**
+ * @brief Azimuthal Start Time (Start acquisition time).
+ */
+ ossimString _azStartTime;
+
+ /**
+ * @brief Azimuthal Stop Time (Start acquisition time).
+ */
+ ossimString _azStopTime;
+
+ /**
+ * @brief Generation time.
+ */
+ ossimString _generationTime;
+
ossimFilename theProductXmlFile;
TYPE_DATA
diff --git a/Utilities/otbossimplugins/ossim/ossimTerraSarProductDoc.cpp b/Utilities/otbossimplugins/ossim/ossimTerraSarProductDoc.cpp
index aabb8e3e81e497e58c1960c2690f2c35fde259c8..8f80d056fc4760eee41c6544a68a76c8dc674c59 100644
--- a/Utilities/otbossimplugins/ossim/ossimTerraSarProductDoc.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimTerraSarProductDoc.cpp
@@ -849,7 +849,7 @@ bool ossimplugins::ossimTerraSarProductDoc::getAzimuthStartTime(
const ossimXmlDocument* xdoc, ossimString& s) const
{
ossimString path =
- "/level1Product/productInfo/sceneInfo/start/timeUTC";
+ "/level1Product/instrument/settings/rxGainSetting/startTimeUTC";
return ossim::getPath(path, xdoc, s);
}
@@ -857,7 +857,7 @@ bool ossimplugins::ossimTerraSarProductDoc::getAzimuthStopTime(
const ossimXmlDocument* xdoc, ossimString& s) const
{
ossimString path =
- "/level1Product/productInfo/sceneInfo/stop/timeUTC";
+ "/level1Product/instrument/settings/rxGainSetting/stopTimeUTC";
return ossim::getPath(path, xdoc, s);
}
diff --git a/Wrapping/.NoDartCoverage b/Wrapping/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CMakeLists.txt b/Wrapping/CMakeLists.txt
deleted file mode 100644
index daecf7ab42c49e053bb57826833e1621887d4bd7..0000000000000000000000000000000000000000
--- a/Wrapping/CMakeLists.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-IF("${OTB_COMMON_BUILD_TYPE}" MATCHES "SHARED")
- SET(BUILD_SHARED_LIBS ON)
-ENDIF("${OTB_COMMON_BUILD_TYPE}" MATCHES "SHARED")
-
-#-----------------------------------------------------------------------------
-# Find wrapping language API libraries.
-IF(OTB_CSWIG_TCL)
- FIND_PACKAGE(TCL)
- # Hide useless settings provided by FindTCL.
- FOREACH(entry TCL_LIBRARY_DEBUG
- TK_LIBRARY_DEBUG
- TCL_STUB_LIBRARY
- TCL_STUB_LIBRARY_DEBUG
- TK_STUB_LIBRARY
- TK_STUB_LIBRARY_DEBUG
- TK_WISH)
- SET(${entry} "${${entry}}" CACHE INTERNAL "This value is not used by OTB.")
- ENDFOREACH(entry)
-ENDIF(OTB_CSWIG_TCL)
-
-IF(OTB_CSWIG_PYTHON)
- INCLUDE(${CMAKE_ROOT}/Modules/FindPythonLibs.cmake)
- FIND_PROGRAM(PYTHON_EXECUTABLE
- NAMES python python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
- PATHS
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]
- )
- MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
-ENDIF(OTB_CSWIG_PYTHON)
-
-IF(OTB_CSWIG_JAVA)
- FIND_PACKAGE(Java)
- FIND_PACKAGE(JNI)
-ENDIF(OTB_CSWIG_JAVA)
-
-IF(OTB_CSWIG_PERL)
- FIND_PACKAGE(Perl)
- FIND_PACKAGE(PerlLibs)
-ENDIF(OTB_CSWIG_PERL)
-
-MARK_AS_ADVANCED(OTB_CSWIG_PYTHON)
-MARK_AS_ADVANCED(OTB_CSWIG_TCL)
-MARK_AS_ADVANCED(OTB_CSWIG_JAVA)
-MARK_AS_ADVANCED(OTB_CSWIG_PERL)
-MARK_AS_ADVANCED(CABLE_INDEX)
-MARK_AS_ADVANCED(CSWIG)
-MARK_AS_ADVANCED(GCCXML)
-
-# set a variable to determine if
-# the CSwig directory should be used
-SET(OTB_CSWIG_DIR 0)
-IF(OTB_CSWIG_TCL)
- SET(OTB_CSWIG_DIR 1)
-ENDIF(OTB_CSWIG_TCL)
-IF(OTB_CSWIG_PYTHON)
- SET(OTB_CSWIG_DIR 1)
-ENDIF(OTB_CSWIG_PYTHON)
-IF(OTB_CSWIG_JAVA)
- SET(OTB_CSWIG_DIR 1)
-ENDIF(OTB_CSWIG_JAVA)
-
-IF(OTB_CSWIG_DIR)
- SUBDIRS(CSwig)
-ENDIF(OTB_CSWIG_DIR)
-
-
diff --git a/Wrapping/CSwig/.NoDartCoverage b/Wrapping/CSwig/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/Algorithms/.NoDartCoverage b/Wrapping/CSwig/Algorithms/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/Algorithms/CMakeLists.txt b/Wrapping/CSwig/Algorithms/CMakeLists.txt
deleted file mode 100644
index 382b44dc7a70fe0990f067d29a386cd66acc45d0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-# create the ITKAlgorithmsTcl libraries
-SET(WRAP_SOURCES
- wrap_itkCurvatureFlowImageFilter
- wrap_itkDemonsRegistrationFilter
- wrap_itkHistogramMatchingImageFilter
- wrap_itkImageRegistrationMethod
- wrap_itkImageToImageMetric
- wrap_itkMattesMutualInformationImageToImageMetric
- wrap_itkMeanSquaresImageToImageMetric
- wrap_itkMinMaxCurvatureFlowImageFilter
- wrap_itkMutualInformationImageToImageMetric
- wrap_itkMultiResolutionImageRegistrationMethod
- wrap_itkNormalizedCorrelationImageToImageMetric
- wrap_itkOtsuThresholdImageCalculator
- wrap_itkMeanReciprocalSquareDifferenceImageToImageMetric
- wrap_itkRecursiveMultiResolutionPyramidImageFilter
- wrap_itkThresholdSegmentationLevelSetImageFilter
- wrap_itkGeodesicActiveContourLevelSetImageFilter
- wrap_itkShapeDetectionLevelSetImageFilter
-# wrap_itkCurvesLevelSetImageFilter
-# wrap_itkNarrowBandLevelSetImageFilter
- wrap_itkPDEDeformableRegistrationFilter
-# wrap_itkNarrowBandCurvesLevelSetImageFilter
- wrap_itkVoronoiSegmentationImageFilter
- wrap_itkWatershedImageFilter
- wrap_itkSegmentationLevelSetImageFilter
- wrap_itkSparseFieldLevelSetImageFilter
- wrap_itkSymmetricForcesDemonsRegistrationFilter
- wrap_itkTreeNodeSO
- wrap_itkLevelSetFunction
-)
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersA/ITKBasicFiltersA.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersB/ITKBasicFiltersB.mdx"
- "${WrapOTB_BINARY_DIR}/Algorithms/ITKAlgorithms.mdx"
-)
-
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKAlgorithms Algorithms
- "ITKNumerics;ITKCommonB;ITKCommonA;ITKBasicFiltersA;ITKBasicFiltersB" "" "")
diff --git a/Wrapping/CSwig/Algorithms/CVS/Entries b/Wrapping/CSwig/Algorithms/CVS/Entries
deleted file mode 100644
index 9851f715b57cfe2205caaa7a9f0ded1f5fcd61a5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/CVS/Entries
+++ /dev/null
@@ -1,36 +0,0 @@
-/.NoDartCoverage/1.1/Sat Sep 25 17:38:41 2004//TITK-3-0-1
-/CMakeLists.txt/1.31/Fri Jun 3 08:37:35 2005//TITK-3-0-1
-/wrap_ITKAlgorithms.cxx/1.18/Fri Jun 3 08:37:35 2005//TITK-3-0-1
-/wrap_ITKAlgorithmsJava.cxx/1.2/Wed Feb 18 14:47:41 2004//TITK-3-0-1
-/wrap_ITKAlgorithmsPython.cxx/1.1/Tue May 13 20:28:38 2003//TITK-3-0-1
-/wrap_ITKAlgorithmsTcl.cxx/1.1/Tue May 13 20:28:38 2003//TITK-3-0-1
-/wrap_itkCurvatureFlowImageFilter.cxx/1.5/Wed Nov 26 02:01:03 2003//TITK-3-0-1
-/wrap_itkCurvesLevelSetImageFilter.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkDemonsRegistrationFilter.cxx/1.5/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkGeodesicActiveContourLevelSetImageFilter.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkHistogramMatchingImageFilter.cxx/1.5/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-/wrap_itkImageRegistrationMethod.cxx/1.6/Wed Jan 19 16:45:43 2005//TITK-3-0-1
-/wrap_itkImageToImageMetric.cxx/1.4/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkLevelSetFunction.cxx/1.1/Tue Jan 25 22:50:35 2005//TITK-3-0-1
-/wrap_itkMattesMutualInformationImageToImageMetric.cxx/1.4/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkMeanReciprocalSquareDifferenceImageToImageMetric.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkMeanSquaresImageToImageMetric.cxx/1.4/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkMinMaxCurvatureFlowImageFilter.cxx/1.1/Wed Nov 26 02:01:03 2003//TITK-3-0-1
-/wrap_itkMultiResolutionImageRegistrationMethod.cxx/1.1/Tue Oct 14 17:59:55 2003//TITK-3-0-1
-/wrap_itkMutualInformationImageToImageMetric.cxx/1.4/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkNarrowBandCurvesLevelSetImageFilter.cxx/1.3/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkNarrowBandLevelSetImageFilter.cxx/1.2/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-/wrap_itkNormalizedCorrelationImageToImageMetric.cxx/1.4/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkOtsuThresholdImageCalculator.cxx/1.4/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_itkPDEDeformableRegistrationFilter.cxx/1.3/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkRecursiveMultiResolutionPyramidImageFilter.cxx/1.2/Thu Nov 6 22:24:13 2003//TITK-3-0-1
-/wrap_itkSegmentationLevelSetImageFilter.cxx/1.1/Thu Jan 20 15:19:57 2005//TITK-3-0-1
-/wrap_itkShapeDetectionLevelSetImageFilter.cxx/1.4/Wed Jan 19 16:45:43 2005//TITK-3-0-1
-/wrap_itkSparseFieldLevelSetImageFilter.cxx/1.2/Tue Jan 25 16:40:03 2005//TITK-3-0-1
-/wrap_itkSymmetricForcesDemonsRegistrationFilter.cxx/1.1/Fri Jun 3 08:37:35 2005//TITK-3-0-1
-/wrap_itkThresholdSegmentationLevelSetImageFilter.cxx/1.5/Wed Jan 26 17:15:22 2005//TITK-3-0-1
-/wrap_itkTreeNode.cxx/1.1/Thu Jan 20 15:19:57 2005//TITK-3-0-1
-/wrap_itkTreeNodeSO.cxx/1.1/Fri Jan 14 15:27:23 2005//TITK-3-0-1
-/wrap_itkVoronoiSegmentationImageFilter.cxx/1.2/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-/wrap_itkWatershedImageFilter.cxx/1.1/Fri Mar 26 12:57:10 2004//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Algorithms/CVS/Repository b/Wrapping/CSwig/Algorithms/CVS/Repository
deleted file mode 100644
index 911d45decb10bd9b7160fb9dd1266a86ace13d73..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Algorithms
diff --git a/Wrapping/CSwig/Algorithms/CVS/Root b/Wrapping/CSwig/Algorithms/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Algorithms/CVS/Tag b/Wrapping/CSwig/Algorithms/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Algorithms/CVS/Template b/Wrapping/CSwig/Algorithms/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithms.cxx b/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithms.cxx
deleted file mode 100644
index 2dc151d1978767fd38dbb579580755e4efc927ad..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithms.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKAlgorithms.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:37:35 $
- Version: $Revision: 1.18 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(itkCurvatureFlowImageFilter),
- ITK_WRAP_GROUP(itkDemonsRegistrationFilter),
- ITK_WRAP_GROUP(itkHistogramMatchingImageFilter),
- ITK_WRAP_GROUP(itkImageRegistrationMethod),
- ITK_WRAP_GROUP(itkImageToImageMetric),
- ITK_WRAP_GROUP(itkMeanSquaresImageToImageMetric),
- ITK_WRAP_GROUP(itkMutualInformationImageToImageMetric),
- ITK_WRAP_GROUP(itkMultiResolutionImageRegistrationMethod),
- ITK_WRAP_GROUP(itkNormalizedCorrelationImageToImageMetric),
- ITK_WRAP_GROUP(itkOtsuThresholdImageCalculator),
- ITK_WRAP_GROUP(itkMeanReciprocalSquareDifferenceImageToImageMetric),
- ITK_WRAP_GROUP(itkThresholdSegmentationLevelSetImageFilter),
- ITK_WRAP_GROUP(itkGeodesicActiveContourLevelSetImageFilter),
- ITK_WRAP_GROUP(itkShapeDetectionLevelSetImageFilter),
-// ITK_WRAP_GROUP(itkCurvesLevelSetImageFilter),
-// ITK_WRAP_GROUP(itkNarrowBandLevelSetImageFilter),
-// ITK_WRAP_GROUP(itkNarrowBandCurvesLevelSetImageFilter),
- ITK_WRAP_GROUP(itkMattesMutualInformationImageToImageMetric),
- ITK_WRAP_GROUP(itkPDEDeformableRegistrationFilter),
- ITK_WRAP_GROUP(itkRecursiveMultiResolutionPyramidImageFilter),
- ITK_WRAP_GROUP(itkVoronoiSegmentationImageFilter),
- ITK_WRAP_GROUP(itkWatershedImageFilter),
- ITK_WRAP_GROUP(itkSegmentationLevelSetImageFilter),
- ITK_WRAP_GROUP(itkTreeNodeSO),
- ITK_WRAP_GROUP(itkSparseFieldLevelSetImageFilter),
- ITK_WRAP_GROUP(itkSymmetricForcesDemonsRegistrationFilter),
- ITK_WRAP_GROUP(itkLevelSetFunction)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsJava.cxx b/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsJava.cxx
deleted file mode 100644
index 9d81b644c54bbd8c5c8be9cf71ca8a974d18ae34..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKAlgorithmsJava"
-#include "wrap_ITKAlgorithms.cxx"
diff --git a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsPython.cxx b/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsPython.cxx
deleted file mode 100644
index 36771bcb0ddf78e3b05a356741e4ab61f2e8ceb4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKAlgorithmsPython"
-#include "wrap_ITKAlgorithms.cxx"
diff --git a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsTcl.cxx b/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsTcl.cxx
deleted file mode 100644
index 28575f9e59fe5477542fe0e41bbca9a5181cfb43..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_ITKAlgorithmsTcl.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKAlgorithmsTcl"
-#include "wrap_ITKAlgorithms.cxx"
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkCurvatureFlowImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkCurvatureFlowImageFilter.cxx
deleted file mode 100644
index dc18946ae91c72dc0ec34b989117e538d0272a90..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkCurvatureFlowImageFilter.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkCurvatureFlowImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2003/11/26 02:01:03 $
- Version: $Revision: 1.5 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkCurvatureFlowImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkCurvatureFlowImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(CurvatureFlowImageFilter, image::F2, image::F2,
- itkCurvatureFlowImageFilterF2F2);
- ITK_WRAP_OBJECT2(CurvatureFlowImageFilter, image::F3, image::F3,
- itkCurvatureFlowImageFilterF3F3);
-
- ITK_WRAP_OBJECT2(CurvatureFlowImageFilter, image::D2, image::D2,
- itkCurvatureFlowImageFilterD2D2);
- ITK_WRAP_OBJECT2(CurvatureFlowImageFilter, image::D3, image::D3,
- itkCurvatureFlowImageFilterD3D3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkCurvesLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkCurvesLevelSetImageFilter.cxx
deleted file mode 100644
index 3a3da46704ab8646e7841e402654b7e81ee7a612..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkCurvesLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkCurvesLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkCurvesLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkCurvesLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(CurvesLevelSetImageFilter, image::F2, image::F2,
- itkCurvesLevelSetImageFilterF2F2);
- ITK_WRAP_OBJECT2(CurvesLevelSetImageFilter, image::F3, image::F3,
- itkCurvesLevelSetImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkDemonsRegistrationFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkDemonsRegistrationFilter.cxx
deleted file mode 100644
index 7620467f6c1b7706f1b3c251760e0d6074eb4eff..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkDemonsRegistrationFilter.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkDemonsRegistrationFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.5 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkDemonsRegistrationFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkDemonsRegistrationFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT3(DemonsRegistrationFilter, image::F2, image::F2, image::VF2,
- itkDemonsRegistrationFilterF2F2);
- ITK_WRAP_OBJECT3(DemonsRegistrationFilter, image::F3, image::F3, image::VF3,
- itkDemonsRegistrationFilterF3F3);
- ITK_WRAP_OBJECT3(DemonsRegistrationFilter, image::US2, image::US2, image::VF2,
- itkDemonsRegistrationFilterUS2US2);
- ITK_WRAP_OBJECT3(DemonsRegistrationFilter, image::US3, image::US3, image::VF3,
- itkDemonsRegistrationFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkGeodesicActiveContourLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkGeodesicActiveContourLevelSetImageFilter.cxx
deleted file mode 100644
index bd5ae345fa16409003ea62fa4cd0078ac670f49d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkGeodesicActiveContourLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkGeodesicActiveContourLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkGeodesicActiveContourLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkGeodesicActiveContourLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(GeodesicActiveContourLevelSetImageFilter, image::F2, image::F2,
- itkGeodesicActiveContourLevelSetImageFilterF2F2);
- ITK_WRAP_OBJECT2(GeodesicActiveContourLevelSetImageFilter, image::F3, image::F3,
- itkGeodesicActiveContourLevelSetImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkHistogramMatchingImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkHistogramMatchingImageFilter.cxx
deleted file mode 100644
index 9eee803a269bdf6778606b1b529fcb1811de9899..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkHistogramMatchingImageFilter.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkHistogramMatchingImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.5 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkHistogramMatchingImageFilter.h"
-#include "itkSpatialObject.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkHistogramMatchingImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(HistogramMatchingImageFilter, image::F2, image::F2,
- itkHistogramMatchingImageFilterF2F2);
- ITK_WRAP_OBJECT2(HistogramMatchingImageFilter, image::F3, image::F3,
- itkHistogramMatchingImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkImageRegistrationMethod.cxx b/Wrapping/CSwig/Algorithms/wrap_itkImageRegistrationMethod.cxx
deleted file mode 100644
index 0992e64073f1668e7daa0862e6e90b5f493e0ee0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkImageRegistrationMethod.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageRegistrationMethod.cxx,v $
- Language: C++
- Date: $Date: 2005/01/19 16:45:43 $
- Version: $Revision: 1.6 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkImageRegistrationMethod.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageRegistrationMethod);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ImageRegistrationMethod, image::F2, image::F2,
- itkImageRegistrationMethodF2F2);
- ITK_WRAP_OBJECT2(ImageRegistrationMethod, image::F3, image::F3,
- itkImageRegistrationMethodF3F3);
- ITK_WRAP_OBJECT2(ImageRegistrationMethod, image::US2, image::US2,
- itkImageRegistrationMethodUS2US2);
- ITK_WRAP_OBJECT2(ImageRegistrationMethod, image::US3, image::US3,
- itkImageRegistrationMethodUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkImageToImageMetric.cxx b/Wrapping/CSwig/Algorithms/wrap_itkImageToImageMetric.cxx
deleted file mode 100644
index 2d5c59bd90168b50db9f10f39f2a559e59f553b7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkImageToImageMetric.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageToImageMetric.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkImageToImageMetric.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageToImageMetric);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ImageToImageMetric, image::F2, image::F2,
- itkImageToImageMetricF2F2);
- ITK_WRAP_OBJECT2(ImageToImageMetric, image::F3, image::F3,
- itkImageToImageMetricF3F3);
- ITK_WRAP_OBJECT2(ImageToImageMetric, image::US2, image::US2,
- itkImageToImageMetricUS2US2);
- ITK_WRAP_OBJECT2(ImageToImageMetric, image::US3, image::US3,
- itkImageToImageMetricUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkLevelSetFunction.cxx b/Wrapping/CSwig/Algorithms/wrap_itkLevelSetFunction.cxx
deleted file mode 100644
index 1b014d61d3459c5f155265d0d2030dcfeee8775d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkLevelSetFunction.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkLevelSetFunction.cxx,v $
- Language: C++
- Date: $Date: 2005/01/25 22:50:35 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkLevelSetFunction.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkLevelSetFunction);
- namespace wrappers
- {
-
- ITK_WRAP_OBJECT1(LevelSetFunction,image::F2,itkLevelSetFunctionF2);
- ITK_WRAP_OBJECT1(LevelSetFunction,image::F3,itkLevelSetFunctionF3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkMattesMutualInformationImageToImageMetric.cxx b/Wrapping/CSwig/Algorithms/wrap_itkMattesMutualInformationImageToImageMetric.cxx
deleted file mode 100644
index a418477ad6f7e054e776162c3d1da6b34b9e9052..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkMattesMutualInformationImageToImageMetric.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMattesMutualInformationImageToImageMetric.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkMattesMutualInformationImageToImageMetric.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMattesMutualInformationImageToImageMetric);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(MattesMutualInformationImageToImageMetric, image::F2, image::F2,
- itkMattesMutualInformationImageToImageMetricF2F2);
- ITK_WRAP_OBJECT2(MattesMutualInformationImageToImageMetric, image::F3, image::F3,
- itkMattesMutualInformationImageToImageMetricF3F3);
- ITK_WRAP_OBJECT2(MattesMutualInformationImageToImageMetric, image::US2, image::US2,
- itkMattesMutualInformationImageToImageMetricUS2US2);
- ITK_WRAP_OBJECT2(MattesMutualInformationImageToImageMetric, image::US3, image::US3,
- itkMattesMutualInformationImageToImageMetricUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkMeanReciprocalSquareDifferenceImageToImageMetric.cxx b/Wrapping/CSwig/Algorithms/wrap_itkMeanReciprocalSquareDifferenceImageToImageMetric.cxx
deleted file mode 100644
index 99df9276003d45a47bb291f2dde5ce71faaea48e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkMeanReciprocalSquareDifferenceImageToImageMetric.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMeanReciprocalSquareDifferenceImageToImageMetric.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkMeanReciprocalSquareDifferenceImageToImageMetric.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMeanReciprocalSquareDifferenceImageToImageMetric);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(MeanReciprocalSquareDifferenceImageToImageMetric, image::F2, image::F2,
- itkMeanReciprocalSquareDifferenceImageToImageMetricF2F2);
- ITK_WRAP_OBJECT2(MeanReciprocalSquareDifferenceImageToImageMetric, image::F3, image::F3,
- itkMeanReciprocalSquareDifferenceImageToImageMetricF3F3);
- ITK_WRAP_OBJECT2(MeanReciprocalSquareDifferenceImageToImageMetric, image::US2, image::US2,
- itkMeanReciprocalSquareDifferenceImageToImageMetricUS2US2);
- ITK_WRAP_OBJECT2(MeanReciprocalSquareDifferenceImageToImageMetric, image::US3, image::US3,
- itkMeanReciprocalSquareDifferenceImageToImageMetricUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkMeanSquaresImageToImageMetric.cxx b/Wrapping/CSwig/Algorithms/wrap_itkMeanSquaresImageToImageMetric.cxx
deleted file mode 100644
index 4601e5be355e2de6b3f37b5c93c7d6c456b29911..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkMeanSquaresImageToImageMetric.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMeanSquaresImageToImageMetric.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkMeanSquaresImageToImageMetric.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMeanSquaresImageToImageMetric);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(MeanSquaresImageToImageMetric, image::F2, image::F2,
- itkMeanSquaresImageToImageMetricF2F2);
- ITK_WRAP_OBJECT2(MeanSquaresImageToImageMetric, image::F3, image::F3,
- itkMeanSquaresImageToImageMetricF3F3);
- ITK_WRAP_OBJECT2(MeanSquaresImageToImageMetric, image::US2, image::US2,
- itkMeanSquaresImageToImageMetricUS2US2);
- ITK_WRAP_OBJECT2(MeanSquaresImageToImageMetric, image::US3, image::US3,
- itkMeanSquaresImageToImageMetricUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkMinMaxCurvatureFlowImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkMinMaxCurvatureFlowImageFilter.cxx
deleted file mode 100644
index 8b5ed28c1672e14a2668018c4b61bf5a773fad89..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkMinMaxCurvatureFlowImageFilter.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMinMaxCurvatureFlowImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2003/11/26 02:01:03 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkMinMaxCurvatureFlowImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH MakeConsistentWrappedClasses.sh
-//=================================
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMinMaxCurvatureFlowImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(MinMaxCurvatureFlowImageFilter, image::F2 , image::F2 , itkMinMaxCurvatureFlowImageFilterF2F2 );
- ITK_WRAP_OBJECT2(MinMaxCurvatureFlowImageFilter, image::D2 , image::D2 , itkMinMaxCurvatureFlowImageFilterD2D2 );
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(MinMaxCurvatureFlowImageFilter, image::F3 , image::F3 , itkMinMaxCurvatureFlowImageFilterF3F3 );
- ITK_WRAP_OBJECT2(MinMaxCurvatureFlowImageFilter, image::D3 , image::D3 , itkMinMaxCurvatureFlowImageFilterD3D3 );
- }
-}
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkMultiResolutionImageRegistrationMethod.cxx b/Wrapping/CSwig/Algorithms/wrap_itkMultiResolutionImageRegistrationMethod.cxx
deleted file mode 100644
index b09ea0d1ade8d323071cf37cbeac5360ae577ed3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkMultiResolutionImageRegistrationMethod.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMultiResolutionImageRegistrationMethod.cxx,v $
- Language: C++
- Date: $Date: 2003/10/14 17:59:55 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkMultiResolutionImageRegistrationMethod.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMultiResolutionImageRegistrationMethod);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(MultiResolutionImageRegistrationMethod, image::F2, image::F2,
- itkMultiResolutionImageRegistrationMethodF2F2);
- ITK_WRAP_OBJECT2(MultiResolutionImageRegistrationMethod, image::F3, image::F3,
- itkMultiResolutionImageRegistrationMethodF3F3);
- ITK_WRAP_OBJECT2(MultiResolutionImageRegistrationMethod, image::US2, image::US2,
- itkMultiResolutionImageRegistrationMethodUS2US2);
- ITK_WRAP_OBJECT2(MultiResolutionImageRegistrationMethod, image::US3, image::US3,
- itkMultiResolutionImageRegistrationMethodUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkMutualInformationImageToImageMetric.cxx b/Wrapping/CSwig/Algorithms/wrap_itkMutualInformationImageToImageMetric.cxx
deleted file mode 100644
index 347b33a0559a6663989f5064c0e71ca8250b9691..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkMutualInformationImageToImageMetric.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMutualInformationImageToImageMetric.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkMutualInformationImageToImageMetric.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMutualInformationImageToImageMetric);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(MutualInformationImageToImageMetric, image::F2, image::F2,
- itkMutualInformationImageToImageMetricF2F2);
- ITK_WRAP_OBJECT2(MutualInformationImageToImageMetric, image::F3, image::F3,
- itkMutualInformationImageToImageMetricF3F3);
- ITK_WRAP_OBJECT2(MutualInformationImageToImageMetric, image::US2, image::US2,
- itkMutualInformationImageToImageMetricUS2US2);
- ITK_WRAP_OBJECT2(MutualInformationImageToImageMetric, image::US3, image::US3,
- itkMutualInformationImageToImageMetricUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkNarrowBandCurvesLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkNarrowBandCurvesLevelSetImageFilter.cxx
deleted file mode 100644
index 6ffba01bbc58dd60f626e4103bde20f5a5e75f50..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkNarrowBandCurvesLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkNarrowBandCurvesLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.3 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkNarrowBandCurvesLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkNarrowBandCurvesLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(NarrowBandCurvesLevelSetImageFilter, image::F2, image::F2,
- itkNarrowBandCurvesLevelSetImageFilterF2F2);
- ITK_WRAP_OBJECT2(NarrowBandCurvesLevelSetImageFilter, image::F3, image::F3,
- itkNarrowBandCurvesLevelSetImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkNarrowBandLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkNarrowBandLevelSetImageFilter.cxx
deleted file mode 100644
index e64dbe4621958d10cf35914124605edc62097af4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkNarrowBandLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkNarrowBandLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkNarrowBandLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkNarrowBandLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(NarrowBandImageFilterBase, image::F2, image::F2,
- itkNarrowBandImageFilterBaseF2F2);
- ITK_WRAP_OBJECT2(NarrowBandImageFilterBase, image::F3, image::F3,
- itkNarrowBandImageFilterBaseF3F3);
- ITK_WRAP_OBJECT2(NarrowBandLevelSetImageFilter, image::F2, image::F2,
- itkNarrowBandLevelSetImageFilterF2F2);
- ITK_WRAP_OBJECT2(NarrowBandLevelSetImageFilter, image::F3, image::F3,
- itkNarrowBandLevelSetImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkNormalizedCorrelationImageToImageMetric.cxx b/Wrapping/CSwig/Algorithms/wrap_itkNormalizedCorrelationImageToImageMetric.cxx
deleted file mode 100644
index b96f9da3885024000af0403e7279a368e22ac2e8..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkNormalizedCorrelationImageToImageMetric.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkNormalizedCorrelationImageToImageMetric.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkNormalizedCorrelationImageToImageMetric.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkNormalizedCorrelationImageToImageMetric);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(NormalizedCorrelationImageToImageMetric, image::F2, image::F2,
- itkNormalizedCorrelationImageToImageMetricF2F2);
- ITK_WRAP_OBJECT2(NormalizedCorrelationImageToImageMetric, image::F3, image::F3,
- itkNormalizedCorrelationImageToImageMetricF3F3);
- ITK_WRAP_OBJECT2(NormalizedCorrelationImageToImageMetric, image::US2, image::US2,
- itkNormalizedCorrelationImageToImageMetricUS2US2);
- ITK_WRAP_OBJECT2(NormalizedCorrelationImageToImageMetric, image::US3, image::US3,
- itkNormalizedCorrelationImageToImageMetricUS3US3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkOtsuThresholdImageCalculator.cxx b/Wrapping/CSwig/Algorithms/wrap_itkOtsuThresholdImageCalculator.cxx
deleted file mode 100644
index 0d17441869a164adcc9271947f1fa3caf59c2d98..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkOtsuThresholdImageCalculator.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkOtsuThresholdImageCalculator.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkOtsuThresholdImageCalculator.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkOtsuThresholdImageCalculator);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(OtsuThresholdImageCalculator, image::F2,
- itkOtsuThresholdImageCalculatorF2);
- ITK_WRAP_OBJECT1(OtsuThresholdImageCalculator, image::F3,
- itkOtsuThresholdImageCalculatorF3);
- ITK_WRAP_OBJECT1(OtsuThresholdImageCalculator, image::US2,
- itkOtsuThresholdImageCalculatorUS2);
- ITK_WRAP_OBJECT1(OtsuThresholdImageCalculator, image::US3,
- itkOtsuThresholdImageCalculatorUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkPDEDeformableRegistrationFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkPDEDeformableRegistrationFilter.cxx
deleted file mode 100644
index ccc215b443e78ffa18b90939ebf371be56bc0d50..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkPDEDeformableRegistrationFilter.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkPDEDeformableRegistrationFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.3 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkPDEDeformableRegistrationFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkPDEDeformableRegistrationFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT3(PDEDeformableRegistrationFilter, image::F2, image::F2, image::VF2,
- itkPDEDeformableRegistrationFilterF2F2);
- ITK_WRAP_OBJECT3(PDEDeformableRegistrationFilter, image::F3, image::F3, image::VF3,
- itkPDEDeformableRegistrationFilterF3F3);
- ITK_WRAP_OBJECT3(PDEDeformableRegistrationFilter, image::US2, image::US2, image::VF2,
- itkPDEDeformableRegistrationFilterUS2US2);
- ITK_WRAP_OBJECT3(PDEDeformableRegistrationFilter, image::US3, image::US3, image::VF3,
- itkPDEDeformableRegistrationFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkRecursiveMultiResolutionPyramidImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkRecursiveMultiResolutionPyramidImageFilter.cxx
deleted file mode 100644
index e8365d7979edb52f72f223b293b9cfd0b501c862..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkRecursiveMultiResolutionPyramidImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkRecursiveMultiResolutionPyramidImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2003/11/06 22:24:13 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkRecursiveMultiResolutionPyramidImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkRecursiveMultiResolutionPyramidImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RecursiveMultiResolutionPyramidImageFilter, image::F2, image::F2,
- itkRecursiveMultiResolutionPyramidImageFilterF2F2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RecursiveMultiResolutionPyramidImageFilter, image::F3, image::F3,
- itkRecursiveMultiResolutionPyramidImageFilterF3F3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RecursiveMultiResolutionPyramidImageFilter, image::US2, image::US2,
- itkRecursiveMultiResolutionPyramidImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RecursiveMultiResolutionPyramidImageFilter, image::US3, image::US3,
- itkRecursiveMultiResolutionPyramidImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkSegmentationLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkSegmentationLevelSetImageFilter.cxx
deleted file mode 100644
index 1cb784dc475bafe17dc35e7b25377db30060c81a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkSegmentationLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSegmentationLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/20 15:19:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkShapeDetectionLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSegmentationLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(SegmentationLevelSetImageFilter, image::F2, image::F2,
- itkSegmentationLevelSetImageFilterF2F2);
- ITK_WRAP_OBJECT2(SegmentationLevelSetImageFilter, image::F3, image::F3,
- itkSegmentationLevelSetImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkShapeDetectionLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkShapeDetectionLevelSetImageFilter.cxx
deleted file mode 100644
index 4c0eba4e333856a457812047c23848092f3d160d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkShapeDetectionLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkShapeDetectionLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/19 16:45:43 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkShapeDetectionLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkShapeDetectionLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ShapeDetectionLevelSetImageFilter, image::F2, image::F2,
- itkShapeDetectionLevelSetImageFilterF2F2);
- ITK_WRAP_OBJECT2(ShapeDetectionLevelSetImageFilter, image::F3, image::F3,
- itkShapeDetectionLevelSetImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkSparseFieldLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkSparseFieldLevelSetImageFilter.cxx
deleted file mode 100644
index aa9663711affe3dd5c182d20326e4be3fabb6219..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkSparseFieldLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSparseFieldLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/25 16:40:03 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkSparseFieldLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSparseFieldLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(SparseFieldLevelSetImageFilter,image::F2,image::F2,
- itkSparseFieldLevelSetImageFilterF2F2);
- ITK_WRAP_OBJECT2(SparseFieldLevelSetImageFilter,image::F3,image::F3,
- itkSparseFieldLevelSetImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkSymmetricForcesDemonsRegistrationFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkSymmetricForcesDemonsRegistrationFilter.cxx
deleted file mode 100644
index c40144d5d2068c07fb45ba5f8008d64c8c850259..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkSymmetricForcesDemonsRegistrationFilter.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSymmetricForcesDemonsRegistrationFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:37:35 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkSymmetricForcesDemonsRegistrationFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSymmetricForcesDemonsRegistrationFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT3(SymmetricForcesDemonsRegistrationFilter, image::F2, image::F2, image::VF2,
- itkSymmetricForcesDemonsRegistrationFilterF2F2);
- ITK_WRAP_OBJECT3(SymmetricForcesDemonsRegistrationFilter, image::F3, image::F3, image::VF3,
- itkSymmetricForcesDemonsRegistrationFilterF3F3);
- ITK_WRAP_OBJECT3(SymmetricForcesDemonsRegistrationFilter, image::US2, image::US2, image::VF2,
- itkSymmetricForcesDemonsRegistrationFilterUS2US2);
- ITK_WRAP_OBJECT3(SymmetricForcesDemonsRegistrationFilter, image::US3, image::US3, image::VF3,
- itkSymmetricForcesDemonsRegistrationFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkThresholdSegmentationLevelSetImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkThresholdSegmentationLevelSetImageFilter.cxx
deleted file mode 100644
index 66942450ef7f26a492151931d39de135f179800e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkThresholdSegmentationLevelSetImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkThresholdSegmentationLevelSetImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/26 17:15:22 $
- Version: $Revision: 1.5 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkThresholdSegmentationLevelSetImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkThresholdSegmentationLevelSetImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ThresholdSegmentationLevelSetImageFilter, image::F3, image::F3,
- itkThresholdSegmentationLevelSetImageFilterF3F3);
- ITK_WRAP_OBJECT2(ThresholdSegmentationLevelSetImageFilter, image::F2, image::F2,
- itkThresholdSegmentationLevelSetImageFilterF2F2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkTreeNode.cxx b/Wrapping/CSwig/Algorithms/wrap_itkTreeNode.cxx
deleted file mode 100644
index 2c4c92bc4129855baf763fbaf492c5e7bf5370ed..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkTreeNode.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkTreeNode.cxx,v $
- Language: C++
- Date: $Date: 2005/01/20 15:19:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkHistogramMatchingImageFilter.h"
-#include "itkSpatialObject.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace itkso
-{
- typedef itk::SpatialObject<2> SO2;
- typedef itk::SpatialObject<3> SO3;
-}
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkTreeNode);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(TreeNode,itkso::SO2 *,itkSOTreeNodeSO2);
- ITK_WRAP_OBJECT1(TreeNode,itkso::SO3 *,itkSOTreeNodeSO3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkTreeNodeSO.cxx b/Wrapping/CSwig/Algorithms/wrap_itkTreeNodeSO.cxx
deleted file mode 100644
index acfc924dcb3589822a717b5f2b95d16a8908fe48..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkTreeNodeSO.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkTreeNodeSO.cxx,v $
- Language: C++
- Date: $Date: 2005/01/14 15:27:23 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkTreeNode.h"
-#include "itkSpatialObject.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkTreeNodeSO);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(TreeNode, itk::SpatialObject<2>*,itkTreeNodeSO2);
- ITK_WRAP_OBJECT1(TreeNode, itk::SpatialObject<3>*,itkTreeNodeSO3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkVoronoiSegmentationImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkVoronoiSegmentationImageFilter.cxx
deleted file mode 100644
index c2110e9ac001301c9718511c95b5279747463443..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkVoronoiSegmentationImageFilter.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkVoronoiSegmentationImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkVoronoiSegmentationImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace itktraits
-{
- typedef itk::DefaultDynamicMeshTraits<double,2,2,double,float,double>
- dynamicMeshTraitDouble;
-}
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkVoronoiSegmentationImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT3(PointSet,double,2,itktraits::dynamicMeshTraitDouble,itkPointSetDouble);
- ITK_WRAP_OBJECT3(Mesh,double,2,itktraits::dynamicMeshTraitDouble,itkMeshDouble);
- ITK_WRAP_OBJECT3(VoronoiSegmentationImageFilterBase,
- image::UC2, image::UC2, image::UC2,
- itkVoronoiSegmentationImageFilterBaseUC2UC2UC2);
- ITK_WRAP_OBJECT3(VoronoiSegmentationImageFilter, image::UC2, image::UC2, image::UC2,
- itkVoronoiSegmentationImageFilterUC2UC2UC2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Algorithms/wrap_itkWatershedImageFilter.cxx b/Wrapping/CSwig/Algorithms/wrap_itkWatershedImageFilter.cxx
deleted file mode 100644
index e35b1bedea6df42441922e7c69c045c1542f7fdf..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Algorithms/wrap_itkWatershedImageFilter.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkWatershedImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/03/26 12:57:10 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkWatershedImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkWatershedImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(WatershedImageFilter, image::F2, itkWatershedImageFilterF2);
- ITK_WRAP_OBJECT1(WatershedImageFilter, image::F3, itkWatershedImageFilterF3);
-
- ITK_WRAP_OBJECT1(WatershedImageFilter, image::D2, itkWatershedImageFilterD2);
- ITK_WRAP_OBJECT1(WatershedImageFilter, image::D3, itkWatershedImageFilterD3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/.NoDartCoverage b/Wrapping/CSwig/BasicFiltersA/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/BasicFiltersA/CMakeLists.txt b/Wrapping/CSwig/BasicFiltersA/CMakeLists.txt
deleted file mode 100644
index 4186165189a47a3fc1b4138d1583e9d74b78d35c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# create the ITKBasicFiltersTcl libraries
-SET(WRAP_SOURCES
- wrap_itkAnisotropicDiffusionImageFilter_2D
- wrap_itkAnisotropicDiffusionImageFilter_3D
- wrap_itkBinaryThresholdImageFilter
- wrap_itkBinaryDilateImageFilter
- wrap_itkBinaryErodeImageFilter
- wrap_itkCannyEdgeDetectionImageFilter
- wrap_itkCastImageFilter_2D
- wrap_itkCastImageFilter_3D
- wrap_itkConfidenceConnectedImageFilter
- wrap_itkChangeInformationImageFilter
- wrap_itkConnectedThresholdImageFilter
- wrap_itkCurvatureAnisotropicDiffusionImageFilter
- wrap_itkExtractImageFilter
- wrap_itkFastMarchingImageFilter
- wrap_itkFlipImageFilter
- wrap_itkGradientAnisotropicDiffusionImageFilter
- wrap_itkGradientMagnitudeImageFilter
- wrap_itkGrayscaleDilateImageFilter
- wrap_itkGrayscaleErodeImageFilter
- wrap_itkDanielssonDistanceMapImageFilter
- wrap_itkIsolatedConnectedImageFilter
- wrap_itkImportImageFilter
- wrap_itkLaplacianImageFilter
- wrap_itkMinimumMaximumImageCalculator
- wrap_itkMorphologyImageFilter
- wrap_itkNeighborhoodConnectedImageFilter
- wrap_itkSobelEdgeDetectionImageFilter
- wrap_itkTernaryMagnitudeImageFilter
-)
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersA/ITKBasicFiltersA.mdx"
- )
-
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKBasicFiltersA BasicFiltersA "ITKNumerics;ITKCommonB;ITKCommonA" "" "ITKBasicFilters")
diff --git a/Wrapping/CSwig/BasicFiltersA/CVS/Entries b/Wrapping/CSwig/BasicFiltersA/CVS/Entries
deleted file mode 100644
index ff4e1ae99ccf97db6e2668592281df4750a676c9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/CVS/Entries
+++ /dev/null
@@ -1,36 +0,0 @@
-/.NoDartCoverage/1.1/Sat Sep 25 17:38:20 2004//TITK-3-0-1
-/CMakeLists.txt/1.6/Mon Nov 21 19:18:44 2005//TITK-3-0-1
-/MakeConsistentWrappedClasses.sh/1.2/Wed Nov 2 21:45:13 2005//TITK-3-0-1
-/wrap_ITKBasicFiltersA.cxx/1.4/Mon Nov 21 19:18:44 2005//TITK-3-0-1
-/wrap_ITKBasicFiltersAJava.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_ITKBasicFiltersAPython.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_ITKBasicFiltersATcl.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkAnisotropicDiffusionImageFilter_2D.cxx/1.2/Thu Nov 3 13:45:42 2005//TITK-3-0-1
-/wrap_itkAnisotropicDiffusionImageFilter_3D.cxx/1.2/Thu Nov 3 13:45:42 2005//TITK-3-0-1
-/wrap_itkBinaryDilateImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkBinaryErodeImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkBinaryThresholdImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkCannyEdgeDetectionImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkCastImageFilter_2D.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkCastImageFilter_3D.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkChangeInformationImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkConfidenceConnectedImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkConnectedThresholdImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkCurvatureAnisotropicDiffusionImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkDanielssonDistanceMapImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkExtractImageFilter.cxx/1.2/Thu Apr 29 20:39:13 2004//TITK-3-0-1
-/wrap_itkFastMarchingImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkFlipImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkGradientAnisotropicDiffusionImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkGradientMagnitudeImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkGrayscaleDilateImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkGrayscaleErodeImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkImportImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkIsolatedConnectedImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkLaplacianImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkMinimumMaximumImageCalculator.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkMorphologyImageFilter.cxx/1.1/Mon Nov 21 19:18:12 2005//TITK-3-0-1
-/wrap_itkNeighborhoodConnectedImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkSobelEdgeDetectionImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-/wrap_itkTernaryMagnitudeImageFilter.cxx/1.1/Mon Apr 19 18:50:54 2004//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/BasicFiltersA/CVS/Repository b/Wrapping/CSwig/BasicFiltersA/CVS/Repository
deleted file mode 100644
index f0d64c1e010042b013083b1e2379f2c922575d4a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/BasicFiltersA
diff --git a/Wrapping/CSwig/BasicFiltersA/CVS/Root b/Wrapping/CSwig/BasicFiltersA/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/BasicFiltersA/CVS/Tag b/Wrapping/CSwig/BasicFiltersA/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/BasicFiltersA/CVS/Template b/Wrapping/CSwig/BasicFiltersA/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/BasicFiltersA/MakeConsistentWrappedClasses.sh b/Wrapping/CSwig/BasicFiltersA/MakeConsistentWrappedClasses.sh
deleted file mode 100644
index c67b456b521d57e4f3477d8eadc745901abd54d5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/MakeConsistentWrappedClasses.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/bash
-#This is a utilty script that is useful for generating a consistent set
-#of wrapping definitions. In an attempt to make the interpreted environment
-#match the compiled environment as much as possible, it will be important
-#to keep all the wrapped functionallity consistent across filters.
-#
-
-Prefix=wrap_itk
-Postfix=.cxx
-
-
-MAKE_ALL_FILTER_TYPES="MedianImageFilter NeighborhoodConnectedImageFilter IsolatedConnectedImageFilter GradientMagnitudeImageFilter FastMarchingImageFilter RegionOfInterestImageFilter"
-
-MAKE_ONLY_FLOAT_TYPES=""
-
-for WRAP_OBJECT2_TARGET in ${MAKE_ALL_FILTER_TYPES}; do
-CURRFILE=${Prefix}${WRAP_OBJECT2_TARGET}${Postfix}
-DATESTAMP=`date '+%F-%R'`
-mv ${CURRFILE} ${CURRFILE}.${DATESTAMP}
-echo "Building ${CURRFILE}"
-cat > ${CURRFILE} << FILE_EOF
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: \$RCSfile: MakeConsistentWrappedClasses.sh,v ${WRAP_OBJECT2_TARGET}.cxx,v \$
- Language: C++
- Date: \$Date: 2005/11/02 21:45:13 $
- Version: \$Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImage.h"
-#include "itk${WRAP_OBJECT2_TARGET}.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH $0
-//=================================
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itk${WRAP_OBJECT2_TARGET});
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::F2 , image::F2 , itk${WRAP_OBJECT2_TARGET}F2F2 );
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::D2 , image::D2 , itk${WRAP_OBJECT2_TARGET}D2D2 );
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::UC2, image::UC2, itk${WRAP_OBJECT2_TARGET}UC2UC2);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::US2, image::US2, itk${WRAP_OBJECT2_TARGET}US2US2);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::UI2, image::UI2, itk${WRAP_OBJECT2_TARGET}UI2UI2);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::SC2, image::SC2, itk${WRAP_OBJECT2_TARGET}SC2SC2);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::SS2, image::SS2, itk${WRAP_OBJECT2_TARGET}SS2SS2);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::SI2, image::SI2, itk${WRAP_OBJECT2_TARGET}SI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::F3 , image::F3 , itk${WRAP_OBJECT2_TARGET}F3F3 );
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::D3 , image::D3 , itk${WRAP_OBJECT2_TARGET}D3D3 );
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::UC3, image::UC3, itk${WRAP_OBJECT2_TARGET}UC3UC3);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::US3, image::US3, itk${WRAP_OBJECT2_TARGET}US3US3);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::UI3, image::UI3, itk${WRAP_OBJECT2_TARGET}UI3UI3);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::SC3, image::SC3, itk${WRAP_OBJECT2_TARGET}SC3SC3);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::SS3, image::SS3, itk${WRAP_OBJECT2_TARGET}SS3SS3);
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::SI3, image::SI3, itk${WRAP_OBJECT2_TARGET}SI3SI3);
- }
-}
-#endif
-FILE_EOF
-
-done
-
-for WRAP_OBJECT2_TARGET in ${MAKE_ONLY_FLOAT_TYPES}; do
-CURRFILE=${Prefix}${WRAP_OBJECT2_TARGET}${Postfix}
-echo "Building ${CURRFILE}"
-cat > ${CURRFILE} << FILE_EOF
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: \$RCSfile: MakeConsistentWrappedClasses.sh,v ${WRAP_OBJECT2_TARGET}.cxx,v \$
- Language: C++
- Date: \$Date: 2005/11/02 21:45:13 $
- Version: \$Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itk${WRAP_OBJECT2_TARGET}.h"
-#include "itkImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH $0
-//=================================
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itk${WRAP_OBJECT2_TARGET});
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::F2 , image::F2 , itk${WRAP_OBJECT2_TARGET}F2F2 );
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::D2 , image::D2 , itk${WRAP_OBJECT2_TARGET}D2D2 );
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::F3 , image::F3 , itk${WRAP_OBJECT2_TARGET}F3F3 );
- ITK_WRAP_OBJECT2(${WRAP_OBJECT2_TARGET}, image::D3 , image::D3 , itk${WRAP_OBJECT2_TARGET}D3D3 );
- }
-}
-#endif
-FILE_EOF
-
-done
-
-
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersA.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersA.cxx
deleted file mode 100644
index 46f97faa045daff97c4e9d9383fdf9e8f66f2b63..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersA.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKBasicFiltersA.cxx,v $
- Language: C++
- Date: $Date: 2005/11/21 19:18:44 $
- Version: $Revision: 1.4 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(itkAnisotropicDiffusionImageFilter_2D),
- ITK_WRAP_GROUP(itkAnisotropicDiffusionImageFilter_3D),
- ITK_WRAP_GROUP(itkBinaryThresholdImageFilter),
- ITK_WRAP_GROUP(itkBinaryDilateImageFilter),
- ITK_WRAP_GROUP(itkBinaryErodeImageFilter),
- ITK_WRAP_GROUP(itkCannyEdgeDetectionImageFilter),
- ITK_WRAP_GROUP(itkCastImageFilter_2D),
- ITK_WRAP_GROUP(itkCastImageFilter_3D),
- ITK_WRAP_GROUP(itkChangeInformationImageFilter),
- ITK_WRAP_GROUP(itkConfidenceConnectedImageFilter),
- ITK_WRAP_GROUP(itkConnectedThresholdImageFilter),
- ITK_WRAP_GROUP(itkCurvatureAnisotropicDiffusionImageFilter),
- ITK_WRAP_GROUP(itkDanielssonDistanceMapImageFilter),
- ITK_WRAP_GROUP(itkExtractImageFilter),
- ITK_WRAP_GROUP(itkFastMarchingImageFilter),
- ITK_WRAP_GROUP(itkFlipImageFilter),
- ITK_WRAP_GROUP(itkGradientAnisotropicDiffusionImageFilter),
- ITK_WRAP_GROUP(itkGradientMagnitudeImageFilter),
- ITK_WRAP_GROUP(itkGrayscaleDilateImageFilter),
- ITK_WRAP_GROUP(itkGrayscaleErodeImageFilter),
- ITK_WRAP_GROUP(itkIsolatedConnectedImageFilter),
- ITK_WRAP_GROUP(itkImportImageFilter),
- ITK_WRAP_GROUP(itkLaplacianImageFilter),
- ITK_WRAP_GROUP(itkMinimumMaximumImageCalculator),
- ITK_WRAP_GROUP(itkMorphologyImageFilter),
- ITK_WRAP_GROUP(itkNeighborhoodConnectedImageFilter),
- ITK_WRAP_GROUP(itkSobelEdgeDetectionImageFilter),
- ITK_WRAP_GROUP(itkTernaryMagnitudeImageFilter)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersAJava.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersAJava.cxx
deleted file mode 100644
index 98c4cb5eecc2a96f8c7ee4a3c3e886e2b38fadc4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersAJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKBasicFiltersAJava"
-#include "wrap_ITKBasicFiltersA.cxx"
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersAPython.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersAPython.cxx
deleted file mode 100644
index 3909436c78a321a18079ba65a16e3470948c2a30..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersAPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKBasicFiltersAPython"
-#include "wrap_ITKBasicFiltersA.cxx"
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersATcl.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersATcl.cxx
deleted file mode 100644
index 46d472ab99fac4e2b945f133400101c712e177b6..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_ITKBasicFiltersATcl.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKBasicFiltersATcl"
-#include "wrap_ITKBasicFiltersA.cxx"
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkAnisotropicDiffusionImageFilter_2D.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkAnisotropicDiffusionImageFilter_2D.cxx
deleted file mode 100644
index acdfb14fcfbcce3addeb6e99f0320041ca26a935..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkAnisotropicDiffusionImageFilter_2D.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkAnisotropicDiffusionImageFilter_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/11/03 13:45:42 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkAnisotropicDiffusionImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkAnisotropicDiffusionImageFilter_2D);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::F2 , image::F2 , itkAnisotropicDiffusionImageFilterF2F2 );
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::D2 , image::D2 , itkAnisotropicDiffusionImageFilterD2D2 );
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::UC2, image::UC2, itkAnisotropicDiffusionImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::US2, image::US2, itkAnisotropicDiffusionImageFilterUS2US2);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::UI2, image::UI2, itkAnisotropicDiffusionImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::SC2, image::SC2, itkAnisotropicDiffusionImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::SS2, image::SS2, itkAnisotropicDiffusionImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::SI2, image::SI2, itkAnisotropicDiffusionImageFilterSI2SI2);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkAnisotropicDiffusionImageFilter_3D.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkAnisotropicDiffusionImageFilter_3D.cxx
deleted file mode 100644
index b4b564b51197eb29df5547504e58e3a0159e1211..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkAnisotropicDiffusionImageFilter_3D.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkAnisotropicDiffusionImageFilter_3D.cxx,v $
- Language: C++
- Date: $Date: 2005/11/03 13:45:42 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkAnisotropicDiffusionImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkAnisotropicDiffusionImageFilter_3D);
- namespace wrappers
- {
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::F3 , image::F3 , itkAnisotropicDiffusionImageFilterF3F3 );
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::D3 , image::D3 , itkAnisotropicDiffusionImageFilterD3D3 );
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::UC3, image::UC3, itkAnisotropicDiffusionImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::US3, image::US3, itkAnisotropicDiffusionImageFilterUS3US3);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::UI3, image::UI3, itkAnisotropicDiffusionImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::SC3, image::SC3, itkAnisotropicDiffusionImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::SS3, image::SS3, itkAnisotropicDiffusionImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(AnisotropicDiffusionImageFilter, image::SI3, image::SI3, itkAnisotropicDiffusionImageFilterSI3SI3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryDilateImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryDilateImageFilter.cxx
deleted file mode 100644
index 32d5e0c4a3e8a4a73f54c4622d4d499945e26563..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryDilateImageFilter.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkBinaryDilateImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkBinaryDilateImageFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-#include "itkCSwigBinaryBallStructuringElement.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkBinaryDilateImageFilter);
- namespace wrappers
- {
- // NOTE: since both the BinaryDilateImageFilter and BinaryErodeImageFilter derive from the same superclass, only one of
- // them should do the wrapping WITH_SUPERCLASS.
- //
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT3(BinaryDilateImageFilter, image::F2 , image::F2 , structuringElement::F2, itkBinaryDilateImageFilterF2F2 );
- ITK_WRAP_OBJECT3(BinaryDilateImageFilter, image::UC2, image::UC2, structuringElement::UC2, itkBinaryDilateImageFilterUC2UC2);
- ITK_WRAP_OBJECT3(BinaryDilateImageFilter, image::US2, image::US2, structuringElement::US2, itkBinaryDilateImageFilterUS2US2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT3(BinaryDilateImageFilter, image::F3 , image::F3 , structuringElement::F3, itkBinaryDilateImageFilterF3F3 );
- ITK_WRAP_OBJECT3(BinaryDilateImageFilter, image::UC3, image::UC3, structuringElement::UC3, itkBinaryDilateImageFilterUC3UC3);
- ITK_WRAP_OBJECT3(BinaryDilateImageFilter, image::US3, image::US3, structuringElement::US3, itkBinaryDilateImageFilterUS3US3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryErodeImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryErodeImageFilter.cxx
deleted file mode 100644
index c594878c7c576e3b948dad9e8d51b1cc97ac7a2e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryErodeImageFilter.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkBinaryErodeImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkBinaryErodeImageFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-#include "itkCSwigBinaryBallStructuringElement.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkBinaryErodeImageFilter);
- namespace wrappers
- {
- // NOTE: since both the BinaryDilateImageFilter and BinaryErodeImageFilter derive from the same superclass, only one of
- // them should do the wrapping WITH_SUPERCLASS.
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(BinaryErodeImageFilter, image::F2 , image::F2 , structuringElement::F2, itkBinaryErodeImageFilterF2F2 );
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(BinaryErodeImageFilter, image::UC2, image::UC2, structuringElement::UC2, itkBinaryErodeImageFilterUC2UC2);
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(BinaryErodeImageFilter, image::US2, image::US2, structuringElement::US2, itkBinaryErodeImageFilterUS2US2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(BinaryErodeImageFilter, image::F3 , image::F3 , structuringElement::F3, itkBinaryErodeImageFilterF3F3 );
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(BinaryErodeImageFilter, image::UC3, image::UC3, structuringElement::UC3, itkBinaryErodeImageFilterUC3UC3);
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(BinaryErodeImageFilter, image::US3, image::US3, structuringElement::US3, itkBinaryErodeImageFilterUS3US3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryThresholdImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryThresholdImageFilter.cxx
deleted file mode 100644
index 38b3c06a675e946772bd3be91c8f169639b0ea25..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkBinaryThresholdImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkBinaryThresholdImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkBinaryThresholdImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkBinaryThresholdImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(BinaryThresholdImageFilter, image::F2, image::US2,
- itkBinaryThresholdImageFilterF2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(BinaryThresholdImageFilter, image::US2, image::US2,
- itkBinaryThresholdImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(BinaryThresholdImageFilter, image::F3, image::US3,
- itkBinaryThresholdImageFilterF3US3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(BinaryThresholdImageFilter, image::US3, image::US3,
- itkBinaryThresholdImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkCannyEdgeDetectionImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkCannyEdgeDetectionImageFilter.cxx
deleted file mode 100644
index f25f89e9aed8d137bb66eab205c4ad8692322811..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkCannyEdgeDetectionImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkCannyEdgeDetectionImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkCannyEdgeDetectionImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkCannyEdgeDetectionImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(CannyEdgeDetectionImageFilter, image::F2, image::F2,
- itkCannyEdgeDetectionImageFilterF2F2);
- ITK_WRAP_OBJECT2(CannyEdgeDetectionImageFilter, image::F3, image::F3,
- itkCannyEdgeDetectionImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkCastImageFilter_2D.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkCastImageFilter_2D.cxx
deleted file mode 100644
index bef4c7eac3cd516a5b6a0f485d50a30d5ba40afa..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkCastImageFilter_2D.cxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkCastImageFilter_2D.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkCastImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkCastImageFilter_2D);
- namespace wrappers
- {
- //Cast to self
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::F2,
- itkCastImageFilterF2F2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::D2, image::D2,
- itkCastImageFilterD2D2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UC2, image::UC2,
- itkCastImageFilterUC2UC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::US2, image::US2,
- itkCastImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UI2, image::UI2,
- itkCastImageFilterUI2UI2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SC2, image::SC2,
- itkCastImageFilterSC2SC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SS2, image::SS2,
- itkCastImageFilterSS2SS2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SI2, image::SI2,
- itkCastImageFilterSI2SI2);
-
- //Double to/from float 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::D2,
- itkCastImageFilterF2D2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::D2, image::F2,
- itkCastImageFilterD2F2);
-
- //Unsigned char to/from float 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::UC2,
- itkCastImageFilterF2UC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UC2, image::F2,
- itkCastImageFilterUC2F2);
- //Unsigned short to/from float 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::US2,
- itkCastImageFilterF2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::US2, image::F2,
- itkCastImageFilterUS2F2);
- //Unsigned int to/from float 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::UI2,
- itkCastImageFilterF2UI2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UI2, image::F2,
- itkCastImageFilterUI2F2);
-
- //Signed char to/from float 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::SC2,
- itkCastImageFilterF2SC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SC2, image::F2,
- itkCastImageFilterSC2F2);
- //Signed short to/from float 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::SS2,
- itkCastImageFilterF2SS2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SS2, image::F2,
- itkCastImageFilterSS2F2);
- //Signed int to/from float 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F2, image::SI2,
- itkCastImageFilterF2SI2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SI2, image::F2,
- itkCastImageFilterSI2F2);
- //Unsigned char to/from unsigned short 2D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::US2, image::UC2,
- itkCastImageFilterUS2UC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UC2, image::US2,
- itkCastImageFilterUC2US2);
-
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkCastImageFilter_3D.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkCastImageFilter_3D.cxx
deleted file mode 100644
index ec37c69bce6d54973a5e76b2eabaf60565d8120e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkCastImageFilter_3D.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkCastImageFilter_3D.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkCastImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkCastImageFilter_3D);
- namespace wrappers
- {
- //Cast to self
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::F3,
- itkCastImageFilterF3F3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::D3, image::D3,
- itkCastImageFilterD3D3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UC3, image::UC3,
- itkCastImageFilterUC3UC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::US3, image::US3,
- itkCastImageFilterUS3US3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UI3, image::UI3,
- itkCastImageFilterUI3UI3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SC3, image::SC3,
- itkCastImageFilterSC3SC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SS3, image::SS3,
- itkCastImageFilterSS3SS3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SI3, image::SI3,
- itkCastImageFilterSI3SI3);
-
- //Double to/from float 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::D3,
- itkCastImageFilterF3D3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::D3, image::F3,
- itkCastImageFilterD3F3);
-
- //Unsigned char to/from float 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::UC3,
- itkCastImageFilterF3UC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UC3, image::F3,
- itkCastImageFilterUC3F3);
- //Unsigned short to/from float 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::US3,
- itkCastImageFilterF3US3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::US3, image::F3,
- itkCastImageFilterUS3F3);
- //Unsigned int to/from float 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::UI3,
- itkCastImageFilterF3UI3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UI3, image::F3,
- itkCastImageFilterUI3F3);
-
- //Signed char to/from float 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::SC3,
- itkCastImageFilterF3SC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SC3, image::F3,
- itkCastImageFilterSC3F3);
- //Signed short to/from float 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::SS3,
- itkCastImageFilterF3SS3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SS3, image::F3,
- itkCastImageFilterSS3F3);
- //Signed int to/from float 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::F3, image::SI3,
- itkCastImageFilterF3SI3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::SI3, image::F3,
- itkCastImageFilterSI3F3);
- //Unsigned char to/from unsigned short 3D
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::US3, image::UC3,
- itkCastImageFilterUS3UC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(CastImageFilter, image::UC3, image::US3,
- itkCastImageFilterUC3US3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkChangeInformationImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkChangeInformationImageFilter.cxx
deleted file mode 100644
index a0e944c9fa013f12223915010eae9b73cbf3be54..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkChangeInformationImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkChangeInformationImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkChangeInformationImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkChangeInformationImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ChangeInformationImageFilter, image::F2, itkChangeInformationImageFilterF2);
- ITK_WRAP_OBJECT1(ChangeInformationImageFilter, image::F3, itkChangeInformationImageFilterF3);
- ITK_WRAP_OBJECT1(ChangeInformationImageFilter, image::US2, itkChangeInformationImageFilterUS2);
- ITK_WRAP_OBJECT1(ChangeInformationImageFilter, image::US3, itkChangeInformationImageFilterUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkConfidenceConnectedImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkConfidenceConnectedImageFilter.cxx
deleted file mode 100644
index 8ab543f5902d5ced6ac01cba4fb8272720f904e8..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkConfidenceConnectedImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkConfidenceConnectedImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkConfidenceConnectedImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkConfidenceConnectedImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ConfidenceConnectedImageFilter, image::F2, image::F2,
- itkConfidenceConnectedImageFilterF2F2);
- ITK_WRAP_OBJECT2(ConfidenceConnectedImageFilter, image::F3, image::F3,
- itkConfidenceConnectedImageFilterF3F3);
- ITK_WRAP_OBJECT2(ConfidenceConnectedImageFilter, image::US2, image::US2,
- itkConfidenceConnectedImageFilterUS2US2);
- ITK_WRAP_OBJECT2(ConfidenceConnectedImageFilter, image::US3, image::US3,
- itkConfidenceConnectedImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkConnectedThresholdImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkConnectedThresholdImageFilter.cxx
deleted file mode 100644
index 4fa805b82fe1ab676e3cb33cee7da178649086c9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkConnectedThresholdImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkConnectedThresholdImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkConnectedThresholdImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkConnectedThresholdImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ConnectedThresholdImageFilter, image::F2, image::F2,
- itkConnectedThresholdImageFilterF2F2);
- ITK_WRAP_OBJECT2(ConnectedThresholdImageFilter, image::F3, image::F3,
- itkConnectedThresholdImageFilterF3F3);
- ITK_WRAP_OBJECT2(ConnectedThresholdImageFilter, image::US2, image::US2,
- itkConnectedThresholdImageFilterUS2US2);
- ITK_WRAP_OBJECT2(ConnectedThresholdImageFilter, image::US3, image::US3,
- itkConnectedThresholdImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkCurvatureAnisotropicDiffusionImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkCurvatureAnisotropicDiffusionImageFilter.cxx
deleted file mode 100644
index 13155b3336f263819122214dc359da77c8bccd87..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkCurvatureAnisotropicDiffusionImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkCurvatureAnisotropicDiffusionImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkCurvatureAnisotropicDiffusionImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkCurvatureAnisotropicDiffusionImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(CurvatureAnisotropicDiffusionImageFilter, image::F2, image::F2,
- itkCurvatureAnisotropicDiffusionImageFilterF2F2);
- ITK_WRAP_OBJECT2(CurvatureAnisotropicDiffusionImageFilter, image::F3, image::F3,
- itkCurvatureAnisotropicDiffusionImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkDanielssonDistanceMapImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkDanielssonDistanceMapImageFilter.cxx
deleted file mode 100644
index 754a322351bfd6ce541efc438aad21a45e58cda5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkDanielssonDistanceMapImageFilter.cxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkDanielssonDistanceMapImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkDanielssonDistanceMapImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkDanielssonDistanceMapImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::F2, image::F2,
- itkDanielssonDistanceMapImageFilterF2F2);
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::F2, image::US2,
- itkDanielssonDistanceMapImageFilterF2US2);
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::US2, image::F2,
- itkDanielssonDistanceMapImageFilterUS2F2);
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::F3, image::F3,
- itkDanielssonDistanceMapImageFilterF3F3);
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::F3, image::US3,
- itkDanielssonDistanceMapImageFilterF3US3);
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::US2, image::US2,
- itkDanielssonDistanceMapImageFilterUS2US2);
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::US3, image::US3,
- itkDanielssonDistanceMapImageFilterUS3US3);
- ITK_WRAP_OBJECT2(DanielssonDistanceMapImageFilter, image::US3, image::F3,
- itkDanielssonDistanceMapImageFilterUS3F3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkExtractImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkExtractImageFilter.cxx
deleted file mode 100644
index d1ce390a7b1f9e642fb245e3c6cdee02a6ca9084..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkExtractImageFilter.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkExtractImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/29 20:39:13 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkExtractImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkExtractImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::F2, image::F2, itkExtractImageFilterF2F2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::D2, image::D2, itkExtractImageFilterD2D2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::UC2, image::UC2, itkExtractImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::US2, image::US2, itkExtractImageFilterUS2US2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::UI2, image::UI2, itkExtractImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SC2, image::SC2, itkExtractImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SS2, image::SS2, itkExtractImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SI2, image::SI2, itkExtractImageFilterSI2SI2);
-
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::F3, image::F3, itkExtractImageFilterF3F3);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::D3, image::D3, itkExtractImageFilterD3D3);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::UC3, image::UC3, itkExtractImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::US3, image::US3, itkExtractImageFilterUS3US3);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::UI3, image::UI3, itkExtractImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SC3, image::SC3, itkExtractImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SS3, image::SS3, itkExtractImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SI3, image::SI3, itkExtractImageFilterSI3SI3);
-
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::F3, image::F2, itkExtractImageFilterF3F2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::D3, image::D2, itkExtractImageFilterD3D2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::UC3, image::UC2, itkExtractImageFilterUC3UC2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::US3, image::US2, itkExtractImageFilterUS3US2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::UI3, image::UI2, itkExtractImageFilterUI3UI2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SC3, image::SC2, itkExtractImageFilterSC3SC2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SS3, image::SS2, itkExtractImageFilterSS3SS2);
- ITK_WRAP_OBJECT2(ExtractImageFilter, image::SI3, image::SI2, itkExtractImageFilterSI3SI2);
-
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkFastMarchingImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkFastMarchingImageFilter.cxx
deleted file mode 100644
index 7b5fcfdf92fdec6927f18edfd11a7357e59e1e04..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkFastMarchingImageFilter.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkFastMarchingImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkFastMarchingImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH MakeConsistentWrappedClasses.sh
-//=================================
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkFastMarchingImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::F2 , image::F2 , itkFastMarchingImageFilterF2F2 );
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::D2 , image::D2 , itkFastMarchingImageFilterD2D2 );
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::UC2, image::UC2, itkFastMarchingImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::US2, image::US2, itkFastMarchingImageFilterUS2US2);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::UI2, image::UI2, itkFastMarchingImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::SC2, image::SC2, itkFastMarchingImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::SS2, image::SS2, itkFastMarchingImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::SI2, image::SI2, itkFastMarchingImageFilterSI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::F3 , image::F3 , itkFastMarchingImageFilterF3F3 );
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::D3 , image::D3 , itkFastMarchingImageFilterD3D3 );
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::UC3, image::UC3, itkFastMarchingImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::US3, image::US3, itkFastMarchingImageFilterUS3US3);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::UI3, image::UI3, itkFastMarchingImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::SC3, image::SC3, itkFastMarchingImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::SS3, image::SS3, itkFastMarchingImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(FastMarchingImageFilter, image::SI3, image::SI3, itkFastMarchingImageFilterSI3SI3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkFlipImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkFlipImageFilter.cxx
deleted file mode 100644
index 1de32cff1b989eee6934c229650aa9f746f88981..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkFlipImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkFlipImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkFlipImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkFlipImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(FlipImageFilter, image::F2, itkFlipImageFilterF2);
- ITK_WRAP_OBJECT1(FlipImageFilter, image::F3, itkFlipImageFilterF3);
- ITK_WRAP_OBJECT1(FlipImageFilter, image::US2, itkFlipImageFilterUS2);
- ITK_WRAP_OBJECT1(FlipImageFilter, image::US3, itkFlipImageFilterUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkGradientAnisotropicDiffusionImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkGradientAnisotropicDiffusionImageFilter.cxx
deleted file mode 100644
index 6e69020a2e47a398634d2a07bb74025356f3c5ef..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkGradientAnisotropicDiffusionImageFilter.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkGradientAnisotropicDiffusionImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkGradientAnisotropicDiffusionImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkGradientAnisotropicDiffusionImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(GradientAnisotropicDiffusionImageFilter, image::F2, image::F2,
- itkGradientAnisotropicDiffusionImageFilterF2F2);
- ITK_WRAP_OBJECT2(GradientAnisotropicDiffusionImageFilter, image::F3, image::F3,
- itkGradientAnisotropicDiffusionImageFilterF3F3);
-
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkGradientMagnitudeImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkGradientMagnitudeImageFilter.cxx
deleted file mode 100644
index 182ad76e2c47fb6075e47e1cf1f149a967db2189..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkGradientMagnitudeImageFilter.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkGradientMagnitudeImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkGradientMagnitudeImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH MakeConsistentWrappedClasses.sh
-//=================================
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkGradientMagnitudeImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::F2 , image::F2 , itkGradientMagnitudeImageFilterF2F2 );
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::D2 , image::D2 , itkGradientMagnitudeImageFilterD2D2 );
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::UC2, image::UC2, itkGradientMagnitudeImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::US2, image::US2, itkGradientMagnitudeImageFilterUS2US2);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::UI2, image::UI2, itkGradientMagnitudeImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::SC2, image::SC2, itkGradientMagnitudeImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::SS2, image::SS2, itkGradientMagnitudeImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::SI2, image::SI2, itkGradientMagnitudeImageFilterSI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::F3 , image::F3 , itkGradientMagnitudeImageFilterF3F3 );
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::D3 , image::D3 , itkGradientMagnitudeImageFilterD3D3 );
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::UC3, image::UC3, itkGradientMagnitudeImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::US3, image::US3, itkGradientMagnitudeImageFilterUS3US3);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::UI3, image::UI3, itkGradientMagnitudeImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::SC3, image::SC3, itkGradientMagnitudeImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::SS3, image::SS3, itkGradientMagnitudeImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(GradientMagnitudeImageFilter, image::SI3, image::SI3, itkGradientMagnitudeImageFilterSI3SI3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkGrayscaleDilateImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkGrayscaleDilateImageFilter.cxx
deleted file mode 100644
index cc385e518bf0de253d2eab7f9c6917d0a7359298..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkGrayscaleDilateImageFilter.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkGrayscaleDilateImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkGrayscaleDilateImageFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-#include "itkCSwigBinaryBallStructuringElement.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkGrayscaleDilateImageFilter);
- namespace wrappers
- {
-
- // NOTE: since both the GrayscaleDilateImageFilter and GrayscaleErodeImageFilter derive from the same superclass, only one of
- // them should do the wrapping WITH_SUPERCLASS.
- //
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT3(GrayscaleDilateImageFilter, image::F2 , image::F2 , structuringElement::F2, itkGrayscaleDilateImageFilterF2F2 );
- ITK_WRAP_OBJECT3(GrayscaleDilateImageFilter, image::UC2, image::UC2, structuringElement::UC2, itkGrayscaleDilateImageFilterUC2UC2);
- ITK_WRAP_OBJECT3(GrayscaleDilateImageFilter, image::US2, image::US2, structuringElement::US2, itkGrayscaleDilateImageFilterUS2US2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT3(GrayscaleDilateImageFilter, image::F3 , image::F3 , structuringElement::F3, itkGrayscaleDilateImageFilterF3F3 );
- ITK_WRAP_OBJECT3(GrayscaleDilateImageFilter, image::UC3, image::UC3, structuringElement::UC3, itkGrayscaleDilateImageFilterUC3UC3);
- ITK_WRAP_OBJECT3(GrayscaleDilateImageFilter, image::US3, image::US3, structuringElement::US3, itkGrayscaleDilateImageFilterUS3US3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkGrayscaleErodeImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkGrayscaleErodeImageFilter.cxx
deleted file mode 100644
index 28617c9b97dbc816e734f82f8a32e41208c3f60a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkGrayscaleErodeImageFilter.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkGrayscaleErodeImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkGrayscaleErodeImageFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-#include "itkCSwigBinaryBallStructuringElement.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkGrayscaleErodeImageFilter);
- namespace wrappers
- {
-
- // NOTE: since both the GrayscaleDilateImageFilter and GrayscaleErodeImageFilter derive from the same superclass, only one of
- // them should do the wrapping WITH_SUPERCLASS.
- //
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT3(GrayscaleErodeImageFilter, image::F2 , image::F2 , structuringElement::F2, itkGrayscaleErodeImageFilterF2F2 );
- ITK_WRAP_OBJECT3(GrayscaleErodeImageFilter, image::UC2, image::UC2, structuringElement::UC2, itkGrayscaleErodeImageFilterUC2UC2);
- ITK_WRAP_OBJECT3(GrayscaleErodeImageFilter, image::US2, image::US2, structuringElement::US2, itkGrayscaleErodeImageFilterUS2US2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT3(GrayscaleErodeImageFilter, image::F3 , image::F3 , structuringElement::F3, itkGrayscaleErodeImageFilterF3F3 );
- ITK_WRAP_OBJECT3(GrayscaleErodeImageFilter, image::UC3, image::UC3, structuringElement::UC3, itkGrayscaleErodeImageFilterUC3UC3);
- ITK_WRAP_OBJECT3(GrayscaleErodeImageFilter, image::US3, image::US3, structuringElement::US3, itkGrayscaleErodeImageFilterUS3US3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkImportImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkImportImageFilter.cxx
deleted file mode 100644
index 31389da4985670f936cfdaf88b41dc8eeb162635..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkImportImageFilter.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImportImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImportImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImportImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2( ImportImageFilter, float, 2, itkImportImageFilterF2 );
- ITK_WRAP_OBJECT2( ImportImageFilter, unsigned char, 2, itkImportImageFilterUC2 );
- ITK_WRAP_OBJECT2( ImportImageFilter, unsigned short, 2, itkImportImageFilterUS2 );
- ITK_WRAP_OBJECT2( ImportImageFilter, float, 3, itkImportImageFilterF3 );
- ITK_WRAP_OBJECT2( ImportImageFilter, unsigned char, 3, itkImportImageFilterUC3 );
- ITK_WRAP_OBJECT2( ImportImageFilter, unsigned short, 3, itkImportImageFilterUS3 );
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkIsolatedConnectedImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkIsolatedConnectedImageFilter.cxx
deleted file mode 100644
index c881b4759a59aadca7456ffc2f9fc3d7a50e809e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkIsolatedConnectedImageFilter.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkIsolatedConnectedImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkIsolatedConnectedImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH MakeConsistentWrappedClasses.sh
-//=================================
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkIsolatedConnectedImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::F2 , image::F2 , itkIsolatedConnectedImageFilterF2F2 );
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::D2 , image::D2 , itkIsolatedConnectedImageFilterD2D2 );
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::UC2, image::UC2, itkIsolatedConnectedImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::US2, image::US2, itkIsolatedConnectedImageFilterUS2US2);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::UI2, image::UI2, itkIsolatedConnectedImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::SC2, image::SC2, itkIsolatedConnectedImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::SS2, image::SS2, itkIsolatedConnectedImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::SI2, image::SI2, itkIsolatedConnectedImageFilterSI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::F3 , image::F3 , itkIsolatedConnectedImageFilterF3F3 );
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::D3 , image::D3 , itkIsolatedConnectedImageFilterD3D3 );
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::UC3, image::UC3, itkIsolatedConnectedImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::US3, image::US3, itkIsolatedConnectedImageFilterUS3US3);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::UI3, image::UI3, itkIsolatedConnectedImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::SC3, image::SC3, itkIsolatedConnectedImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::SS3, image::SS3, itkIsolatedConnectedImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(IsolatedConnectedImageFilter, image::SI3, image::SI3, itkIsolatedConnectedImageFilterSI3SI3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkLaplacianImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkLaplacianImageFilter.cxx
deleted file mode 100644
index 539c0ae7e299e54bd6c63ca6ace789bcc6389e44..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkLaplacianImageFilter.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkLaplacianImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkLaplacianImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkLaplacianImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(LaplacianImageFilter, image::F2, image::F2, itkLaplacianImageFilterF2F2);
- ITK_WRAP_OBJECT2(LaplacianImageFilter, image::F3, image::F3, itkLaplacianImageFilterF3F3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkMinimumMaximumImageCalculator.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkMinimumMaximumImageCalculator.cxx
deleted file mode 100644
index b7254491b9595da170dca5713c21780528eb8663..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkMinimumMaximumImageCalculator.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMinimumMaximumImageCalculator.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkMinimumMaximumImageCalculator.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMinimumMaximumImageCalculator);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(MinimumMaximumImageCalculator, image::F2, itkMinimumMaximumImageCalculatorF2);
- ITK_WRAP_OBJECT1(MinimumMaximumImageCalculator, image::F3, itkMinimumMaximumImageCalculatorF3);
- ITK_WRAP_OBJECT1(MinimumMaximumImageCalculator, image::US2, itkMinimumMaximumImageCalculatorUS2);
- ITK_WRAP_OBJECT1(MinimumMaximumImageCalculator, image::US3, itkMinimumMaximumImageCalculatorUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkMorphologyImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkMorphologyImageFilter.cxx
deleted file mode 100644
index 18503b32a64218e51d6606cb0959addde3581f40..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkMorphologyImageFilter.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMorphologyImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/11/21 19:18:12 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkMorphologyImageFilter.h"
-#include "itkBinaryBallStructuringElement.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-#include "itkCSwigBinaryBallStructuringElement.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMorphologyImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT3(MorphologyImageFilter, image::F2 , image::F2 , structuringElement::F2, itkMorphologyImageFilterF2F2 );
- ITK_WRAP_OBJECT3(MorphologyImageFilter, image::UC2, image::UC2, structuringElement::UC2, itkMorphologyImageFilterUC2UC2);
- ITK_WRAP_OBJECT3(MorphologyImageFilter, image::US2, image::US2, structuringElement::US2, itkMorphologyImageFilterUS2US2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT3(MorphologyImageFilter, image::F3 , image::F3 , structuringElement::F3, itkMorphologyImageFilterF3F3 );
- ITK_WRAP_OBJECT3(MorphologyImageFilter, image::UC3, image::UC3, structuringElement::UC3, itkMorphologyImageFilterUC3UC3);
- ITK_WRAP_OBJECT3(MorphologyImageFilter, image::US3, image::US3, structuringElement::US3, itkMorphologyImageFilterUS3US3);
- }
-}
-
-#endif
-
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkNeighborhoodConnectedImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkNeighborhoodConnectedImageFilter.cxx
deleted file mode 100644
index 36a90edfc585b18c4c52f94558481b8b773588c5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkNeighborhoodConnectedImageFilter.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkNeighborhoodConnectedImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkNeighborhoodConnectedImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH MakeConsistentWrappedClasses.sh
-//=================================
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkNeighborhoodConnectedImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::F2 , image::F2 , itkNeighborhoodConnectedImageFilterF2F2 );
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::D2 , image::D2 , itkNeighborhoodConnectedImageFilterD2D2 );
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::UC2, image::UC2, itkNeighborhoodConnectedImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::US2, image::US2, itkNeighborhoodConnectedImageFilterUS2US2);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::UI2, image::UI2, itkNeighborhoodConnectedImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::SC2, image::SC2, itkNeighborhoodConnectedImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::SS2, image::SS2, itkNeighborhoodConnectedImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::SI2, image::SI2, itkNeighborhoodConnectedImageFilterSI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::F3 , image::F3 , itkNeighborhoodConnectedImageFilterF3F3 );
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::D3 , image::D3 , itkNeighborhoodConnectedImageFilterD3D3 );
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::UC3, image::UC3, itkNeighborhoodConnectedImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::US3, image::US3, itkNeighborhoodConnectedImageFilterUS3US3);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::UI3, image::UI3, itkNeighborhoodConnectedImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::SC3, image::SC3, itkNeighborhoodConnectedImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::SS3, image::SS3, itkNeighborhoodConnectedImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(NeighborhoodConnectedImageFilter, image::SI3, image::SI3, itkNeighborhoodConnectedImageFilterSI3SI3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkSobelEdgeDetectionImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkSobelEdgeDetectionImageFilter.cxx
deleted file mode 100644
index 32d875e912d04470674466e71b5fdffceb443955..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkSobelEdgeDetectionImageFilter.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSobelEdgeDetectionImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkSobelEdgeDetectionImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSobelEdgeDetectionImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(SobelEdgeDetectionImageFilter, image::F2, image::F2,
- itkSobelEdgeDetectionImageFilterF2F2);
- ITK_WRAP_OBJECT2(SobelEdgeDetectionImageFilter, image::F3, image::F3,
- itkSobelEdgeDetectionImageFilterF3F3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersA/wrap_itkTernaryMagnitudeImageFilter.cxx b/Wrapping/CSwig/BasicFiltersA/wrap_itkTernaryMagnitudeImageFilter.cxx
deleted file mode 100644
index d4a01102f5c86f7953fdf72b7e20e339c4438ed9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersA/wrap_itkTernaryMagnitudeImageFilter.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkTernaryMagnitudeImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/19 18:50:54 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkTernaryMagnitudeImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkTernaryMagnitudeImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT4_WITH_SUPERCLASS(TernaryMagnitudeImageFilter,
- image::F2,
- image::F2,
- image::F2,
- image::F2,
- itkTernaryMagnitudeImageFilterF2F2);
- ITK_WRAP_OBJECT4_WITH_SUPERCLASS(TernaryMagnitudeImageFilter,
- image::F3,
- image::F3,
- image::F3,
- image::F3,
- itkTernaryMagnitudeImageFilterF3F3);
- ITK_WRAP_OBJECT4_WITH_SUPERCLASS(TernaryMagnitudeImageFilter,
- image::US2,
- image::US2,
- image::US2,
- image::US2,
- itkTernaryMagnitudeImageFilterUS2US2);
- ITK_WRAP_OBJECT4_WITH_SUPERCLASS(TernaryMagnitudeImageFilter,
- image::US3,
- image::US3,
- image::US3,
- image::US3,
- itkTernaryMagnitudeImageFilterUS3US3);
-
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/.NoDartCoverage b/Wrapping/CSwig/BasicFiltersB/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/BasicFiltersB/CMakeLists.txt b/Wrapping/CSwig/BasicFiltersB/CMakeLists.txt
deleted file mode 100644
index d3d19e632a12e30adb46c928060a1f1478eeaea0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-SET(WRAP_SOURCES
- wrap_itkExpImageFilter
- wrap_itkExpNegativeImageFilter
- wrap_itkGradientMagnitudeRecursiveGaussianImageFilter
- wrap_itkGradientRecursiveGaussianImageFilter
- wrap_itkMeanImageFilter
- wrap_itkMedianImageFilter
- wrap_itkMinimumMaximumImageFilter
- wrap_itkNaryAddImageFilter
- wrap_itkNormalizeImageFilter
- wrap_itkPermuteAxesImageFilter
- wrap_itkRandomImageSource
- wrap_itkRecursiveGaussianImageFilter
- wrap_itkRecursiveSeparableImageFilter
- wrap_itkRegionOfInterestImageFilter
- wrap_itkResampleImageFilter
- wrap_itkRescaleIntensityImageFilter
- wrap_itkShiftScaleImageFilter
- wrap_itkSigmoidImageFilter
- wrap_itkSmoothingRecursiveGaussianImageFilter
- wrap_itkStatisticsImageFilter
- wrap_itkSubtractImageFilter
- wrap_itkThresholdImageFilter
- wrap_itkVTKImageExport
- wrap_itkVTKImageImport
-)
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersB/ITKBasicFiltersB.mdx"
- )
-
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKBasicFiltersB BasicFiltersB "ITKNumerics;ITKCommonB;ITKCommonA" "" "ITKBasicFilters")
diff --git a/Wrapping/CSwig/BasicFiltersB/CVS/Entries b/Wrapping/CSwig/BasicFiltersB/CVS/Entries
deleted file mode 100644
index 452d00d80c46cebe028a2436f1f7e953cba99771..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/CVS/Entries
+++ /dev/null
@@ -1,31 +0,0 @@
-/.NoDartCoverage/1.1/Sat Sep 25 17:38:30 2004//TITK-3-0-1
-/CMakeLists.txt/1.5/Tue Jun 7 13:25:02 2005//TITK-3-0-1
-/wrap_ITKBasicFiltersB.cxx/1.3/Tue Jun 7 13:25:02 2005//TITK-3-0-1
-/wrap_ITKBasicFiltersBJava.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_ITKBasicFiltersBPython.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_ITKBasicFiltersBTcl.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_itkExpImageFilter.cxx/1.2/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-/wrap_itkExpNegativeImageFilter.cxx/1.2/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-/wrap_itkGradientMagnitudeRecursiveGaussianImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkGradientRecursiveGaussianImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkMeanImageFilter.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_itkMedianImageFilter.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_itkMinimumMaximumImageFilter.cxx/1.1/Tue Jun 7 13:25:02 2005//TITK-3-0-1
-/wrap_itkNaryAddImageFilter.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_itkNormalizeImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkPermuteAxesImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkRandomImageSource.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_itkRecursiveGaussianImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkRecursiveSeparableImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkRegionOfInterestImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkResampleImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkRescaleIntensityImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkShiftScaleImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkSigmoidImageFilter.cxx/1.2/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-/wrap_itkSmoothingRecursiveGaussianImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkStatisticsImageFilter.cxx/1.1/Wed Apr 21 20:24:21 2004//TITK-3-0-1
-/wrap_itkSubtractImageFilter.cxx/1.1/Tue Jun 7 13:25:02 2005//TITK-3-0-1
-/wrap_itkThresholdImageFilter.cxx/1.1/Fri Apr 2 22:43:59 2004//TITK-3-0-1
-/wrap_itkVTKImageExport.cxx/1.2/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-/wrap_itkVTKImageImport.cxx/1.2/Thu Jan 13 18:37:50 2005//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/BasicFiltersB/CVS/Repository b/Wrapping/CSwig/BasicFiltersB/CVS/Repository
deleted file mode 100644
index 7b640d78ced7977bbc0fb5693225afca8ba5c083..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/BasicFiltersB
diff --git a/Wrapping/CSwig/BasicFiltersB/CVS/Root b/Wrapping/CSwig/BasicFiltersB/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/BasicFiltersB/CVS/Tag b/Wrapping/CSwig/BasicFiltersB/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/BasicFiltersB/CVS/Template b/Wrapping/CSwig/BasicFiltersB/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersB.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersB.cxx
deleted file mode 100644
index feddda6173cdbda26bec85a0c92d5a471ba5063e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersB.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKBasicFiltersB.cxx,v $
- Language: C++
- Date: $Date: 2005/06/07 13:25:02 $
- Version: $Revision: 1.3 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(itkExpImageFilter),
- ITK_WRAP_GROUP(itkExpNegativeImageFilter),
- ITK_WRAP_GROUP(itkGradientMagnitudeRecursiveGaussianImageFilter),
- ITK_WRAP_GROUP(itkGradientRecursiveGaussianImageFilter),
- ITK_WRAP_GROUP(itkMeanImageFilter),
- ITK_WRAP_GROUP(itkMedianImageFilter),
- ITK_WRAP_GROUP(itkMinimumMaximumImageFilter),
- ITK_WRAP_GROUP(itkNaryAddImageFilter),
- ITK_WRAP_GROUP(itkNormalizeImageFilter),
- ITK_WRAP_GROUP(itkPermuteAxesImageFilter),
- ITK_WRAP_GROUP(itkRandomImageSource),
- ITK_WRAP_GROUP(itkRecursiveGaussianImageFilter),
- ITK_WRAP_GROUP(itkRecursiveSeparableImageFilter),
- ITK_WRAP_GROUP(itkRegionOfInterestImageFilter),
- ITK_WRAP_GROUP(itkResampleImageFilter),
- ITK_WRAP_GROUP(itkRescaleIntensityImageFilter),
- ITK_WRAP_GROUP(itkShiftScaleImageFilter),
- ITK_WRAP_GROUP(itkSigmoidImageFilter),
- ITK_WRAP_GROUP(itkSmoothingRecursiveGaussianImageFilter),
- ITK_WRAP_GROUP(itkStatisticsImageFilter),
- ITK_WRAP_GROUP(itkSubtractImageFilter),
- ITK_WRAP_GROUP(itkThresholdImageFilter),
- ITK_WRAP_GROUP(itkVTKImageExport),
- ITK_WRAP_GROUP(itkVTKImageImport)
- };
-}
-#endif
-
-
-
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBJava.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBJava.cxx
deleted file mode 100644
index 6a45e5453a21375cb6861e40cb728bba7e92cbcc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKBasicFiltersBJava"
-#include "wrap_ITKBasicFiltersB.cxx"
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBPython.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBPython.cxx
deleted file mode 100644
index 136817166e01a676d54986ae45aac3a2f72da521..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKBasicFiltersBPython"
-#include "wrap_ITKBasicFiltersB.cxx"
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBTcl.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBTcl.cxx
deleted file mode 100644
index 4f50ecc1153ea01a461dd0d0bd0acc7c85c6604d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_ITKBasicFiltersBTcl.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKBasicFiltersBTcl"
-#include "wrap_ITKBasicFiltersB.cxx"
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkExpImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkExpImageFilter.cxx
deleted file mode 100644
index bd28b3e9773dd4eec46a7d181f4308959db01955..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkExpImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkExpImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkExpImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkExpImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpImageFilter, image::F2, image::F2,
- itkExpImageFilterF2F2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpImageFilter, image::F3, image::F3,
- itkExpImageFilterF3F3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpImageFilter, image::US2, image::US2,
- itkExpImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpImageFilter, image::US3, image::US3,
- itkExpImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkExpNegativeImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkExpNegativeImageFilter.cxx
deleted file mode 100644
index 1f0f94cd639d7709949541a844a8b0ee464372e0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkExpNegativeImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkExpNegativeImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkExpNegativeImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkExpNegativeImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpNegativeImageFilter, image::F2, image::F2,
- itkExpNegativeImageFilterF2F2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpNegativeImageFilter, image::F3, image::F3,
- itkExpNegativeImageFilterF3F3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpNegativeImageFilter, image::US2, image::US2,
- itkExpNegativeImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(ExpNegativeImageFilter, image::US3, image::US3,
- itkExpNegativeImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkGradientMagnitudeRecursiveGaussianImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkGradientMagnitudeRecursiveGaussianImageFilter.cxx
deleted file mode 100644
index 3395b9f03e1988aaf0aefbe43968a4f09f6c96ab..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkGradientMagnitudeRecursiveGaussianImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkGradientMagnitudeRecursiveGaussianImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkGradientMagnitudeRecursiveGaussianImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkGradientMagnitudeRecursiveGaussianImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(GradientMagnitudeRecursiveGaussianImageFilter, image::F2, image::F2,
- itkGradientMagnitudeRecursiveGaussianImageFilterF2F2);
- ITK_WRAP_OBJECT2(GradientMagnitudeRecursiveGaussianImageFilter, image::F3, image::F3,
- itkGradientMagnitudeRecursiveGaussianImageFilterF3F3);
- ITK_WRAP_OBJECT2(GradientMagnitudeRecursiveGaussianImageFilter, image::US2, image::US2,
- itkGradientMagnitudeRecursiveGaussianImageFilterUS2US2);
- ITK_WRAP_OBJECT2(GradientMagnitudeRecursiveGaussianImageFilter, image::US3, image::US3,
- itkGradientMagnitudeRecursiveGaussianImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkGradientRecursiveGaussianImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkGradientRecursiveGaussianImageFilter.cxx
deleted file mode 100644
index f3d27e7178edc9bcbf8a3e2306a78956ef737682..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkGradientRecursiveGaussianImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkGradientRecursiveGaussianImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkGradientRecursiveGaussianImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkGradientRecursiveGaussianImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(GradientRecursiveGaussianImageFilter, image::F2,
- itkGradientRecursiveGaussianImageFilterF2);
- ITK_WRAP_OBJECT1(GradientRecursiveGaussianImageFilter, image::F3,
- itkGradientRecursiveGaussianImageFilterF3);
- ITK_WRAP_OBJECT1(GradientRecursiveGaussianImageFilter, image::US2,
- itkGradientRecursiveGaussianImageFilterUS2);
- ITK_WRAP_OBJECT1(GradientRecursiveGaussianImageFilter, image::US3,
- itkGradientRecursiveGaussianImageFilterUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkMeanImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkMeanImageFilter.cxx
deleted file mode 100644
index c73bef8e8b1dfc43db0c57561474dfa013b80ffe..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkMeanImageFilter.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMeanImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/02 22:43:59 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkMeanImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMeanImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(MeanImageFilter, image::F2, image::F2,
- itkMeanImageFilterF2F2);
- ITK_WRAP_OBJECT2(MeanImageFilter, image::US2, image::US2,
- itkMeanImageFilterUS2US2);
- ITK_WRAP_OBJECT2(MeanImageFilter, image::F3, image::F3,
- itkMeanImageFilterF3F3);
- ITK_WRAP_OBJECT2(MeanImageFilter, image::US3, image::US3,
- itkMeanImageFilterUS3US3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkMedianImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkMedianImageFilter.cxx
deleted file mode 100644
index da4e9c6dae832346c04e993a9aa764889a93a1e9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkMedianImageFilter.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMedianImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/02 22:43:59 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkMedianImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH MakeConsistentWrappedClasses.sh
-//=================================
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMedianImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(MedianImageFilter, image::F2 , image::F2 , itkMedianImageFilterF2F2 );
- ITK_WRAP_OBJECT2(MedianImageFilter, image::D2 , image::D2 , itkMedianImageFilterD2D2 );
- ITK_WRAP_OBJECT2(MedianImageFilter, image::UC2, image::UC2, itkMedianImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::US2, image::US2, itkMedianImageFilterUS2US2);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::UI2, image::UI2, itkMedianImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::SC2, image::SC2, itkMedianImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::SS2, image::SS2, itkMedianImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::SI2, image::SI2, itkMedianImageFilterSI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(MedianImageFilter, image::F3 , image::F3 , itkMedianImageFilterF3F3 );
- ITK_WRAP_OBJECT2(MedianImageFilter, image::D3 , image::D3 , itkMedianImageFilterD3D3 );
- ITK_WRAP_OBJECT2(MedianImageFilter, image::UC3, image::UC3, itkMedianImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::US3, image::US3, itkMedianImageFilterUS3US3);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::UI3, image::UI3, itkMedianImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::SC3, image::SC3, itkMedianImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::SS3, image::SS3, itkMedianImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(MedianImageFilter, image::SI3, image::SI3, itkMedianImageFilterSI3SI3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkMinimumMaximumImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkMinimumMaximumImageFilter.cxx
deleted file mode 100644
index 5f83273b1942b591a420fc0883576d57a3a03bd1..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkMinimumMaximumImageFilter.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMinimumMaximumImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/06/07 13:25:02 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkMinimumMaximumImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMinimumMaximumImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT1(MinimumMaximumImageFilter, image::F2,
- itkMinimumMaximumImageFilterF2);
- ITK_WRAP_OBJECT1(MinimumMaximumImageFilter, image::US2,
- itkMinimumMaximumImageFilterUS2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT1(MinimumMaximumImageFilter, image::F3,
- itkMinimumMaximumImageFilterF3);
- ITK_WRAP_OBJECT1(MinimumMaximumImageFilter, image::US3,
- itkMinimumMaximumImageFilterUS3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkNaryAddImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkNaryAddImageFilter.cxx
deleted file mode 100644
index 633899c69e72e693f45d0e5fa9d1e93804dbd93c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkNaryAddImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkNaryAddImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/02 22:43:59 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkNaryAddImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkNaryAddImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(NaryAddImageFilter, image::F2, image::F2,
- itkNaryAddImageFilterF2F2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(NaryAddImageFilter, image::F3, image::F3,
- itkNaryAddImageFilterF3F3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(NaryAddImageFilter, image::US2, image::US2,
- itkNaryAddImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(NaryAddImageFilter, image::US3, image::US3,
- itkNaryAddImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkNormalizeImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkNormalizeImageFilter.cxx
deleted file mode 100644
index 0a2a3b591af7ce6f472381277464d93aa2355faa..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkNormalizeImageFilter.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkNormalizeImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkNormalizeImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkNormalizeImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::F2, image::F2, itkNormalizeImageFilterF2F2);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::D2, image::D2, itkNormalizeImageFilterD2D2);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::UC2, image::UC2, itkNormalizeImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::US2, image::US2, itkNormalizeImageFilterUS2US2);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::UI2, image::UI2, itkNormalizeImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::SC2, image::SC2, itkNormalizeImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::SS2, image::SS2, itkNormalizeImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::SI2, image::SI2, itkNormalizeImageFilterSI2SI2);
-
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::F3, image::F3, itkNormalizeImageFilterF3F3);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::D3, image::D3, itkNormalizeImageFilterD3D3);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::UC3, image::UC3, itkNormalizeImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::US3, image::US3, itkNormalizeImageFilterUS3US3);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::UI3, image::UI3, itkNormalizeImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::SC3, image::SC3, itkNormalizeImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::SS3, image::SS3, itkNormalizeImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(NormalizeImageFilter, image::SI3, image::SI3, itkNormalizeImageFilterSI3SI3);
-
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkPermuteAxesImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkPermuteAxesImageFilter.cxx
deleted file mode 100644
index 2b705b17906bc6197700f01ce4f6d26ecc71248d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkPermuteAxesImageFilter.cxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkPermuteAxesImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkPermuteAxesImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkPermuteAxesImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::F2, itkPermuteAxesImageFilterF2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::F3, itkPermuteAxesImageFilterF3);
-
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::D2, itkPermuteAxesImageFilterD2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::D3, itkPermuteAxesImageFilterD3);
-
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::UC2, itkPermuteAxesImageFilterUC2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::UC3, itkPermuteAxesImageFilterUC3);
-
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::US2, itkPermuteAxesImageFilterUS2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::US3, itkPermuteAxesImageFilterUS3);
-
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::UI2, itkPermuteAxesImageFilterUI2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::UI3, itkPermuteAxesImageFilterUI3);
-
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::SC2, itkPermuteAxesImageFilterSC2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::SC3, itkPermuteAxesImageFilterSC3);
-
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::SS2, itkPermuteAxesImageFilterSS2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::SS3, itkPermuteAxesImageFilterSS3);
-
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::SI2, itkPermuteAxesImageFilterSI2);
- ITK_WRAP_OBJECT1(PermuteAxesImageFilter, image::SI3, itkPermuteAxesImageFilterSI3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkRandomImageSource.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkRandomImageSource.cxx
deleted file mode 100644
index d85a33ef5897442268850915110322e61e0fa5d0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkRandomImageSource.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkRandomImageSource.cxx,v $
- Language: C++
- Date: $Date: 2004/04/02 22:43:59 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkRandomImageSource.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkRandomImageSource);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(RandomImageSource, image::F2, itkRandomImageSourceF2);
- ITK_WRAP_OBJECT1(RandomImageSource, image::F3, itkRandomImageSourceF3);
- ITK_WRAP_OBJECT1(RandomImageSource, image::US2, itkRandomImageSourceUS2);
- ITK_WRAP_OBJECT1(RandomImageSource, image::US3, itkRandomImageSourceUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkRecursiveGaussianImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkRecursiveGaussianImageFilter.cxx
deleted file mode 100644
index 4958451831c3ac602d03b2e1e8955abc9f1361da..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkRecursiveGaussianImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkRecursiveGaussianImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkRecursiveGaussianImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkRecursiveGaussianImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(RecursiveGaussianImageFilter, image::F2, image::F2,
- itkRecursiveGaussianImageFilterF2F2);
- ITK_WRAP_OBJECT2(RecursiveGaussianImageFilter, image::F3, image::F3,
- itkRecursiveGaussianImageFilterF3F3);
- ITK_WRAP_OBJECT2(RecursiveGaussianImageFilter, image::US2, image::US2,
- itkRecursiveGaussianImageFilterUS2US2);
- ITK_WRAP_OBJECT2(RecursiveGaussianImageFilter, image::US3, image::US3,
- itkRecursiveGaussianImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkRecursiveSeparableImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkRecursiveSeparableImageFilter.cxx
deleted file mode 100644
index efece15e8a33bb6170e66aa36c41ba92b6e46fe3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkRecursiveSeparableImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkRecursiveSeparableImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkRecursiveSeparableImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkRecursiveSeparableImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(RecursiveSeparableImageFilter, image::F2, image::F2,
- itkRecursiveSeparableImageFilterF2F2);
- ITK_WRAP_OBJECT2(RecursiveSeparableImageFilter, image::F3, image::F3,
- itkRecursiveSeparableImageFilterF3F3);
- ITK_WRAP_OBJECT2(RecursiveSeparableImageFilter, image::US2, image::US2,
- itkRecursiveSeparableImageFilterUS2US2);
- ITK_WRAP_OBJECT2(RecursiveSeparableImageFilter, image::US3, image::US3,
- itkRecursiveSeparableImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkRegionOfInterestImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkRegionOfInterestImageFilter.cxx
deleted file mode 100644
index 31d3f9c563b2802295507c44134071b51369cb15..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkRegionOfInterestImageFilter.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkRegionOfInterestImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkRegionOfInterestImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-//=================================
-//THIS FILE GENERATED WITH MakeConsistentWrappedClasses.sh
-//=================================
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkRegionOfInterestImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::F2 , image::F2 , itkRegionOfInterestImageFilterF2F2 );
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::D2 , image::D2 , itkRegionOfInterestImageFilterD2D2 );
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::UC2, image::UC2, itkRegionOfInterestImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::US2, image::US2, itkRegionOfInterestImageFilterUS2US2);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::UI2, image::UI2, itkRegionOfInterestImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::SC2, image::SC2, itkRegionOfInterestImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::SS2, image::SS2, itkRegionOfInterestImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::SI2, image::SI2, itkRegionOfInterestImageFilterSI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::F3 , image::F3 , itkRegionOfInterestImageFilterF3F3 );
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::D3 , image::D3 , itkRegionOfInterestImageFilterD3D3 );
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::UC3, image::UC3, itkRegionOfInterestImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::US3, image::US3, itkRegionOfInterestImageFilterUS3US3);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::UI3, image::UI3, itkRegionOfInterestImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::SC3, image::SC3, itkRegionOfInterestImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::SS3, image::SS3, itkRegionOfInterestImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(RegionOfInterestImageFilter, image::SI3, image::SI3, itkRegionOfInterestImageFilterSI3SI3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkResampleImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkResampleImageFilter.cxx
deleted file mode 100644
index 692647c8cd987cd20d6e8f6f1ce2c494e50ab01a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkResampleImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkResampleImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkResampleImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkResampleImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ResampleImageFilter, image::F2, image::F2,
- itkResampleImageFilterF2F2);
- ITK_WRAP_OBJECT2(ResampleImageFilter, image::F3, image::F3,
- itkResampleImageFilterF3F3);
- ITK_WRAP_OBJECT2(ResampleImageFilter, image::US2, image::US2,
- itkResampleImageFilterUS2US2);
- ITK_WRAP_OBJECT2(ResampleImageFilter, image::US3, image::US3,
- itkResampleImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkRescaleIntensityImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkRescaleIntensityImageFilter.cxx
deleted file mode 100644
index 68ad12f629eee357772c93bba3b9f145aa5e0444..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkRescaleIntensityImageFilter.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkRescaleIntensityImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkRescaleIntensityImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkRescaleIntensityImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::F2, image::US2,
- itkRescaleIntensityImageFilterF2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::US2, image::F2,
- itkRescaleIntensityImageFilterUS2F2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::F2, image::F2,
- itkRescaleIntensityImageFilterF2F2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::F2, image::US2,
- itkRescaleIntensityImageFilterF2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::F2, image::UC2,
- itkRescaleIntensityImageFilterF2UC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::US2, image::UC2,
- itkRescaleIntensityImageFilterUS2UC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::US2, image::US2,
- itkRescaleIntensityImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::F3, image::US3,
- itkRescaleIntensityImageFilterF3US3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::F3, image::F3,
- itkRescaleIntensityImageFilterF3F3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::US3, image::US3,
- itkRescaleIntensityImageFilterUS3US3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::US3, image::F3,
- itkRescaleIntensityImageFilterUS3F3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::F3, image::UC3,
- itkRescaleIntensityImageFilterF3UC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(RescaleIntensityImageFilter, image::US3, image::UC3,
- itkRescaleIntensityImageFilterUS3UC3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkShiftScaleImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkShiftScaleImageFilter.cxx
deleted file mode 100644
index 4c2c26611772b34e6c7dcd69475e4e464ab5f70d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkShiftScaleImageFilter.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkShiftScaleImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkShiftScaleImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkShiftScaleImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::F2, image::US2,
- itkShiftScaleImageFilterF2US2);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::US2, image::F2,
- itkShiftScaleImageFilterUS2F2);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::F2, image::F2,
- itkShiftScaleImageFilterF2F2);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::F2, image::US2,
- itkShiftScaleImageFilterF2US2);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::US2, image::US2,
- itkShiftScaleImageFilterUS2US2);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::F3, image::US3,
- itkShiftScaleImageFilterF3US3);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::F3, image::F3,
- itkShiftScaleImageFilterF3F3);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::US3, image::US3,
- itkShiftScaleImageFilterUS3US3);
- ITK_WRAP_OBJECT2(ShiftScaleImageFilter, image::US3, image::F3,
- itkShiftScaleImageFilterUS3F3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkSigmoidImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkSigmoidImageFilter.cxx
deleted file mode 100644
index 2a91f0b013158f717917c952df49850512a5fb4e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkSigmoidImageFilter.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSigmoidImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkSigmoidImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSigmoidImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::F2 , image::F2 , itkSigmoidImageFilterF2F2 );
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::D2 , image::D2 , itkSigmoidImageFilterD2D2 );
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::UC2, image::UC2, itkSigmoidImageFilterUC2UC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::US2, image::US2, itkSigmoidImageFilterUS2US2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::UI2, image::UI2, itkSigmoidImageFilterUI2UI2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::SC2, image::SC2, itkSigmoidImageFilterSC2SC2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::SS2, image::SS2, itkSigmoidImageFilterSS2SS2);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::SI2, image::SI2, itkSigmoidImageFilterSI2SI2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::F3 , image::F3 , itkSigmoidImageFilterF3F3 );
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::D3 , image::D3 , itkSigmoidImageFilterD3D3 );
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::UC3, image::UC3, itkSigmoidImageFilterUC3UC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::US3, image::US3, itkSigmoidImageFilterUS3US3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::UI3, image::UI3, itkSigmoidImageFilterUI3UI3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::SC3, image::SC3, itkSigmoidImageFilterSC3SC3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::SS3, image::SS3, itkSigmoidImageFilterSS3SS3);
- ITK_WRAP_OBJECT2_WITH_SUPERCLASS(SigmoidImageFilter, image::SI3, image::SI3, itkSigmoidImageFilterSI3SI3);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkSmoothingRecursiveGaussianImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkSmoothingRecursiveGaussianImageFilter.cxx
deleted file mode 100644
index caf0f23438dfb1ffd43d65fd2cbb886cf63383fe..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkSmoothingRecursiveGaussianImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSmoothingRecursiveGaussianImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkSmoothingRecursiveGaussianImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSmoothingRecursiveGaussianImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(SmoothingRecursiveGaussianImageFilter, image::F2, image::F2,
- itkSmoothingRecursiveGaussianImageFilterF2F2);
- ITK_WRAP_OBJECT2(SmoothingRecursiveGaussianImageFilter, image::F3, image::F3,
- itkSmoothingRecursiveGaussianImageFilterF3F3);
- ITK_WRAP_OBJECT2(SmoothingRecursiveGaussianImageFilter, image::US2, image::US2,
- itkSmoothingRecursiveGaussianImageFilterUS2US2);
- ITK_WRAP_OBJECT2(SmoothingRecursiveGaussianImageFilter, image::US3, image::US3,
- itkSmoothingRecursiveGaussianImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkStatisticsImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkStatisticsImageFilter.cxx
deleted file mode 100644
index fb1e235d9bece260adaaada9b8e56109e3922cac..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkStatisticsImageFilter.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkStatisticsImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/21 20:24:21 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkStatisticsImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkStatisticsImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(StatisticsImageFilter, image::F2, itkStatisticsImageFilterF2);
- ITK_WRAP_OBJECT1(StatisticsImageFilter, image::F3, itkStatisticsImageFilterF3);
- ITK_WRAP_OBJECT1(StatisticsImageFilter, image::US2, itkStatisticsImageFilterUS2);
- ITK_WRAP_OBJECT1(StatisticsImageFilter, image::US3, itkStatisticsImageFilterUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkSubtractImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkSubtractImageFilter.cxx
deleted file mode 100644
index 9948ed46dc96dcd2548655141859fc0cf1eef09c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkSubtractImageFilter.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSubtractImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/06/07 13:25:02 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkSubtractImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSubtractImageFilter);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(SubtractImageFilter, image::F2,
- image::F2, image::F2,
- itkSubtractImageFilterF2F2F2);
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(SubtractImageFilter, image::US2,
- image::US2, image::US2,
- itkSubtractImageFilterUS2US2US2);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(SubtractImageFilter, image::F3,
- image::F3, image::F3,
- itkSubtractImageFilterF3F3F3);
- ITK_WRAP_OBJECT3_WITH_SUPERCLASS(SubtractImageFilter, image::US3,
- image::US3, image::US3,
- itkSubtractImageFilterUS3US3US3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkThresholdImageFilter.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkThresholdImageFilter.cxx
deleted file mode 100644
index c12b0aec3968bbf244d37cb49f6d25259e70fbc4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkThresholdImageFilter.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkThresholdImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/04/02 22:43:59 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkThresholdImageFilter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkThresholdImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ThresholdImageFilter, image::F2,
- itkThresholdImageFilterF2);
- ITK_WRAP_OBJECT1(ThresholdImageFilter, image::US2,
- itkThresholdImageFilterUS2);
- ITK_WRAP_OBJECT1(ThresholdImageFilter, image::F3,
- itkThresholdImageFilterF3);
- ITK_WRAP_OBJECT1(ThresholdImageFilter, image::US3,
- itkThresholdImageFilterUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkVTKImageExport.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkVTKImageExport.cxx
deleted file mode 100644
index 4df367e27799c53c5479a448bbda37fa5557273b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkVTKImageExport.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkVTKImageExport.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkVTKImageExport.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkVTKImageExport);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(VTKImageExportBase);
- ITK_WRAP_OBJECT1(VTKImageExport, image::F2,
- itkVTKImageExportF2);
- ITK_WRAP_OBJECT1(VTKImageExport, image::UC2,
- itkVTKImageExportUC2);
- ITK_WRAP_OBJECT1(VTKImageExport, image::US2,
- itkVTKImageExportUS2);
- ITK_WRAP_OBJECT1(VTKImageExport, image::UL2,
- itkVTKImageExportUL2);
-
- ITK_WRAP_OBJECT1(VTKImageExport, image::F3,
- itkVTKImageExportF3);
- ITK_WRAP_OBJECT1(VTKImageExport, image::UC3,
- itkVTKImageExportUC3);
- ITK_WRAP_OBJECT1(VTKImageExport, image::US3,
- itkVTKImageExportUS3);
- ITK_WRAP_OBJECT1(VTKImageExport, image::UL3,
- itkVTKImageExportUL3);
-
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/BasicFiltersB/wrap_itkVTKImageImport.cxx b/Wrapping/CSwig/BasicFiltersB/wrap_itkVTKImageImport.cxx
deleted file mode 100644
index 446fb426261e5d81e5493fcdea2fde6a16f97ad1..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/BasicFiltersB/wrap_itkVTKImageImport.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkVTKImageImport.cxx,v $
- Language: C++
- Date: $Date: 2005/01/13 18:37:50 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkVTKImageImport.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkVTKImageImport);
- namespace wrappers
- {
-
- ITK_WRAP_OBJECT1(VTKImageImport, image::F2,
- itkVTKImageImportF2);
- ITK_WRAP_OBJECT1(VTKImageImport, image::UC2,
- itkVTKImageImportUC2);
- ITK_WRAP_OBJECT1(VTKImageImport, image::US2,
- itkVTKImageImportUS2);
- ITK_WRAP_OBJECT1(VTKImageImport, image::F3,
- itkVTKImageImportF3);
- ITK_WRAP_OBJECT1(VTKImageImport, image::UC3,
- itkVTKImageImportUC3);
- ITK_WRAP_OBJECT1(VTKImageImport, image::US3,
- itkVTKImageImportUS3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CMakeLists.txt b/Wrapping/CSwig/CMakeLists.txt
deleted file mode 100644
index 804dd8e3d14282846651b6bc84181165764e4dec..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CMakeLists.txt
+++ /dev/null
@@ -1,821 +0,0 @@
-PROJECT(WrapOTB)
-
-IF(OTB_CSWIG_TCL)
- SET(OTB_INCLUDE_DIRS_SYSTEM ${OTB_INCLUDE_DIRS_SYSTEM} ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH})
-ENDIF(OTB_CSWIG_TCL)
-
-IF(OTB_CSWIG_PYTHON)
- # Python include directory.
- SET(OTB_INCLUDE_DIRS_SYSTEM ${OTB_INCLUDE_DIRS_SYSTEM}
- ${PYTHON_INCLUDE_PATH})
-ENDIF(OTB_CSWIG_PYTHON)
-
-IF(OTB_CSWIG_JAVA)
- # Java include directories.
- SET(OTB_INCLUDE_DIRS_SYSTEM ${OTB_INCLUDE_DIRS_SYSTEM}
- ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_INCLUDE_PATH})
-ENDIF(OTB_CSWIG_JAVA)
-
-# Choose an install location for the Java wrapper libraries. This
-# must be next to the OTBCommon shared library.
-IF(WIN32)
- SET(OTB_INSTALL_JAVA_LIBS_DIR /bin)
-ELSE(WIN32)
- SET(OTB_INSTALL_JAVA_LIBS_DIR ${OTB_INSTALL_LIB_DIR})
-ENDIF(WIN32)
-
-# We have found CableSwig. Use the settings.
-SET(CABLE_INDEX ${CableSwig_cableidx_EXE})
-SET(CSWIG ${CableSwig_cswig_EXE})
-SET(GCCXML ${CableSwig_gccxml_EXE})
-
-SET(OTB_WRAP_NEEDS_DEPEND 1)
-IF(${CMAKE_MAKE_PROGRAM} MATCHES make)
- SET(OTB_WRAP_NEEDS_DEPEND 0)
-ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES make)
-SET(OTB_TOP ${OTB_SOURCE_DIR})
-SET(OTB_SWIG_DEFAULT_LIB ${OTB_TOP}/Utilities/CableSwig/Swig/Lib )
-
-SET(CSWIG_EXTRA_LINKFLAGS )
-IF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)")
- SET(CSWIG_EXTRA_LINKFLAGS "/IGNORE:4049")
-ENDIF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)")
-
-IF(CMAKE_SYSTEM MATCHES "IRIX.*")
- IF(CMAKE_CXX_COMPILER MATCHES "CC")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -woff 1552")
- ENDIF(CMAKE_CXX_COMPILER MATCHES "CC")
-ENDIF(CMAKE_SYSTEM MATCHES "IRIX.*")
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
- STRING(REGEX REPLACE "-Wcast-qual" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
-SET(IGNORE_WARNINGS -w362 -w389 -w503 -w508 -w509 -w516)
-# define macros for wrapping commands
-MACRO(GCCXML_CREATE_XML_FILE Source Bin Input Output Library)
-# if the make program is not an IDE then include
-# the depend file in a way that will make cmake
-# re-run if it changes
- SET(CABLE_SWIG_DEPEND)
- SET(CABLE_SWIG_DEPEND_REGENERATE)
- IF(${CMAKE_MAKE_PROGRAM} MATCHES "make")
- IF(EXISTS ${Bin}/${Output}.depend)
- ELSE(EXISTS ${Bin}/${Output}.depend)
- CONFIGURE_FILE(
- ${OTB_SOURCE_DIR}/Wrapping/CSwig/empty.depend.in
- ${Bin}/${Output}.depend @ONLY IMMEDIATE)
- ENDIF(EXISTS ${Bin}/${Output}.depend)
- INCLUDE(${Bin}/${Output}.depend)
- ELSE(${CMAKE_MAKE_PROGRAM} MATCHES "make")
-# for IDE generators like MS dev only include the depend files
-# if they exist. This is to prevent ecessive reloading of
-# workspaces after each build. This also means
-# that the depends will not be correct until cmake
-# is run once after the build has completed once.
-# the depend files are created in the wrap tcl/python sections
-# when the .xml file is parsed.
- INCLUDE(${Bin}/${Output}.depend OPTIONAL)
- ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "make")
-
- IF(CABLE_SWIG_DEPEND)
- # There are dependencies. Make sure all the files are present.
- # If not, force the rule to re-run to update the dependencies.
- FOREACH(f ${CABLE_SWIG_DEPEND})
- IF(EXISTS ${f})
- ELSE(EXISTS ${f})
- SET(CABLE_SWIG_DEPEND_REGENERATE 1)
- ENDIF(EXISTS ${f})
- ENDFOREACH(f)
- ELSE(CABLE_SWIG_DEPEND)
- # No dependencies, make the output depend on the dependency file
- # itself, which should cause the rule to re-run.
- SET(CABLE_SWIG_DEPEND_REGENERATE 1)
- ENDIF(CABLE_SWIG_DEPEND)
- IF(CABLE_SWIG_DEPEND_REGENERATE)
- SET(CABLE_SWIG_DEPEND ${Bin}/${Output}.depend)
- CONFIGURE_FILE(
- ${OTB_SOURCE_DIR}/Wrapping/CSwig/empty.depend.in
- ${Bin}/${Output}.depend @ONLY IMMEDIATE)
- ENDIF(CABLE_SWIG_DEPEND_REGENERATE)
-
- ADD_CUSTOM_COMMAND(
- COMMENT "${Output} from "
- SOURCE ${Source}/${Input}
- COMMAND ${GCCXML}
- ARGS -fxml-start=_cable_
- -fxml=${Bin}/${Output} --gccxml-gcc-options ${SWIG_INC_FILE}
- -DCSWIG -DCABLE_CONFIGURATION ${Source}/${Input}
- TARGET ${Library}
- OUTPUTS ${Bin}/${Output}
- DEPENDS ${GCCXML} ${CABLE_SWIG_DEPEND})
-ENDMACRO(GCCXML_CREATE_XML_FILE)
-
-
-MACRO(CINDEX_CREATE_IDX_FILE Bin Input Output Library)
- ADD_CUSTOM_COMMAND(
- COMMENT "${Output} from "
- SOURCE ${Bin}/${Input}
- COMMAND ${CABLE_INDEX}
- ARGS ${Bin}/${Input} ${Bin}/${Output}
- TARGET ${Library}
- OUTPUTS ${Bin}/${Output}
- DEPENDS ${Bin}/${Input} ${CABLE_INDEX}
-)
-ENDMACRO(CINDEX_CREATE_IDX_FILE)
-
-MACRO(CSWIG_CREATE_TCL_CXX_FILE Bin MasterIdx InputIdx InputXml OutputTclCxx Library LibraryIndexFiles)
- SET(CINDEX)
- FOREACH(MIDX ${MasterIdx})
- SET(CINDEX ${CINDEX} -Cindex "${MIDX}")
- ENDFOREACH(MIDX)
-
- # Need dependency on ${OTB_BINARY_DIR}/itkConfigure.h so
- # package is rebuilt when the OTB version changes.
- ADD_CUSTOM_COMMAND(
- COMMENT "${OutputTclCxx} from "
- SOURCE ${Bin}/${InputIdx}
- COMMAND ${CSWIG}
- ARGS -l${OTB_TOP}/Wrapping/CSwig/itk.swg
- -I${OTB_SWIG_DEFAULT_LIB}
- -I${OTB_SWIG_DEFAULT_LIB}/tcl
- -noruntime ${CINDEX} ${IGNORE_WARNINGS} -depend ${Bin}/${InputXml}.depend
- -o ${Bin}/${OutputTclCxx} -tcl -pkgversion "${OTB_VERSION_STRING}" -c++ ${Bin}/${InputXml}
- TARGET ${Library}
- OUTPUTS ${Bin}/${OutputTclCxx}
- DEPENDS ${LibraryIndexFiles} ${OTB_TOP}/Wrapping/CSwig/itk.swg ${Bin}/${InputXml} ${CSWIG} ${OTB_BINARY_DIR}/itkConfigure.h)
-# MESSAGE("depends are ${CABLE_SWIG_DEPEND}")
-ENDMACRO(CSWIG_CREATE_TCL_CXX_FILE)
-
-MACRO(CSWIG_CREATE_PERL_CXX_FILE Bin MasterIdx InputIdx InputXml OutputPerlCxx Library LibraryIndexFiles)
- SET(CINDEX)
- FOREACH(MIDX ${MasterIdx})
- SET(CINDEX ${CINDEX} -Cindex "${MIDX}")
- ENDFOREACH(MIDX)
-
- # Need dependency on ${OTB_BINARY_DIR}/itkConfigure.h so
- # package is rebuilt when the OTB version changes.
- ADD_CUSTOM_COMMAND(
- COMMENT "${OutputPerlCxx} from "
- SOURCE ${Bin}/${InputIdx}
- COMMAND ${CSWIG}
- ARGS -perl5 -l${OTB_TOP}/Wrapping/CSwig/itk.swg
- -I${OTB_SWIG_DEFAULT_LIB}
- -noruntime ${CINDEX} ${IGNORE_WARNINGS} -depend ${Bin}/${InputXml}.depend
- -o ${Bin}/${OutputPerlCxx} -c++ ${Bin}/${InputXml}
- TARGET ${Library}
- OUTPUTS ${Bin}/${OutputPerlCxx}
- DEPENDS ${LibraryIndexFiles} ${OTB_TOP}/Wrapping/CSwig/itk.swg ${Bin}/${InputXml} ${CSWIG} ${OTB_BINARY_DIR}/itkConfigure.h)
-ENDMACRO(CSWIG_CREATE_PERL_CXX_FILE)
-
-SET(OTB_CSWIG_PYTHON_NO_EXCEPTION_REGEX "(ContinuousIndex|Python)\\.xml$")
-SET(OTB_CSWIG_JAVA_NO_EXCEPTION_REGEX "(Java)\\.xml$")
-
-MACRO(CSWIG_CREATE_PYTHON_CXX_FILE Bin MasterIdx InputIdx InputXml OutputTclCxx Library LibraryIndexFiles)
- SET(CINDEX)
- FOREACH(MIDX ${MasterIdx})
- SET(CINDEX ${CINDEX} -Cindex "${MIDX}")
- ENDFOREACH(MIDX)
- IF("${InputXml}" MATCHES "${OTB_CSWIG_PYTHON_NO_EXCEPTION_REGEX}")
- SET(OTB_SWG_FILE "")
- ELSE("${InputXml}" MATCHES "${OTB_CSWIG_PYTHON_NO_EXCEPTION_REGEX}")
- SET(OTB_SWG_FILE "-l${OTB_TOP}/Wrapping/CSwig/itk.swg")
- ENDIF("${InputXml}" MATCHES "${OTB_CSWIG_PYTHON_NO_EXCEPTION_REGEX}")
- ADD_CUSTOM_COMMAND(
- COMMENT "${OutputTclCxx} from "
- SOURCE ${Bin}/${InputIdx}
- COMMAND ${CSWIG}
- ARGS ${OTB_SWG_FILE}
- -I${OTB_SWIG_DEFAULT_LIB}
- -I${OTB_SWIG_DEFAULT_LIB}/python
- -noruntime ${CINDEX} ${IGNORE_WARNINGS} -depend ${Bin}/${InputXml}.depend
- -outdir "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}"
- -o ${Bin}/${OutputTclCxx} -python -c++ ${Bin}/${InputXml}
- TARGET ${Library}
- OUTPUTS ${Bin}/${OutputTclCxx}
- DEPENDS ${LibraryIndexFiles} ${OTB_TOP}/Wrapping/CSwig/itk.swg ${OTB_TOP}/Wrapping/CSwig/itk.swg ${Bin}/${InputXml} ${CSWIG} )
-ENDMACRO(CSWIG_CREATE_PYTHON_CXX_FILE)
-
-MACRO(CSWIG_CREATE_JAVA_CXX_FILE Bin MasterIdx InputIdx InputXml OutputTclCxx Library LibraryIndexFiles)
- SET(CINDEX)
- FOREACH(MIDX ${MasterIdx})
- SET(CINDEX ${CINDEX} -Cindex "${MIDX}")
- ENDFOREACH(MIDX)
- IF("${InputXml}" MATCHES "${OTB_CSWIG_JAVA_NO_EXCEPTION_REGEX}")
- SET(OTB_SWG_FILE "")
- ELSE("${InputXml}" MATCHES "${OTB_CSWIG_JAVA_NO_EXCEPTION_REGEX}")
- SET(OTB_SWG_FILE "-l${OTB_TOP}/Wrapping/CSwig/itk.swg")
- ENDIF("${InputXml}" MATCHES "${OTB_CSWIG_JAVA_NO_EXCEPTION_REGEX}")
- ADD_CUSTOM_COMMAND(
- COMMENT "${OutputTclCxx} from "
- SOURCE ${Bin}/${InputIdx}
- COMMAND ${CSWIG}
- ARGS -I${OTB_SWIG_DEFAULT_LIB}
- -I${OTB_SWIG_DEFAULT_LIB}/java
- ${OTB_SWG_FILE}
- -noruntime ${CINDEX} ${IGNORE_WARNINGS} -depend ${Bin}/${InputXml}.depend
- -outdir ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit
- -o ${Bin}/${OutputTclCxx} -package InsightToolkit -java -c++ ${Bin}/${InputXml}
- TARGET ${Library}
- OUTPUTS ${Bin}/${OutputTclCxx}
- DEPENDS ${LibraryIndexFiles} ${OTB_TOP}/Wrapping/CSwig/itk.swg ${Bin}/${InputXml} ${CSWIG} )
-ENDMACRO(CSWIG_CREATE_JAVA_CXX_FILE)
-
-
-# macro to create .xml, .idx and Tcl.cxx files
-MACRO(WRAP_TCL_SOURCES Source Bin BaseName LibraryName MasterIdx LibraryIndexFiles)
- GCCXML_CREATE_XML_FILE(${Source} ${Bin} ${BaseName}.cxx ${BaseName}.xml ${LibraryName})
- CINDEX_CREATE_IDX_FILE(${Bin} ${BaseName}.xml ${BaseName}.idx ${LibraryName})
- CSWIG_CREATE_TCL_CXX_FILE(${Bin} "${MasterIdx}" ${BaseName}.idx ${BaseName}.xml
- ${BaseName}Tcl.cxx ${LibraryName} "${LibraryIndexFiles}")
-ENDMACRO(WRAP_TCL_SOURCES)
-
-# macro to create .xml, .idx and Tcl.cxx files
-MACRO(WRAP_PERL_SOURCES Source Bin BaseName LibraryName MasterIdx LibraryIndexFiles)
- GCCXML_CREATE_XML_FILE(${Source} ${Bin} ${BaseName}.cxx ${BaseName}.xml ${LibraryName})
- CINDEX_CREATE_IDX_FILE(${Bin} ${BaseName}.xml ${BaseName}.idx ${LibraryName})
- CSWIG_CREATE_PERL_CXX_FILE(${Bin} "${MasterIdx}" ${BaseName}.idx ${BaseName}.xml
- ${BaseName}Perl.cxx ${LibraryName} "${LibraryIndexFiles}")
-ENDMACRO(WRAP_PERL_SOURCES)
-
-# macro to create .xml, .idx and Python.cxx files
-MACRO(WRAP_PYTHON_SOURCES Source Bin BaseName LibraryName MasterIdx LibraryIndexFiles)
- GCCXML_CREATE_XML_FILE(${Source} ${Bin} ${BaseName}.cxx ${BaseName}.xml ${LibraryName})
- CINDEX_CREATE_IDX_FILE(${Bin} ${BaseName}.xml ${BaseName}.idx ${LibraryName})
- CSWIG_CREATE_PYTHON_CXX_FILE(${Bin} "${MasterIdx}" ${BaseName}.idx ${BaseName}.xml
- ${BaseName}Python.cxx ${LibraryName} "${LibraryIndexFiles}")
-ENDMACRO(WRAP_PYTHON_SOURCES)
-
-# macro to create .xml, .idx and Python.cxx files
-MACRO(WRAP_JAVA_SOURCES Source Bin BaseName LibraryName MasterIdx LibraryIndexFiles)
- GCCXML_CREATE_XML_FILE(${Source} ${Bin} ${BaseName}.cxx ${BaseName}.xml ${LibraryName})
- CINDEX_CREATE_IDX_FILE(${Bin} ${BaseName}.xml ${BaseName}.idx ${LibraryName})
- CSWIG_CREATE_JAVA_CXX_FILE(${Bin} "${MasterIdx}" ${BaseName}.idx ${BaseName}.xml
- ${BaseName}Java.cxx ${LibraryName} "${LibraryIndexFiles}")
-ENDMACRO(WRAP_JAVA_SOURCES)
-
-
-# make sure required stuff is set
-SET(CSWIG_MISSING_VALUES)
-IF(NOT CSWIG)
- SET(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} CSWIG ")
-ENDIF(NOT CSWIG)
-IF(NOT CABLE_INDEX)
- SET(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} CABLE_INDEX ")
-ENDIF(NOT CABLE_INDEX)
-IF(NOT GCCXML)
- SET(CSWIG_MISSING_VALUES "${CSWIG_MISSING_VALUES} GCCXML ")
-ENDIF(NOT GCCXML)
-IF(CSWIG_MISSING_VALUES)
- MESSAGE(SEND_ERROR "To use cswig wrapping, CSWIG, CABLE_INDEX, and GCCXML executables must be specified. If they are all in the same directory, only specifiy one of them, and then run cmake configure again and the others should be found.\nCurrently, you are missing the following:\n ${CSWIG_MISSING_VALUES}")
-ENDIF(CSWIG_MISSING_VALUES)
-
-
-IF(OTB_CSWIG_PYTHON)
- INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} )
-ENDIF(OTB_CSWIG_PYTHON)
-IF(OTB_CSWIG_TCL)
- INCLUDE_DIRECTORIES(${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH})
-ENDIF(OTB_CSWIG_TCL)
-IF(OTB_CSWIG_PERL)
- INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH})
-ENDIF(OTB_CSWIG_PERL)
-IF(OTB_CSWIG_JAVA)
- INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_INCLUDE_PATH})
-ENDIF(OTB_CSWIG_JAVA)
-
-SET(SWIG_INC
- ${TCL_INCLUDE_PATH}
- ${OTB_INCLUDE_DIRS_BUILD_TREE}
- ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
- ${OTB_INCLUDE_DIRS_SYSTEM}
- ${OTB_TOP}/Wrapping/CSwig
- ${OTB_TOP}/Wrapping/CSwig/CommonA
- ${OTB_TOP}/Wrapping/CSwig/CommonB
- ${OTB_TOP}/Wrapping/CSwig/VXLNumerics
- ${OTB_TOP}/Wrapping/CSwig/Numerics
- ${OTB_TOP}/Wrapping/CSwig/BasicFiltersA
- ${OTB_TOP}/Wrapping/CSwig/BasicFiltersB
- ${OTB_TOP}/Wrapping/CSwig/IO
- ${OTB_TOP}/Wrapping/CSwig/Algorithms
- ${OTB_TOP}/Wrapping/CSwig/otbCommon
- ${OTB_TOP}/Wrapping/CSwig/otbIO
- ${OTB_TOP}/Wrapping/CSwig/otbVisu
- )
-ADD_DEFINITIONS(-DSWIG_GLOBAL)
-
-SET(OTB_KITS
-VXLNumerics
-CommonA CommonB
-Numerics
-BasicFiltersA BasicFiltersB
-IO
-Algorithms
-otbCommon
-otbIO
-otbVisu
-)
-SUBDIRS(SwigRuntime ${OTB_KITS} Tests)
-IF(OTB_CSWIG_JAVA)
- SUBDIRS(Java)
-ENDIF(OTB_CSWIG_JAVA)
-
-
-IF(UNIX)
- SET(OTB_CSWIG_LIBNAME_PREFIX "lib")
-ELSE(UNIX)
- SET(OTB_CSWIG_LIBNAME_PREFIX "")
-ENDIF(UNIX)
-
-SET(OTB_CSWIG_PACKAGE_DIR_BUILD "${OTB_LIBRARY_PATH}")
-
-#-----------------------------------------------------------------------------
-# Configure pkgIndex.tcl for the build tree.
-SET(OTB_CSWIG_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES})
-SET(OTB_CSWIG_DATA_ROOT "${OTB_DATA_ROOT}")
-SET(OTB_CSWIG_TEST_ROOT "${OTB_BINARY_DIR}/Testing")
-SET(OTB_CSWIG_SCRIPT_DIR "${OTB_SOURCE_DIR}/Wrapping/CSwig/Tcl")
-
-IF(OTB_CSWIG_CONFIGURATION_TYPES)
- FOREACH(config ${OTB_CSWIG_CONFIGURATION_TYPES})
- SET(OTB_CSWIG_PACKAGE_DIR "${OTB_CSWIG_PACKAGE_DIR_BUILD}/${config}")
- CONFIGURE_FILE("${OTB_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in"
- "${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/${config}/pkgIndex.tcl"
- @ONLY IMMEDIATE)
- ENDFOREACH(config)
-ELSE(OTB_CSWIG_CONFIGURATION_TYPES)
- SET(OTB_CSWIG_PACKAGE_DIR "${OTB_CSWIG_PACKAGE_DIR_BUILD}")
- CONFIGURE_FILE("${OTB_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in"
- "${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl"
- @ONLY IMMEDIATE)
-ENDIF(OTB_CSWIG_CONFIGURATION_TYPES)
-
-#-----------------------------------------------------------------------------
-# Configure pkgIndex.tcl for the install tree.
-
-SET(OTB_CSWIG_SCRIPT_DIR "[file dirname [info script]]")
-SET(OTB_CSWIG_PACKAGE_DIR "[file dirname [file dirname [info script]]]")
-SET(OTB_CSWIG_DATA_ROOT "[file dirname [file dirname [info script]]]/Data")
-SET(OTB_CSWIG_TEST_ROOT "<NO_DEFAULT>")
-CONFIGURE_FILE("${OTB_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in"
- "${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/InstallOnly/Hide/pkgIndex.tcl"
- IMMEDIATE @ONLY)
-INSTALL(FILES "${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/InstallOnly/Hide/pkgIndex.tcl"
- DESTINATION ${OTB_INSTALL_LIB_DIR}/tcl
- COMPONENT RuntimeLibraries)
-
-#-----------------------------------------------------------------------------
-# Configure python packages.
-SET(OTB_CSWIG_DATA_ROOT "'${OTB_DATA_ROOT}'")
-SET(OTB_CSWIG_TEST_ROOT "'${OTB_BINARY_DIR}/Testing'")
-IF(OTB_CSWIG_CONFIGURATION_TYPES)
- FOREACH(config ${OTB_CSWIG_CONFIGURATION_TYPES})
- SET(OTB_CSWIG_PACKAGE_DIR "'${OTB_CSWIG_PACKAGE_DIR_BUILD}/${config}'")
- CONFIGURE_FILE("${OTB_SOURCE_DIR}/Wrapping/CSwig/Python/itkbase.py.in"
- "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/${config}/itkbase.py"
- @ONLY IMMEDIATE)
- ENDFOREACH(config)
-ELSE(OTB_CSWIG_CONFIGURATION_TYPES)
- SET(OTB_CSWIG_PACKAGE_DIR "'${OTB_CSWIG_PACKAGE_DIR_BUILD}'")
- CONFIGURE_FILE("${OTB_SOURCE_DIR}/Wrapping/CSwig/Python/itkbase.py.in"
- "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/itkbase.py"
- @ONLY IMMEDIATE)
-ENDIF(OTB_CSWIG_CONFIGURATION_TYPES)
-
-# Handle out-of-source builds correctly.
-#
-# 1. Create a list of Python files to be installed/copied.
-# 2. Copy them to OTB_BINARY_DIR if it is different from OTB_SOURCE_DIR.
-# 3. Use Python's compileall to compile the copied files.
-#
-# *** Step 1 has to be done carefully to avoid missing out files ***
-IF(PYTHON_EXECUTABLE AND OTB_CSWIG_PYTHON)
-
- # Deal with numarray package Options
- SET(CMAKE_MODULE_PATH ${OTB_SOURCE_DIR}/CMake)
- OPTION(OTB_USE_PYTHON_NUMARRAY "Use the numarray python package" OFF)
- MARK_AS_ADVANCED(OTB_USE_PYTHON_NUMARRAY)
- IF( OTB_USE_PYTHON_NUMARRAY )
- FIND_PACKAGE( NUMARRAY )
- ENDIF( OTB_USE_PYTHON_NUMARRAY )
-
- IF(PYTHON_NUMARRAY_FOUND)
- INCLUDE_DIRECTORIES( ${PYTHON_NUMARRAY_INCLUDE_DIR} )
- SET(SWIG_INC ${SWIG_INC} ${PYTHON_NUMARRAY_INCLUDE_DIR})
- ENDIF(PYTHON_NUMARRAY_FOUND)
-
-
- ADD_CUSTOM_TARGET(itkpython_pyc ALL echo "...")
-
- # Make the necessary directories.
- MAKE_DIRECTORY(${OTB_BINARY_DIR}/Wrapping/CSwig/Python)
-
- # Now create a list of Python files.
- SET(OTB_PYTHON_FILES)
-
- # Wrapping/CSwig/Python/*.py
- SET(OTB_PYTHON_FILES
- ${OTB_PYTHON_FILES}
- InsightToolkit
- OrfeoToolBox
- itkalgorithms
- itkbasicfilters
- itkcommon
- itkio
- itktesting
- itkdata
- itknumerics
- vxlnumerics
- otbio
- otbcommon
- otbvisu
- )
- # Done listing files.
-
- # Now copy these files if necessary.
- SET(OTB_PYTHON_SOURCE_FILES)
- SET(OTB_PYTHON_OUTPUT_FILES)
- IF(OTB_CSWIG_CONFIGURATION_TYPES)
- FOREACH(file ${OTB_PYTHON_FILES})
- SET(src "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/${CMAKE_CFG_INTDIR}/${file}.py")
- SET(OTB_PYTHON_SOURCE_FILES ${OTB_PYTHON_SOURCE_FILES} ${src})
- ENDFOREACH(file)
- ELSE(OTB_CSWIG_CONFIGURATION_TYPES)
- FOREACH(file ${OTB_PYTHON_FILES})
- SET(src "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py")
- SET(OTB_PYTHON_SOURCE_FILES ${OTB_PYTHON_SOURCE_FILES} ${src})
- ENDFOREACH(file)
- ENDIF(OTB_CSWIG_CONFIGURATION_TYPES)
- IF ("${OTB_BINARY_DIR}" MATCHES "^${OTB_SOURCE_DIR}$")
- #MESSAGE("In source build -- no need to copy Python files.")
- ELSE ("${OTB_BINARY_DIR}" MATCHES "^${OTB_SOURCE_DIR}$")
- IF(OTB_CSWIG_CONFIGURATION_TYPES)
- FOREACH(file ${OTB_PYTHON_FILES})
- SET(src "${OTB_SOURCE_DIR}/Wrapping/CSwig/Python/${file}.py")
- SET(tgt "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/${CMAKE_CFG_INTDIR}/${file}.py")
- ADD_CUSTOM_COMMAND(SOURCE ${src}
- COMMAND ${CMAKE_COMMAND}
- ARGS -E copy ${src} ${tgt}
- OUTPUTS ${tgt}
- TARGET itkpython_pyc
- COMMENT "source copy")
- ENDFOREACH(file)
- ELSE(OTB_CSWIG_CONFIGURATION_TYPES)
- FOREACH(file ${OTB_PYTHON_FILES})
- SET(src "${OTB_SOURCE_DIR}/Wrapping/CSwig/Python/${file}.py")
- SET(tgt "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py")
- ADD_CUSTOM_COMMAND(SOURCE ${src}
- COMMAND ${CMAKE_COMMAND}
- ARGS -E copy ${src} ${tgt}
- OUTPUTS ${tgt}
- TARGET itkpython_pyc
- COMMENT "source copy")
- ENDFOREACH(file)
- ENDIF(OTB_CSWIG_CONFIGURATION_TYPES)
- ENDIF ("${OTB_BINARY_DIR}" MATCHES "^${OTB_SOURCE_DIR}$")
-
- # Byte compile the Python files.
- WRITE_FILE(${OTB_BINARY_DIR}/Wrapping/CSwig/Python/compile_all_itk
- "import compileall\n"
- "compileall.compile_dir('${OTB_BINARY_DIR}/Wrapping/CSwig/Python')\n"
- "file = open('${OTB_BINARY_DIR}/Wrapping/CSwig/Python/itk_compile_complete', 'w')\n"
- "file.write('Done')\n")
-
- ADD_CUSTOM_COMMAND(
- SOURCE ${OTB_BINARY_DIR}/Wrapping/CSwig/Python/compile_all_itk
- COMMAND ${PYTHON_EXECUTABLE}
- ARGS ${OTB_BINARY_DIR}/Wrapping/CSwig/Python/compile_all_itk
- DEPENDS ${OTB_PYTHON_SOURCE_FILES}
- OUTPUTS "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/itk_compile_complete"
- TARGET itkpython_pyc
- )
-
- ADD_CUSTOM_COMMAND(
- SOURCE itkpython_pyc
- DEPENDS "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/itk_compile_complete"
- TARGET itkpython_pyc
- )
-
-ENDIF(PYTHON_EXECUTABLE AND OTB_CSWIG_PYTHON)
-
-IF(OTB_CSWIG_TCL)
- SUBDIRS(Tcl)
-ENDIF(OTB_CSWIG_TCL)
-
-IF(OTB_CSWIG_PYTHON)
- CONFIGURE_FILE(
- "${WrapOTB_SOURCE_DIR}/pythonfiles_install.cmake.in"
- "${WrapOTB_BINARY_DIR}/pythonfiles_install.cmake"
- @ONLY IMMEDIATE)
- ADD_CUSTOM_TARGET(python_install)
- SET_TARGET_PROPERTIES(python_install PROPERTIES
- POST_INSTALL_SCRIPT "${WrapOTB_BINARY_DIR}/pythonfiles_install.cmake")
-
- # Install the package python files.
- FOREACH(file ${OTB_PYTHON_FILES})
- INSTALL(FILES "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py"
- DESTINATION ${OTB_INSTALL_LIB_DIR}/python
- COMPONENT RuntimeLibraries)
- ENDFOREACH(file)
-
- SET(OTB_CSWIG_PACKAGE_DIR "os.path.dirname(selfpath)")
- SET(OTB_CSWIG_DATA_ROOT "os.path.join(os.path.dirname(selfpath),'Data')")
- SET(OTB_CSWIG_TEST_ROOT "'<NO_DEFAULT>'")
- CONFIGURE_FILE("${OTB_SOURCE_DIR}/Wrapping/CSwig/Python/itkbase.py.in"
- "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/itkbase.py"
- @ONLY IMMEDIATE)
- INSTALL(FILES "${OTB_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/itkbase.py"
- DESTINATION ${OTB_INSTALL_LIB_DIR}/python
- COMPONENT RuntimeLibraries)
-ENDIF(OTB_CSWIG_PYTHON)
-
-
-MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_SOURCES OTB_LINK_LIBRARIES)
- # loop over cable config files creating two lists:
- # WRAP_TCL_SOURCES: list of generated files
- SET(INDEX_FILE_CONTENT "%JavaLoader=InsightToolkit.itkbase.LoadLibrary(\"${LIBRARY_NAME}Java\")\n")
- FOREACH(Source ${WRAP_SOURCES})
- SET(WRAP_PERL_SOURCES ${WRAP_PERL_SOURCES} ${Source}Perl.cxx)
- SET(WRAP_TCL_SOURCES ${WRAP_TCL_SOURCES} ${Source}Tcl.cxx)
- SET(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} ${Source}Python.cxx)
- SET(WRAP_JAVA_SOURCES ${WRAP_JAVA_SOURCES} ${Source}Java.cxx)
- STRING(REGEX REPLACE wrap_ "" JAVA_DEP ${Source})
- SET(${LIBRARY_NAME}_JAVA_DEPENDS_INIT ${${LIBRARY_NAME}_JAVA_DEPENDS_INIT} ${JAVA_DEP}.java)
- SET(ALL_IDX_FILES ${ALL_IDX_FILES} ${WrapOTB_BINARY_DIR}/${DIRECTORY}/${Source}.idx )
- SET(INDEX_FILE_CONTENT "${INDEX_FILE_CONTENT}${WrapOTB_BINARY_DIR}/${DIRECTORY}/${Source}.idx\n")
- ENDFOREACH(Source)
- SET(${LIBRARY_NAME}_JAVA_DEPENDS "${${LIBRARY_NAME}_JAVA_DEPENDS_INIT}" CACHE INTERNAL "" FORCE)
- # add the package wrappers
- SET(WRAP_PERL_SOURCES ${WRAP_PERL_SOURCES} wrap_${LIBRARY_NAME}PerlPerl.cxx)
- SET(WRAP_TCL_SOURCES ${WRAP_TCL_SOURCES} wrap_${LIBRARY_NAME}TclTcl.cxx)
- SET(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} wrap_${LIBRARY_NAME}PythonPython.cxx)
- SET(WRAP_JAVA_SOURCES ${WRAP_JAVA_SOURCES} wrap_${LIBRARY_NAME}JavaJava.cxx)
- IF(OTB_EXTRA_TCL_WRAP)
- SET(WRAP_TCL_SOURCES ${WRAP_TCL_SOURCES} ${OTB_EXTRA_TCL_WRAP}Tcl.cxx)
- ENDIF(OTB_EXTRA_TCL_WRAP)
- IF(OTB_EXTRA_PYTHON_WRAP)
- FOREACH( extraPython ${OTB_EXTRA_PYTHON_WRAP})
- SET(WRAP_PYTHON_SOURCES ${WRAP_PYTHON_SOURCES} ${extraPython}Python.cxx)
- ENDFOREACH( extraPython )
- ENDIF(OTB_EXTRA_PYTHON_WRAP)
- IF(OTB_EXTRA_JAVA_WRAP)
- SET(WRAP_JAVA_SOURCES ${WRAP_JAVA_SOURCES} ${OTB_EXTRA_JAVA_WRAP}Java.cxx)
- ENDIF(OTB_EXTRA_JAVA_WRAP)
- IF(OTB_EXTRA_PERL_WRAP)
- SET(WRAP_PERL_SOURCES ${WRAP_PERL_SOURCES} ${OTB_EXTRA_PERL_WRAP}Java.cxx)
- ENDIF(OTB_EXTRA_PERL_WRAP)
-
- # set the generated sources as generated
- SET_SOURCE_FILES_PROPERTIES(
- ${WRAP_PERL_SOURCES}
- ${WRAP_TCL_SOURCES}
- ${WRAP_PYTHON_SOURCES}
- ${WRAP_JAVA_SOURCES} GENERATED )
- SET(EXTRA_LIBS ${OTB_LINK_LIBRARIES})
- IF("${OTB_LINK_LIBRARIES}" MATCHES "^$")
- SET(EXTRA_LIBS ${LIBRARY_NAME})
- ENDIF("${OTB_LINK_LIBRARIES}" MATCHES "^$")
- IF(OTB_CSWIG_TCL)
- IF(OTB_SWIG_FILE)
- SET(SWIG_INC ${SWIG_INC} ${TCL_INCLUDE_PATH})
- SET_SOURCE_FILES_PROPERTIES(${OTB_SWIG_FILE_CXX}Tcl.cxx GENERATED)
- SET(WRAP_FILE ${OTB_SWIG_FILE_CXX}Tcl.cxx )
- ENDIF(OTB_SWIG_FILE)
-
- ADD_LIBRARY(${LIBRARY_NAME}Tcl SHARED
- ${WRAP_TCL_SOURCES}
- ${OTB_EXTRA_TCL_SOURCES}
- ${WRAP_FILE}
- ${EXTRA_SOURCES})
- IF(OTB_WRAP_NEEDS_DEPEND)
- FOREACH(lib ${DEPEND_LIBRARY})
- ADD_DEPENDENCIES(${LIBRARY_NAME}Tcl ${lib}Tcl)
- ENDFOREACH(lib)
- ENDIF(OTB_WRAP_NEEDS_DEPEND)
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(${LIBRARY_NAME}Tcl PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}" ${OTB_LIBRARY_PROPERTIES})
- ELSE(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(${LIBRARY_NAME}Tcl PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
- ENDIF(OTB_LIBRARY_PROPERTIES)
- TARGET_LINK_LIBRARIES(${LIBRARY_NAME}Tcl ${EXTRA_LIBS} SwigRuntimeTcl ${TCL_LIBRARY})
- INSTALL(TARGETS ${LIBRARY_NAME}Tcl
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
- IF(OTB_SWIG_FILE)
- ADD_CUSTOM_COMMAND(
- COMMENT "run native swig on ${OTB_SWIG_FILE}"
- SOURCE ${OTB_SWIG_FILE}
- COMMAND ${CSWIG}
- ARGS -nocable -noruntime ${IGNORE_WARNINGS} -o ${WRAP_FILE}
- -c++ ${OTB_SWIG_FILE}
- TARGET ${LIBRARY_NAME}Tcl
- OUTPUTS ${WRAP_FILE}
- DEPENDS ${OTB_SWIG_FILE} ${CSWIG})
- ENDIF(OTB_SWIG_FILE)
- ENDIF(OTB_CSWIG_TCL)
-
-
- IF(OTB_CSWIG_PERL)
- IF(OTB_SWIG_FILE)
- SET(SWIG_INC ${SWIG_INC} ${PERL_INCLUDE_PATH})
- SET_SOURCE_FILES_PROPERTIES(${OTB_SWIG_FILE_CXX}Perl.cxx GENERATED)
- SET(WRAP_FILE ${OTB_SWIG_FILE_CXX}Perl.cxx )
- ENDIF(OTB_SWIG_FILE)
-
- ADD_LIBRARY(${LIBRARY_NAME}Perl SHARED
- ${WRAP_PERL_SOURCES}
- ${OTB_EXTRA_PERL_SOURCES}
- ${WRAP_FILE}
- ${EXTRA_SOURCES})
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(${LIBRARY_NAME}Perl PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}" ${OTB_LIBRARY_PROPERTIES})
- ELSE(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(${LIBRARY_NAME}Perl PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
- ENDIF(OTB_LIBRARY_PROPERTIES)
- TARGET_LINK_LIBRARIES(${LIBRARY_NAME}Perl ${EXTRA_LIBS} SwigRuntimePerl ${PERL_LIBRARY})
- IF(OTB_WRAP_NEEDS_DEPEND)
- FOREACH(lib ${DEPEND_LIBRARY})
- ADD_DEPENDENCIES(${LIBRARY_NAME}Perl ${lib}Perl)
- ENDFOREACH(lib)
- ENDIF(OTB_WRAP_NEEDS_DEPEND)
- INSTALL(TARGETS ${LIBRARY_NAME}Perl
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
- IF(OTB_SWIG_FILE)
- ADD_CUSTOM_COMMAND(
- COMMENT "run native swig on ${OTB_SWIG_FILE}"
- SOURCE ${OTB_SWIG_FILE}
- COMMAND ${CSWIG}
- ARGS -nocable -noruntime ${IGNORE_WARNINGS} -o ${WRAP_FILE}
- -perl5 -c++ ${OTB_SWIG_FILE}
- TARGET ${LIBRARY_NAME}Perl
- OUTPUTS ${WRAP_FILE}
- DEPENDS ${OTB_SWIG_FILE} ${CSWIG})
- ENDIF(OTB_SWIG_FILE)
- ENDIF(OTB_CSWIG_PERL)
-
-
- IF(OTB_CSWIG_PYTHON)
- IF(OTB_SWIG_FILE)
- SET(SWIG_INC ${SWIG_INC} ${PYTHON_INCLUDE_PATH})
- SET_SOURCE_FILES_PROPERTIES(${OTB_SWIG_FILE_CXX}Python.cxx GENERATED)
- SET(WRAP_FILE ${OTB_SWIG_FILE_CXX}Python.cxx )
- ENDIF(OTB_SWIG_FILE)
-
- ADD_LIBRARY(_${LIBRARY_NAME}Python MODULE
- ${WRAP_PYTHON_SOURCES}
- ${OTB_EXTRA_PYTHON_SOURCES}
- ${WRAP_FILE}
- ${EXTRA_SOURCES})
- IF(OTB_WRAP_NEEDS_DEPEND)
- FOREACH(lib ${DEPEND_LIBRARY})
- ADD_DEPENDENCIES(_${LIBRARY_NAME}Python _${lib}Python)
- ENDFOREACH(lib)
- ENDIF(OTB_WRAP_NEEDS_DEPEND)
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES( _${LIBRARY_NAME}Python PROPERTIES PREFIX "" ${OTB_LIBRARY_PROPERTIES})
- ELSE(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES( _${LIBRARY_NAME}Python PROPERTIES PREFIX "")
- ENDIF(OTB_LIBRARY_PROPERTIES)
- TARGET_LINK_LIBRARIES(_${LIBRARY_NAME}Python ${EXTRA_LIBS} SwigRuntimePython ${PYTHON_LIBRARY})
- INSTALL(TARGETS _${LIBRARY_NAME}Python
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
- IF(OTB_SWIG_FILE)
- ADD_CUSTOM_COMMAND(
- COMMENT "run native swig on ${OTB_SWIG_FILE}"
- SOURCE ${OTB_SWIG_FILE}
- COMMAND ${CSWIG}
- ARGS -nocable -noruntime ${IGNORE_WARNINGS} -o ${WRAP_FILE}
- -outdir "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}"
- -python -c++ ${OTB_SWIG_FILE}
- TARGET _${LIBRARY_NAME}Python
- OUTPUTS ${WRAP_FILE}
- DEPENDS ${OTB_SWIG_FILE} ${CSWIG})
- ENDIF(OTB_SWIG_FILE)
- ENDIF(OTB_CSWIG_PYTHON)
-
- IF(OTB_CSWIG_JAVA)
- IF(OTB_SWIG_FILE)
- SET(SWIG_INC ${SWIG_INC} ${JAVA_INCLUDE_PATH})
- SET_SOURCE_FILES_PROPERTIES(${OTB_SWIG_FILE_CXX}Java.cxx GENERATED)
- SET(WRAP_FILE ${OTB_SWIG_FILE_CXX}Java.cxx )
- ENDIF(OTB_SWIG_FILE)
- MAKE_DIRECTORY("${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit")
- ADD_LIBRARY(${LIBRARY_NAME}Java MODULE
- ${WRAP_JAVA_SOURCES}
- ${OTB_EXTRA_JAVA_SOURCES}
- ${WRAP_FILE}
- ${EXTRA_SOURCES})
- TARGET_LINK_LIBRARIES(${LIBRARY_NAME}Java ${JAVA_LIBRARY} ${EXTRA_LIBS} )
- IF(OTB_WRAP_NEEDS_DEPEND)
- FOREACH(lib ${DEPEND_LIBRARY})
- ADD_DEPENDENCIES(${LIBRARY_NAME}Java ${lib}Java)
- ENDFOREACH(lib)
- ENDIF(OTB_WRAP_NEEDS_DEPEND)
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(${LIBRARY_NAME}Java PROPERTIES ${OTB_LIBRARY_PROPERTIES})
- ENDIF(OTB_LIBRARY_PROPERTIES)
- INSTALL(TARGETS ${LIBRARY_NAME}Java
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
- IF(OTB_SWIG_FILE)
- ADD_CUSTOM_COMMAND(
- COMMENT "run native swig on ${OTB_SWIG_FILE}"
- SOURCE ${OTB_SWIG_FILE}
- COMMAND ${CSWIG}
- ARGS -nocable -noruntime ${IGNORE_WARNINGS} -o ${WRAP_FILE}
- -I${OTB_TOP}/Code/Common -DOTBCommon_EXPORT=
- -outdir ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit
- -package InsightToolkit -java -c++ ${OTB_SWIG_FILE}
- TARGET ${LIBRARY_NAME}Java
- OUTPUTS ${WRAP_FILE}
- DEPENDS ${OTB_SWIG_FILE} ${CSWIG})
- ENDIF(OTB_SWIG_FILE)
- ENDIF(OTB_CSWIG_JAVA)
-
- CONFIGURE_FILE(
- ${WrapOTB_SOURCE_DIR}/Master.mdx.in
- ${WrapOTB_BINARY_DIR}/${DIRECTORY}/${LIBRARY_NAME}.mdx IMMEDIATE
- )
-
- SET(SWIG_INC_FILE ${WrapOTB_BINARY_DIR}/${DIRECTORY}/SwigInc.txt)
- SET(SWIG_INC_CONTENTS)
- FOREACH(dir ${SWIG_INC})
- SET(SWIG_INC_CONTENTS "${SWIG_INC_CONTENTS}-I${dir}\n")
- ENDFOREACH(dir)
- CONFIGURE_FILE(${WrapOTB_SOURCE_DIR}/SwigInc.txt.in ${SWIG_INC_FILE}
- @ONLY IMMEDIATE)
-
- FOREACH(Source ${WRAP_SOURCES})
- IF(OTB_CSWIG_TCL)
- # tcl
- WRAP_TCL_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- ${Source} ${LIBRARY_NAME}Tcl "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDIF(OTB_CSWIG_TCL)
-
- IF(OTB_CSWIG_PERL)
- # tcl
- WRAP_PERL_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- ${Source} ${LIBRARY_NAME}Perl "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDIF(OTB_CSWIG_PERL)
-
- IF(OTB_CSWIG_PYTHON)
- # python
- WRAP_PYTHON_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- ${Source} _${LIBRARY_NAME}Python "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDIF(OTB_CSWIG_PYTHON)
-
- IF(OTB_CSWIG_JAVA)
- # java
- WRAP_JAVA_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- ${Source} ${LIBRARY_NAME}Java "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDIF(OTB_CSWIG_JAVA)
- ENDFOREACH(Source)
-
-
- # wrap the package files for tcl and python
- IF(OTB_CSWIG_TCL)
- # tcl
- WRAP_TCL_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- wrap_${LIBRARY_NAME}Tcl ${LIBRARY_NAME}Tcl "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- IF(OTB_EXTRA_TCL_WRAP)
- WRAP_TCL_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- "${OTB_EXTRA_TCL_WRAP}" ${LIBRARY_NAME}Tcl "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDIF(OTB_EXTRA_TCL_WRAP)
- ENDIF(OTB_CSWIG_TCL)
-
- IF(OTB_CSWIG_PERL)
- # perl
- WRAP_PERL_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- wrap_${LIBRARY_NAME}Perl ${LIBRARY_NAME}Perl "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- IF(OTB_EXTRA_PERL_WRAP)
- WRAP_PERL_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- "${OTB_EXTRA_PERL_WRAP}" ${LIBRARY_NAME}Perl "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDIF(OTB_EXTRA_PERL_WRAP)
- ENDIF(OTB_CSWIG_PERL)
-
- IF(OTB_CSWIG_PYTHON)
- # python
- WRAP_PYTHON_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- wrap_${LIBRARY_NAME}Python _${LIBRARY_NAME}Python "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- IF(OTB_EXTRA_PYTHON_WRAP)
- FOREACH( extraPython ${OTB_EXTRA_PYTHON_WRAP})
- WRAP_PYTHON_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- ${extraPython} _${LIBRARY_NAME}Python "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDFOREACH( extraPython )
- ENDIF(OTB_EXTRA_PYTHON_WRAP)
-
- ENDIF(OTB_CSWIG_PYTHON)
-
- IF(OTB_CSWIG_JAVA)
- # python
- WRAP_JAVA_SOURCES(${OTB_TOP}/Wrapping/CSwig/${DIRECTORY} ${WrapOTB_BINARY_DIR}/${DIRECTORY}
- wrap_${LIBRARY_NAME}Java ${LIBRARY_NAME}Java "${MASTER_INDEX_FILES}" "${ALL_IDX_FILES}")
- ENDIF(OTB_CSWIG_JAVA)
-
-ENDMACRO(ITK_WRAP_LIBRARY)
diff --git a/Wrapping/CSwig/CommonA/.NoDartCoverage b/Wrapping/CSwig/CommonA/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/CommonA/CMakeLists.txt b/Wrapping/CSwig/CommonA/CMakeLists.txt
deleted file mode 100644
index acb2d1ca4ef69dcfad5354b581a405e6611424dc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-# create a list of cable config files for wrapping
-SET(WRAP_SOURCES
- wrap_ITKCommonBase
- wrap_ITKInterpolators
- wrap_ITKRegions
- wrap_SwigExtras
- wrap_itkArray
- wrap_itkBinaryBallStructuringElement
- wrap_itkContinuousIndex
- wrap_itkDenseFiniteDifferenceImageFilter_2D
- wrap_itkDenseFiniteDifferenceImageFilter_3D
- wrap_itkDifferenceImageFilter
- wrap_itkEventObject
- wrap_itkFiniteDifferenceFunction
- wrap_itkFiniteDifferenceImageFilter_2D
- wrap_itkFiniteDifferenceImageFilter_3D
- wrap_itkFixedArray
- wrap_itkFunctionBase
- wrap_itkImage_2D
- wrap_itkImage_3D
- wrap_itkImageFunction
- wrap_itkImageConstIterator
- wrap_itkImageRegionIterator
- wrap_itkImageRegionConstIterator
- wrap_itkImageSource
- wrap_itkImageToImageFilter_2D
- wrap_itkImageToImageFilter_3D
- wrap_itkInPlaceImageFilter_A
- wrap_itkInPlaceImageFilter_B
- wrap_itkIndex
- wrap_itkLevelSet
- wrap_itkNeighborhood
- wrap_itkPoint
- wrap_itkSize
- wrap_itkVector
-)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
-)
-SET(OTB_SWIG_FILE ${OTB_TOP}/Wrapping/CSwig/CommonA/SwigExtras.i)
-SET(OTB_SWIG_FILE_CXX ${WrapOTB_BINARY_DIR}/CommonA/SwigExtras_wrap)
-SET(OTB_EXTRA_TCL_SOURCES itkTclCommand.cxx)
-SET(OTB_EXTRA_PYTHON_SOURCES itkPyCommand.cxx)
-SET(OTB_EXTRA_PYTHON_WRAP wrap_ITKPyUtils )
-
-IF(PYTHON_NUMARRAY_FOUND)
- SET(OTB_EXTRA_PYTHON_WRAP ${OTB_EXTRA_PYTHON_WRAP} wrap_itkPyBuffer )
-ENDIF(PYTHON_NUMARRAY_FOUND)
-
-SET(OTB_EXTRA_TCL_WRAP wrap_ITKUtils)
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKCommonA CommonA "VXLNumerics" itkStringStream.cxx "ITKCommon;OTBIO")
-
diff --git a/Wrapping/CSwig/CommonA/CVS/Entries b/Wrapping/CSwig/CommonA/CVS/Entries
deleted file mode 100644
index addbd1332033e216827823c2bd82f42664083d95..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/CVS/Entries
+++ /dev/null
@@ -1,55 +0,0 @@
-/.NoDartCoverage/1.1/Fri Apr 1 14:38:32 2005//TITK-3-0-1
-/CMakeLists.txt/1.3/Tue May 10 14:37:07 2005//TITK-3-0-1
-/SwigExtras.i/1.2/Fri Apr 22 17:05:30 2005//TITK-3-0-1
-/SwigGetTclInterp.i/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkCommand.i/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkJavaCommand.h/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkPyBuffer.h/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkPyBuffer.txx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkPyCommand.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkPyCommand.h/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkStringStream.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkStringStream.h/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkTclCommand.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/itkTclCommand.h/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonA.cxx/1.3/Tue May 10 14:37:07 2005//TITK-3-0-1
-/wrap_ITKCommonAJava.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonAPython.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonATcl.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonBase.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKInterpolators.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKPyUtils.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKRegions.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKUtils.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_SwigExtras.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkArray.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkBinaryBallStructuringElement.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkContinuousIndex.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkDenseFiniteDifferenceImageFilter_2D.cxx/1.1/Tue May 10 14:37:07 2005//TITK-3-0-1
-/wrap_itkDenseFiniteDifferenceImageFilter_3D.cxx/1.1/Tue May 10 14:37:07 2005//TITK-3-0-1
-/wrap_itkDifferenceImageFilter.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkEventObject.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkFiniteDifferenceFunction.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkFiniteDifferenceImageFilter_2D.cxx/1.1/Tue May 10 14:37:07 2005//TITK-3-0-1
-/wrap_itkFiniteDifferenceImageFilter_3D.cxx/1.1/Tue May 10 14:37:07 2005//TITK-3-0-1
-/wrap_itkFixedArray.cxx/1.2/Thu Oct 27 20:22:55 2005//TITK-3-0-1
-/wrap_itkFunctionBase.cxx/1.2/Fri Apr 1 14:50:41 2005//TITK-3-0-1
-/wrap_itkImageConstIterator.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkImageFunction.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkImageRegionConstIterator.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkImageRegionIterator.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkImageSource.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkImageToImageFilter_2D.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkImageToImageFilter_3D.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkImage_2D.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkImage_3D.cxx/1.2/Fri Apr 1 16:30:14 2005//TITK-3-0-1
-/wrap_itkInPlaceImageFilter_A.cxx/1.2/Fri Apr 1 16:30:15 2005//TITK-3-0-1
-/wrap_itkInPlaceImageFilter_B.cxx/1.1/Fri Apr 1 14:53:33 2005//TITK-3-0-1
-/wrap_itkIndex.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkLevelSet.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkNeighborhood.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkPoint.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkPyBuffer.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkSize.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkVector.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/CommonA/CVS/Repository b/Wrapping/CSwig/CommonA/CVS/Repository
deleted file mode 100644
index 68775ad48e633422c9121524ba54005623df0a07..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/CommonA
diff --git a/Wrapping/CSwig/CommonA/CVS/Root b/Wrapping/CSwig/CommonA/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/CommonA/CVS/Tag b/Wrapping/CSwig/CommonA/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/CommonA/CVS/Template b/Wrapping/CSwig/CommonA/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/CommonA/SwigExtras.i b/Wrapping/CSwig/CommonA/SwigExtras.i
deleted file mode 100644
index 55869aae8b3aec958da8ff3e78a4e9a179dd31f5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/SwigExtras.i
+++ /dev/null
@@ -1,90 +0,0 @@
-%module(directors="1") SwigExtras
-%include "typemaps.i"
-%include "carrays.i"
-%array_functions(unsigned long, ULArray);
-%array_functions(int, IArray);
-%array_functions(float, FArray);
-%array_functions(double, DArray);
-%array_class(unsigned long, ULArrayClass);
-%array_class(int, IArrayClass);
-%array_class(float, FArrayClass);
-%array_class(double, DArrayClass);
-#ifdef SWIGTCL
-Tcl_Interp* GetInterp(Tcl_Interp* interp);
-%{
-Tcl_Interp* GetInterp(Tcl_Interp* interp)
-{
- return interp;
-}
-%}
-#endif
-
-// Create swig version of std::list with
-// a specialization for std::string.
-// This is because list<std::string> is used
-// in the wrapper interface of ITK and for java
-// this creates SWIGTYPE_p_*.java files that are
-// too big for windows file systems. But if the
-// class is wrapped, the shorter name StringList is used.
-
-%{
-#include <list>
-%}
-namespace std {
- template<class T> class list {
- public:
- list();
- unsigned int size() const;
- bool empty() const;
- void clear();
- void push_back(std::string x);
- };
- template<> class list<std::string> {
- // add specialized typemaps here
- public:
- list();
- unsigned int size() const;
- bool empty() const;
- void clear();
- void push_back(std::string x);
- %extend {
- std::string get(int i)
- {
- std::list<std::string>::iterator j = self->begin();
- while(i)
- {
- j++;
- i--;
- }
- return *j;
- }
- }
- };
-}
-
-/* See wrap_SwigExtras.cxx. */
-%include stl.i
-%template(StringVector) std::vector<std::string>;
-%template(StringList) std::list<std::string>;
-#ifdef SWIGJAVA
-%feature("director") itkJavaCommand;
-%{
-#include "itkJavaCommand.h"
-%}
-
-// import fake itk command
-// because itkCommand will be wrapped elsewhere by cableswig
-%import "itkCommand.i"
-
-// create an itkJavaCommand that has an Execute method that
-// can be overriden in java, and used as an itkCommand
-class itkJavaCommand : public itkCommand
-{
-public:
- virtual void Execute();
-};
-
-%pragma(java) jniclasscode=%{
- static { InsightToolkit.itkbase.LoadLibrary("ITKCommonAJava"); }
-%}
-#endif
diff --git a/Wrapping/CSwig/CommonA/SwigGetTclInterp.i b/Wrapping/CSwig/CommonA/SwigGetTclInterp.i
deleted file mode 100644
index 92f056e6a7188c3edccf939ca6fcab41c8999a85..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/SwigGetTclInterp.i
+++ /dev/null
@@ -1,16 +0,0 @@
-%module SwigGetTclInterp
-%include "typemaps.i"
-%include "carrays.i"
-%array_functions(unsigned long, ULArray);
-%array_functions(int, IArray);
-%array_functions(float, FArray);
-%array_functions(double, DArray);
-#ifdef SWIGTCL
-Tcl_Interp* GetInterp(Tcl_Interp* interp);
-%{
-Tcl_Interp* GetInterp(Tcl_Interp* interp)
-{
- return interp;
-}
-#endif
-%}
diff --git a/Wrapping/CSwig/CommonA/itkCommand.i b/Wrapping/CSwig/CommonA/itkCommand.i
deleted file mode 100644
index 752a84e88707553bc20884a876f1b61eef1c64c7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkCommand.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is needed for a reference in SwigExtras.i
-// The actuall itkCommand wrapping is done in wrap_ITKCommonBase.cxx by
-// CableSwig
-class itkCommand
-{
-public:
- virtual ~itkCommand() {}
-};
diff --git a/Wrapping/CSwig/CommonA/itkJavaCommand.h b/Wrapping/CSwig/CommonA/itkJavaCommand.h
deleted file mode 100644
index e25ed64f0c1c542eab6164bbc58f917953546e19..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkJavaCommand.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef itkJavaCommand_h
-#define itkJavaCommand_h
-#include "itkCommand.h"
-typedef itk::Command itkCommand;
-
-class itkJavaCommand : public itk::Command
-{
-public:
- virtual void Execute(itk::Object *, const itk::EventObject&){ this->Execute();};
- virtual void Execute(const itk::Object *, const itk::EventObject&){ this->Execute();};
- virtual void Execute(){};
-};
-#endif
diff --git a/Wrapping/CSwig/CommonA/itkPyBuffer.h b/Wrapping/CSwig/CommonA/itkPyBuffer.h
deleted file mode 100644
index 2393d7b5d256f09322772077e17372d78ff38628..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkPyBuffer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkPyBuffer.h,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef _itkPyBuffer_h
-#define _itkPyBuffer_h
-
-#include "itkObject.h"
-#include "itkObjectFactory.h"
-#include "itkImportImageFilter.h"
-
-// The python header defines _POSIX_C_SOURCE without a preceding #undef
-#undef _POSIX_C_SOURCE
-#include <Python.h>
-#include <arrayobject.h>
-
-
-
-namespace itk
-{
-
-/** \Class PyBuffer
- * \brief Helper class for converting C buffers into python arrays.
- *
- * This class will receive a C buffer and create the equivalen python
- * array. This permits to pass image buffers into python arrays from
- * the Numeric python package.
- *
- */
-
-template <typename TImage>
-class PyBuffer : public Object
-{
-public:
- ///! Standard "Self" typedef.
- typedef PyBuffer Self;
-
- ///! Smart pointer typedef support.
- typedef SmartPointer<Self> Pointer;
-
- ///! Run-time type information (and related methods).
- itkTypeMacro(PyBuffer,Object);
-
- ///! Method for creation through the object factory.
- itkNewMacro(Self);
-
- /// Type of the image from where the buffer will be converted
- typedef TImage ImageType;
- typedef typename ImageType::PixelType PixelType;
- typedef typename ImageType::SizeType SizeType;
- typedef typename ImageType::IndexType IndexType;
- typedef typename ImageType::RegionType RegionType;
- typedef typename ImageType::PointType PointType;
- typedef typename ImageType::SpacingType SpacingType;
-
-
- /** Image dimension. */
- itkStaticConstMacro(ImageDimension, unsigned int,
- ImageType::ImageDimension);
-
- /// Type of the import image filter
- typedef ImportImageFilter< PixelType,
- ImageDimension > ImporterType;
-
- typedef typename ImporterType::Pointer ImporterPointer;
-
- /**
- * Get an Array with the content of the image buffer
- */
- PyObject * GetArrayFromImage(const ImageType * image);
-
- /**
- * Get an ITK image from a Python array
- */
- const ImageType * GetImageFromArray( PyObject *obj );
-
-
-protected:
- PyBuffer();
- ~PyBuffer();
- PyBuffer(const Self&); // Not implemented.
- void operator=(const Self&); // Not implemented.
-
-private:
- PyObject *obj;
- ImporterPointer m_Importer;
-};
-
-
-} // namespace itk
-
-#ifndef ITK_MANUAL_INSTANTIATION
-#include "itkPyBuffer.txx"
-#endif
-
-#endif // _itkPyBuffer_h
-
diff --git a/Wrapping/CSwig/CommonA/itkPyBuffer.txx b/Wrapping/CSwig/CommonA/itkPyBuffer.txx
deleted file mode 100644
index afc595b7fbe15649b632a2f578974599edb50d21..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkPyBuffer.txx
+++ /dev/null
@@ -1,166 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkPyBuffer.txx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef _itkPyBuffer_txx
-#define _itkPyBuffer_txx
-
-#include "itkPyBuffer.h"
-
-namespace itk
-{
-
-template<typename TImage>
-PyBuffer<TImage>
-::PyBuffer()
-{
- this->obj = NULL;
- this->m_Importer = ImporterType::New();
-
- import_libnumarray();
-}
-
-template<typename TImage>
-PyBuffer<TImage>
-::~PyBuffer()
-{
- if (this->obj)
- {
- Py_DECREF(this->obj);
- }
- this->obj = NULL;
-}
-
-
-template<typename TImage>
-PyObject *
-PyBuffer<TImage>
-::GetArrayFromImage( const ImageType * image )
-{
- if( !image )
- {
- itkExceptionMacro("Input image is null");
- }
-
- PixelType * buffer = const_cast< PixelType *>( image->GetBufferPointer() );
-
- char * data = (char *)( buffer );
-
- int dimensions[ ImageDimension ];
-
- SizeType size = image->GetBufferedRegion().GetSize();
-
- for(unsigned int d=0; d < ImageDimension; d++ )
- {
- dimensions[d] = size[d];
- }
-
- int item_type = 0; // TODO find a way of doing this through pixel traits
-
- this->obj = PyArray_FromDimsAndData( ImageDimension, dimensions, item_type, data );
-
- return this->obj;
-}
-
-
-
-template<typename TImage>
-const typename PyBuffer<TImage>::ImageType *
-PyBuffer<TImage>
-::GetImageFromArray( PyObject *obj )
-{
- if (obj != this->obj)
- {
- if (this->obj)
- {
- // get rid of our reference
- Py_DECREF(this->obj);
- }
-
- // store the new object
- this->obj = obj;
-
- if (this->obj)
- {
- // take out reference (so that the calling code doesn't
- // have to keep a binding to the callable around)
- Py_INCREF(this->obj);
- }
- }
-
-
- int element_type = PyArray_DOUBLE; // change this with pixel traits.
-
- PyArrayObject * parray =
- (PyArrayObject *) PyArray_ContiguousFromObject(
- this->obj,
- element_type,
- ImageDimension,
- ImageDimension );
-
- if( parray == NULL )
- {
- itkExceptionMacro("Contiguous array couldn't be created from input python object");
- }
-
- const unsigned int imageDimension = parray->nd;
-
- SizeType size;
-
- unsigned int numberOfPixels = 1;
-
- for( unsigned int d=0; d<imageDimension; d++ )
- {
- size[d] = parray->dimensions[d];
- numberOfPixels *= parray->dimensions[d];
- }
-
- IndexType start;
- start.Fill( 0 );
-
- RegionType region;
- region.SetIndex( start );
- region.SetSize( size );
-
- PointType origin;
- origin.Fill( 0.0 );
-
- SpacingType spacing;
- spacing.Fill( 1.0 );
-
- this->m_Importer->SetRegion( region );
- this->m_Importer->SetOrigin( origin );
- this->m_Importer->SetSpacing( spacing );
-
- const bool importImageFilterWillOwnTheBuffer = false;
-
- PixelType * data = (PixelType *)parray->data;
-
- this->m_Importer->SetImportPointer(
- data,
- numberOfPixels,
- importImageFilterWillOwnTheBuffer );
-
- this->m_Importer->Update();
-
- return this->m_Importer->GetOutput();
-}
-
-
-
-} // namespace itk
-
-#endif
-
diff --git a/Wrapping/CSwig/CommonA/itkPyCommand.cxx b/Wrapping/CSwig/CommonA/itkPyCommand.cxx
deleted file mode 100644
index 801f412c99c37ea1b0523ff1c472ef151c9d8cac..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkPyCommand.cxx
+++ /dev/null
@@ -1,107 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkPyCommand.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkPyCommand.h"
-
-namespace itk
-{
-
-PyCommand::PyCommand()
-{
- this->obj = NULL;
-}
-
-PyCommand::~PyCommand()
-{
- if (this->obj)
- {
- Py_DECREF(this->obj);
- }
- this->obj = NULL;
-}
-
-void PyCommand::SetCommandCallable(PyObject *obj)
-{
- if (obj != this->obj)
- {
- if (this->obj)
- {
- // get rid of our reference
- Py_DECREF(this->obj);
- }
-
- // store the new object
- this->obj = obj;
-
- if (this->obj)
- {
- // take out reference (so that the calling code doesn't
- // have to keep a binding to the callable around)
- Py_INCREF(this->obj);
- }
- }
-}
-
-void PyCommand::Execute(Object *, const EventObject&)
-{
- this->PyExecute();
-}
-
-
-void PyCommand::Execute(const Object*, const EventObject&)
-{
- this->PyExecute();
-
-}
-
-void PyCommand::PyExecute()
-{
- // make sure that the CommandCallable is in fact callable
- if (!PyCallable_Check(this->obj))
- {
- // we throw a standard ITK exception: this makes it possible for
- // our standard CableSwig exception handling logic to take this
- // through to the invoking Python process
- itkExceptionMacro(<<"CommandCallable is not a callable Python object, "
- <<"or it has not been set.");
- }
- else
- {
- PyObject *result;
-
- result = PyEval_CallObject(this->obj, (PyObject *)NULL);
-
- if (result)
- {
- Py_DECREF(result);
- }
- else
- {
- // there was a Python error. Clear the error by printing to stdout
- PyErr_Print();
- // make sure the invoking Python code knows there was a problem
- // by raising an exception
- itkExceptionMacro(<<"There was an error executing the "
- <<"CommandCallable.");
- }
- }
-}
-
-
-
-} // namespace itk
-
-
diff --git a/Wrapping/CSwig/CommonA/itkPyCommand.h b/Wrapping/CSwig/CommonA/itkPyCommand.h
deleted file mode 100644
index add31b761f1d4c9e8417d37f1abd4cad676d9949..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkPyCommand.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkPyCommand.h,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef _itkPyCommand_h
-#define _itkPyCommand_h
-
-#include "itkCommand.h"
-
-// The python header defines _POSIX_C_SOURCE without a preceding #undef
-#undef _POSIX_C_SOURCE
-#include <Python.h>
-
-namespace itk
-{
-
-/** \Class PyCommand
- * \brief Command subclass that calls a Python callable object, e.g.
- * a Python function.
- *
- * With this class, arbitrary Python callable objects (e.g. functions)
- * can be associated with an instance to be used in AddObserver calls.
- * This is analogous to itk::TclCommand, but then a tad more flexible. ;)
- *
- * This class was contributed by Charl P. Botha <cpbotha |AT| ieee.org>
- */
-class PyCommand : public Command
-{
-public:
- ///! Standard "Self" typedef.
- typedef PyCommand Self;
-
- ///! Smart pointer typedef support.
- typedef SmartPointer<Self> Pointer;
-
- ///! Run-time type information (and related methods).
- itkTypeMacro(PyCommand,Command);
-
- ///! Method for creation through the object factory.
- itkNewMacro(Self);
-
- /**
- * Assign a Python callable object to be used. You don't have to keep
- * a binding to the callable, PyCommand will also take out a reference
- * to make sure the Callable sticks around.
- */
- void SetCommandCallable(PyObject *obj);
-
- void Execute(Object *, const EventObject&);
- void Execute(const Object *, const EventObject&);
-
-protected:
- PyCommand();
- ~PyCommand();
- void PyExecute();
- PyCommand(const Self&); // Not implemented.
- void operator=(const Self&); // Not implemented.
-
-private:
- PyObject *obj;
-};
-
-
-} // namespace itk
-
-#endif // _itkPyCommand_h
-
diff --git a/Wrapping/CSwig/CommonA/itkStringStream.cxx b/Wrapping/CSwig/CommonA/itkStringStream.cxx
deleted file mode 100644
index dc2d6540c47dcc00fb15fb55697e53ea5468a978..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkStringStream.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkStringStream.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkStringStream.h"
-#include <iostream>
-
-namespace itk
-{
-
-/**
- * Default constructor. Use this to create a re-usable instance.
- */
-StringStream::StringStream()
-{
-}
-
-
-/**
- * Destructor will set the result to the string value if an
- * interpreter was provided to the constructor, and GetString() and
- * Reset() were never called.
- */
-StringStream::~StringStream()
-{
-}
-
-
-/**
- * Get the string that has been written to the stream. This disables
- * further writing until Reset() is called.
- */
-const char* StringStream::GetString()
-{
- m_String = this->str();
- return m_String.c_str();
-}
-
-
-/**
- * Reset the stream to accept new input starting from an empty string.
- */
-void StringStream::Reset()
-{
- this->seekp(0, std::ios::beg);
-}
-
-} // namespace itk
diff --git a/Wrapping/CSwig/CommonA/itkStringStream.h b/Wrapping/CSwig/CommonA/itkStringStream.h
deleted file mode 100644
index 6b2e32f7dcadd3b04d716408f746f6e7e1730ea7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkStringStream.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkStringStream.h,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef _itkTclStringStream_h
-#define _itkTclStringStream_h
-
-// Need to include at least one ITK header.
-#include "itkMacro.h"
-
-
-namespace itk
-{
-
-/** \Class StringStream
- * \brief Provides access to C++ ostreams.
- */
-class StringStream: public itk::OStringStream
-{
-public:
- typedef StringStream Self;
- typedef itk::OStringStream Superclass;
-
- StringStream();
- ~StringStream();
- std::ostream& GetStream() { return *this;}
- const char* GetString();
- void Reset();
-private:
- std::string m_String;
- StringStream(const StringStream&); // Not implemented.
- void operator=(const StringStream&); // Not implemented.
-
-};
-
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/itkTclCommand.cxx b/Wrapping/CSwig/CommonA/itkTclCommand.cxx
deleted file mode 100644
index 4eae279c430b23f0ab4da5624e7da4bb0f5b4ddc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkTclCommand.cxx
+++ /dev/null
@@ -1,97 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkTclCommand.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkTclCommand.h"
-
-namespace itk
-{
-
-TclCommand::TclCommand()
-{
- m_Interpreter = 0;
-}
-
-
-///! Set the interpreter in which the command is to be invoked.
-void TclCommand::SetInterpreter(Tcl_Interp* interp)
-{
- m_Interpreter = interp;
-}
-
-
-///! Get the interpreter in which the command will be invoked.
-Tcl_Interp* TclCommand::GetInterpreter() const
-{
- return m_Interpreter;
-}
-
-
-///! Set the command to invoke in the interpreter.
-void TclCommand::SetCommandString(const char* commandString)
-{
- m_CommandString = commandString;
-}
-
-
-///! Get the command that will be invoked in the interpreter.
-const char* TclCommand::GetCommandString() const
-{
- return m_CommandString.c_str();
-}
-
-
-///! Execute the callback to the Tcl interpreter.
-void TclCommand::Execute(Object*, const EventObject &)
-{
- this->TclExecute();
-}
-
-
-///! Execute the callback to the Tcl interpreter with a const LightObject
-void TclCommand::Execute(const Object*, const EventObject & )
-{
- this->TclExecute();
-}
-
-
-/**
- * Invokes the registered command in the Tcl interpreter. Reports
- * command errors as ITK warnings.
- */
-void TclCommand::TclExecute() const
-{
- // Make sure an interpreter has been assigned.
- if(!m_Interpreter)
- {
- itkWarningMacro("Error in itk/tcl callback:\n" <<
- m_CommandString.c_str() << std::endl <<
- "invoked with no interpreter!");
- return;
- }
-
- // Try to evaluate the command in the interpreter.
- if(Tcl_GlobalEval(m_Interpreter,
- const_cast<char*>(m_CommandString.c_str())) == TCL_ERROR)
- {
- const char* errorInfo = Tcl_GetVar(m_Interpreter, "errorInfo", 0);
- if(!errorInfo) { errorInfo = ""; }
- itkWarningMacro("Error returned from itk/tcl callback:\n" <<
- m_CommandString.c_str() << std::endl << errorInfo <<
- " at line number " << m_Interpreter->errorLine);
- }
-}
-
-} // namespace itk
diff --git a/Wrapping/CSwig/CommonA/itkTclCommand.h b/Wrapping/CSwig/CommonA/itkTclCommand.h
deleted file mode 100644
index d4f50df81b235669877f1619f5be16fa0166a302..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/itkTclCommand.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkTclCommand.h,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef _itkTclCommand_h
-#define _itkTclCommand_h
-
-#include "itkCommand.h"
-
-#include <tcl.h>
-
-namespace itk
-{
-
-/** \Class TclCommand
- * \brief Command subclass that calls back to a Tcl interpreter.
- *
- * TclCommand can be given a string and a Tcl interpreter. When it is
- * invoked, it will invoke the string in the Tcl interpreter as a
- * command. This can be used to create arbitrary Tcl event callbacks
- * in ITK Tcl scripts.
- */
-
-class TclCommand : public Command
-{
-public:
- ///! Standard "Self" typedef.
- typedef TclCommand Self;
-
- ///! Smart pointer typedef support.
- typedef SmartPointer<Self> Pointer;
-
- ///! Run-time type information (and related methods).
- itkTypeMacro(TclCommand,Command);
-
- ///! Method for creation through the object factory.
- itkNewMacro(Self);
-
- void SetInterpreter(Tcl_Interp*);
- Tcl_Interp* GetInterpreter() const;
- void SetCommandString(const char*);
- const char* GetCommandString() const;
- void Execute(Object*, const EventObject & );
- void Execute(const Object*, const EventObject & );
-
-protected:
- TclCommand();
- ~TclCommand() {}
- TclCommand(const Self&); // Not implemented.
- void operator=(const Self&); // Not implemented.
-
- void TclExecute() const;
-
-private:
- ///! The Tcl interpreter in which the command will be invoked.
- Tcl_Interp* m_Interpreter;
-
- ///! The command to invoke in the Tcl interpreter.
- std::string m_CommandString;
-};
-
-
-} // namespace itk
-
-#endif // _itkTclCommand_h
-
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKCommonA.cxx b/Wrapping/CSwig/CommonA/wrap_ITKCommonA.cxx
deleted file mode 100644
index 48fe1ebaf440c38a15d12928dfd1e3c835da523a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKCommonA.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKCommonA.cxx,v $
- Language: C++
- Date: $Date: 2005/05/10 14:37:07 $
- Version: $Revision: 1.3 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(ITKCommonBase),
- ITK_WRAP_GROUP(ITKInterpolators),
- ITK_WRAP_GROUP(ITKRegions),
- ITK_WRAP_GROUP(itkArray),
- ITK_WRAP_GROUP(itkBinaryBallStructuringElement),
- ITK_WRAP_GROUP(itkContinuousIndex),
- ITK_WRAP_GROUP(itkDifferenceImageFilter),
- ITK_WRAP_GROUP(itkDenseFiniteDifferenceImageFilter_2D),
- ITK_WRAP_GROUP(itkDenseFiniteDifferenceImageFilter_3D),
- ITK_WRAP_GROUP(itkEventObjectGroup),
- ITK_WRAP_GROUP(itkFiniteDifferenceFunction),
- ITK_WRAP_GROUP(itkFiniteDifferenceImageFilter_2D),
- ITK_WRAP_GROUP(itkFiniteDifferenceImageFilter_3D),
- ITK_WRAP_GROUP(itkFixedArray),
- ITK_WRAP_GROUP(itkFunctionBase),
- ITK_WRAP_GROUP(itkImage_2D),
- ITK_WRAP_GROUP(itkImage_3D),
- ITK_WRAP_GROUP(itkImageSource),
- ITK_WRAP_GROUP(itkImageConstIterator),
- ITK_WRAP_GROUP(itkImageRegionIterator),
- ITK_WRAP_GROUP(itkImageRegionConstIterator),
- ITK_WRAP_GROUP(itkImageFunction),
- ITK_WRAP_GROUP(itkImageToImageFilter_2D),
- ITK_WRAP_GROUP(itkImageToImageFilter_3D),
- ITK_WRAP_GROUP(itkInPlaceImageFilter_A),
- ITK_WRAP_GROUP(itkInPlaceImageFilter_B),
- ITK_WRAP_GROUP(itkIndex),
- ITK_WRAP_GROUP(itkLevelSet),
- ITK_WRAP_GROUP(itkNeighborhood),
- ITK_WRAP_GROUP(itkPoint),
- ITK_WRAP_GROUP(itkSize),
-#ifdef OTB_TCL_WRAP
- ITK_WRAP_GROUP(ITKUtils),
-#endif
-#ifdef OTB_PYTHON_WRAP
- ITK_WRAP_GROUP(ITKPyUtils),
-#ifdef OTB_PYTHON_NUMERICS
- ITK_WRAP_GROUP(itkPyBuffer),
-#endif
-#endif
- "SwigExtras",
- ITK_WRAP_GROUP(itkVector)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKCommonAJava.cxx b/Wrapping/CSwig/CommonA/wrap_ITKCommonAJava.cxx
deleted file mode 100644
index b7e80184e96a8ec76c7e7217af8e46aa5cbbeac7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKCommonAJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKCommonAJava"
-#include "wrap_ITKCommonA.cxx"
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKCommonAPython.cxx b/Wrapping/CSwig/CommonA/wrap_ITKCommonAPython.cxx
deleted file mode 100644
index 3ff1e9f66f36174aadbc0ccdcf7c999e6758e855..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKCommonAPython.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKCommonAPython"
-#define ITK_PYTHON_WRAP
-#include "wrap_ITKCommonA.cxx"
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKCommonATcl.cxx b/Wrapping/CSwig/CommonA/wrap_ITKCommonATcl.cxx
deleted file mode 100644
index 41624d5bd4bc119e5ace1864e2ac70eaf0ed4721..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKCommonATcl.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKCommonATcl"
-#define ITK_TCL_WRAP
-#include "wrap_ITKCommonA.cxx"
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKCommonBase.cxx b/Wrapping/CSwig/CommonA/wrap_ITKCommonBase.cxx
deleted file mode 100644
index 505e8d0d582375ba8ae5e1f179bdeadb30387606..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKCommonBase.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKCommonBase.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "itkCommand.h"
-#include "itkDataObject.h"
-#include "itkDirectory.h"
-#include "itkLightObject.h"
-#include "itkObject.h"
-#include "itkLightProcessObject.h"
-#include "itkProcessObject.h"
-#include "itkOutputWindow.h"
-#include "itkVersion.h"
-#include "itkTimeStamp.h"
-#include "itkStringStream.h"
-#include "itkDynamicLoader.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKCommonBase);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(Command);
- ITK_WRAP_OBJECT(DataObject);
- ITK_WRAP_OBJECT(Directory);
- ITK_WRAP_OBJECT(DynamicLoader);
- ITK_WRAP_OBJECT(LightObject);
- ITK_WRAP_OBJECT(Object);
- ITK_WRAP_OBJECT(ObjectFactoryBase);
- ITK_WRAP_OBJECT(LightProcessObject);
- ITK_WRAP_OBJECT(ProcessObject);
- ITK_WRAP_OBJECT(OutputWindow);
- ITK_WRAP_OBJECT(Version);
- typedef itk::TimeStamp itkTimeStamp;
- typedef itk::StringStream itkStringStream;
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKInterpolators.cxx b/Wrapping/CSwig/CommonA/wrap_ITKInterpolators.cxx
deleted file mode 100644
index a0b170a809b83f7228d148fd91782f0932fb6ef9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKInterpolators.cxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKInterpolators.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkNearestNeighborInterpolateImageFunction.h"
-#include "itkLinearInterpolateImageFunction.h"
-#include "itkBSplineInterpolateImageFunction.h"
-#include "itkBSplineResampleImageFunction.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKInterpolators);
- namespace wrappers
- {
- // wrap InterpolateImageFunction and two super classes up
- ITK_WRAP_OBJECT2(InterpolateImageFunction, image::F2,
- double,
- itkInterpolateImageFunctionF2D);
- ITK_WRAP_OBJECT2(InterpolateImageFunction, image::F3,
- double,
- itkInterpolateImageFunctionF3D);
- ITK_WRAP_OBJECT2(InterpolateImageFunction, image::US2,
- double,
- itkInterpolateImageFunctionUS2D);
- ITK_WRAP_OBJECT2(InterpolateImageFunction, image::US3,
- double,
- itkInterpolateImageFunctionUS3D);
-
- // wrap LinearInterpolateImageFunction
- ITK_WRAP_OBJECT2(LinearInterpolateImageFunction, image::F2, double,
- itkLinearInterpolateImageFunctionF2D);
- ITK_WRAP_OBJECT2(LinearInterpolateImageFunction, image::F3, double,
- itkLinearInterpolateImageFunctionF3D);
- ITK_WRAP_OBJECT2(LinearInterpolateImageFunction, image::US2, double,
- itkLinearInterpolateImageFunctionUS2D);
- ITK_WRAP_OBJECT2(LinearInterpolateImageFunction, image::US3, double,
- itkLinearInterpolateImageFunctionUS3D);
-
- // wrap NearestNeighborInterpolateImageFunction
- ITK_WRAP_OBJECT2(NearestNeighborInterpolateImageFunction, image::F2,
- double,
- itkNearestNeighborInterpolateImageFunctionF2D);
- ITK_WRAP_OBJECT2(NearestNeighborInterpolateImageFunction, image::F3,
- double,
- itkNearestNeighborInterpolateImageFunctionF3D);
- ITK_WRAP_OBJECT2(NearestNeighborInterpolateImageFunction, image::US2,
- double,
- itkNearestNeighborInterpolateImageFunctionUS2D);
- ITK_WRAP_OBJECT2(NearestNeighborInterpolateImageFunction, image::US3,
- double,
- itkNearestNeighborInterpolateImageFunctionUS3D);
-
- // wrap BSplineInterpolateImageFunction
- ITK_WRAP_OBJECT2(BSplineInterpolateImageFunction, image::F2,
- double,
- itkBSplineInterpolateImageFunctionF2D);
- ITK_WRAP_OBJECT2(BSplineInterpolateImageFunction, image::F3,
- double,
- itkBSplineInterpolateImageFunctionF3D);
- ITK_WRAP_OBJECT2(BSplineInterpolateImageFunction, image::US2,
- double,
- itkBSplineInterpolateImageFunctionUS2D);
- ITK_WRAP_OBJECT2(BSplineInterpolateImageFunction, image::US3,
- double,
- itkBSplineInterpolateImageFunctionUS3D);
-
- ITK_WRAP_OBJECT3(BSplineInterpolateImageFunction, image::F2,
- double,float,
- itkBSplineInterpolateImageFunctionF2DF);
- ITK_WRAP_OBJECT3(BSplineInterpolateImageFunction, image::F3,
- double,float,
- itkBSplineInterpolateImageFunctionF3DF);
- ITK_WRAP_OBJECT3(BSplineInterpolateImageFunction, image::US2,
- double,unsigned short,
- itkBSplineInterpolateImageFunctionUS2DUS);
- ITK_WRAP_OBJECT3(BSplineInterpolateImageFunction, image::US3,
- double,unsigned short,
- itkBSplineInterpolateImageFunctionUS3DUS);
-
-
- // wrap BSplineResampleImageFunction
- ITK_WRAP_OBJECT2(BSplineResampleImageFunction, image::F2,
- double,
- itkBSplineResampleImageFunctionF2D);
- ITK_WRAP_OBJECT2(BSplineResampleImageFunction, image::F3,
- double,
- itkBSplineResampleImageFunctionF3D);
- ITK_WRAP_OBJECT2(BSplineResampleImageFunction, image::US2,
- double,
- itkBSplineResampleImageFunctionUS2D);
- ITK_WRAP_OBJECT2(BSplineResampleImageFunction, image::US3,
- double,
- itkBSplineResampleImageFunctionUS3D);
-
-
-
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKPyUtils.cxx b/Wrapping/CSwig/CommonA/wrap_ITKPyUtils.cxx
deleted file mode 100644
index c78ee61711ff5344d6396622941bfc359f2838ef..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKPyUtils.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKPyUtils.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkPyCommand.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKPyUtils);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(PyCommand);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKRegions.cxx b/Wrapping/CSwig/CommonA/wrap_ITKRegions.cxx
deleted file mode 100644
index 6c56d46637d5c2b0ef3759a5ea061524792ae3fc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKRegions.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKRegions.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "itkRegion.h"
-#include "itkImageRegion.h"
-#include "itkMeshRegion.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKRegions);
- namespace wrappers
- {
- typedef itk::Region itkRegion;
- typedef itk::MeshRegion itkMeshRegion;
- typedef itk::ImageRegion<2>::ImageRegion itkImageRegion2;
- typedef itk::ImageRegion<3>::ImageRegion itkImageRegion3;
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_ITKUtils.cxx b/Wrapping/CSwig/CommonA/wrap_ITKUtils.cxx
deleted file mode 100644
index f784b7e63e20a616f4f1126e7e083722691de0de..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_ITKUtils.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKUtils.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkTclCommand.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKUtils);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(TclCommand);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_SwigExtras.cxx b/Wrapping/CSwig/CommonA/wrap_SwigExtras.cxx
deleted file mode 100644
index d50004e0cd26e2a30aee800feedc8098bee11de0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_SwigExtras.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_SwigExtras.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include <vector>
-#include <string>
-#include <list>
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = "SwigExtras";
- namespace renames
- {
- typedef std::vector<std::string>::vector StringVector;
- typedef std::list<std::string>::list StringList;
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkArray.cxx b/Wrapping/CSwig/CommonA/wrap_itkArray.cxx
deleted file mode 100644
index e3c9c36ddbfb353b4cbef2fb075a7e8d88ea6460..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkArray.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkArray.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkArray.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkArray);
- namespace wrappers
- {
- typedef itk::Array<double >::Array itkArrayD;
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkBinaryBallStructuringElement.cxx b/Wrapping/CSwig/CommonA/wrap_itkBinaryBallStructuringElement.cxx
deleted file mode 100644
index b7ecd6191029ee566dca6b1428ec687755413b8f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkBinaryBallStructuringElement.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkBinaryBallStructuringElement.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkBinaryBallStructuringElement.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigBinaryBallStructuringElement.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkBinaryBallStructuringElement);
- namespace wrappers
- {
- typedef structuringElement::F2 itkBinaryBallStructuringElementF2;
- typedef structuringElement::F3 itkBinaryBallStructuringElementF3;
- typedef structuringElement::UC2 itkBinaryBallStructuringElementUC2;
- typedef structuringElement::UC3 itkBinaryBallStructuringElementUC3;
- typedef structuringElement::US2 itkBinaryBallStructuringElementUS2;
- typedef structuringElement::US3 itkBinaryBallStructuringElementUS3;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkContinuousIndex.cxx b/Wrapping/CSwig/CommonA/wrap_itkContinuousIndex.cxx
deleted file mode 100644
index 8c79e76d478f3c533c59d6021ee0bb74abfaa0c2..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkContinuousIndex.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkContinuousIndex.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkContinuousIndex.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkContinuousIndex);
- namespace wrappers
- {
- typedef itk::ContinuousIndex<double, 2> itkContinuousIndexD2;
- typedef itk::ContinuousIndex<double, 3> itkContinuousIndexD3;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkDenseFiniteDifferenceImageFilter_2D.cxx b/Wrapping/CSwig/CommonA/wrap_itkDenseFiniteDifferenceImageFilter_2D.cxx
deleted file mode 100644
index 239eaf578d1cd9b6175990f42a3cfd6b49547dcf..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkDenseFiniteDifferenceImageFilter_2D.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkDenseFiniteDifferenceImageFilter_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/05/10 14:37:07 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkDenseFiniteDifferenceImageFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group =
- ITK_WRAP_GROUP(itkDenseFiniteDifferenceImageFilter_2D);
- namespace wrappers
- {
- // vector image wrapped Filters
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter,
- image::VF2, image::VF2,
- itkDenseFiniteDifferenceImageFilterVF2VF2);
-
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::F2 , image::F2 , itkDenseFiniteDifferenceImageFilterF2F2 );
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::D2 , image::D2 , itkDenseFiniteDifferenceImageFilterD2D2 );
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::UC2, image::UC2, itkDenseFiniteDifferenceImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::US2, image::US2, itkDenseFiniteDifferenceImageFilterUS2US2);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::UI2, image::UI2, itkDenseFiniteDifferenceImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::SC2, image::SC2, itkDenseFiniteDifferenceImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::SS2, image::SS2, itkDenseFiniteDifferenceImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::SI2, image::SI2, itkDenseFiniteDifferenceImageFilterSI2SI2);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::F2 , image::VF2 ,itkDenseFiniteDifferenceImageFilterF2VF2 );
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::US2, image::VF2, itkDenseFiniteDifferenceImageFilterUS2VF2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkDenseFiniteDifferenceImageFilter_3D.cxx b/Wrapping/CSwig/CommonA/wrap_itkDenseFiniteDifferenceImageFilter_3D.cxx
deleted file mode 100644
index 15fca2eacd4c130dd72fc8c1273180ca2c64b92f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkDenseFiniteDifferenceImageFilter_3D.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkDenseFiniteDifferenceImageFilter_3D.cxx,v $
- Language: C++
- Date: $Date: 2005/05/10 14:37:07 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkDenseFiniteDifferenceImageFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group =
- ITK_WRAP_GROUP(itkDenseFiniteDifferenceImageFilter_3D);
- namespace wrappers
- {
- // vector image wrapped Filters
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter,
- image::VF3, image::VF3,
- itkDenseFiniteDifferenceImageFilterVF3VF3);
-
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::F3 , image::F3 , itkDenseFiniteDifferenceImageFilterF3F3 );
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::D3 , image::D3 , itkDenseFiniteDifferenceImageFilterD3D3 );
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::UC3, image::UC3, itkDenseFiniteDifferenceImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::US3, image::US3, itkDenseFiniteDifferenceImageFilterUS3US3);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::UI3, image::UI3, itkDenseFiniteDifferenceImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::SC3, image::SC3, itkDenseFiniteDifferenceImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::SS3, image::SS3, itkDenseFiniteDifferenceImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::SI3, image::SI3, itkDenseFiniteDifferenceImageFilterSI3SI3);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::F3 , image::VF3 ,itkDenseFiniteDifferenceImageFilterF3VF3);
- ITK_WRAP_OBJECT2(DenseFiniteDifferenceImageFilter, image::US3, image::VF3, itkDenseFiniteDifferenceImageFilterUS3VF3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkDifferenceImageFilter.cxx b/Wrapping/CSwig/CommonA/wrap_itkDifferenceImageFilter.cxx
deleted file mode 100644
index c1fc51d5023b922ec6e44876fe47869abc3355cc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkDifferenceImageFilter.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkDifferenceImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkDifferenceImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkDifferenceImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(DifferenceImageFilter, image::F2, image::F2,
- itkDifferenceImageFilterF2);
- ITK_WRAP_OBJECT2(DifferenceImageFilter, image::F3, image::F3,
- itkDifferenceImageFilterF3);
- ITK_WRAP_OBJECT2(DifferenceImageFilter, image::US2, image::US2,
- itkDifferenceImageFilterUS2);
- ITK_WRAP_OBJECT2(DifferenceImageFilter, image::US3, image::US3,
- itkDifferenceImageFilterUS3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkEventObject.cxx b/Wrapping/CSwig/CommonA/wrap_itkEventObject.cxx
deleted file mode 100644
index 8f0f910e120861123d0231a4f7a17ed9d38299e2..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkEventObject.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkEventObject.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkEventObject.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkEventObjectGroup);
- namespace wrappers
- {
- typedef itk::EventObject itkEventObject;
- typedef itk::NoEvent itkNoEvent;
- typedef itk::AnyEvent itkAnyEvent;
- typedef itk::DeleteEvent itkDeleteEvent;
- typedef itk::StartEvent itkStartEvent;
- typedef itk::EndEvent itkEndEvent;
- typedef itk::ProgressEvent itkProgressEvent;
- typedef itk::ExitEvent itkExitEvent;
- typedef itk::ModifiedEvent itkModifiedEvent;
- typedef itk::IterationEvent itkIterationEvent;
- typedef itk::PickEvent itkPickEvent;
- typedef itk::StartPickEvent itkStartPickEvent;
- typedef itk::EndPickEvent itkEndPickEvent;
- typedef itk::AbortCheckEvent itkAbortCheckEvent;
- typedef itk::UserEvent itkUserEvent;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceFunction.cxx b/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceFunction.cxx
deleted file mode 100644
index e22b4cc0e23d18bbbf7f49cd4471d75e9cb45ae5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceFunction.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkFiniteDifferenceFunction.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkFiniteDifferenceFunction.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkFiniteDifferenceFunction);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(FiniteDifferenceFunction,image::F2, itkFiniteDifferenceFunctionF2);
- ITK_WRAP_OBJECT1(FiniteDifferenceFunction,image::F3, itkFiniteDifferenceFunctionF3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceImageFilter_2D.cxx b/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceImageFilter_2D.cxx
deleted file mode 100644
index 57d1d52a0b19726302af5283648e0475c1ec0484..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceImageFilter_2D.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkFiniteDifferenceImageFilter_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/05/10 14:37:07 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkFiniteDifferenceImageFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkFiniteDifferenceImageFilter_2D);
- namespace wrappers
- {
- //===========2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::F2 , image::F2 , itkFiniteDifferenceImageFilterF2F2 );
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::D2 , image::D2 , itkFiniteDifferenceImageFilterD2D2 );
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::UC2, image::UC2, itkFiniteDifferenceImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::US2, image::US2, itkFiniteDifferenceImageFilterUS2US2);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::UI2, image::UI2, itkFiniteDifferenceImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::SC2, image::SC2, itkFiniteDifferenceImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::SS2, image::SS2, itkFiniteDifferenceImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::SI2, image::SI2, itkFiniteDifferenceImageFilterSI2SI2);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::F2 , image::VF2 ,itkFiniteDifferenceImageFilterF2VF2 );
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::VF2 , image::VF2 ,itkFiniteDifferenceImageFilterVF2VF2 );
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::US2, image::VF2, itkFiniteDifferenceImageFilterUS2VF2);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceImageFilter_3D.cxx b/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceImageFilter_3D.cxx
deleted file mode 100644
index 3a488da8774c69c1bc88051240e0d1ddda1de73e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkFiniteDifferenceImageFilter_3D.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkFiniteDifferenceImageFilter_3D.cxx,v $
- Language: C++
- Date: $Date: 2005/05/10 14:37:07 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkFiniteDifferenceImageFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkFiniteDifferenceImageFilter_3D);
- namespace wrappers
- {
- //===========3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::F3 , image::F3 , itkFiniteDifferenceImageFilterF3F3 );
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::D3 , image::D3 , itkFiniteDifferenceImageFilterD3D3 );
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::UC3, image::UC3, itkFiniteDifferenceImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::US3, image::US3, itkFiniteDifferenceImageFilterUS3US3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::UI3, image::UI3, itkFiniteDifferenceImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::SC3, image::SC3, itkFiniteDifferenceImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::SS3, image::SS3, itkFiniteDifferenceImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::SI3, image::SI3, itkFiniteDifferenceImageFilterSI3SI3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::F3 , image::VF3 ,itkFiniteDifferenceImageFilterF3VF3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::VF3 , image::VF3 ,itkFiniteDifferenceImageFilterVF3VF3);
- ITK_WRAP_OBJECT2(FiniteDifferenceImageFilter, image::US3, image::VF3, itkFiniteDifferenceImageFilterUS3VF3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkFixedArray.cxx b/Wrapping/CSwig/CommonA/wrap_itkFixedArray.cxx
deleted file mode 100644
index d67c3e0d535cde3c6086cb75e7bc7574239ea5d3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkFixedArray.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkFixedArray.cxx,v $
- Language: C++
- Date: $Date: 2005/10/27 20:22:55 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkFixedArray.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkFixedArray);
- namespace wrappers
- {
- typedef itk::FixedArray<double, 2 >::FixedArray itkFixedArrayD2;
- typedef itk::FixedArray<double, 3 >::FixedArray itkFixedArrayD3;
- typedef itk::FixedArray<unsigned int, 2 >::FixedArray itkFixedArrayUI2;
- typedef itk::FixedArray<unsigned int, 3 >::FixedArray itkFixedArrayUI3;
- typedef itk::FixedArray<bool, 2 >::FixedArray itkFixedArrayB2;
- typedef itk::FixedArray<bool, 3 >::FixedArray itkFixedArrayB3;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkFunctionBase.cxx b/Wrapping/CSwig/CommonA/wrap_itkFunctionBase.cxx
deleted file mode 100644
index a1f51fc4b3fdd075e0f2a728ba19b2782e2d71b2..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkFunctionBase.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkFunctionBase.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 14:50:41 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkFunctionBase.h"
-#include "itkArray.h"
-#include "itkPoint.h"
-#include "itkContinuousIndex.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkFunctionBase);
- namespace wrappers
- {
-
- ITK_WRAP_OBJECT2(FunctionBase, image::F2, double, itkFunctionBaseIF2D);
- ITK_WRAP_OBJECT2(FunctionBase, image::F3, double, itkFunctionBaseIF3D);
- ITK_WRAP_OBJECT2(FunctionBase, image::US2, double, itkFunctionBaseIUS2D);
- ITK_WRAP_OBJECT2(FunctionBase, image::US3, double, itkFunctionBaseIUS3D);
- ITK_WRAP_OBJECT2(FunctionBase, double, double, itkFunctionBaseDD);
-
- namespace point
- {
- typedef ::itk::Point< float, 2 > F2;
- typedef ::itk::Point< float, 3 > F3;
- typedef ::itk::Point< double, 2 > D2;
- typedef ::itk::Point< double, 3 > D3;
- }
- // wrap FunctionBase
- ITK_WRAP_OBJECT2(FunctionBase, point::F2, double, itkFunctionBasePF2D);
- ITK_WRAP_OBJECT2(FunctionBase, point::F3, double, itkFunctionBasePF3D);
- ITK_WRAP_OBJECT2(FunctionBase, point::D2, double, itkFunctionBasePD2D);
- ITK_WRAP_OBJECT2(FunctionBase, point::D3, double, itkFunctionBasePD3D);
-
-
- // the following types are needed for the BSplineInterpolationWeightFunction
- namespace continuousIndex
- {
- typedef ::itk::ContinuousIndex< float, 2 > F2;
- typedef ::itk::ContinuousIndex< float, 3 > F3;
- typedef ::itk::ContinuousIndex< double, 2 > D2;
- typedef ::itk::ContinuousIndex< double, 3 > D3;
- }
-
- namespace array
- {
- typedef ::itk::Array< double > D;
- typedef ::itk::Array< float > F;
- }
-
- ITK_WRAP_OBJECT2(FunctionBase, continuousIndex::F2, array::D, itkFunctionBaseCIF2AD);
- ITK_WRAP_OBJECT2(FunctionBase, continuousIndex::F3, array::D, itkFunctionBaseCIPF3AD);
- ITK_WRAP_OBJECT2(FunctionBase, continuousIndex::D2, array::D, itkFunctionBaseCIPD2AD);
- ITK_WRAP_OBJECT2(FunctionBase, continuousIndex::D3, array::D, itkFunctionBaseCIPD3AD);
-
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImageConstIterator.cxx b/Wrapping/CSwig/CommonA/wrap_itkImageConstIterator.cxx
deleted file mode 100644
index feeb5617260a09f85268623e1fd5f3197db0f510..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImageConstIterator.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageConstIterator.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkImageConstIterator.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageConstIterator);
-
-#define ITK_WRAP_ITERATOR(name, arg1, wrapname) typedef itk::name<arg1 > wrapname;
-
- namespace wrappers
- {
- ITK_WRAP_ITERATOR(ImageConstIterator, image::F2 , itkImageConstIteratorF2 );
- ITK_WRAP_ITERATOR(ImageConstIterator, image::D2 , itkImageConstIteratorD2 );
- ITK_WRAP_ITERATOR(ImageConstIterator, image::UC2, itkImageConstIteratorUC2);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::US2, itkImageConstIteratorUS2);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::UI2, itkImageConstIteratorUI2);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::UL2, itkImageConstIteratorUL2);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::SC2, itkImageConstIteratorSC2);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::SS2, itkImageConstIteratorSS2);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::SI2, itkImageConstIteratorSI2);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::VF2 , itkImageConstIteratorVF2 );
- ITK_WRAP_ITERATOR(ImageConstIterator, image::CVF2 , itkImageConstIteratorCVF2 );
-
- ITK_WRAP_ITERATOR(ImageConstIterator, image::F3 , itkImageConstIteratorF3 );
- ITK_WRAP_ITERATOR(ImageConstIterator, image::D3 , itkImageConstIteratorD3 );
- ITK_WRAP_ITERATOR(ImageConstIterator, image::UC3, itkImageConstIteratorUC3);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::US3, itkImageConstIteratorUS3);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::UI3, itkImageConstIteratorUI3);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::UL3, itkImageConstIteratorUL3);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::SC3, itkImageConstIteratorSC3);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::SS3, itkImageConstIteratorSS3);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::SI3, itkImageConstIteratorSI3);
- ITK_WRAP_ITERATOR(ImageConstIterator, image::VF3 , itkImageConstIteratorVF3 );
- ITK_WRAP_ITERATOR(ImageConstIterator, image::CVF3 , itkImageConstIteratorCVF3 );
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImageFunction.cxx b/Wrapping/CSwig/CommonA/wrap_itkImageFunction.cxx
deleted file mode 100644
index 737b40a08304c3be28c21c55edab96c3abc3da13..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImageFunction.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFunction.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkImageFunction.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageFunction);
- namespace wrappers
- {
- // wrap ImageFunction
- ITK_WRAP_OBJECT3(ImageFunction, image::F2, double, float, itkImageFunctionF2DF);
- ITK_WRAP_OBJECT3(ImageFunction, image::F3, double, float, itkImageFunctionF3DF);
- ITK_WRAP_OBJECT3(ImageFunction, image::US2, double, float, itkImageFunctionUS2DF);
- ITK_WRAP_OBJECT3(ImageFunction, image::US3, double, float, itkImageFunctionUS3DF);
-
- ITK_WRAP_OBJECT3(ImageFunction, image::F2, double, double, itkImageFunctionF2DD);
- ITK_WRAP_OBJECT3(ImageFunction, image::F3, double, double, itkImageFunctionF3DD);
- ITK_WRAP_OBJECT3(ImageFunction, image::US2, double, double, itkImageFunctionUS2DD);
- ITK_WRAP_OBJECT3(ImageFunction, image::US3, double, double, itkImageFunctionUS3DD);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImageRegionConstIterator.cxx b/Wrapping/CSwig/CommonA/wrap_itkImageRegionConstIterator.cxx
deleted file mode 100644
index 5fe0835aa18a45fa1d7032b870712199403d192c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImageRegionConstIterator.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageRegionConstIterator.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkImageRegionConstIterator.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageRegionConstIterator);
-
-#define ITK_WRAP_ITERATOR(name, arg1, wrapname) typedef itk::name<arg1 > wrapname;
-
- namespace wrappers
- {
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::F2 , itkImageRegionConstIteratorF2 );
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::D2 , itkImageRegionConstIteratorD2 );
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::UC2, itkImageRegionConstIteratorUC2);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::US2, itkImageRegionConstIteratorUS2);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::UI2, itkImageRegionConstIteratorUI2);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::UL2, itkImageRegionConstIteratorUL2);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::SC2, itkImageRegionConstIteratorSC2);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::SS2, itkImageRegionConstIteratorSS2);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::SI2, itkImageRegionConstIteratorSI2);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::VF2 , itkImageRegionConstIteratorVF2 );
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::CVF2 , itkImageRegionConstIteratorCVF2 );
-
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::F3 , itkImageRegionConstIteratorF3 );
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::D3 , itkImageRegionConstIteratorD3 );
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::UC3, itkImageRegionConstIteratorUC3);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::US3, itkImageRegionConstIteratorUS3);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::UI3, itkImageRegionConstIteratorUI3);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::UL3, itkImageRegionConstIteratorUL3);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::SC3, itkImageRegionConstIteratorSC3);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::SS3, itkImageRegionConstIteratorSS3);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::SI3, itkImageRegionConstIteratorSI3);
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::VF3 , itkImageRegionConstIteratorVF3 );
- ITK_WRAP_ITERATOR(ImageRegionConstIterator, image::CVF3 , itkImageRegionConstIteratorCVF3 );
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImageRegionIterator.cxx b/Wrapping/CSwig/CommonA/wrap_itkImageRegionIterator.cxx
deleted file mode 100644
index 4430e8120201252b85298bdeb6e1b127f384c4a6..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImageRegionIterator.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageRegionIterator.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkImageRegionIterator.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageRegionIterator);
-
-#define ITK_WRAP_ITERATOR(name, arg1, wrapname) typedef itk::name<arg1 > wrapname;
-
- namespace wrappers
- {
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::F2 , itkImageRegionIteratorF2 );
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::D2 , itkImageRegionIteratorD2 );
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::UC2, itkImageRegionIteratorUC2);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::US2, itkImageRegionIteratorUS2);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::UI2, itkImageRegionIteratorUI2);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::UL2, itkImageRegionIteratorUL2);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::SC2, itkImageRegionIteratorSC2);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::SS2, itkImageRegionIteratorSS2);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::SI2, itkImageRegionIteratorSI2);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::VF2 , itkImageRegionIteratorVF2 );
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::CVF2 , itkImageRegionIteratorCVF2 );
-
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::F3 , itkImageRegionIteratorF3 );
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::D3 , itkImageRegionIteratorD3 );
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::UC3, itkImageRegionIteratorUC3);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::US3, itkImageRegionIteratorUS3);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::UI3, itkImageRegionIteratorUI3);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::UL3, itkImageRegionIteratorUL3);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::SC3, itkImageRegionIteratorSC3);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::SS3, itkImageRegionIteratorSS3);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::SI3, itkImageRegionIteratorSI3);
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::VF3 , itkImageRegionIteratorVF3 );
- ITK_WRAP_ITERATOR(ImageRegionIterator, image::CVF3 , itkImageRegionIteratorCVF3 );
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImageSource.cxx b/Wrapping/CSwig/CommonA/wrap_itkImageSource.cxx
deleted file mode 100644
index 066477b3dd3516e8e08082470f544307fc7083ea..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImageSource.cxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageSource.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "itkImageToImageFilter.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageSource);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageSource, image::F2 , itkImageSourceF2 );
- ITK_WRAP_OBJECT1(ImageSource, image::D2 , itkImageSourceD2 );
- ITK_WRAP_OBJECT1(ImageSource, image::UC2, itkImageSourceUC2);
- ITK_WRAP_OBJECT1(ImageSource, image::US2, itkImageSourceUS2);
- ITK_WRAP_OBJECT1(ImageSource, image::UI2, itkImageSourceUI2);
- ITK_WRAP_OBJECT1(ImageSource, image::UL2, itkImageSourceUL2);
- ITK_WRAP_OBJECT1(ImageSource, image::SC2, itkImageSourceSC2);
- ITK_WRAP_OBJECT1(ImageSource, image::SS2, itkImageSourceSS2);
- ITK_WRAP_OBJECT1(ImageSource, image::SI2, itkImageSourceSI2);
- ITK_WRAP_OBJECT1(ImageSource, image::VF2 , itkImageSourceVF2 );
- ITK_WRAP_OBJECT1(ImageSource, image::CVF2 , itkImageSourceCVF2 );
- ITK_WRAP_OBJECT1(ImageSource, image::CVD2 , itkImageSourceCVD2 );
-
- ITK_WRAP_OBJECT1(ImageSource, image::F3 , itkImageSourceF3 );
- ITK_WRAP_OBJECT1(ImageSource, image::D3 , itkImageSourceD3 );
- ITK_WRAP_OBJECT1(ImageSource, image::UC3, itkImageSourceUC3);
- ITK_WRAP_OBJECT1(ImageSource, image::US3, itkImageSourceUS3);
- ITK_WRAP_OBJECT1(ImageSource, image::UI3, itkImageSourceUI3);
- ITK_WRAP_OBJECT1(ImageSource, image::UL3, itkImageSourceUL3);
- ITK_WRAP_OBJECT1(ImageSource, image::SC3, itkImageSourceSC3);
- ITK_WRAP_OBJECT1(ImageSource, image::SS3, itkImageSourceSS3);
- ITK_WRAP_OBJECT1(ImageSource, image::SI3, itkImageSourceSI3);
- ITK_WRAP_OBJECT1(ImageSource, image::VF3 , itkImageSourceVF3 );
- ITK_WRAP_OBJECT1(ImageSource, image::CVF3 , itkImageSourceCVF3 );
- ITK_WRAP_OBJECT1(ImageSource, image::CVD3 , itkImageSourceCVD3 );
- ITK_WRAP_OBJECT1(ImageSource, image::V2F3 , itkImageSourceV2F3 );
-
- ITK_WRAP_OBJECT1(ImageSource, image::VIF2 , itkImageSourceVIF2 );
- ITK_WRAP_OBJECT1(ImageSource, image::VID2 , itkImageSourceVID2 );
- ITK_WRAP_OBJECT1(ImageSource, image::VIUC2, itkImageSourceVIUC2);
- ITK_WRAP_OBJECT1(ImageSource, image::VIUS2, itkImageSourceVIUS2);
- ITK_WRAP_OBJECT1(ImageSource, image::VIUI2, itkImageSourceVIUI2);
- ITK_WRAP_OBJECT1(ImageSource, image::VIUL2, itkImageSourceVIUL2);
- ITK_WRAP_OBJECT1(ImageSource, image::VISC2, itkImageSourceVISC2);
- ITK_WRAP_OBJECT1(ImageSource, image::VISS2, itkImageSourceVISS2);
- ITK_WRAP_OBJECT1(ImageSource, image::VISI2, itkImageSourceVISI2);
-
-
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImageToImageFilter_2D.cxx b/Wrapping/CSwig/CommonA/wrap_itkImageToImageFilter_2D.cxx
deleted file mode 100644
index e9ecd9f5cab330101f0e1f7abc2e608fa45d8eb3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImageToImageFilter_2D.cxx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageToImageFilter_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageToImageFilter.h"
-#include "otbImage.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageToImageFilter_2D);
- namespace wrappers
- {
- // to self
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::F2, itkImageToImageFilterF2F2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D2, image::D2, itkImageToImageFilterD2D2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC2, image::UC2, itkImageToImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::US2, itkImageToImageFilterUS2US2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UI2, image::UI2, itkImageToImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SC2, image::SC2, itkImageToImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SS2, image::SS2, itkImageToImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SI2, image::SI2, itkImageToImageFilterSI2SI2);
-
- // 3D --> 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::F2, itkImageToImageFilterF3F2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D3, image::D2, itkImageToImageFilterD3D2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC3, image::UC2, itkImageToImageFilterUC3UC2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::US2, itkImageToImageFilterUS3US2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UI3, image::UI2, itkImageToImageFilterUI3UI2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SC3, image::SC2, itkImageToImageFilterSC3SC2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SS3, image::SS2, itkImageToImageFilterSS3SS2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SI3, image::SI2, itkImageToImageFilterSI3SI2);
-
- //Double to/from float 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::D2, itkImageToImageFilterF2D2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D2, image::F2, itkImageToImageFilterD2F2);
-
- //Unsigned char to/from float 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::UC2, itkImageToImageFilterF2UC2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC2, image::F2, itkImageToImageFilterUC2F2);
- //Unsigned short to/from float 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::US2, itkImageToImageFilterF2US2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::F2, itkImageToImageFilterUS2F2);
- //Unsigned int to/from float 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::UI2, itkImageToImageFilterF2UI2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UI2, image::F2, itkImageToImageFilterUI2F2);
-
- //Signed char to/from float 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::SC2, itkImageToImageFilterF2SC2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SC2, image::F2, itkImageToImageFilterSC2F2);
- //Signed short to/from float 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::SS2, itkImageToImageFilterF2SS2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SS2, image::F2, itkImageToImageFilterSS2F2);
- //Signed int to/from float 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::SI2, itkImageToImageFilterF2SI2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SI2, image::F2, itkImageToImageFilterSI2F2);
- //Unsigned char to/from unsigned short 2D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::UC2, itkImageToImageFilterUS2UC2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC2, image::US2, itkImageToImageFilterUC2US2);
-
- //Unsigned short to CovariantVector
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::CVD2, itkImageToImageFilterUS2CVD2);
-
- // float to unsigned long
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::UL2, itkImageToImageFilterF2UL2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D2, image::UL2, itkImageToImageFilterD2UL2);
-
-
- // Image to Image of vectors
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2 , image::VF2 ,itkImageToImageFilterF2VF2 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::VF2, itkImageToImageFilterUS2VF2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2 , image::CVF2 ,itkImageToImageFilterF2CVF2 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2 , image::CVD2 ,itkImageToImageFilterF2CVD2 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::CVF2, itkImageToImageFilterUS2CVF2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::V2F2, image::V2F2, itkImageToImageFilterV2F2V2F2);
-
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2 , image::VF3 ,itkImageToImageFilterF2VF3 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::VF3, itkImageToImageFilterUS2VF3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2 , image::CVF3 ,itkImageToImageFilterF2CVF3 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::CVF3, itkImageToImageFilterUS2CVF3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::V2F2, image::V2F3, itkImageToImageFilterV2F2V2F3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImageToImageFilter_3D.cxx b/Wrapping/CSwig/CommonA/wrap_itkImageToImageFilter_3D.cxx
deleted file mode 100644
index b78bb909a0f303c7a0e48a585b3d1755f44c3d8e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImageToImageFilter_3D.cxx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageToImageFilter_3D.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageToImageFilter.h"
-#include "otbImage.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageToImageFilter_3D);
- namespace wrappers
- {
- // to self
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::F3, itkImageToImageFilterF3F3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D3, image::D3, itkImageToImageFilterD3D3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC3, image::UC3, itkImageToImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::US3, itkImageToImageFilterUS3US3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UI3, image::UI3, itkImageToImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SC3, image::SC3, itkImageToImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SS3, image::SS3, itkImageToImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SI3, image::SI3, itkImageToImageFilterSI3SI3);
-
- // 2D-->3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F2, image::F3, itkImageToImageFilterF2F3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D2, image::D3, itkImageToImageFilterD2D3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC2, image::UC3, itkImageToImageFilterUC2UC3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US2, image::US3, itkImageToImageFilterUS2US3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UI2, image::UI3, itkImageToImageFilterUI2UI3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SC2, image::SC3, itkImageToImageFilterSC2SC3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SS2, image::SS3, itkImageToImageFilterSS2SS3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SI2, image::SI3, itkImageToImageFilterSI2SI3);
-
- //Double to/from float 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::D3, itkImageToImageFilterF3D3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D3, image::F3, itkImageToImageFilterD3F3);
-
- //Unsigned char to/from float 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::UC3, itkImageToImageFilterF3UC3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC3, image::F3, itkImageToImageFilterUC3F3);
- //Unsigned short to/from float 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::US3, itkImageToImageFilterF3US3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::F3, itkImageToImageFilterUS3F3);
- //Unsigned int to/from float 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::UI3, itkImageToImageFilterF3UI3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UI3, image::F3, itkImageToImageFilterUI3F3);
-
- //Signed char to/from float 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::SC3, itkImageToImageFilterF3SC3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SC3, image::F3, itkImageToImageFilterSC3F3);
- //Signed short to/from float 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::SS3, itkImageToImageFilterF3SS3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SS3, image::F3, itkImageToImageFilterSS3F3);
- //Signed int to/from float 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::SI3, itkImageToImageFilterF3SI3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::SI3, image::F3, itkImageToImageFilterSI3F3);
- //Unsigned char to/from unsigned short 3D
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::UC3, itkImageToImageFilterUS3UC3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::UC3, image::US3, itkImageToImageFilterUC3US3);
-
- // float to unsigned long
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3, image::UL3, itkImageToImageFilterF3UL3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::D3, image::UL3, itkImageToImageFilterD3UL3);
-
- //Unsigned short to CovariantVector
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::CVD3, itkImageToImageFilterUS3CVD3);
-
- // Image to Image of vectors
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3 , image::VF3 ,itkImageToImageFilterF3VF3 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::VF3 , image::VF3 ,itkImageToImageFilterVF3VF3 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::VF3, itkImageToImageFilterUS3VF3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3 , image::CVF3 ,itkImageToImageFilterF3CVF3 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::CVF3, itkImageToImageFilterUS3CVF3);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::V2F3, image::V2F3, itkImageToImageFilterV2F3V2F3);
-
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3 , image::VF2 ,itkImageToImageFilterF3VF2 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::VF2, itkImageToImageFilterUS3VF2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3 , image::CVF2 ,itkImageToImageFilterF3CVF2 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::US3, image::CVF2, itkImageToImageFilterUS3CVF2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::V2F3, image::V2F2, itkImageToImageFilterV2F3V2F2);
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3 , image::CVF3 ,itkImageToImageFilterF3CVF3 );
- ITK_WRAP_OBJECT2(ImageToImageFilter, image::F3 , image::CVD3 ,itkImageToImageFilterF3CVD3 );
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImage_2D.cxx b/Wrapping/CSwig/CommonA/wrap_itkImage_2D.cxx
deleted file mode 100644
index 1e2bd2cf50fea16b327d10d97f5274889d1ea6a4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImage_2D.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImage_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImage.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImage_2D);
- namespace wrappers
- {
-
- ITK_WRAP_OBJECT1(ImageBase, 2, itkImageBase2);
- ITK_WRAP_OBJECT2(Image, float, 2, itkImageF2);
- ITK_WRAP_OBJECT2(Image, double, 2, itkImageD2);
- ITK_WRAP_OBJECT2(Image, unsigned char, 2, itkImageUC2);
- ITK_WRAP_OBJECT2(Image, unsigned short, 2, itkImageUS2);
- ITK_WRAP_OBJECT2(Image, unsigned int, 2, itkImageUI2);
- ITK_WRAP_OBJECT2(Image, unsigned long, 2, itkImageUL2);
- ITK_WRAP_OBJECT2(Image, signed char, 2, itkImageSC2);
- ITK_WRAP_OBJECT2(Image, signed short, 2, itkImageSS2);
- ITK_WRAP_OBJECT2(Image, signed int, 2, itkImageSI2);
-
- ITK_WRAP_OBJECT2(Image, itkvector::F2, 2, itkImageVF2);
- ITK_WRAP_OBJECT2(Image, itkvector::D2, 2, itkImageVD2);
- ITK_WRAP_OBJECT2(Image, covariantvector::F2, 2, itkImageCVF2);
- ITK_WRAP_OBJECT2(Image, covariantvector::D2, 2, itkImageCVD2);
-
-
-// typedef image::F2::PixelContainer::Self itkImageF_PixelContainer;
-// typedef image::D2::PixelContainer::Self itkImageD_PixelContainer;
-// typedef image::UC2::PixelContainer::Self itkImageUC_PixelContainer;
-// typedef image::US2::PixelContainer::Self itkImageUS_PixelContainer;
-// typedef image::UI2::PixelContainer::Self itkImageUI_PixelContainer;
-// typedef image::SC2::PixelContainer::Self itkImageSC_PixelContainer;
-// typedef image::SS2::PixelContainer::Self itkImageSS_PixelContainer;
-// typedef image::SI2::PixelContainer::Self itkImageSI_PixelContainer;
-
-// typedef itkImageF_PixelContainer::Pointer::SmartPointer itkImageF_PixelContainer_Pointer;
-// typedef itkImageD_PixelContainer::Pointer::SmartPointer itkImageD_PixelContainer_Pointer;
-// typedef itkImageUC_PixelContainer::Pointer::SmartPointer itkImageUC_PixelContainer_Pointer;
-// typedef itkImageUS_PixelContainer::Pointer::SmartPointer itkImageUS_PixelContainer_Pointer;
-// typedef itkImageUI_PixelContainer::Pointer::SmartPointer itkImageUI_PixelContainer_Pointer;
-// typedef itkImageSC_PixelContainer::Pointer::SmartPointer itkImageSC_PixelContainer_Pointer;
-// typedef itkImageSS_PixelContainer::Pointer::SmartPointer itkImageSS_PixelContainer_Pointer;
-// typedef itkImageSI_PixelContainer::Pointer::SmartPointer itkImageSI_PixelContainer_Pointer;
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkImage_3D.cxx b/Wrapping/CSwig/CommonA/wrap_itkImage_3D.cxx
deleted file mode 100644
index e85ef5ea4d013dbb4cafbbe5dc974f07b07b48c7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkImage_3D.cxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImage_3D.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImage.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImage_3D);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageBase, 3, itkImageBase3);
- ITK_WRAP_OBJECT2(Image, float, 3, itkImageF3);
- ITK_WRAP_OBJECT2(Image, double, 3, itkImageD3);
- ITK_WRAP_OBJECT2(Image, unsigned char, 3, itkImageUC3);
- ITK_WRAP_OBJECT2(Image, unsigned short, 3, itkImageUS3);
- ITK_WRAP_OBJECT2(Image, unsigned int, 3, itkImageUI3);
- ITK_WRAP_OBJECT2(Image, unsigned long, 3, itkImageUL3);
- ITK_WRAP_OBJECT2(Image, signed char, 3, itkImageSC3);
- ITK_WRAP_OBJECT2(Image, signed short, 3, itkImageSS3);
- ITK_WRAP_OBJECT2(Image, signed int, 3, itkImageSI3);
-
- ITK_WRAP_OBJECT2(Image, itkvector::F3, 3, itkImageVF3);
- ITK_WRAP_OBJECT2(Image, itkvector::D3, 3, itkImageVD3);
- ITK_WRAP_OBJECT2(Image, covariantvector::F3, 3, itkImageCVF3);
- ITK_WRAP_OBJECT2(Image, covariantvector::D3, 3, itkImageCVD3);
-
-
-// typedef image::F2::PixelContainer::Self itkImageF_PixelContainer;
-// typedef image::D2::PixelContainer::Self itkImageD_PixelContainer;
-// typedef image::UC2::PixelContainer::Self itkImageUC_PixelContainer;
-// typedef image::US2::PixelContainer::Self itkImageUS_PixelContainer;
-// typedef image::UI2::PixelContainer::Self itkImageUI_PixelContainer;
-// typedef image::SC2::PixelContainer::Self itkImageSC_PixelContainer;
-// typedef image::SS2::PixelContainer::Self itkImageSS_PixelContainer;
-// typedef image::SI2::PixelContainer::Self itkImageSI_PixelContainer;
-
-// typedef itkImageF_PixelContainer::Pointer::SmartPointer itkImageF_PixelContainer_Pointer;
-// typedef itkImageD_PixelContainer::Pointer::SmartPointer itkImageD_PixelContainer_Pointer;
-// typedef itkImageUC_PixelContainer::Pointer::SmartPointer itkImageUC_PixelContainer_Pointer;
-// typedef itkImageUS_PixelContainer::Pointer::SmartPointer itkImageUS_PixelContainer_Pointer;
-// typedef itkImageUI_PixelContainer::Pointer::SmartPointer itkImageUI_PixelContainer_Pointer;
-// typedef itkImageSC_PixelContainer::Pointer::SmartPointer itkImageSC_PixelContainer_Pointer;
-// typedef itkImageSS_PixelContainer::Pointer::SmartPointer itkImageSS_PixelContainer_Pointer;
-// typedef itkImageSI_PixelContainer::Pointer::SmartPointer itkImageSI_PixelContainer_Pointer;
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkInPlaceImageFilter_A.cxx b/Wrapping/CSwig/CommonA/wrap_itkInPlaceImageFilter_A.cxx
deleted file mode 100644
index 7e64bb749ed34b6c71c96d69bacf01d0074b16ea..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkInPlaceImageFilter_A.cxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkInPlaceImageFilter_A.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:15 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkInPlaceImageFilter.h"
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkInPlaceImageFilter_A);
- namespace wrappers
- {
- //===========Same type 2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2 , image::F2 , itkInPlaceImageFilterF2F2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::D2 , image::D2 , itkInPlaceImageFilterD2D2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC2, image::UC2, itkInPlaceImageFilterUC2UC2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US2, image::US2, itkInPlaceImageFilterUS2US2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UI2, image::UI2, itkInPlaceImageFilterUI2UI2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UI2, image::F2, itkInPlaceImageFilterUI2F2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SC2, image::SC2, itkInPlaceImageFilterSC2SC2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SS2, image::SS2, itkInPlaceImageFilterSS2SS2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SI2, image::SI2, itkInPlaceImageFilterSI2SI2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2 , image::VF2, itkInPlaceImageFilterF2VF2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::VF2 , image::VF2, itkInPlaceImageFilterVF2VF2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US2, image::VF2, itInPlaceeImageFilterUS2VF2);
-
- //===========Same type 3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3 , image::F3 , itkInPlaceImageFilterF3F3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::D3 , image::D3 , itkInPlaceImageFilterD3D3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC3, image::UC3, itkInPlaceImageFilterUC3UC3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US3, image::US3, itkInPlaceImageFilterUS3US3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UI3, image::UI3, itkInPlaceImageFilterUI3UI3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UI3, image::F3, itkInPlaceImageFilterUI3F3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SC3, image::SC3, itkInPlaceImageFilterSC3SC3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SS3, image::SS3, itkInPlaceImageFilterSS3SS3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SI3, image::SI3, itkInPlaceImageFilterSI3SI3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3 , image::VF3, itkInPlaceImageFilterF3VF3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::VF3 , image::VF3, itkInPlaceImageFilterVF3VF3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US3, image::VF3, itInPlaceeImageFilterUS3VF3);
-
- //===========Same type 2D->3D Wrapped Filters==============
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2 , image::F3 , itkInPlaceImageFilterF2F3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::D2 , image::D3 , itkInPlaceImageFilterD2D3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC2, image::UC3, itkInPlaceImageFilterUC2UC3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US2, image::US3, itkInPlaceImageFilterUS2US3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UI2, image::UI3, itkInPlaceImageFilterUI2UI3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SC2, image::SC3, itkInPlaceImageFilterSC2SC3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SS2, image::SS3, itkInPlaceImageFilterSS2SS3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SI2, image::SI3, itkInPlaceImageFilterSI2SI3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2 , image::VF3, itkInPlaceImageFilterF2VF3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US2, image::VF3, itInPlaceeImageFilterUS2VF3);
-
- //===========Same type 3D->2D Wrapped Filters==============
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3 , image::F2 , itkInPlaceImageFilterF3F2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::D3 , image::D2 , itkInPlaceImageFilterD3D2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC3, image::UC2, itkInPlaceImageFilterUC3UC2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US3, image::US2, itkInPlaceImageFilterUS3US2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UI3, image::UI2, itkInPlaceImageFilterUI3UI2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SC3, image::SC2, itkInPlaceImageFilterSC3SC2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SS3, image::SS2, itkInPlaceImageFilterSS3SS2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SI3, image::SI2, itkInPlaceImageFilterSI3SI2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3 , image::VF2, itkInPlaceImageFilterF3VF2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US3, image::VF2, itInPlaceeImageFilterUS3VF2);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkInPlaceImageFilter_B.cxx b/Wrapping/CSwig/CommonA/wrap_itkInPlaceImageFilter_B.cxx
deleted file mode 100644
index ae5e40ae08b8d37ab7d62eaf024d19533864dd52..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkInPlaceImageFilter_B.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkInPlaceImageFilter_B.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 14:53:33 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkInPlaceImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkInPlaceImageFilter_B);
- namespace wrappers
- {
- //===== Mixed types InPlaceImageFilters 2D ImageFilters
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2, image::UC2, itkInPlaceImageFilterF2UC2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2, image::US2, itkInPlaceImageFilterF2US2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2, image::UI2, itkInPlaceImageFilterF2UI2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2, image::SC2, itkInPlaceImageFilterF2SC2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2, image::SI2, itkInPlaceImageFilterF2SI2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2, image::SS2, itkInPlaceImageFilterF2SS2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F2 , image::D2 , itkInPlaceImageFilterF2D2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::D2 , image::F2 , itkInPlaceImageFilterD2F2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US2, image::F2, itkInPlaceImageFilterUS2F2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US2, image::UC2, itkInPlaceImageFilterUS2UC2);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC2, image::F2, itkInPlaceImageFilterUC2F2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC2, image::US2, itkInPlaceImageFilterUC2US2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SC2, image::F2, itkInPlaceImageFilterSC2F2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SS2, image::F2, itkInPlaceImageFilterSS2F2 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SI2, image::F2, itkInPlaceImageFilterSI2F2 );
- //===== Mixed types InPlaceImageFilters 3D ImageFilters
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3, image::UC3, itkInPlaceImageFilterF3UC3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3, image::US3, itkInPlaceImageFilterF3US3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3, image::UI3, itkInPlaceImageFilterF3UI3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3, image::SC3, itkInPlaceImageFilterF3SC3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3, image::SI3, itkInPlaceImageFilterF3SI3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3, image::SS3, itkInPlaceImageFilterF3SS3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::F3 , image::D3 , itkInPlaceImageFilterF3D3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::D3 , image::F3 , itkInPlaceImageFilterD3F3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US3, image::F3, itkInPlaceImageFilterUS3F3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::US3, image::UC3, itkInPlaceImageFilterUS3UC3);
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC3, image::F3, itkInPlaceImageFilterUC3F3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::UC3, image::US3, itkInPlaceImageFilterUC3US3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SC3, image::F3, itkInPlaceImageFilterSC3F3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SS3, image::F3, itkInPlaceImageFilterSS3F3 );
- ITK_WRAP_OBJECT2(InPlaceImageFilter, image::SI3, image::F3, itkInPlaceImageFilterSI3F3 );
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkIndex.cxx b/Wrapping/CSwig/CommonA/wrap_itkIndex.cxx
deleted file mode 100644
index d928e5f7a90a70c99b08d64ce1692812be306e2f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkIndex.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkIndex.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkIndex.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkIndex);
- namespace wrappers
- {
- typedef itk::Index<2 >::Index itkIndex2;
- typedef itk::Index<3 >::Index itkIndex3;
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkLevelSet.cxx b/Wrapping/CSwig/CommonA/wrap_itkLevelSet.cxx
deleted file mode 100644
index 13738ead6ef207bfb09aa095f9801b46b8ddb909..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkLevelSet.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkLevelSet.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkLevelSet.h"
-#include "itkVectorContainer.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _LSN_ {
- typedef itk::LevelSetNode<float , 2 >::LevelSetNode itkLevelSetNodeF2 ;
- typedef itk::LevelSetNode<double , 2 >::LevelSetNode itkLevelSetNodeD2 ;
- typedef itk::LevelSetNode<unsigned char , 2 >::LevelSetNode itkLevelSetNodeUC2;
- typedef itk::LevelSetNode<unsigned short, 2 >::LevelSetNode itkLevelSetNodeUS2;
- typedef itk::LevelSetNode<unsigned int , 2 >::LevelSetNode itkLevelSetNodeUI2;
- typedef itk::LevelSetNode<signed char , 2 >::LevelSetNode itkLevelSetNodeSC2;
- typedef itk::LevelSetNode<signed short , 2 >::LevelSetNode itkLevelSetNodeSS2;
- typedef itk::LevelSetNode<signed int , 2 >::LevelSetNode itkLevelSetNodeSI2;
- typedef itk::LevelSetNode<float , 3 >::LevelSetNode itkLevelSetNodeF3 ;
- typedef itk::LevelSetNode<double , 3 >::LevelSetNode itkLevelSetNodeD3 ;
- typedef itk::LevelSetNode<unsigned char , 3 >::LevelSetNode itkLevelSetNodeUC3;
- typedef itk::LevelSetNode<unsigned short, 3 >::LevelSetNode itkLevelSetNodeUS3;
- typedef itk::LevelSetNode<unsigned int , 3 >::LevelSetNode itkLevelSetNodeUI3;
- typedef itk::LevelSetNode<signed char , 3 >::LevelSetNode itkLevelSetNodeSC3;
- typedef itk::LevelSetNode<signed short , 3 >::LevelSetNode itkLevelSetNodeSS3;
- typedef itk::LevelSetNode<signed int , 3 >::LevelSetNode itkLevelSetNodeSI3;
-}
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkLevelSet);
- namespace wrappers
- {
-
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeF2, itkNodeContainerF2);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeD2, itkNodeContainerD2);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeUC2, itkNodeContainerUC2);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeUS2, itkNodeContainerUS2);
-
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeUI2, itkNodeContainerUI2);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeSC2, itkNodeContainerSC2);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeSS2, itkNodeContainerSS2);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeSI2, itkNodeContainerSI2);
-
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeF3, itkNodeContainerF3);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeD3, itkNodeContainerD3);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeUC3, itkNodeContainerUC3);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeUS3, itkNodeContainerUS3);
-
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeUI3, itkNodeContainerUI3);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeSC3, itkNodeContainerSC3);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeSS3, itkNodeContainerSS3);
- ITK_WRAP_OBJECT2(VectorContainer, unsigned int, _LSN_::itkLevelSetNodeSI3, itkNodeContainerSI3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkNeighborhood.cxx b/Wrapping/CSwig/CommonA/wrap_itkNeighborhood.cxx
deleted file mode 100644
index d5232c8423a5d5318ab6159724642af01d5fe56f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkNeighborhood.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkNeighborhood.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkNeighborhood.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkNeighborhood);
- namespace wrappers
- {
- typedef itk::Neighborhood<float, 2 >::Self itkNeighborhoodF2;
- typedef itk::Neighborhood<float, 3 >::Self itkNeighborhoodF3;
- typedef itk::Neighborhood<unsigned char, 2 >::Self itkNeighborhoodUC2;
- typedef itk::Neighborhood<unsigned char, 3 >::Self itkNeighborhoodUC3;
- typedef itk::Neighborhood<unsigned short, 2 >::Self itkNeighborhoodUS2;
- typedef itk::Neighborhood<unsigned short, 3 >::Self itkNeighborhoodUS3;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkPoint.cxx b/Wrapping/CSwig/CommonA/wrap_itkPoint.cxx
deleted file mode 100644
index f4677c1f7016004cd902ff2da2b1943dbcff7b1d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkPoint.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkPoint.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkPoint.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkPoint);
- namespace wrappers
- {
- typedef itk::Point<double, 2 >::Point itkPointD2;
- typedef itk::Point<double, 3 >::Point itkPointD3;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkPyBuffer.cxx b/Wrapping/CSwig/CommonA/wrap_itkPyBuffer.cxx
deleted file mode 100644
index acdb30078538c3d408b088e978750c42af65a4bc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkPyBuffer.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkPyBuffer.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkPyBuffer.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkPyBuffer);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(PyBuffer, image::F2 , itkPyBufferF2 );
- ITK_WRAP_OBJECT1(PyBuffer, image::US2, itkPyBufferUS2 );
- ITK_WRAP_OBJECT1(PyBuffer, image::UC2, itkPyBufferUC2 );
-
- ITK_WRAP_OBJECT1(PyBuffer, image::F3 , itkPyBufferF3 );
- ITK_WRAP_OBJECT1(PyBuffer, image::US3, itkPyBufferUS3 );
- ITK_WRAP_OBJECT1(PyBuffer, image::UC3, itkPyBufferUC3 );
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkSize.cxx b/Wrapping/CSwig/CommonA/wrap_itkSize.cxx
deleted file mode 100644
index a530468c53e2e8dc5ca471c30bc74cf27b7c8fc1..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkSize.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSize.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkSize.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSize);
- namespace wrappers
- {
- typedef itk::Size<2 >::Size itkSize2;
- typedef itk::Size<3 >::Size itkSize3;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonA/wrap_itkVector.cxx b/Wrapping/CSwig/CommonA/wrap_itkVector.cxx
deleted file mode 100644
index e87ac44ad83a339a05fc91c37f6e009ffdacc087..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonA/wrap_itkVector.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkVector.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkVector);
- namespace wrappers
- {
- typedef itk::Vector<double, 2 >::Vector itkVectorD2;
- typedef itk::Vector<double, 3 >::Vector itkVectorD3;
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/.NoDartCoverage b/Wrapping/CSwig/CommonB/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/CommonB/CMakeLists.txt b/Wrapping/CSwig/CommonB/CMakeLists.txt
deleted file mode 100644
index 99daa3149da1b373764bc1139b8caf1808ab02bb..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# create a list of cable config files for wrapping
-SET(WRAP_SOURCES
- wrap_ITKKernelDeformableTransforms
- wrap_ITKRigidTransforms
- wrap_ITKSimilarityTransforms
- wrap_itkAffineTransform
- wrap_itkAzimuthElevationToCartesianTransform
- wrap_itkBSplineDeformableTransform
- wrap_itkIdentityTransform
- wrap_itkMatrixOffsetTransformBase
- wrap_itkScaleTransform
- wrap_itkTransform
- wrap_itkTranslationTransform
- wrap_itkVersorTransform
-)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
-# "${WrapOTB_BINARY_DIR}/otbCommon/OTBCommon.mdx"
-)
-
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKCommonB CommonB "ITKCommonA;VXLNumerics" "" "ITKCommon")
-
diff --git a/Wrapping/CSwig/CommonB/CVS/Entries b/Wrapping/CSwig/CommonB/CVS/Entries
deleted file mode 100644
index ec751c8eb1b1057368579d222416cce444ad408b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/CVS/Entries
+++ /dev/null
@@ -1,19 +0,0 @@
-/.NoDartCoverage/1.1/Fri Apr 1 14:38:32 2005//TITK-3-0-1
-/CMakeLists.txt/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonB.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonBJava.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonBPython.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKCommonBTcl.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKKernelDeformableTransforms.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKRigidTransforms.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_ITKSimilarityTransforms.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkAffineTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkAzimuthElevationToCartesianTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkBSplineDeformableTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkIdentityTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkMatrixOffsetTransformBase.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkScaleTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkTranslationTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-/wrap_itkVersorTransform.cxx/1.1/Fri Mar 25 13:17:57 2005//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/CommonB/CVS/Repository b/Wrapping/CSwig/CommonB/CVS/Repository
deleted file mode 100644
index bc6b263ec4c2c7b50cc3548c16ddbdc56c4628c0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/CommonB
diff --git a/Wrapping/CSwig/CommonB/CVS/Root b/Wrapping/CSwig/CommonB/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/CommonB/CVS/Tag b/Wrapping/CSwig/CommonB/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/CommonB/CVS/Template b/Wrapping/CSwig/CommonB/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/CommonB/wrap_ITKCommonB.cxx b/Wrapping/CSwig/CommonB/wrap_ITKCommonB.cxx
deleted file mode 100644
index bfe02199db8f7e2d80986504716d077a6c1d6c55..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_ITKCommonB.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKCommonB.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(ITKKernelDeformableTransforms),
- ITK_WRAP_GROUP(ITKRigidTransforms),
- ITK_WRAP_GROUP(ITKSimilarityTransforms),
- ITK_WRAP_GROUP(itkAffineTransform),
- ITK_WRAP_GROUP(itkAzimuthElevationToCartesianTransform),
- ITK_WRAP_GROUP(itkBSplineDeformableTransform),
- ITK_WRAP_GROUP(itkIdentityTransform),
- ITK_WRAP_GROUP(itkScaleTransform),
- ITK_WRAP_GROUP(itkTranslationTransform),
- ITK_WRAP_GROUP(itkTransform),
- ITK_WRAP_GROUP(itkMatrixOffsetTransformBase),
- ITK_WRAP_GROUP(itkVersorTransformGroup)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_ITKCommonBJava.cxx b/Wrapping/CSwig/CommonB/wrap_ITKCommonBJava.cxx
deleted file mode 100644
index 7233e0f93ceb642b8a0ff9416a6a872fd9ddcdb5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_ITKCommonBJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKCommonBJava"
-#include "wrap_ITKCommonB.cxx"
diff --git a/Wrapping/CSwig/CommonB/wrap_ITKCommonBPython.cxx b/Wrapping/CSwig/CommonB/wrap_ITKCommonBPython.cxx
deleted file mode 100644
index 306c02cc95e7740d39ebcf418cf8b05f57a45ecd..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_ITKCommonBPython.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKCommonBPython"
-#define ITK_PYTHON_WRAP
-#include "wrap_ITKCommonB.cxx"
diff --git a/Wrapping/CSwig/CommonB/wrap_ITKCommonBTcl.cxx b/Wrapping/CSwig/CommonB/wrap_ITKCommonBTcl.cxx
deleted file mode 100644
index 1f38865875b6839b273de98c18052fe6bca05129..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_ITKCommonBTcl.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKCommonBTcl"
-#define ITK_TCL_WRAP
-#include "wrap_ITKCommonB.cxx"
diff --git a/Wrapping/CSwig/CommonB/wrap_ITKKernelDeformableTransforms.cxx b/Wrapping/CSwig/CommonB/wrap_ITKKernelDeformableTransforms.cxx
deleted file mode 100644
index e3a2c75cbae0b0677b85c2ad57e541d998752c3f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_ITKKernelDeformableTransforms.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKKernelDeformableTransforms.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkKernelTransform.h"
-#include "itkElasticBodyReciprocalSplineKernelTransform.h"
-#include "itkElasticBodySplineKernelTransform.h"
-#include "itkThinPlateR2LogRSplineKernelTransform.h"
-#include "itkThinPlateSplineKernelTransform.h"
-#include "itkVolumeSplineKernelTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_2(x, d1) \
- ITK_WRAP_OBJECT2(x, double, d1, itk##x##d1)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKKernelDeformableTransforms);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_2(ElasticBodyReciprocalSplineKernelTransform, 2);
- ITK_WRAP_TRANSFORM_2(ElasticBodyReciprocalSplineKernelTransform, 3);
- ITK_WRAP_TRANSFORM_2(ElasticBodySplineKernelTransform, 2);
- ITK_WRAP_TRANSFORM_2(ElasticBodySplineKernelTransform, 3);
- ITK_WRAP_TRANSFORM_2(KernelTransform, 2);
- ITK_WRAP_TRANSFORM_2(KernelTransform, 3);
- ITK_WRAP_TRANSFORM_2(ThinPlateR2LogRSplineKernelTransform, 2);
- ITK_WRAP_TRANSFORM_2(ThinPlateR2LogRSplineKernelTransform, 3);
- ITK_WRAP_TRANSFORM_2(ThinPlateSplineKernelTransform, 2);
- ITK_WRAP_TRANSFORM_2(ThinPlateSplineKernelTransform, 3);
- ITK_WRAP_TRANSFORM_2(VolumeSplineKernelTransform, 2);
- ITK_WRAP_TRANSFORM_2(VolumeSplineKernelTransform, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_ITKRigidTransforms.cxx b/Wrapping/CSwig/CommonB/wrap_ITKRigidTransforms.cxx
deleted file mode 100644
index 85b3192547a73bab3841a17de71f16e234381454..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_ITKRigidTransforms.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKRigidTransforms.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkCenteredRigid2DTransform.h"
-#include "itkEuler2DTransform.h"
-#include "itkQuaternionRigidTransform.h"
-#include "itkRigid2DTransform.h"
-#include "itkRigid3DPerspectiveTransform.h"
-#include "itkRigid3DTransform.h"
-#include "itkVersorRigid3DTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_1(x) \
- ITK_WRAP_OBJECT1(x, double, itk##x)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKRigidTransforms);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_1(CenteredRigid2DTransform);
- ITK_WRAP_TRANSFORM_1(Euler2DTransform);
- ITK_WRAP_TRANSFORM_1(QuaternionRigidTransform);
- ITK_WRAP_TRANSFORM_1(Rigid2DTransform);
- ITK_WRAP_TRANSFORM_1(Rigid3DPerspectiveTransform);
- ITK_WRAP_TRANSFORM_1(Rigid3DTransform);
- ITK_WRAP_TRANSFORM_1(VersorRigid3DTransform);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_ITKSimilarityTransforms.cxx b/Wrapping/CSwig/CommonB/wrap_ITKSimilarityTransforms.cxx
deleted file mode 100644
index b05944ef7968348826bf3a6a2440a11cc22dcdbc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_ITKSimilarityTransforms.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKSimilarityTransforms.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkSimilarity2DTransform.h"
-#include "itkCenteredSimilarity2DTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_1(x) \
- ITK_WRAP_OBJECT1(x, double, itk##x)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKSimilarityTransforms);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_1(Similarity2DTransform);
- ITK_WRAP_TRANSFORM_1(CenteredSimilarity2DTransform);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkAffineTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkAffineTransform.cxx
deleted file mode 100644
index 429cb24bff08129d0aa59e754a46dea54b141667..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkAffineTransform.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkAffineTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkAffineTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_2(x, d1) \
- ITK_WRAP_OBJECT2(x, double, d1, itk##x##d1)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkAffineTransform);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_2(AffineTransform, 2);
- ITK_WRAP_TRANSFORM_2(AffineTransform, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkAzimuthElevationToCartesianTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkAzimuthElevationToCartesianTransform.cxx
deleted file mode 100644
index 5eb3729038416029fa2c4776ccab1253acaca40c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkAzimuthElevationToCartesianTransform.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkAzimuthElevationToCartesianTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkAzimuthElevationToCartesianTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_2(x, d1) \
- ITK_WRAP_OBJECT2(x, double, d1, itk##x##d1)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkAzimuthElevationToCartesianTransform);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_2(AzimuthElevationToCartesianTransform, 2);
- ITK_WRAP_TRANSFORM_2(AzimuthElevationToCartesianTransform, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkBSplineDeformableTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkBSplineDeformableTransform.cxx
deleted file mode 100644
index 0469f179e9d4d6105feb13c004d1836a17c1f0d7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkBSplineDeformableTransform.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkBSplineDeformableTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkBSplineDeformableTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_3(x, d1, d2) \
- ITK_WRAP_OBJECT3(x, double, d1, d2, itk##x##d1##d2)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkBSplineDeformableTransform);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_3(BSplineDeformableTransform, 2, 3);
- ITK_WRAP_TRANSFORM_3(BSplineDeformableTransform, 3, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkIdentityTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkIdentityTransform.cxx
deleted file mode 100644
index 4e82c1d3c56a098f112abc9dac5100be680e1403..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkIdentityTransform.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkIdentityTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkIdentityTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_2(x, d1) \
- ITK_WRAP_OBJECT2(x, double, d1, itk##x##d1)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkIdentityTransform);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_2(IdentityTransform, 2);
- ITK_WRAP_TRANSFORM_2(IdentityTransform, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkMatrixOffsetTransformBase.cxx b/Wrapping/CSwig/CommonB/wrap_itkMatrixOffsetTransformBase.cxx
deleted file mode 100644
index bdb86c608396a0138e80b615b69c4bf88804368d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkMatrixOffsetTransformBase.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkMatrixOffsetTransformBase.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkMatrixOffsetTransformBase.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_3(x, d1, d2) \
- ITK_WRAP_OBJECT3(x, double, d1, d2, itk##x##d1##d2)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkMatrixOffsetTransformBase);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_3(MatrixOffsetTransformBase, 2, 2);
- ITK_WRAP_TRANSFORM_3(MatrixOffsetTransformBase, 3, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkScaleTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkScaleTransform.cxx
deleted file mode 100644
index 44aeab8a586abd5c70223e53e58b7da24e9b9b7a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkScaleTransform.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkScaleTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkScaleTransform.h"
-#include "itkScaleLogarithmicTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_2(x, d1) \
- ITK_WRAP_OBJECT2(x, double, d1, itk##x##d1)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkScaleTransform);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_2(ScaleTransform, 2);
- ITK_WRAP_TRANSFORM_2(ScaleTransform, 3);
- ITK_WRAP_TRANSFORM_2(ScaleLogarithmicTransform, 2);
- ITK_WRAP_TRANSFORM_2(ScaleLogarithmicTransform, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkTransform.cxx
deleted file mode 100644
index 25494e83f43f869bc1a5d6725489c2151a749839..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkTransform.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkTransformBase.h"
-#include "itkTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_3(x, d1, d2) \
- ITK_WRAP_OBJECT3(x, double, d1, d2, itk##x##d1##d2)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkTransform);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(TransformBase);
- ITK_WRAP_TRANSFORM_3(Transform, 2, 2);
- ITK_WRAP_TRANSFORM_3(Transform, 3, 2);
- ITK_WRAP_TRANSFORM_3(Transform, 3, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkTranslationTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkTranslationTransform.cxx
deleted file mode 100644
index 2a00c963e217dc8b1b1170b727ce83f31eedaa83..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkTranslationTransform.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkTranslationTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkTranslationTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_2(x, d1) \
- ITK_WRAP_OBJECT2(x, double, d1, itk##x##d1)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkTranslationTransform);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_2(TranslationTransform, 2);
- ITK_WRAP_TRANSFORM_2(TranslationTransform, 3);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/CommonB/wrap_itkVersorTransform.cxx b/Wrapping/CSwig/CommonB/wrap_itkVersorTransform.cxx
deleted file mode 100644
index a2dcfd99fa6598ce5fbebfd07ab69f8b3db2e5f1..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/CommonB/wrap_itkVersorTransform.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkVersorTransform.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkVersorTransform.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-#define ITK_WRAP_TRANSFORM_1(x) \
- ITK_WRAP_OBJECT1(x, double, itk##x)
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkVersorTransformGroup);
- namespace wrappers
- {
- ITK_WRAP_TRANSFORM_1(VersorTransform);
- }
-}
-#endif
diff --git a/Wrapping/CSwig/IO/.NoDartCoverage b/Wrapping/CSwig/IO/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/IO/CMakeLists.txt b/Wrapping/CSwig/IO/CMakeLists.txt
deleted file mode 100644
index 9e1922f70547f76b603e61cb47456643219942d4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# create the ITKIOTcl libraries
-SET(WRAP_SOURCES
- wrap_IOBase
- wrap_itkImageFileReader_2D
- wrap_itkImageFileReader_3D
- wrap_itkImageFileWriter_2D
- wrap_itkImageFileWriter_3D
- wrap_itkImageSeriesReader
- wrap_itkImageSeriesWriter
-)
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersA/ITKBasicFiltersA.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersB/ITKBasicFiltersB.mdx"
- "${WrapOTB_BINARY_DIR}/IO/ITKIO.mdx"
-)
-SET(ITK_EXTRA_TCL_SOURCES itkTkImageViewer2D.cxx)
-SET(ITK_EXTRA_TCL_WRAP wrap_itkTkImageViewer2D)
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKIO IO "ITKNumerics;ITKCommonA;ITKCommonB" "" "")
-IF(ITK_CSWIG_TCL)
- TARGET_LINK_LIBRARIES(ITKIOTcl ${TK_LIBRARY})
-ENDIF(ITK_CSWIG_TCL)
diff --git a/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx b/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx
deleted file mode 100644
index c0e21264226cd8492e4c323d6b336c4bbd5060a9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/itkTkImageViewer2D.cxx
+++ /dev/null
@@ -1,150 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkTkImageViewer2D.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkTkImageViewer2D.h"
-
-#include <tk.h>
-
-namespace itk
-{
-
-TkImageViewer2D::TkImageViewer2D()
-{
- m_Interpreter = 0;
-
- // Setup the internal pipeline.
- m_FlipFilter = FlipFilter::New();
- FlipFilter::FlipAxesArrayType axes;
- axes[0] = false;
- axes[1] = true;
- m_FlipFilter->SetFlipAxes(axes);
- m_RescaleFilter = RescaleFilter::New();
- m_RescaleFilter->SetInput(m_FlipFilter->GetOutput());
- m_RescaleFilter->SetOutputMinimum(0);
- m_RescaleFilter->SetOutputMaximum(255);
-}
-
-TkImageViewer2D::~TkImageViewer2D()
-{
-}
-
-//----------------------------------------------------------------------------
-void TkImageViewer2D::SetInterpreter(Tcl_Interp* interp)
-{
- m_Interpreter = interp;
-}
-
-//----------------------------------------------------------------------------
-Tcl_Interp* TkImageViewer2D::GetInterpreter() const
-{
- return m_Interpreter;
-}
-
-//----------------------------------------------------------------------------
-void TkImageViewer2D::SetImageName(const char* name)
-{
- m_ImageName = name;
-}
-
-//----------------------------------------------------------------------------
-const char* TkImageViewer2D::GetImageName() const
-{
- return m_ImageName.c_str();
-}
-
-//----------------------------------------------------------------------------
-void TkImageViewer2D::SetCanvasName(const char* name)
-{
- m_CanvasName = name;
-}
-
-//----------------------------------------------------------------------------
-const char* TkImageViewer2D::GetCanvasName() const
-{
- return m_CanvasName.c_str();
-}
-
-//----------------------------------------------------------------------------
-void TkImageViewer2D::SetInput(InputImageType* image)
-{
- this->Superclass::SetNthInput(0, image);
-}
-
-//----------------------------------------------------------------------------
-TkImageViewer2D::InputImageType* TkImageViewer2D::GetInput()
-{
- DataObject* input = this->Superclass::GetInput(0);
- return dynamic_cast<InputImageType*>(input);
-}
-
-//----------------------------------------------------------------------------
-void TkImageViewer2D::Draw()
-{
- // Make sure we have an input image.
- InputImageType* input = this->GetInput();
- if(!input) { return; }
-
- // Connect our input to the internal pipeline.
- m_FlipFilter->SetInput(input);
-
- // Bring the image up to date.
- RescaleFilter::OutputImageType* image = m_RescaleFilter->GetOutput();
- image->UpdateOutputInformation();
- image->SetRequestedRegion(image->GetLargestPossibleRegion());
- image->Update();
-
- // Get the size of the image.
- itk::Size<2> size = image->GetLargestPossibleRegion().GetSize();
- int width = static_cast<int>(size[0]);
- int height = static_cast<int>(size[1]);
-
- // Setup the size
- Tk_PhotoHandle photo =
- Tk_FindPhoto(m_Interpreter, const_cast<char*>(m_ImageName.c_str()));
- Tk_PhotoSetSize(photo, width, height);
-
- OStringStream command;
- command << m_CanvasName.c_str() << " configure -scrollregion \"1 1 "
- << width << " " << height << "\"";
- std::string cmdstr = command.str();
- char* cmd = new char[cmdstr.length()+1];
- strcpy(cmd, cmdstr.c_str());
- Tcl_GlobalEval(m_Interpreter, cmd);
- delete [] cmd;
-
- // Copy the image data to the Tk photo.
- unsigned char* buffer =
- reinterpret_cast<unsigned char*>(image->GetBufferPointer());
-
- Tk_PhotoImageBlock block;
- block.pixelPtr = buffer;
- block.width = width;
- block.height = height;
- block.pitch = width;
- block.pixelSize = 1;
- block.offset[0] = 0;
- block.offset[1] = 0;
- block.offset[2] = 0;
- block.offset[3] = 0;
-#if (TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION < 4)
- Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1]);
-#else
- Tk_PhotoPutBlock(photo, &block, 0, 0, size[0], size[1],
- TK_PHOTO_COMPOSITE_SET);
-#endif
-}
-
-} // namespace itk
diff --git a/Wrapping/CSwig/IO/itkTkImageViewer2D.h b/Wrapping/CSwig/IO/itkTkImageViewer2D.h
deleted file mode 100644
index 10e373d42432e21f7df269658b4f488a63403aa5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/itkTkImageViewer2D.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkTkImageViewer2D.h,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef _itkTkImageViewer2D_h
-#define _itkTkImageViewer2D_h
-
-#include "itkObject.h"
-#include "itkImage.h"
-#include "itkFlipImageFilter.h"
-#include "itkRescaleIntensityImageFilter.h"
-
-#include <tcl.h>
-
-namespace itk
-{
-
-/** \Class TkImageViewer2D
- * \brief View an ITK image in a Tk window.
- */
-class TkImageViewer2D : public ProcessObject
-{
-public:
- /** Standard ITK class members. */
- typedef TkImageViewer2D Self;
- typedef SmartPointer<Self> Pointer;
- typedef ProcessObject Superclass;
- itkTypeMacro(TkImageViewer2D, ProcessObject);
-
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- /** The type of the input image. */
- typedef Image<unsigned short, 2> InputImageType;
-
- /** Set/Get the Tcl interpreter. */
- void SetInterpreter(Tcl_Interp* interp);
- Tcl_Interp* GetInterpreter() const;
-
- /** Set/Get the name of the Tk image. */
- void SetImageName(const char* name);
- const char* GetImageName() const;
-
- /** Set/Get the name of the Tk canvas. */
- void SetCanvasName(const char* name);
- const char* GetCanvasName() const;
-
- void SetInput(InputImageType* input);
- InputImageType* GetInput();
-
- void Draw();
-
-protected:
- TkImageViewer2D();
- ~TkImageViewer2D();
-
- // The Tcl interpreter associated with the Tk window.
- Tcl_Interp* m_Interpreter;
-
- // The name of the Tk image.
- std::string m_ImageName;
-
- // The name of the Tk canvas.
- std::string m_CanvasName;
-
- // The filter to flip the Y-axis.
- typedef FlipImageFilter<InputImageType> FlipFilter;
- FlipFilter::Pointer m_FlipFilter;
-
- // The filter to scale the image to 256 shades of gray.
- typedef RescaleIntensityImageFilter<FlipFilter::OutputImageType,
- itk::Image<unsigned char, 2> >
- RescaleFilter;
- RescaleFilter::Pointer m_RescaleFilter;
-
-private:
- TkImageViewer2D(const Self&); // Not implemented.
- void operator=(const Self&); // Not implemented.
-};
-
-
-} // namespace itk
-
-#endif // _itkTkImageViewer2D_h
-
diff --git a/Wrapping/CSwig/IO/wrap_IOBase.cxx b/Wrapping/CSwig/IO/wrap_IOBase.cxx
deleted file mode 100644
index 09b52a59c5e3000e2aee7f766b501e6106472464..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_IOBase.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_IOBase.cxx,v $
- Language: C++
- Date: $Date: 2005/08/12 23:02:58 $
- Version: $Revision: 1.6 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkRawImageIO.h"
-#include "itkImageIOBase.h"
-#include "itkPNGImageIO.h"
-#include "itkMetaImageIO.h"
-#include "itkDicomImageIO.h"
-#include "itkGDCMImageIO.h"
-#include "itkPNGImageIOFactory.h"
-#include "itkMetaImageIOFactory.h"
-#include "itkDicomImageIOFactory.h"
-#include "itkDICOMSeriesFileNames.h"
-#include "itkNumericSeriesFileNames.h"
-#include "itkRegularExpressionSeriesFileNames.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(IOBase);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(ImageIOBase);
- ITK_WRAP_OBJECT(PNGImageIO);
- ITK_WRAP_OBJECT(MetaImageIO);
- ITK_WRAP_OBJECT(DicomImageIO);
- ITK_WRAP_OBJECT(GDCMImageIO);
- ITK_WRAP_OBJECT(PNGImageIOFactory);
- ITK_WRAP_OBJECT(MetaImageIOFactory);
- ITK_WRAP_OBJECT(DicomImageIOFactory);
- ITK_WRAP_OBJECT2(RawImageIO, float, 2, itkRawImageIOF2);
- ITK_WRAP_OBJECT2(RawImageIO, float, 3, itkRawImageIOF3);
- ITK_WRAP_OBJECT(DICOMSeriesFileNames);
- ITK_WRAP_OBJECT(NumericSeriesFileNames);
- ITK_WRAP_OBJECT(RegularExpressionSeriesFileNames);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_ITKIO.cxx b/Wrapping/CSwig/IO/wrap_ITKIO.cxx
deleted file mode 100644
index 4dc395bdb4c7cd4dc8bd5061e891976be5c938ef..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_ITKIO.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKIO.cxx,v $
- Language: C++
- Date: $Date: 2004/04/15 14:42:45 $
- Version: $Revision: 1.9 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(IOBase),
- ITK_WRAP_GROUP(itkImageFileReader_2D),
- ITK_WRAP_GROUP(itkImageFileReader_3D),
-#ifdef ITK_TCL_WRAP
- ITK_WRAP_GROUP(itkTkImageViewer2D),
-#endif
- ITK_WRAP_GROUP(itkImageFileWriter_2D),
- ITK_WRAP_GROUP(itkImageFileWriter_3D),
- ITK_WRAP_GROUP(itkImageSeriesReader),
- ITK_WRAP_GROUP(itkImageSeriesWriter)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_ITKIOJava.cxx b/Wrapping/CSwig/IO/wrap_ITKIOJava.cxx
deleted file mode 100644
index 5953a548b1e003f99cb6987ac568b6e8fb261479..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_ITKIOJava.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKIOJava"
-#define ITK_JAVA_WRAP
-#include "wrap_ITKIO.cxx"
diff --git a/Wrapping/CSwig/IO/wrap_ITKIOPython.cxx b/Wrapping/CSwig/IO/wrap_ITKIOPython.cxx
deleted file mode 100644
index 2c77fd2ddf764df7ece0509024ac3c5219c814ca..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_ITKIOPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKIOPython"
-#include "wrap_ITKIO.cxx"
diff --git a/Wrapping/CSwig/IO/wrap_ITKIOTcl.cxx b/Wrapping/CSwig/IO/wrap_ITKIOTcl.cxx
deleted file mode 100644
index c01e7558ffa02f768a17c1535a7bb90f6cf4e2ad..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_ITKIOTcl.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKIOTcl"
-#define ITK_TCL_WRAP
-#include "wrap_ITKIO.cxx"
diff --git a/Wrapping/CSwig/IO/wrap_itkImageFileReader_2D.cxx b/Wrapping/CSwig/IO/wrap_itkImageFileReader_2D.cxx
deleted file mode 100644
index 969ae683808bd21d013443a0bc85558402b25691..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_itkImageFileReader_2D.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFileReader_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:39:17 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageFileReader.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageFileReader_2D);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageFileReader, image::F2, itkImageFileReaderF2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::VF2, itkImageFileReaderVF2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::D2, itkImageFileReaderD2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::UC2, itkImageFileReaderUC2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::US2, itkImageFileReaderUS2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::UL2, itkImageFileReaderUL2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::UI2, itkImageFileReaderUI2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::SS2, itkImageFileReaderSS2);
- ITK_WRAP_OBJECT1(ImageFileReader, image::SI2, itkImageFileReaderSI2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_itkImageFileReader_3D.cxx b/Wrapping/CSwig/IO/wrap_itkImageFileReader_3D.cxx
deleted file mode 100644
index 70c8ac5e5344b512d744569adf72f0299be0b536..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_itkImageFileReader_3D.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFileReader_3D.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:39:17 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageFileReader.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageFileReader_3D);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageFileReader, image::F3, itkImageFileReaderF3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::VF3, itkImageFileReaderVF3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::D3, itkImageFileReaderD3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::UC3, itkImageFileReaderUC3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::US3, itkImageFileReaderUS3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::UL3, itkImageFileReaderUL3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::UI3, itkImageFileReaderUI3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::SS3, itkImageFileReaderSS3);
- ITK_WRAP_OBJECT1(ImageFileReader, image::SI3, itkImageFileReaderSI3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_itkImageFileWriter_2D.cxx b/Wrapping/CSwig/IO/wrap_itkImageFileWriter_2D.cxx
deleted file mode 100644
index f0968b92028963f5fdec57d12a51048dcbc1601b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_itkImageFileWriter_2D.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFileWriter_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:39:17 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageFileWriter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageFileWriter_2D);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageFileWriter, image::F2, itkImageFileWriterF2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::VF2, itkImageFileWriterVF2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::D2, itkImageFileWriterD2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::UC2, itkImageFileWriterUC2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::US2, itkImageFileWriterUS2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::UL2, itkImageFileWriterUL2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::UI2, itkImageFileWriterUI2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::SS2, itkImageFileWriterSS2);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::SI2, itkImageFileWriterSI2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_itkImageFileWriter_3D.cxx b/Wrapping/CSwig/IO/wrap_itkImageFileWriter_3D.cxx
deleted file mode 100644
index 4a62394f893fc54d25da4f4bd5b47886c546b972..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_itkImageFileWriter_3D.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFileWriter_3D.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:39:17 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageFileWriter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageFileWriter_3D);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageFileWriter, image::F3, itkImageFileWriterF3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::VF3, itkImageFileWriterVF3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::D3, itkImageFileWriterD3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::UC3, itkImageFileWriterUC3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::US3, itkImageFileWriterUS3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::UL3, itkImageFileWriterUL3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::UI3, itkImageFileWriterUI3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::SS3, itkImageFileWriterSS3);
- ITK_WRAP_OBJECT1(ImageFileWriter, image::SI3, itkImageFileWriterSI3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_itkImageSeriesReader.cxx b/Wrapping/CSwig/IO/wrap_itkImageSeriesReader.cxx
deleted file mode 100644
index 51e828388e946c8cc7a534faa695d3452a93cf3b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_itkImageSeriesReader.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageSeriesReader.cxx,v $
- Language: C++
- Date: $Date: 2003/10/30 00:15:10 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageSeriesReader.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageSeriesReader);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageSeriesReader, image::F2, itkImageSeriesReaderF2);
- ITK_WRAP_OBJECT1(ImageSeriesReader, image::F3, itkImageSeriesReaderF3);
- ITK_WRAP_OBJECT1(ImageSeriesReader, image::US2, itkImageSeriesReaderUS2);
- ITK_WRAP_OBJECT1(ImageSeriesReader, image::US3, itkImageSeriesReaderUS3);
- ITK_WRAP_OBJECT1(ImageSeriesReader, image::UC2, itkImageSeriesReaderUC2);
- ITK_WRAP_OBJECT1(ImageSeriesReader, image::UC3, itkImageSeriesReaderUC3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_itkImageSeriesWriter.cxx b/Wrapping/CSwig/IO/wrap_itkImageSeriesWriter.cxx
deleted file mode 100644
index 918731e2c1a41a604ea3e2e22bf6b7e48c8c7db0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_itkImageSeriesWriter.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageSeriesWriter.cxx,v $
- Language: C++
- Date: $Date: 2003/10/30 21:20:57 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkImageSeriesWriter.h"
-#include "otbImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageSeriesWriter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(ImageSeriesWriter, image::F3, image::F2, itkImageSeriesWriterF3F2);
- ITK_WRAP_OBJECT2(ImageSeriesWriter, image::US3, image::US2, itkImageSeriesWriterUS3US2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/IO/wrap_itkTkImageViewer2D.cxx b/Wrapping/CSwig/IO/wrap_itkTkImageViewer2D.cxx
deleted file mode 100644
index 13b5dc6958eac9741abc8927bcd856545f8f20a3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/IO/wrap_itkTkImageViewer2D.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkTkImageViewer2D.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.3 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkTkImageViewer2D.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkTkImageViewer2D);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(TkImageViewer2D);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Java/CMakeLists.txt b/Wrapping/CSwig/Java/CMakeLists.txt
deleted file mode 100644
index 6edcf3923a82d0f6e7c56a9bd882ca5ae6bffe3d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/CMakeLists.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-SET(OTB_JAVA_CLASSPATH ${OTB_BINARY_DIR}/Wrapping/CSwig/Java)
-SET(OTB_JAVA_OUTPATH ${OTB_BINARY_DIR}/Wrapping/CSwig/Java)
-
-# Relative path from InsightToolkit.jar installation to dlls.
-IF(WIN32)
- SET(OTB_JAVA_INSTALL_DIR "/../../bin")
-ELSE(WIN32)
- SET(OTB_JAVA_INSTALL_DIR "")
-ENDIF(WIN32)
-
-IF(CMAKE_CONFIGURATION_TYPES)
- SET(OTB_BASE_JAVA_FILE ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit/itkbase.java)
- FOREACH(config ${CMAKE_CONFIGURATION_TYPES})
- SET(OTB_JAVA_BUILD_DIR ${LIBRARY_OUTPUT_PATH}/${config})
- CONFIGURE_FILE(
- ${OTB_SOURCE_DIR}/Wrapping/CSwig/Java/itkbase.java.in
- ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${config}/InsightToolkit/itkbase.java
- @ONLY IMMEDIATE
- )
- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${config}/itk_build_tree.mark
- "File next to InsightToolkit.jar to mark the build tree.\n"
- )
- ENDFOREACH(config)
- SET(OTB_JAVA_CLASSPATH
- "${OTB_JAVA_CLASSPATH}\;${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}")
- SET(OTB_JAVA_OUTPATH "${OTB_JAVA_OUTPATH}/${CMAKE_CFG_INTDIR}")
-ELSE(CMAKE_CONFIGURATION_TYPES)
- SET(OTB_JAVA_BUILD_DIR ${LIBRARY_OUTPUT_PATH})
- SET(OTB_BASE_JAVA_FILE ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/itkbase.java)
- CONFIGURE_FILE(
- ${OTB_SOURCE_DIR}/Wrapping/CSwig/Java/itkbase.java.in
- ${OTB_BASE_JAVA_FILE}
- @ONLY IMMEDIATE
- )
- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/itk_build_tree.mark
- "File next to InsightToolkit.jar to mark the build tree.\n"
- )
-ENDIF(CMAKE_CONFIGURATION_TYPES)
-
-SET(ORDERING_DEP)
-FOREACH(Kit ${OTB_KITS})
- IF(${Kit} MATCHES VXLNumerics)
- SET(DEP_FILES ${VXLNumerics_JAVA_DEPENDS})
- SET(KIT_JAVA_NAME ${Kit})
- ELSE(${Kit} MATCHES VXLNumerics)
- SET(KIT_JAVA_NAME OTB${Kit})
- SET(DEP_FILES ${OTB${Kit}_JAVA_DEPENDS})
- ENDIF(${Kit} MATCHES VXLNumerics)
- FOREACH(File ${DEP_FILES})
- SET(FULL_DEP_FILES ${FULL_DEP_FILES} ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/${File})
- ENDFOREACH(File)
-
- SET(OTB_JAVA_KIT_LIBS ${OTB_JAVA_KIT_LIBS} ${KIT_JAVA_NAME}Java)
- SET(KIT_FILE_NAME ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit/${KIT_JAVA_NAME}Java)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${KIT_FILE_NAME}.class
- DEPENDS ${KIT_FILE_NAME}.java ${FULL_DEP_FILES} ${OTB_BASE_JAVA_FILE} ${ORDERING_DEP}
- COMMAND ${JAVA_COMPILE}
- ARGS -classpath "${OTB_JAVA_CLASSPATH}" -d "${OTB_JAVA_OUTPATH}"
- ${KIT_FILE_NAME}.java
- COMMENT "Java Class")
- SET(OTB_JAVA_KITS_FILES ${OTB_JAVA_KITS_FILES} ${KIT_FILE_NAME}.class)
- SET(ORDERING_DEP ${KIT_FILE_NAME}.class)
-ENDFOREACH(Kit)
-
-IF(CMAKE_CONFIGURATION_TYPES)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar
- DEPENDS ${OTB_JAVA_KITS_FILES}
- COMMAND ${JAVA_ARCHIVE}
- ARGS -cf ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar
- -C ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR} InsightToolkit
- COMMENT "Java Archive"
- )
- ADD_CUSTOM_TARGET(OTBJavaJar ALL DEPENDS ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${CMAKE_CFG_INTDIR}/InsightToolkit.jar)
- SET(DOLLAR "$")
- INSTALL(FILES
- ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/${DOLLAR}{BUILD_TYPE}/InsightToolkit.jar
- DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
- COMPONENT RuntimeLibraries)
-ELSE(CMAKE_CONFIGURATION_TYPES)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
- DEPENDS ${OTB_JAVA_KITS_FILES}
- COMMAND ${JAVA_ARCHIVE}
- ARGS -cf ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
- -C ${OTB_BINARY_DIR}/Wrapping/CSwig/Java InsightToolkit
- COMMENT "Java Archive"
- )
- ADD_CUSTOM_TARGET(OTBJavaJar ALL DEPENDS ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar)
- INSTALL(FILES
- ${OTB_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
- DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
- COMPONENT RuntimeLibraries)
-ENDIF(CMAKE_CONFIGURATION_TYPES)
-ADD_DEPENDENCIES(OTBJavaJar ${OTB_JAVA_KIT_LIBS} SwigRuntimeJava)
-FOREACH(Kit ${OTB_KITS})
- IF(${Kit} MATCHES VXLNumerics)
- SET(KIT_JAVA_NAME ${Kit})
- ELSE(${Kit} MATCHES VXLNumerics)
- SET(KIT_JAVA_NAME OTB${Kit})
- ENDIF(${Kit} MATCHES VXLNumerics)
- ADD_DEPENDENCIES(OTBJavaJar "${KIT_JAVA_NAME}Java")
-ENDFOREACH(Kit)
-ADD_LIBRARY(OTBJavaJarDummyLibrary OTBJavaJarDummyLibrary.c)
-ADD_DEPENDENCIES(OTBJavaJarDummyLibrary OTBJavaJar)
diff --git a/Wrapping/CSwig/Java/CVS/Entries b/Wrapping/CSwig/Java/CVS/Entries
deleted file mode 100644
index 9c55c4ce46aaf9cd0e60b77e4d28629a37d8334b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/CVS/Entries
+++ /dev/null
@@ -1,4 +0,0 @@
-/CMakeLists.txt/1.10/Thu Oct 26 19:59:48 2006//TITK-3-0-1
-/ITKJavaJarDummyLibrary.c/1.1/Sat Apr 2 16:51:26 2005//TITK-3-0-1
-/itkbase.java.in/1.6/Wed Apr 27 14:45:25 2005//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Java/CVS/Repository b/Wrapping/CSwig/Java/CVS/Repository
deleted file mode 100644
index 825d4cd8af8a695fd4cac7fd86c8dae61f834bb0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Java
diff --git a/Wrapping/CSwig/Java/CVS/Root b/Wrapping/CSwig/Java/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Java/CVS/Tag b/Wrapping/CSwig/Java/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Java/CVS/Template b/Wrapping/CSwig/Java/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Java/ITKJavaJarDummyLibrary.c b/Wrapping/CSwig/Java/ITKJavaJarDummyLibrary.c
deleted file mode 100644
index 15f9bffe05f97037819dd01938253ce24542b034..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/ITKJavaJarDummyLibrary.c
+++ /dev/null
@@ -1,3 +0,0 @@
-void ITKJavaJarDummyLibrary()
-{
-}
diff --git a/Wrapping/CSwig/Java/itkbase.java.in b/Wrapping/CSwig/Java/itkbase.java.in
deleted file mode 100644
index dea321a1142847bacc30348ab2f7a1c3744cd36c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Java/itkbase.java.in
+++ /dev/null
@@ -1,75 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkbase.java.in,v $
- Language: C++
- Date: $Date: 2005/04/27 14:45:25 $
- Version: $Revision: 1.6 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- Portions of this code are covered under the VTK copyright.
- See VTKCopyright.txt or http://www.kitware.com/VTKCopyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-package InsightToolkit;
-
-import java.util.StringTokenizer;
-
-public class itkbase
-{
- private static String buildDir = "@ITK_JAVA_BUILD_DIR@";
- private static String installDir = "@ITK_JAVA_INSTALL_DIR@";
- private static String libDir = "/InsightToolkit.jar must be in CLASSPATH";
-
- static
- {
- // Detect whether we are in the build or install tree.
- String sep = System.getProperty("path.separator");
- String classpath = System.getProperty("java.class.path");
- StringTokenizer tokenizer = new StringTokenizer(classpath, sep);
- while(tokenizer.hasMoreTokens())
- {
- String dir = tokenizer.nextToken();
- if(dir.endsWith("InsightToolkit.jar") &&
- (new java.io.File(dir)).exists())
- {
- int index = dir.lastIndexOf("InsightToolkit.jar");
- String self = dir.substring(0, index);
- if((new java.io.File(self+"itk_build_tree.mark")).exists())
- {
- libDir = buildDir;
- break;
- }
- else
- {
- libDir = dir.substring(0, index-1)+installDir;
- break;
- }
- }
- }
-
- // Load JavaCWD helper code.
- sep = System.getProperty("file.separator");
- String lib = System.mapLibraryName("SwigRuntimeJava");
- Runtime.getRuntime().load(libDir + sep + lib);
- }
-
- // Method called by wrapper code to load native libraries.
- public static void LoadLibrary(String name)
- {
- // Change to directory containing libraries so dependents are found.
- String old = JavaCWD.GetCWD();
- JavaCWD.SetCWD(libDir);
- String sep = System.getProperty("file.separator");
- String lib = System.mapLibraryName(name);
- JavaCWD.Load(libDir + sep + lib);
- Runtime.getRuntime().load(libDir + sep + lib);
- JavaCWD.SetCWD(old);
- }
-}
diff --git a/Wrapping/CSwig/Master.mdx.in b/Wrapping/CSwig/Master.mdx.in
deleted file mode 100644
index 4dd4f5e4c104a22d3e7b5fa10612b3fe32bd0106..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Master.mdx.in
+++ /dev/null
@@ -1 +0,0 @@
-${INDEX_FILE_CONTENT}
diff --git a/Wrapping/CSwig/Numerics/.NoDartCoverage b/Wrapping/CSwig/Numerics/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/Numerics/CMakeLists.txt b/Wrapping/CSwig/Numerics/CMakeLists.txt
deleted file mode 100644
index 1efee920b61a345c9d7b27b4eafc5072ec280d77..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# create the ITKNumericsTcl libraries
-SET(WRAP_SOURCES
- wrap_ITKCostFunctions
- wrap_ITKOptimizers
-)
-
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
-)
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKNumerics Numerics "ITKCommonA;ITKCommonB" "" "")
-
diff --git a/Wrapping/CSwig/Numerics/CVS/Entries b/Wrapping/CSwig/Numerics/CVS/Entries
deleted file mode 100644
index 114199773625000193b7d7ddfc7f6fa6b9437c54..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/CVS/Entries
+++ /dev/null
@@ -1,9 +0,0 @@
-/.NoDartCoverage/1.1/Sat Sep 25 17:37:12 2004//TITK-3-0-1
-/CMakeLists.txt/1.10/Fri Mar 25 13:17:58 2005//TITK-3-0-1
-/wrap_ITKCostFunctions.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_ITKNumerics.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_ITKNumericsJava.cxx/1.2/Wed Feb 18 14:47:41 2004//TITK-3-0-1
-/wrap_ITKNumericsPython.cxx/1.1/Tue May 13 20:28:38 2003//TITK-3-0-1
-/wrap_ITKNumericsTcl.cxx/1.1/Tue May 13 20:28:38 2003//TITK-3-0-1
-/wrap_ITKOptimizers.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Numerics/CVS/Repository b/Wrapping/CSwig/Numerics/CVS/Repository
deleted file mode 100644
index c55dd22c481e35e048cbf1ecb14fcffe8d4d1ab0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Numerics
diff --git a/Wrapping/CSwig/Numerics/CVS/Root b/Wrapping/CSwig/Numerics/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Numerics/CVS/Tag b/Wrapping/CSwig/Numerics/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Numerics/CVS/Template b/Wrapping/CSwig/Numerics/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Numerics/wrap_ITKCostFunctions.cxx b/Wrapping/CSwig/Numerics/wrap_ITKCostFunctions.cxx
deleted file mode 100644
index 19678c11e398f302174a62779d7f448e7af1f276..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/wrap_ITKCostFunctions.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKCostFunctions.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkCostFunction.h"
-#include "itkSingleValuedCostFunction.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKCostFunctions);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(CostFunction);
- ITK_WRAP_OBJECT(SingleValuedCostFunction);
- }
-}
-
-
-#endif
diff --git a/Wrapping/CSwig/Numerics/wrap_ITKNumerics.cxx b/Wrapping/CSwig/Numerics/wrap_ITKNumerics.cxx
deleted file mode 100644
index 61d8756d938441a77a4b3aaaf93267833ce8f4db..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/wrap_ITKNumerics.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKNumerics.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(ITKCostFunctions),
- ITK_WRAP_GROUP(ITKOptimizers)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/Numerics/wrap_ITKNumericsJava.cxx b/Wrapping/CSwig/Numerics/wrap_ITKNumericsJava.cxx
deleted file mode 100644
index 34cb323c3236db9ca046e7f55a7b6d72410f203d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/wrap_ITKNumericsJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKNumericsJava"
-#include "wrap_ITKNumerics.cxx"
diff --git a/Wrapping/CSwig/Numerics/wrap_ITKNumericsPython.cxx b/Wrapping/CSwig/Numerics/wrap_ITKNumericsPython.cxx
deleted file mode 100644
index 7b6fcc2eb248adab74b8b8a3d2998706c87c17ce..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/wrap_ITKNumericsPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKNumericsPython"
-#include "wrap_ITKNumerics.cxx"
diff --git a/Wrapping/CSwig/Numerics/wrap_ITKNumericsTcl.cxx b/Wrapping/CSwig/Numerics/wrap_ITKNumericsTcl.cxx
deleted file mode 100644
index ec1be5a7ce5d880066dce5ab3a64a46151dc17df..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/wrap_ITKNumericsTcl.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKNumericsTcl"
-#include "wrap_ITKNumerics.cxx"
diff --git a/Wrapping/CSwig/Numerics/wrap_ITKOptimizers.cxx b/Wrapping/CSwig/Numerics/wrap_ITKOptimizers.cxx
deleted file mode 100644
index 38c062dbf998fc7cce3f81da007b356e49c72340..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Numerics/wrap_ITKOptimizers.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKOptimizers.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkAmoebaOptimizer.h"
-#include "itkConjugateGradientOptimizer.h"
-#include "itkGradientDescentOptimizer.h"
-#include "itkLBFGSOptimizer.h"
-#include "itkLevenbergMarquardtOptimizer.h"
-#include "itkMultipleValuedNonLinearOptimizer.h"
-#include "itkMultipleValuedNonLinearVnlOptimizer.h"
-#include "itkNonLinearOptimizer.h"
-#include "itkOnePlusOneEvolutionaryOptimizer.h"
-#include "itkOptimizer.h"
-#include "itkQuaternionRigidTransformGradientDescentOptimizer.h"
-#include "itkRegularStepGradientDescentBaseOptimizer.h"
-#include "itkRegularStepGradientDescentOptimizer.h"
-#include "itkSingleValuedNonLinearOptimizer.h"
-#include "itkSingleValuedNonLinearVnlOptimizer.h"
-#include "itkVersorTransformOptimizer.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(ITKOptimizers);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(AmoebaOptimizer);
- ITK_WRAP_OBJECT(ConjugateGradientOptimizer);
- ITK_WRAP_OBJECT(GradientDescentOptimizer);
- ITK_WRAP_OBJECT(LBFGSOptimizer);
- ITK_WRAP_OBJECT(LevenbergMarquardtOptimizer);
- ITK_WRAP_OBJECT(MultipleValuedNonLinearOptimizer);
- ITK_WRAP_OBJECT(MultipleValuedNonLinearVnlOptimizer);
- ITK_WRAP_OBJECT(NonLinearOptimizer);
- ITK_WRAP_OBJECT(OnePlusOneEvolutionaryOptimizer);
- ITK_WRAP_OBJECT(Optimizer);
- ITK_WRAP_OBJECT(QuaternionRigidTransformGradientDescentOptimizer);
- ITK_WRAP_OBJECT(RegularStepGradientDescentBaseOptimizer);
- ITK_WRAP_OBJECT(RegularStepGradientDescentOptimizer);
- ITK_WRAP_OBJECT(SingleValuedNonLinearOptimizer);
- ITK_WRAP_OBJECT(SingleValuedNonLinearVnlOptimizer);
- ITK_WRAP_OBJECT(VersorTransformOptimizer);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Patented/CMakeLists.txt b/Wrapping/CSwig/Patented/CMakeLists.txt
deleted file mode 100644
index f169f561293b31f22f429e90244cb796ce5465b4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# create the ITKPatentedTcl libraries
-SET(WRAP_SOURCES
- wrap_itkSimpleFuzzyConnectednessImageFilterBase
- wrap_itkSimpleFuzzyConnectednessScalarImageFilter
-
-)
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersA/ITKBasicFiltersA.mdx"
- "${WrapOTB_BINARY_DIR}/BasicFiltersB/ITKBasicFiltersB.mdx"
- "${WrapOTB_BINARY_DIR}/Algorithms/ITKAlgorithms.mdx"
- "${WrapOTB_BINARY_DIR}/Patented/ITKPatented.mdx"
-)
-
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" ITKPatented Patented
- "ITKNumerics;ITKCommonA;ITKCommonB;ITKBasicFiltersA;ITKBasicFiltersB" "" "")
diff --git a/Wrapping/CSwig/Patented/CVS/Entries b/Wrapping/CSwig/Patented/CVS/Entries
deleted file mode 100644
index 5daa6616050a387a8c58fc87692f821c5f5b4e09..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/CVS/Entries
+++ /dev/null
@@ -1,8 +0,0 @@
-/CMakeLists.txt/1.2/Fri Mar 25 13:17:58 2005//TITK-3-0-1
-/wrap_ITKPatented.cxx/1.1/Sat Oct 9 01:49:55 2004//TITK-3-0-1
-/wrap_ITKPatentedJava.cxx/1.1/Sat Oct 9 01:49:55 2004//TITK-3-0-1
-/wrap_ITKPatentedPython.cxx/1.1/Sat Oct 9 01:49:55 2004//TITK-3-0-1
-/wrap_ITKPatentedTcl.cxx/1.1/Sat Oct 9 01:49:55 2004//TITK-3-0-1
-/wrap_itkSimpleFuzzyConnectednessImageFilterBase.cxx/1.1/Sat Oct 9 01:49:55 2004//TITK-3-0-1
-/wrap_itkSimpleFuzzyConnectednessScalarImageFilter.cxx/1.1/Sat Oct 9 01:49:55 2004//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Patented/CVS/Repository b/Wrapping/CSwig/Patented/CVS/Repository
deleted file mode 100644
index 51adab8560b6b2a5b70551f05ccd8e854c78adea..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Patented
diff --git a/Wrapping/CSwig/Patented/CVS/Root b/Wrapping/CSwig/Patented/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Patented/CVS/Tag b/Wrapping/CSwig/Patented/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Patented/CVS/Template b/Wrapping/CSwig/Patented/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Patented/wrap_ITKPatented.cxx b/Wrapping/CSwig/Patented/wrap_ITKPatented.cxx
deleted file mode 100644
index 9c0e04e872004abcf3f52950482aa4d4a2e96c6a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/wrap_ITKPatented.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKPatented.cxx,v $
- Language: C++
- Date: $Date: 2004/10/09 01:49:55 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(itkSimpleFuzzyConnectednessImageFilterBase),
- ITK_WRAP_GROUP(itkSimpleFuzzyConnectednessScalarImageFilter),
- };
-}
-#endif
diff --git a/Wrapping/CSwig/Patented/wrap_ITKPatentedJava.cxx b/Wrapping/CSwig/Patented/wrap_ITKPatentedJava.cxx
deleted file mode 100644
index 0175a0a0348a260275af0a290ae92b5828b1b8f9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/wrap_ITKPatentedJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKPatentedJava"
-#include "wrap_ITKPatented.cxx"
diff --git a/Wrapping/CSwig/Patented/wrap_ITKPatentedPython.cxx b/Wrapping/CSwig/Patented/wrap_ITKPatentedPython.cxx
deleted file mode 100644
index 3d2ce81011328e4dd23cb5e68cbc1596739e7e2e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/wrap_ITKPatentedPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKPatentedPython"
-#include "wrap_ITKPatented.cxx"
diff --git a/Wrapping/CSwig/Patented/wrap_ITKPatentedTcl.cxx b/Wrapping/CSwig/Patented/wrap_ITKPatentedTcl.cxx
deleted file mode 100644
index ae451bf238de2621cb8df323bd54bd9b3c4dcc61..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/wrap_ITKPatentedTcl.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "ITKPatentedTcl"
-#include "wrap_ITKPatented.cxx"
diff --git a/Wrapping/CSwig/Patented/wrap_itkSimpleFuzzyConnectednessImageFilterBase.cxx b/Wrapping/CSwig/Patented/wrap_itkSimpleFuzzyConnectednessImageFilterBase.cxx
deleted file mode 100644
index ba312f39deec50ce0892cdf2dddb432975aa9038..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/wrap_itkSimpleFuzzyConnectednessImageFilterBase.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSimpleFuzzyConnectednessImageFilterBase.cxx,v $
- Language: C++
- Date: $Date: 2004/10/09 01:49:55 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkSimpleFuzzyConnectednessImageFilterBase.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkSimpleFuzzyConnectednessImageFilterBase);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessImageFilterBase, image::F2, image::F2,
- itkSimpleFuzzyConnectednessImageFilterBaseF2F2);
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessImageFilterBase, image::F3, image::F3,
- itkSimpleFuzzyConnectednessImageFilterBaseF3F3);
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessImageFilterBase, image::US2, image::US2,
- itkSimpleFuzzyConnectednessImageFilterBaseUS2US2);
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessImageFilterBase, image::US3, image::US3,
- itkSimpleFuzzyConnectednessImageFilterBaseUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Patented/wrap_itkSimpleFuzzyConnectednessScalarImageFilter.cxx b/Wrapping/CSwig/Patented/wrap_itkSimpleFuzzyConnectednessScalarImageFilter.cxx
deleted file mode 100644
index c493c5ffb63b03bd7a86daf6a65fc8e4dc54b891..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Patented/wrap_itkSimpleFuzzyConnectednessScalarImageFilter.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkSimpleFuzzyConnectednessScalarImageFilter.cxx,v $
- Language: C++
- Date: $Date: 2004/10/09 01:49:55 $
- Version: $Revision: 1.1 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkSimpleFuzzyConnectednessScalarImageFilter.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigMacros.h"
-#include "itkCSwigImages.h"_
-namespace _cable_
-{
- const char* const group =
- ITK_WRAP_GROUP(itkSimpleFuzzyConnectednessScalarImageFilter);
- namespace wrappers
- {
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessScalarImageFilter, image::F2,
- image::F2,
- itkSimpleFuzzyConnectednessScalarImageFilterF2F2);
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessScalarImageFilter, image::F3,
- image::F3,
- itkSimpleFuzzyConnectednessScalarImageFilterF3F3);
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessScalarImageFilter, image::US2,
- image::US2,
- itkSimpleFuzzyConnectednessScalarImageFilterUS2US2);
- ITK_WRAP_OBJECT2(SimpleFuzzyConnectednessScalarImageFilter, image::US3,
- image::US3,
- itkSimpleFuzzyConnectednessScalarImageFilterUS3US3);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/Python/InsightToolkit.py b/Wrapping/CSwig/Python/InsightToolkit.py
deleted file mode 100644
index b06bc339ba2e60989b2dcabb80f932a6990d909a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/InsightToolkit.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from itkalgorithms import *
-from itkio import *
diff --git a/Wrapping/CSwig/Python/OrfeoToolBox.py b/Wrapping/CSwig/Python/OrfeoToolBox.py
deleted file mode 100644
index 19d277916e0cfc9218a0474e39492436aa76841b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/OrfeoToolBox.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from otbio import *
-from otbvisu import *
diff --git a/Wrapping/CSwig/Python/OrfeoToolBox.pyc b/Wrapping/CSwig/Python/OrfeoToolBox.pyc
deleted file mode 100644
index 55b5fdf34d290cc3b5712628fc77dfbc2e08dbc9..0000000000000000000000000000000000000000
Binary files a/Wrapping/CSwig/Python/OrfeoToolBox.pyc and /dev/null differ
diff --git a/Wrapping/CSwig/Python/itkalgorithms.py b/Wrapping/CSwig/Python/itkalgorithms.py
deleted file mode 100644
index 4ec283833881cd45dde4370deef8217cc4caa78c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itkalgorithms.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from itknumerics import *
-from itkbasicfilters import *
-__itk_import_data__ = itkbase.preimport()
-from ITKAlgorithmsPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/itkbase.py.in b/Wrapping/CSwig/Python/itkbase.py.in
deleted file mode 100644
index f06d0553159a609c00efe2c1f9f34d25c4ecfa02..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itkbase.py.in
+++ /dev/null
@@ -1,76 +0,0 @@
-"""InsightToolkit support module to help load its packages."""
-import sys,os
-
-# Get the path to the directory containing this script. It may be
-# used to set pkgdir below, depending on how this script is
-# configured.
-if __name__ == '__main__':
- selfpath = os.path.abspath(sys.path[0] or os.curdir)
-else:
- selfpath = os.path.abspath(os.path.dirname(__file__))
-
-# The directory containing the binary ITK python wrapper libraries.
-pkgdir = @OTB_CSWIG_PACKAGE_DIR@
-
-# Python "help(sys.setdlopenflags)" states:
-#
-# setdlopenflags(...)
-# setdlopenflags(n) -> None
-#
-# Set the flags that will be used for dlopen() calls. Among other
-# things, this will enable a lazy resolving of symbols when
-# importing a module, if called as sys.setdlopenflags(0) To share
-# symbols across extension modules, call as
-#
-# sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)
-#
-# GCC 3.x depends on proper merging of symbols for RTTI:
-# http://gcc.gnu.org/faq.html#dso
-#
-# The Python setup.py states that the "dl" module
-# requires "sizeof(int) == sizeof(long) == sizeof(char*)".
-# Therefore the dl module is missing on 64-bit platforms.
-# Since RTLD_NOW==0x002 and RTLD_GLOBAL==0x100 very commonly
-# we will just guess that the proper flags are 0x102 when there
-# is no dl module.
-
-def preimport():
- """Called by InsightToolkit packages before loading a C module."""
- # Save the current dlopen flags and set the ones we need.
- try:
- import dl
- newflags = dl.RTLD_NOW|dl.RTLD_GLOBAL
- except:
- newflags = 0x102 # No dl module, so guess (see above).
- try:
- oldflags = sys.getdlopenflags()
- sys.setdlopenflags(newflags)
- except:
- oldflags = None
- # Save the current working directory and change to that containing
- # the python wrapper libraries. They have '.' in their rpaths, so
- # they will find the libraries on which they depend.
- cwd = os.getcwd()
- os.chdir(pkgdir)
- # Add the binary package directory to the python module search path.
- sys.path.insert(1, pkgdir)
- return [cwd, oldflags]
-
-def postimport(data):
- """Called by InsightToolkit packages after loading a C module."""
- # Remove the binary package directory to the python module search path.
- sys.path.remove(pkgdir)
- # Restore the original working directory.
- os.chdir(data[0])
- # Restore the original dlopen flags.
- try:
- sys.setdlopenflags(data[1])
- except:
- pass
-
-# Default location for test output
-defaultTestRoot = @OTB_CSWIG_TEST_ROOT@
-
-# Default location for test input
-defaultDataRoot = @OTB_CSWIG_DATA_ROOT@
-
diff --git a/Wrapping/CSwig/Python/itkbasicfilters.py b/Wrapping/CSwig/Python/itkbasicfilters.py
deleted file mode 100644
index 5c5dc1fbdfd3a8eecf0eddb97c917b4eacbc3e98..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itkbasicfilters.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from itknumerics import *
-__itk_import_data__ = itkbase.preimport()
-from ITKBasicFiltersAPython import *
-from ITKBasicFiltersBPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/itkcommon.py b/Wrapping/CSwig/Python/itkcommon.py
deleted file mode 100644
index 283df8ab1570d497557b4ab15c3426daaac0e7e9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itkcommon.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from vxlnumerics import *
-__itk_import_data__ = itkbase.preimport()
-from ITKCommonAPython import *
-from ITKCommonBPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/itkcommon.pyc b/Wrapping/CSwig/Python/itkcommon.pyc
deleted file mode 100644
index 57d34755b8f7a1d2d5a9450d8e848fd6fb69ad55..0000000000000000000000000000000000000000
Binary files a/Wrapping/CSwig/Python/itkcommon.pyc and /dev/null differ
diff --git a/Wrapping/CSwig/Python/itkdata.py b/Wrapping/CSwig/Python/itkdata.py
deleted file mode 100644
index f9e11c87c515ce6ce6c54cb011d4365b85fa8ac6..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itkdata.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Program: Insight Segmentation & Registration Toolkit
-# Module: $RCSfile: itkdata.py,v $
-# Language: C++
-# Date: $Date: 2004/03/04 23:06:56 $
-# Version: $Revision: 1.1 $
-#
-# Copyright (c) Insight Software Consortium. All rights reserved.
-# See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the above copyright notices for more information.
-#
-
-
-import itkbase
-import sys
-import os
-
-# Put the ITK_DATA_ROOT setting in the global namespace. This
-# package is only used for testing, so this is okay.
-
-ITK_DATA_ROOT = ""
-
-# Look for the -D command line option.
-if not ITK_DATA_ROOT:
- for a in range(len(sys.argv)):
- if sys.argv[a] == "-D" and a < len(sys.argv):
- ITK_DATA_ROOT = sys.argv[a+1]
- break
-
-# Check for the environment variable ::ITK_DATA_ROOT.
-if not ITK_DATA_ROOT and os.environ.has_key('ITK_DATA_ROOT'):
- ITK_DATA_ROOT = os.environ['ITK_DATA_ROOT']
-
-
-# Use the default output directory.
-if not ITK_DATA_ROOT:
- ITK_DATA_ROOT = itkbase.defaultDataRoot
-
-
diff --git a/Wrapping/CSwig/Python/itkio.py b/Wrapping/CSwig/Python/itkio.py
deleted file mode 100644
index 92a43a53db72787f3800226bf7202bec42234cc3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itkio.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from itkcommon import *
-__itk_import_data__ = itkbase.preimport()
-from ITKIOPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/itkio.pyc b/Wrapping/CSwig/Python/itkio.pyc
deleted file mode 100644
index d08cf36b545dfc6c6d251fdadde97df63c330492..0000000000000000000000000000000000000000
Binary files a/Wrapping/CSwig/Python/itkio.pyc and /dev/null differ
diff --git a/Wrapping/CSwig/Python/itknumerics.py b/Wrapping/CSwig/Python/itknumerics.py
deleted file mode 100644
index e10ac4a8975a6c298416f47831abdbb53ab0c70b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itknumerics.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from itkcommon import *
-__itk_import_data__ = itkbase.preimport()
-from ITKNumericsPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/itktesting.py b/Wrapping/CSwig/Python/itktesting.py
deleted file mode 100644
index 56bd36e2b5a8dcaa14e3f391a48431f8b42c216a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/itktesting.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import itkbase
-import sys
-import os
-import stat
-
-import itkdata
-
-# Put the ITK_TEST_ROOT setting in the global namespace. This
-# package is only used for testing, so this is okay.
-
-ITK_TEST_ROOT = ""
-
-# Look for the -T command line option.
-if not ITK_TEST_ROOT:
- for a in range(len(sys.argv)):
- if sys.argv[a] == "-T" and a < len(sys.argv):
- ITK_TEST_ROOT = sys.argv[a+1]
- break
-
-# Check for the environment variable ::ITK_TEST_ROOT.
-if not ITK_TEST_ROOT and os.environ.has_key('ITK_TEST_ROOT'):
- ITK_TEST_ROOT = os.environ['ITK_TEST_ROOT']
-
-
-# Use the default output directory.
-if not ITK_TEST_ROOT:
- ITK_TEST_ROOT = itkbase.defaultTestRoot
- if ITK_TEST_ROOT == "<NO_DEFAULT>":
- sys.stderr.write("Set ITK_TEST_ROOT or use -T option to specify.\n")
- sys.exit(1)
-
-# Setup testing directories.
-ITK_TEST_BASELINE = "%s/Baseline" % itkdata.ITK_DATA_ROOT
-ITK_TEST_INPUT = "%s/Input" % itkdata.ITK_DATA_ROOT
-ITK_TEST_OUTPUT = "%s/Output" % ITK_TEST_ROOT
-
-try:
- if not os.path.exists(ITK_TEST_ROOT):
- os.mkdir(ITK_TEST_OUTPUT)
-except:
- sys.stderr.write("Bla: %s\n" % `sys.exc_info()[0]`)
- sys.stderr.write("Unable to create testing output directory with name: %s\n" % ITK_TEST_OUTPUT)
- sys.exit(1)
-
-
diff --git a/Wrapping/CSwig/Python/otbcommon.py b/Wrapping/CSwig/Python/otbcommon.py
deleted file mode 100644
index 2774d608b5b4150758218d4893b736a803848890..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/otbcommon.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from itkcommon import *
-__itk_import_data__ = itkbase.preimport()
-from OTBCommonPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/otbcommon.pyc b/Wrapping/CSwig/Python/otbcommon.pyc
deleted file mode 100644
index 7d452e6ed188459d7146b6ffab35ee19e9d1a482..0000000000000000000000000000000000000000
Binary files a/Wrapping/CSwig/Python/otbcommon.pyc and /dev/null differ
diff --git a/Wrapping/CSwig/Python/otbio.py b/Wrapping/CSwig/Python/otbio.py
deleted file mode 100644
index d17fa98dc0698e5d98f0a30f9248b5a44b30e2d8..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/otbio.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from otbcommon import *
-from itkio import *
-__itk_import_data__ = itkbase.preimport()
-from OTBIOPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/otbio.pyc b/Wrapping/CSwig/Python/otbio.pyc
deleted file mode 100644
index d5f663011505aae519faa8fe15f2568d15c486b4..0000000000000000000000000000000000000000
Binary files a/Wrapping/CSwig/Python/otbio.pyc and /dev/null differ
diff --git a/Wrapping/CSwig/Python/otbvisu.py b/Wrapping/CSwig/Python/otbvisu.py
deleted file mode 100644
index 406545609ffc69f1c7c1fd3dd54ea42c470520ff..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/otbvisu.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from otbcommon import *
-__itk_import_data__ = itkbase.preimport()
-from OTBVisuPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/vxlnumerics.py b/Wrapping/CSwig/Python/vxlnumerics.py
deleted file mode 100644
index 5d8bd48b599fa0bc099476810cdcde215336c133..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Python/vxlnumerics.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import itkbase
-
-__itk_import_data__ = itkbase.preimport()
-from VXLNumericsPython import *
-itkbase.postimport(__itk_import_data__)
diff --git a/Wrapping/CSwig/Python/vxlnumerics.pyc b/Wrapping/CSwig/Python/vxlnumerics.pyc
deleted file mode 100644
index 2ada2aa8cb26f105da19126ca3305e7d6dc1d579..0000000000000000000000000000000000000000
Binary files a/Wrapping/CSwig/Python/vxlnumerics.pyc and /dev/null differ
diff --git a/Wrapping/CSwig/README b/Wrapping/CSwig/README
deleted file mode 100644
index b49d14bc989e12bb0d031c356e76b3593014fa9b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/README
+++ /dev/null
@@ -1,76 +0,0 @@
-To use tcl or python wrapping using cswig, you will have to build
-CableSwig. CableSwig is a combination package that includes swig,
-cable, and gccxml. When built CableSwig will have three execuables:
-
- cswig - the main cable swig executable, that takes an xml file from
- gccxml as input. The xml file should be created from a cable config
- input file.
-
- cableidx - a program to generate index files from gccxml xml files. The
- index files tell cswig what classes are wrapped in which libraries.
-
- gccxml_cc1plus - A patched version of gcc that has the -fxml option to
- convert c++ into xml.
-
- gccxml - http://www.gccxml.org/HTML/Index.html, the front end program to gccxml_cc1plus
-
-
-To build ITK with the CSwig wrappers:
-
- 1. checkout a copy of CableSwig
-
- Simply do:
-
- cvs -d:pserver:anonymous@public.kitware.com:/cvsroot/CableSwig co CableSwig
-
- Note that no cvs login is needed here.
-
- 1.1 IF you checkout CableSwig in the Insight/Utilities directory, then
- CableSwig will be built as part of ITK
-
- 2. build CableSwig on your system. (this step can be skipped if 1.1 was done.
-
- 3. run cmake on ITK (ccmake or CMakeSetup)
- - turn on the show advanced values option (t in ccmake)
- - Turn on ITK_CSWIG_TCL and/or ITK_CSWIG_PYTHON
- - run cmake configure (c for ccmake, Configure button for CMakeSetup)
- - if not found already, Set the cache entry for CSWIG to the full path to the
- cswig executable built in 1. Run cmake configure again.
- Cmake should set CABLE_INDEX and GCCXML based on the path given for CSWIG.
- When running on windows, as long as CableSwig was configured first, cmake
- should automatically find all of them. If step 1.1 was followed, then
- CSWIG, CABLE_INDEX, and GCCXML should all be set automatically.
- - generate the makefiles
-
-To run scripts.
- To make things easier to use, you have to set paths to the build tree of ITK.
- If using msdev or devenv, you have to include the config directory
- (Release,Debug,MinSizeRel, RelWithDebInfo).
-
- Python:
- - set the PYTHONPATH variable to ITK-build/Wrapping/CSwig/Python/[Release].
- - run python and run this python command:
- from InsightToolkit import *
- Tcl:
- - set the TCLLIBPATH variable to ITK-build/Wrapping/CSwig/Tcl/[Release|Debug]
-
- Use the following at the top of the script:
-
- package require Tk
- package require InsightToolkit
- package require itkinteraction
-
- Java:
- - set CLASSPATH to include ITK-build/Wrapping/CSwig/Java/InsightToolkit.jar
-
-
- There are a few examples in Insight/Wrapping/CSwig/Tests.
-
-
-KNOWN ISSUES:
- - dependency information is not available in visual studio until
- after the first build, and cmake is run again.
- - Python must be built Release of RelWithDebInfo on windows.
- - Java on Linux requires at least the JDK version 1.4.2_04.
-
-
diff --git a/Wrapping/CSwig/SwigInc.txt.in b/Wrapping/CSwig/SwigInc.txt.in
deleted file mode 100644
index 3fc1a405f941bff45efb0fa6b05409007d63b10a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigInc.txt.in
+++ /dev/null
@@ -1 +0,0 @@
-@SWIG_INC_CONTENTS@
diff --git a/Wrapping/CSwig/SwigRuntime/.NoDartCoverage b/Wrapping/CSwig/SwigRuntime/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/SwigRuntime/CMakeLists.txt b/Wrapping/CSwig/SwigRuntime/CMakeLists.txt
deleted file mode 100644
index 0b65b629e48765fe095844bc4ea68c7c32986883..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/CMakeLists.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-#goes ignored. The solution for me was to add a .i with just the
-#following:
-
-#%module swigruntime
-
-#And compile it without -c, while compiling the others with -c. Then
-#using -DSWIG_GLOBAL in my CFLAGS for everything. I expected I might
-#get some linker clashes from this but it went smoothly. I'll have to
-#dig around the automake docs to see if i can set it for just the
-#swigruntime.cc.
-
-SET_SOURCE_FILES_PROPERTIES(${WrapOTB_BINARY_DIR}/SwigRuntime/swigrunTcl.cxx GENERATED)
-SET_SOURCE_FILES_PROPERTIES(${WrapOTB_BINARY_DIR}/SwigRuntime/swigrunPython.cxx GENERATED)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-IF(OTB_CSWIG_TCL)
- ADD_LIBRARY(SwigRuntimeTcl SHARED ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrunTcl.cxx)
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(SwigRuntimeTcl PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}" ${OTB_LIBRARY_PROPERTIES})
- ELSE(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(SwigRuntimeTcl PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
- ENDIF(OTB_LIBRARY_PROPERTIES)
- TARGET_LINK_LIBRARIES(SwigRuntimeTcl ${TCL_LIBRARY})
- INSTALL(TARGETS SwigRuntimeTcl
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-ENDIF(OTB_CSWIG_TCL)
-
-IF(OTB_CSWIG_PYTHON)
- ADD_LIBRARY(SwigRuntimePython SHARED ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrunPython.cxx)
- TARGET_LINK_LIBRARIES(SwigRuntimePython ${PYTHON_LIBRARY})
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(SwigRuntimePython PROPERTIES ${OTB_LIBRARY_PROPERTIES})
- ENDIF(OTB_LIBRARY_PROPERTIES)
- INSTALL(TARGETS SwigRuntimePython
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-ENDIF(OTB_CSWIG_PYTHON)
-
-IF(OTB_CSWIG_PERL)
- ADD_LIBRARY(SwigRuntimePerl SHARED ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrunPerl.cxx)
- TARGET_LINK_LIBRARIES(SwigRuntimePerl "${PERL_LIBRARY}")
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(SwigRuntimePerl PROPERTIES ${OTB_LIBRARY_PROPERTIES})
- ENDIF(OTB_LIBRARY_PROPERTIES)
- INSTALL(TARGETS SwigRuntimePerl
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-ENDIF(OTB_CSWIG_PERL)
-
-MACRO(CREATE_SWIG_RUNTIME LangOption LibName LangPostFix)
- ADD_CUSTOM_COMMAND(
- SOURCE ${WrapOTB_SOURCE_DIR}/SwigRuntime/swigrun.h
- COMMAND ${GCCXML}
- ARGS -fxml-start=_cable_ -DCABLE_CONFIGURATION ${WrapOTB_SOURCE_DIR}/SwigRuntime/swigrun.h
- -fxml=${WrapOTB_BINARY_DIR}/SwigRuntime/swigrun.xml
- TARGET ${LibName}
- OUTPUTS ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrun.xml
- DEPENDS ${GCCXML})
- SET(XML_COMMAND_ADDED 1)
- ADD_CUSTOM_COMMAND(
- SOURCE ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrun.xml
- COMMAND ${CSWIG}
- ARGS -o ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrun${LangPostFix}.cxx ${LangOption}
- -c++ ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrun.xml
- TARGET ${LibName}
- OUTPUTS ${WrapOTB_BINARY_DIR}/SwigRuntime/swigrun${LangPostFix}.cxx
- DEPENDS ${CSWIG})
-ENDMACRO(CREATE_SWIG_RUNTIME)
-
-IF(OTB_CSWIG_TCL)
- CREATE_SWIG_RUNTIME(-tcl SwigRuntimeTcl Tcl)
-ENDIF(OTB_CSWIG_TCL)
-
-IF(OTB_CSWIG_PYTHON)
- CREATE_SWIG_RUNTIME(-python SwigRuntimePython Python)
-ENDIF(OTB_CSWIG_PYTHON)
-
-IF(OTB_CSWIG_PERL)
- CREATE_SWIG_RUNTIME(-perl5 SwigRuntimePerl Perl)
-ENDIF(OTB_CSWIG_PERL)
-
-IF(OTB_CSWIG_JAVA)
- SET_SOURCE_FILES_PROPERTIES(${WrapOTB_BINARY_DIR}/SwigRuntime/JavaCWDJava.cxx GENERATED)
- ADD_LIBRARY(SwigRuntimeJava MODULE ${WrapOTB_BINARY_DIR}/SwigRuntime/JavaCWDJava.cxx JavaCWD.cxx)
- IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(SwigRuntimeJava PROPERTIES ${OTB_LIBRARY_PROPERTIES})
- ENDIF(OTB_LIBRARY_PROPERTIES)
- INSTALL(TARGETS SwigRuntimeJava
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
- MAKE_DIRECTORY(${WrapOTB_BINARY_DIR}/Java/InsightToolkit)
- ADD_CUSTOM_COMMAND(
- COMMENT "run native swig on SwigExtras.i"
- SOURCE ${WrapOTB_SOURCE_DIR}/SwigRuntime/JavaCWD.i
- COMMAND ${CSWIG}
- ARGS -nocable -noruntime ${IGNORE_WARNINGS} -o ${WrapOTB_BINARY_DIR}/SwigRuntime/JavaCWDJava.cxx
- -outdir ${WrapOTB_BINARY_DIR}/Java/InsightToolkit
- -package InsightToolkit
- -java -c++ ${WrapOTB_SOURCE_DIR}/SwigRuntime/JavaCWD.i
- TARGET ${LIBRARY_NAME}Java
- OUTPUTS ${WrapOTB_BINARY_DIR}/SwigRuntime/JavaCWDJava.cxx
- DEPENDS ${WrapOTB_SOURCE_DIR}/SwigRuntime/JavaCWD.i ${CSWIG})
-ENDIF(OTB_CSWIG_JAVA)
-
diff --git a/Wrapping/CSwig/SwigRuntime/CVS/Entries b/Wrapping/CSwig/SwigRuntime/CVS/Entries
deleted file mode 100644
index 0d4bd599123d026c9510cf38b4d92c1203b5a181..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/CVS/Entries
+++ /dev/null
@@ -1,7 +0,0 @@
-/.NoDartCoverage/1.1/Sat Sep 25 17:36:57 2004//TITK-3-0-1
-/CMakeLists.txt/1.15/Thu Oct 26 19:59:48 2006//TITK-3-0-1
-/JavaCWD.cxx/1.3/Fri Jun 18 15:36:19 2004//TITK-3-0-1
-/JavaCWD.h/1.3/Fri Jun 18 15:36:19 2004//TITK-3-0-1
-/JavaCWD.i/1.2/Wed Feb 18 14:47:41 2004//TITK-3-0-1
-/swigrun.h/1.1/Tue May 13 20:28:38 2003//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/SwigRuntime/CVS/Repository b/Wrapping/CSwig/SwigRuntime/CVS/Repository
deleted file mode 100644
index 36d98d14042b8933f02c1434d728b9c2c469b7a9..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/SwigRuntime
diff --git a/Wrapping/CSwig/SwigRuntime/CVS/Root b/Wrapping/CSwig/SwigRuntime/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/SwigRuntime/CVS/Tag b/Wrapping/CSwig/SwigRuntime/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/SwigRuntime/CVS/Template b/Wrapping/CSwig/SwigRuntime/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/SwigRuntime/JavaCWD.cxx b/Wrapping/CSwig/SwigRuntime/JavaCWD.cxx
deleted file mode 100644
index 5f7740b224fe1a1923df0a74b5a9c2f85f338cab..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/JavaCWD.cxx
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "JavaCWD.h"
-
-#if defined(_WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__))
-#include <direct.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void JavaCWD::SetCWD(const char* dir)
-{
-#if defined(__BORLANDC__)
- chdir(dir);
-#else
- _chdir(dir);
-#endif
-}
-
-const char* JavaCWD::GetCWD()
-{
- static char buffer[4096];
-#if defined(__BORLANDC__)
- getcwd(buffer, 4096);
-#else
- _getcwd(buffer, 4096);
-#endif
- return buffer;
-}
-#else
-#include <unistd.h>
-void JavaCWD::SetCWD(const char* dir)
-{
- chdir(dir);
-}
-
-const char* JavaCWD::GetCWD()
-{
- static char buffer[4096];
- getcwd(buffer, 4096);
- return buffer;
-}
-#endif
-
-#if defined(__linux__)
-# include <dlfcn.h>
-
-int JavaCWD::Load(const char* lib)
-{
- return dlopen(lib, RTLD_GLOBAL|RTLD_NOW)? 1:0;
-}
-#else
-int JavaCWD::Load(const char* lib)
-{
- return 0;
-}
-#endif
diff --git a/Wrapping/CSwig/SwigRuntime/JavaCWD.h b/Wrapping/CSwig/SwigRuntime/JavaCWD.h
deleted file mode 100644
index 2d9868f208620aa686ac05ad41577593dc032de3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/JavaCWD.h
+++ /dev/null
@@ -1,7 +0,0 @@
-class JavaCWD
-{
-public:
- static void SetCWD(const char* dir);
- static const char* GetCWD();
- static int Load(const char* lib);
-};
diff --git a/Wrapping/CSwig/SwigRuntime/JavaCWD.i b/Wrapping/CSwig/SwigRuntime/JavaCWD.i
deleted file mode 100644
index 69eb0a7df775e11ba5961a93c86bf2cc8685d219..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/JavaCWD.i
+++ /dev/null
@@ -1,5 +0,0 @@
-%module SwigRuntime
-%include "JavaCWD.h"
-%{
-#include "JavaCWD.h"
-%}
diff --git a/Wrapping/CSwig/SwigRuntime/swigrun.h b/Wrapping/CSwig/SwigRuntime/swigrun.h
deleted file mode 100644
index 64bea5537812bf859e321cf730bd2d9e22e172bc..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/SwigRuntime/swigrun.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef CABLE_CONFIGURATION
-namespace _cable_
-{
- const char* const group="SwigRunTime";
-}
-#endif
diff --git a/Wrapping/CSwig/Tcl/.NoDartCoverage b/Wrapping/CSwig/Tcl/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/Tcl/CMakeLists.txt b/Wrapping/CSwig/Tcl/CMakeLists.txt
deleted file mode 100644
index f4205421d3d65cff0b7310cb22fc30c7b46a5dd0..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-SET(OTB_TCL_EXE_DIR_BUILD "${OTB_EXECUTABLE_PATH}")
-SET(OTB_TCL_EXE_NAME_ROOT "itkwish")
-
-CONFIGURE_FILE(${OTB_SOURCE_DIR}/Wrapping/CSwig/Tcl/itkTclConfigure.h.in
- ${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl/itkTclConfigure.h)
-
-INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Wrapping/CSwig/Tcl)
-ADD_EXECUTABLE(itkwish itkTclAppInit.cxx)
-TARGET_LINK_LIBRARIES(itkwish
- OTBAlgorithmsTcl
- OTBBasicFiltersATcl
- OTBBasicFiltersBTcl
- OTBIOTcl
- OTBNumericsTcl
- OTBCommonATcl
- OTBCommonBTcl
- VXLNumericsTcl
- SwigRuntimeTcl
- ${TCL_LIBRARY}
- ${TK_LIBRARY}
-)
-
-IF(OTB_LIBRARY_PROPERTIES)
- SET_TARGET_PROPERTIES(itkwish PROPERTIES ${OTB_LIBRARY_PROPERTIES})
-ENDIF(OTB_LIBRARY_PROPERTIES)
-INSTALL(TARGETS itkwish
- RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeExecutables)
-
-INSTALL(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/itkinteraction.tcl
- ${CMAKE_CURRENT_SOURCE_DIR}/itktesting.tcl
- ${CMAKE_CURRENT_SOURCE_DIR}/itkdata.tcl
- DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}/tcl
- COMPONENT RuntimeLibraries)
diff --git a/Wrapping/CSwig/Tcl/CVS/Entries b/Wrapping/CSwig/Tcl/CVS/Entries
deleted file mode 100644
index 462cfb3f4c341f512d359eb260b3b66d7f6fee60..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/CVS/Entries
+++ /dev/null
@@ -1,11 +0,0 @@
-/.NoDartCoverage/1.1/Sat Sep 25 17:36:47 2004//TITK-3-0-1
-/CMakeLists.txt/1.9/Thu Oct 26 19:59:48 2006//TITK-3-0-1
-/itkTclAppInit.cxx/1.5/Fri Mar 25 13:17:58 2005//TITK-3-0-1
-/itkTclConfigure.h.in/1.1/Tue Jun 3 17:34:14 2003//TITK-3-0-1
-/itkdata.tcl/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/itkinteraction.tcl/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/itktesting.tcl/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/itkutils.tcl/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/itkwish/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/pkgIndex.tcl.in/1.7/Tue Mar 29 15:00:50 2005//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Tcl/CVS/Repository b/Wrapping/CSwig/Tcl/CVS/Repository
deleted file mode 100644
index ccd4fd49aa0742a98a654c6dc88ff528a92bbfaa..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Tcl
diff --git a/Wrapping/CSwig/Tcl/CVS/Root b/Wrapping/CSwig/Tcl/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Tcl/CVS/Tag b/Wrapping/CSwig/Tcl/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Tcl/CVS/Template b/Wrapping/CSwig/Tcl/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Tcl/itkTclAppInit.cxx b/Wrapping/CSwig/Tcl/itkTclAppInit.cxx
deleted file mode 100644
index 7e68ee734fe35b3d5ebaae7381e038c48e444b05..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/itkTclAppInit.cxx
+++ /dev/null
@@ -1,198 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: itkTclAppInit.cxx,v $
- Language: C++
- Date: $Date: 2005/03/25 13:17:58 $
- Version: $Revision: 1.5 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "itkLightObject.h"
-#include "itkTclConfigure.h"
-
-#include <sys/stat.h>
-#include <string.h>
-
-#ifndef ITK_TCL_NO_TK
-# include <tk.h>
-#else
-# include <tcl.h>
-#endif
-
-//----------------------------------------------------------------------------
-// Definitions related to build tree locations:
-// ITK_TCL_EXE_DIR = Location of this executable.
-// ITK_TCL_LIB_DIR = Location of the pkgIndex.tcl file for ITK.
-#if defined(CMAKE_INTDIR)
-# define ITK_TCL_EXE_DIR ITK_TCL_EXE_DIR_BUILD "/" CMAKE_INTDIR
-# define ITK_TCL_LIB_DIR ITK_BINARY_DIR "/Wrapping/CSwig/Tcl/" CMAKE_INTDIR
-#else
-# define ITK_TCL_EXE_DIR ITK_TCL_EXE_DIR_BUILD
-# define ITK_TCL_LIB_DIR ITK_BINARY_DIR "/Wrapping/CSwig/Tcl"
-#endif
-
-// ITK_TCL_EXE_NAME = Name of this executable.
-#if defined(_WIN32)
-# define ITK_TCL_EXE_NAME ITK_TCL_EXE_NAME_ROOT ".exe"
-#else
-# define ITK_TCL_EXE_NAME ITK_TCL_EXE_NAME_ROOT
-#endif
-
-
-//----------------------------------------------------------------------------
-int itkTclAppInit(Tcl_Interp* interp);
-bool itkTclAppInitCheckSameExecutable(Tcl_Interp* interp);
-
-//----------------------------------------------------------------------------
-/** Program entry point. */
-int main(int argc, char** argv)
-{
- std::ios::sync_with_stdio();
-#ifndef ITK_TCL_NO_TK
- Tk_Main(argc, argv, &itkTclAppInit);
-#else
- Tcl_Main(argc, argv, &itkTclAppInit);
-#endif
- return 0;
-}
-
-//----------------------------------------------------------------------------
-// Get the Tcl package initialization functions to call directly.
-extern "C"
-{
- int Vxlnumericstcl_Init(Tcl_Interp*);
- int Itknumericstcl_Init(Tcl_Interp*);
- int Itkcommonatcl_Init(Tcl_Interp*);
- int Itkcommonbtcl_Init(Tcl_Interp*);
- int Itkiotcl_Init(Tcl_Interp*);
- int Itkbasicfiltersatcl_Init(Tcl_Interp*);
- int Itkbasicfiltersbtcl_Init(Tcl_Interp*);
- int Itkalgorithmstcl_Init(Tcl_Interp*);
-}
-
-//----------------------------------------------------------------------------
-/** Main application initialization function. */
-int itkTclAppInit(Tcl_Interp* interp)
-{
- // Initialize Tcl.
- if(Tcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
-
-#ifndef ITK_TCL_NO_TK
- // Initialize Tk.
- if(Tk_Init(interp) != TCL_OK) { return TCL_ERROR; }
-#endif
-
- if(itkTclAppInitCheckSameExecutable(interp))
- {
- // Running from build tree, load the pkgIndex.tcl file from it.
- char pkgIndexScript[] = "source {" ITK_TCL_LIB_DIR "/pkgIndex.tcl}\n";
- if(Tcl_GlobalEval(interp, pkgIndexScript) != TCL_OK) { return TCL_ERROR; }
- }
- else
- {
- // Not running from build tree, load the pkgIndex.tcl file if
- // there is one next to the exectuable. If it does not exist,
- // just assume the user has configured TCLLIBPATH correctly.
- char pkgIndexScript[] =
- "set itkTclAppInit_pkgIndex_tcl \\\n"
- " [file join [file dirname [info nameofexecutable]] tcl pkgIndex.tcl]\n"
- "if {[file exists $itkTclAppInit_pkgIndex_tcl]} {\n"
- " source $itkTclAppInit_pkgIndex_tcl\n"
- "}\n"
- "unset itkTclAppInit_pkgIndex_tcl";
- if(Tcl_GlobalEval(interp, pkgIndexScript) != TCL_OK) { return TCL_ERROR; }
- }
-
- // Initialize the built-in packages.
- if(Vxlnumericstcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
- if(Itknumericstcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
- if(Itkcommonatcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
- if(Itkcommonbtcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
- if(Itkiotcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
- if(Itkbasicfiltersatcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
- if(Itkbasicfiltersbtcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
- if(Itkalgorithmstcl_Init(interp) != TCL_OK) { return TCL_ERROR; }
-
- // Initialize all ITK Tcl packages.
- static char initScript[] = "package require InsightToolkit " ITK_VERSION_STRING;
- if(Tcl_GlobalEval(interp, initScript) != TCL_OK) { return TCL_ERROR; }
-
- // Allow users to have an initialization file for interactive mode.
- static char rcFileNameVariable[] = "tcl_rcFileName";
- static char rcFileNameValue[] = "~/.itktclrc";
- Tcl_SetVar(interp, rcFileNameVariable, rcFileNameValue, TCL_GLOBAL_ONLY);
-
- return TCL_OK;
-}
-
-//----------------------------------------------------------------------------
-bool itkTclAppInitCheckSameExecutable(Tcl_Interp* interp)
-{
- // Get the name of the actual executable.
- char nameScript[] = "info nameofexecutable";
- if(Tcl_GlobalEval(interp, nameScript) != TCL_OK) { return TCL_ERROR; }
- std::string nameOfExecutable = Tcl_GetStringResult(interp);
-
- // Get the name of the executable in the build tree.
- std::string buildExecutable = ITK_TCL_EXE_DIR "/" ITK_TCL_EXE_NAME;
-
- const char* file1 = nameOfExecutable.c_str();
- const char* file2 = buildExecutable.c_str();
-
-#if defined(_WIN32)
- struct stat fileStat1, fileStat2;
- if (stat(file1, &fileStat1) == 0 && stat(file2, &fileStat2) == 0)
- {
- HANDLE hFile1, hFile2;
-
- hFile1 = CreateFile(file1, GENERIC_READ, FILE_SHARE_READ, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
- hFile2 = CreateFile(file2, GENERIC_READ, FILE_SHARE_READ, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
- if( hFile1 == INVALID_HANDLE_VALUE || hFile2 == INVALID_HANDLE_VALUE)
- {
- if(hFile1 != INVALID_HANDLE_VALUE)
- {
- CloseHandle(hFile1);
- }
- if(hFile2 != INVALID_HANDLE_VALUE)
- {
- CloseHandle(hFile2);
- }
- return false;
- }
-
- BY_HANDLE_FILE_INFORMATION fiBuf1;
- BY_HANDLE_FILE_INFORMATION fiBuf2;
- GetFileInformationByHandle( hFile1, &fiBuf1 );
- GetFileInformationByHandle( hFile2, &fiBuf2 );
- CloseHandle(hFile1);
- CloseHandle(hFile2);
- return (fiBuf1.nFileIndexHigh == fiBuf2.nFileIndexHigh &&
- fiBuf1.nFileIndexLow == fiBuf2.nFileIndexLow);
- }
- return false;
-#else
- struct stat fileStat1, fileStat2;
- if (stat(file1, &fileStat1) == 0 && stat(file2, &fileStat2) == 0)
- {
- // see if the files are the same file
- // check the device inode and size
- if(memcmp(&fileStat2.st_dev, &fileStat1.st_dev, sizeof(fileStat1.st_dev)) == 0 &&
- memcmp(&fileStat2.st_ino, &fileStat1.st_ino, sizeof(fileStat1.st_ino)) == 0 &&
- fileStat2.st_size == fileStat1.st_size
- )
- {
- return true;
- }
- }
- return false;
-#endif
-}
diff --git a/Wrapping/CSwig/Tcl/itkTclConfigure.h.in b/Wrapping/CSwig/Tcl/itkTclConfigure.h.in
deleted file mode 100644
index a212ea45c3671ebefeea40043dc6d2767c06fdc6..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/itkTclConfigure.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _itkTclConfigure_h
-#define _itkTclConfigure_h
-
-#undef ITK_BINARY_DIR
-#define ITK_BINARY_DIR "${ITK_BINARY_DIR}"
-
-#undef ITK_TCL_EXE_DIR_BUILD
-#define ITK_TCL_EXE_DIR_BUILD "${ITK_TCL_EXE_DIR_BUILD}"
-
-#undef ITK_TCL_EXE_NAME_ROOT
-#define ITK_TCL_EXE_NAME_ROOT "${ITK_TCL_EXE_NAME_ROOT}"
-
-#endif
diff --git a/Wrapping/CSwig/Tcl/itkdata.tcl b/Wrapping/CSwig/Tcl/itkdata.tcl
deleted file mode 100644
index c2cdf4ce01c67c147b34addce5063e1ae1bd4755..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/itkdata.tcl
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Program: Insight Segmentation & Registration Toolkit
-# Module: $RCSfile: itkdata.tcl,v $
-# Language: C++
-# Date: $Date: 2003/09/10 14:30:12 $
-# Version: $Revision: 1.2 $
-#
-# Copyright (c) Insight Software Consortium. All rights reserved.
-# See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the above copyright notices for more information.
-#
-
-# Define ITK Tcl data utilities.
-namespace eval itk::data {
-
- # Require the itk packages.
- package require InsightToolkit
-
- # Put the ITK_DATA_ROOT setting in the global namespace.
-
- # Look for the -D command line option.
- if {! [info exists ::ITK_DATA_ROOT] && [info exists argc]} {
- set argcm1 [expr $argc - 1]
- for {set i 0} {$i < $argcm1} {incr i} {
- if {[lindex $argv $i] == "-D" && $i < $argcm1} {
- set ::ITK_DATA_ROOT [lindex $argv [expr $i + 1]]
- break
- }
- }
- }
-
- # Check for the environment variable ::ITK_DATA_ROOT.
- if {! [info exists ::ITK_DATA_ROOT] && [info exists env(ITK_DATA_ROOT)]} {
- set ::ITK_DATA_ROOT $env(ITK_DATA_ROOT)
- }
-
- # Use the default data root.
- if {! [info exists ::ITK_DATA_ROOT]} {
- set ::ITK_DATA_ROOT $::itk::data::defaultDataRoot
- }
-}
diff --git a/Wrapping/CSwig/Tcl/itkinteraction.tcl b/Wrapping/CSwig/Tcl/itkinteraction.tcl
deleted file mode 100644
index 1f6353b8390adac90696ccb2667593099bafd4c7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/itkinteraction.tcl
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Program: Insight Segmentation & Registration Toolkit
-# Module: $RCSfile: itkinteraction.tcl,v $
-# Language: C++
-# Date: $Date: 2003/09/10 14:30:12 $
-# Version: $Revision: 1.2 $
-#
-# Copyright (c) Insight Software Consortium. All rights reserved.
-# See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the above copyright notices for more information.
-#
-
-# Need Tk.
-package require Tk
-
-# Define ITK Tcl interactor.
-namespace eval itk::interact {
-
- set Bold "-background #43ce80 -foreground #221133 -relief raised -borderwidth 1"
- set Normal "-background #dddddd -foreground #221133 -relief flat"
- set Tagcount 1
- set CommandList ""
- set CommandIndex 0
-
- proc createInteractor {} {
- global itk::interact::CommandList
- global itk::interact::CommandIndex
- global itk::interact::Tagcount
-
- proc doitk {s w} {
- global itk::interact::Bold
- global itk::interact::Normal
- global itk::interact::Tagcount
- global itk::interact::CommandList
- global itk::interact::CommandIndex
-
- set tag [append tagnum $Tagcount]
- set CommandIndex $Tagcount
- incr Tagcount 1
- .itkInteract.display.text configure -state normal
- .itkInteract.display.text insert end $s $tag
- set CommandList [linsert $CommandList end $s]
- eval .itkInteract.display.text tag configure $tag $Normal
- .itkInteract.display.text tag bind $tag <Any-Enter> \
- ".itkInteract.display.text tag configure $tag $Bold"
- .itkInteract.display.text tag bind $tag <Any-Leave> \
- ".itkInteract.display.text tag configure $tag $Normal"
- .itkInteract.display.text tag bind $tag <1> "itk::interact::doitk [list $s] .itkInteract"
- .itkInteract.display.text insert end \n;
- .itkInteract.display.text insert end [uplevel 1 $s]
- .itkInteract.display.text insert end \n\n
- .itkInteract.display.text configure -state disabled
- .itkInteract.display.text yview end
- }
-
- catch {destroy .itkInteract}
- toplevel .itkInteract -bg #bbbbbb
- wm title .itkInteract "itk Interactor"
- wm iconname .itkInteract "itk"
-
- frame .itkInteract.buttons -bg #bbbbbb
- pack .itkInteract.buttons -side bottom -fill both -expand 0 -pady 2m
- button .itkInteract.buttons.dismiss -text Dismiss \
- -command "wm withdraw .itkInteract" \
- -bg #bbbbbb -fg #221133 -activebackground #cccccc -activeforeground #221133
- pack .itkInteract.buttons.dismiss -side left -expand 1 -fill x
-
- frame .itkInteract.file -bg #bbbbbb
- label .itkInteract.file.label -text "Command:" -width 10 -anchor w \
- -bg #bbbbbb -fg #221133
- entry .itkInteract.file.entry -width 40 \
- -bg #dddddd -fg #221133 -highlightthickness 1 -highlightcolor #221133
- bind .itkInteract.file.entry <Return> {
- itk::interact::doitk [%W get] .itkInteract; %W delete 0 end
- }
- pack .itkInteract.file.label -side left
- pack .itkInteract.file.entry -side left -expand 1 -fill x
-
- frame .itkInteract.display -bg #bbbbbb
- text .itkInteract.display.text -yscrollcommand ".itkInteract.display.scroll set" \
- -setgrid true -width 60 -height 8 -wrap word -bg #dddddd -fg #331144 \
- -state disabled
- scrollbar .itkInteract.display.scroll \
- -command ".itkInteract.display.text yview" -bg #bbbbbb \
- -troughcolor #bbbbbb -activebackground #cccccc -highlightthickness 0
- pack .itkInteract.display.text -side left -expand 1 -fill both
- pack .itkInteract.display.scroll -side left -expand 0 -fill y
-
- pack .itkInteract.display -side bottom -expand 1 -fill both
- pack .itkInteract.file -pady 3m -padx 2m -side bottom -fill x
-
- set CommandIndex 0
-
- bind .itkInteract <Down> {
- global itk::interact::CommandIndex
- global itk::interact::CommandList
-
- if { $CommandIndex < [expr $Tagcount - 1] } {
- incr CommandIndex
- set command_string [lindex $CommandList $CommandIndex]
- .itkInteract.file.entry delete 0 end
- .itkInteract.file.entry insert end $command_string
- } elseif { $CommandIndex == [expr $Tagcount - 1] } {
- .itkInteract.file.entry delete 0 end
- }
- }
-
- bind .itkInteract <Up> {
- global itk::interact::CommandIndex
- global itk::interact::CommandList
-
- if { $CommandIndex > 0 } {
- set CommandIndex [expr $CommandIndex - 1]
- set command_string [lindex $CommandList $CommandIndex]
- .itkInteract.file.entry delete 0 end
- .itkInteract.file.entry insert end $command_string
- }
- }
-
- wm withdraw .itkInteract
- }
-
- # Create the interactor.
- createInteractor
-}
diff --git a/Wrapping/CSwig/Tcl/itktesting.tcl b/Wrapping/CSwig/Tcl/itktesting.tcl
deleted file mode 100644
index ee78919df707235a74074613a3cdb47a468f600e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/itktesting.tcl
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Program: Insight Segmentation & Registration Toolkit
-# Module: $RCSfile: itktesting.tcl,v $
-# Language: C++
-# Date: $Date: 2003/09/10 14:30:12 $
-# Version: $Revision: 1.2 $
-#
-# Copyright (c) Insight Software Consortium. All rights reserved.
-# See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the above copyright notices for more information.
-#
-
-# Define ITK Tcl testing utilities.
-namespace eval itk::testing {
-
- # Require the itk packages.
- package require InsightToolkit
- package require itkdata
-
- # Put the ITK_TEST_ROOT setting in the global namespace. This
- # package is only used for testing, so this is okay.
-
- # Look for the -T command line option.
- if {! [info exists ::ITK_TEST_ROOT] && [info exists argc]} {
- set argcm1 [expr $argc - 1]
- for {set i 0} {$i < $argcm1} {incr i} {
- if {[lindex $argv $i] == "-T" && $i < $argcm1} {
- set ::ITK_TEST_ROOT [lindex $argv [expr $i + 1]]
- break
- }
- }
- }
-
- # Check for the environment variable ::ITK_TEST_ROOT.
- if {! [info exists ::ITK_TEST_ROOT] && [info exists env(ITK_TEST_ROOT)]} {
- set ::ITK_TEST_ROOT $env(ITK_TEST_ROOT)
- }
-
- # Use the default output directory.
- if {! [info exists ::ITK_TEST_ROOT]} {
- set dtr $::itk::testing::defaultTestRoot
- if {$dtr == "<NO_DEFAULT>"} {
- error "Set ITK_TEST_ROOT or use -T option to specify."
- } else {
- set ::ITK_TEST_ROOT $dtr
- }
- }
-
- # Setup testing directories.
- set ::ITK_TEST_BASELINE "${::ITK_DATA_ROOT}/Baseline"
- set ::ITK_TEST_INPUT "${::ITK_DATA_ROOT}/Input"
- set ::ITK_TEST_OUTPUT "${::ITK_TEST_ROOT}/Output"
- file mkdir "${::ITK_TEST_OUTPUT}"
-}
diff --git a/Wrapping/CSwig/Tcl/itkutils.tcl b/Wrapping/CSwig/Tcl/itkutils.tcl
deleted file mode 100644
index 20fc46666a8bba61c19611d2c4066773d8a83890..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/itkutils.tcl
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Program: Insight Segmentation & Registration Toolkit
-# Module: $RCSfile: itkutils.tcl,v $
-# Language: C++
-# Date: $Date: 2003/09/10 14:30:12 $
-# Version: $Revision: 1.2 $
-#
-# Copyright (c) Insight Software Consortium. All rights reserved.
-# See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the above copyright notices for more information.
-#
-
-# Define ITK Tcl utilities.
-namespace eval itk {
-
- # Allow code like "$obj Print [itk::result]
- proc result {} {
- return [itk::TclStringStream [cable::Interpreter]]
- }
-
- # Create an object of the given type. Return a pointer to it. A
- # smart pointer to the object is kept in a list that is destroyed at
- # program exit.
- proc create {type} {
- global itk::_ObjectList_
- set ptr [itk::$type New]
- set p [$ptr ->]
- lappend _ObjectList_ $ptr
- return $p
- }
-
- # Start with an empty object list.
- set _ObjectList_ {}
-
- # Create an image viewer in a given frame.
- proc createImageViewer2D {frame image args} {
- # Create the canvas.
- eval canvas $frame.canvas {-scrollregion "1 1 32 32"} \
- {-xscrollcommand "$frame.scrollx set"} \
- {-yscrollcommand "$frame.scrolly set"} $args
- scrollbar $frame.scrollx -orient horizontal \
- -command "$frame.canvas xview"
- scrollbar $frame.scrolly -orient vertical \
- -command "$frame.canvas yview"
- pack $frame.scrollx -side bottom -fill x
- pack $frame.scrolly -side right -fill y
- pack $frame.canvas -expand 1 -fill both
-
- # Create a Tk image on the canvas.
- set i [image create photo]
- $frame.canvas create image 0 0 -image $i -anchor nw
-
- # Setup the TkImageViewer2D instance.
- set viewer [itk::create TkImageViewer2D]
- $viewer SetInput $image
- $viewer SetInterpreter [cable::Interpreter]
- $viewer SetImageName $i
- $viewer SetCanvasName $frame.canvas
- return $viewer
- }
-
- # Create a Tcl callback event.
- proc createTclCommand { cmd } {
- set command [itk::create TclCommand]
- $command SetInterpreter [cable::Interpreter]
- $command SetCommandString $cmd
- return $command
- }
-
- # Tcl procedure to list the wrapped classes.
- proc listClasses {} {
- set cmds {}
- foreach c [info commands ::itk::*] {
- if { ! [regexp {(<)|(_Pointer$)|(_Superclass$)|(^::itk::[^A-Z])} $c] } {
- lappend cmds $c
- }
- }
- set cmds [lsort $cmds]
- foreach c $cmds {
- puts $c
- }
- }
-
- proc listMethods {obj} {
- cable::ListMethods $obj
- }
-
- namespace export create result createImageViewer2D
-}
diff --git a/Wrapping/CSwig/Tcl/itkwish b/Wrapping/CSwig/Tcl/itkwish
deleted file mode 100644
index 042fc290cf4b59c1f3d631f6773b13b733889636..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/itkwish
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#-----------------------------------------------------------------------------
-# Program: Insight Segmentation & Registration Toolkit
-# Module: $RCSfile: itkwish,v $
-# Language: C++
-# Date: $Date: 2003/09/10 14:30:12 $
-# Version: $Revision: 1.2 $
-#
-# Copyright (c) Insight Software Consortium. All rights reserved.
-# See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-#
-# Portions of this code are covered under the VTK copyright.
-# See VTKCopyright.txt or http://www.kitware.com/VTKCopyright.htm for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even
-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the above copyright notices for more information.
-#-----------------------------------------------------------------------------
-
-#
-# This is a shell script driving the ITK Tcl wrapper executable. It
-# sets up the environment and then executes the real executable.
-# Alternatively, if the first command line argument is "--run", the rest
-# of the command line will be invoked as a command in the proper
-# environment.
-#
-# The real executable is located relative to this script in
-# ../lib/InsightToolkit
-#
-
-ITKWISH_Usage()
-{
- echo "Insight Segmentation & Registration Toolkit (http://www.itk.org)"
- echo "This is the Tcl wrapper executable driver."
- echo ""
- echo "Usage:"
- echo " itkwish = Run itkwish interactively as a Tcl interpreter."
- echo " itkwish foo.tcl = Run \"foo.tcl\" in the ITK Tcl interpreter."
- echo " itkwish --run ... = Run command \"...\" in the itkwish environment."
- echo ""
- echo "Example commands:"
- echo " \"itkwish\""
- echo " Provides a tcl prompt "%" from which ITK scripts can be written"
- echo " interactively."
- echo ""
- echo " \"itkwish myITKScript.tcl\""
- echo " Runs the myITKScript.tcl script in the ITK Tcl interpreter.."
- echo ""
- echo " \"itkwish --run wish\""
- echo " Runs wish in an environment in which the ITK packages can be"
- echo " loaded with \"package require InsightToolkit\"."
-}
-
-ITKWISH_SELFDIR=`cd \`echo "$0" | sed -n '/\//{s/\/[^\/]*$//;p;}'\`;pwd`
-
-if [ -d "${ITKWISH_SELFDIR}/../lib/InsightToolkit" ]; then : ; else
- ITKWISH_Usage
- echo ""
- echo "Error:"
- echo " This script is meant to be used from an itk installation directory."
- echo " It will not run from the itk source tree."
- exit 1
-fi
-
-ITKWISH_LIBDIR=`cd "${ITKWISH_SELFDIR}/../lib/InsightToolkit"; pwd`
-
-# Setup environment.
-case "`uname`" in
-Darwin)
- if [ -z "$DYLD_LIBRARY_PATH" ]; then
- export DYLD_LIBRARY_PATH="$ITKWISH_LIBDIR"
- else
- export DYLD_LIBRARY_PATH="$ITKWISH_LIBDIR:$DYLD_LIBRARY_PATH"
- fi
- ;;
-*)
- if [ -z "$LD_LIBRARY_PATH" ]; then
- export LD_LIBRARY_PATH="$ITKWISH_LIBDIR"
- else
- export LD_LIBRARY_PATH="$ITKWISH_LIBDIR:$LD_LIBRARY_PATH"
- fi
-esac
-
-if [ -z "$TCLLIBPATH" ]; then
- export TCLLIBPATH="\"$ITKWISH_LIBDIR\""
-else
- export TCLLIBPATH="\"$ITKWISH_LIBDIR\" $TCLLIBPATH"
-fi
-
-if [ "$1" = "--help" ]; then
- # Display usage.
- ITKWISH_Usage
- exit
-elif [ "$1" = "--run" ]; then
- # Skip the "--run" argument.
- shift
- # Run exact command line given after "--run" in this environment.
- exec "$@"
-else
- # Run real itkwish executable in this environment.
- exec "${ITKWISH_LIBDIR}/itkwish" "$@"
-fi
diff --git a/Wrapping/CSwig/Tcl/pkgIndex.tcl.in b/Wrapping/CSwig/Tcl/pkgIndex.tcl.in
deleted file mode 100644
index d45c73a46278060860113b7a2619847078fa2482..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tcl/pkgIndex.tcl.in
+++ /dev/null
@@ -1,106 +0,0 @@
-# Insight Toolkit (ITK) Tcl package configuration.
-
-namespace eval itk {
- #
- # This procedure will help configure other ITK Tcl packages.
- # Call it with:
- # package = the name of the package
- # version = the version number of the package
- #
- proc ConfigureTclPackage {libName version} {
- set libPrefix "@ITK_CSWIG_LIBNAME_PREFIX@"
- set libPath "@ITK_CSWIG_PACKAGE_DIR@"
- set libExt [info sharedlibextension]
- set libFile [file join $libPath "$libPrefix$libName$libExt"]
- set package [string tolower $libName]
-
- package ifneeded $package $version "
- namespace eval ::itk::loader {
- set curDir \[pwd\]
- cd {$libPath}
- if {\[catch { load \"$libFile\" } errorMessage \]} { puts \$errorMessage }
- cd \$curDir
- }
- "
- }
-
- # Procedure to drive configuration of all packages.
- proc ConfigureItkTclPackages {version} {
- # Configure ITK Tcl packages.
- ConfigureTclPackage VXLNumericsTcl $version
- ConfigureTclPackage ITKNumericsTcl $version
- ConfigureTclPackage ITKCommonATcl $version
- ConfigureTclPackage ITKCommonBTcl $version
- ConfigureTclPackage ITKIOTcl $version
- ConfigureTclPackage ITKBasicFiltersATcl $version
- ConfigureTclPackage ITKBasicFiltersBTcl $version
- ConfigureTclPackage ITKAlgorithmsTcl $version
-
- package ifneeded InsightToolkit $version "
- package require itknumerics $version
- package require itkcommon $version
- package require itkio $version
- package require itkbasicfilters $version
- package require itkalgorithms $version
- package provide InsightToolkit $version
- "
-
- package ifneeded itknumerics $version "
- package require vxlnumericstcl $version
- package require itknumericstcl $version
- package provide itknumerics $version
- "
-
- package ifneeded itkcommon $version "
- package require itkcommonatcl $version
- package require itkcommonbtcl $version
- package provide itkcommon $version
- "
-
- package ifneeded itkbasicfilters $version "
- package require itkbasicfiltersatcl $version
- package require itkbasicfiltersbtcl $version
- package provide itkbasicfilters $version
- "
-
- package ifneeded itkalgorithms $version "
- package require itkalgorithmstcl $version
- package provide itkalgorithms $version
- "
-
- package ifneeded itkio $version "
- package require itkiotcl $version
- package provide itkio $version
- "
-
- package ifneeded itkinteraction $version "
- set src \[file join \"@ITK_CSWIG_SCRIPT_DIR@\" itkinteraction.tcl\]
- if {\[catch { source \"\$src\" } errorMessage \]} { puts \$errorMessage } \\
- else { package provide itkinteraction $version }
- "
-
- package ifneeded itkdata $version "
- set src \[file join \"@ITK_CSWIG_SCRIPT_DIR@\" itkdata.tcl\]
- namespace eval itk::data {
- set defaultDataRoot \"@ITK_CSWIG_DATA_ROOT@\"
- }
- if {\[catch { source \"\$src\" } errorMessage \]} { puts \$errorMessage } \\
- else { package provide itkdata $version }
- "
-
- package ifneeded itktesting $version "
- set src \[file join \"@ITK_CSWIG_SCRIPT_DIR@\" itktesting.tcl\]
- namespace eval itk::testing {
- set defaultTestRoot \"@ITK_CSWIG_TEST_ROOT@\"
- }
- if {\[catch { source \"\$src\" } errorMessage \]} { puts \$errorMessage } \\
- else { package provide itktesting $version }
- "
- }
-
- # Make sure the procedure can be called.
- namespace export ConfigureItkTclPackages
-}
-
-# Configure packages with version @ITK_VERSION_STRING@.
-itk::ConfigureItkTclPackages @ITK_VERSION_STRING@
diff --git a/Wrapping/CSwig/Tests/CMakeLists.txt b/Wrapping/CSwig/Tests/CMakeLists.txt
deleted file mode 100644
index 5ede6625eb5ea7ae8763cf67cec321fdf194e059..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS(Tcl)
diff --git a/Wrapping/CSwig/Tests/CVS/Entries b/Wrapping/CSwig/Tests/CVS/Entries
deleted file mode 100644
index eb18e84a7babcaad91c1d38d66078ac98c390b31..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/CVS/Entries
+++ /dev/null
@@ -1,4 +0,0 @@
-/CMakeLists.txt/1.1/Mon Jul 14 12:50:29 2003//TITK-3-0-1
-D/Java////
-D/Python////
-D/Tcl////
diff --git a/Wrapping/CSwig/Tests/CVS/Repository b/Wrapping/CSwig/Tests/CVS/Repository
deleted file mode 100644
index 775fd2b10e0efa8d04c330730b71e961e8f506df..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Tests
diff --git a/Wrapping/CSwig/Tests/CVS/Root b/Wrapping/CSwig/Tests/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Tests/CVS/Tag b/Wrapping/CSwig/Tests/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Tests/CVS/Template b/Wrapping/CSwig/Tests/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Tests/Java/CVS/Entries b/Wrapping/CSwig/Tests/Java/CVS/Entries
deleted file mode 100644
index 9df64b03d7961f6e14128023ead7fb572554f77a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Java/CVS/Entries
+++ /dev/null
@@ -1,2 +0,0 @@
-/cannyEdgeDetectionImageFilter.java/1.2/Wed Feb 18 14:47:41 2004//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Tests/Java/CVS/Repository b/Wrapping/CSwig/Tests/Java/CVS/Repository
deleted file mode 100644
index c41312289c023ab8c542e8f29a5936e5d04f716f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Java/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Tests/Java
diff --git a/Wrapping/CSwig/Tests/Java/CVS/Root b/Wrapping/CSwig/Tests/Java/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Java/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Tests/Java/CVS/Tag b/Wrapping/CSwig/Tests/Java/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Java/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Tests/Java/CVS/Template b/Wrapping/CSwig/Tests/Java/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Java/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Tests/Java/cannyEdgeDetectionImageFilter.java b/Wrapping/CSwig/Tests/Java/cannyEdgeDetectionImageFilter.java
deleted file mode 100644
index 4a022364bcf0a3282f6602fd8a6cd36b4083ba5c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Java/cannyEdgeDetectionImageFilter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-import InsightToolkit.*;
-
-// This example illustrates how C++ classes can be used from Java using SWIG.
-// The Java class gets mapped onto the C++ class and behaves as if it is a Java class.
-
-public class cannyEdgeDetectionImageFilter {
- public static void main(String argv[])
- {
- itkImageFileReaderF2_Pointer reader = itkImageFileReaderF2.itkImageFileReaderF2_New();
- itkCannyEdgeDetectionImageFilterF2F2_Pointer canny
- = itkCannyEdgeDetectionImageFilterF2F2.itkCannyEdgeDetectionImageFilterF2F2_New();
- itkRescaleIntensityImageFilterF2US2_Pointer rescaler
- = itkRescaleIntensityImageFilterF2US2.itkRescaleIntensityImageFilterF2US2_New();
- itkImageFileWriterUS2_Pointer writer = itkImageFileWriterUS2.itkImageFileWriterUS2_New();
- canny.SetInput(reader.GetOutput());
- rescaler.SetInput(canny.GetOutput());
- writer.SetInput(rescaler.GetOutput());
- rescaler.SetOutputMinimum(0);
- rescaler.SetOutputMaximum(65535);
- reader.SetFileName("../../../../Testing/Data/Input/cthead1.png");
- writer.SetFileName("./testout.png");
- writer.Update();
- }
-}
diff --git a/Wrapping/CSwig/Tests/Python/CVS/Entries b/Wrapping/CSwig/Tests/Python/CVS/Entries
deleted file mode 100644
index ae4a0c5e51f8f46dd9a1e724b962a400d3b38043..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/CVS/Entries
+++ /dev/null
@@ -1,4 +0,0 @@
-/cannyEdgeDetectionImageFilter.py/1.2/Tue May 20 15:01:27 2003//TITK-3-0-1
-/testDirectory.py/1.1/Mon Jun 9 13:56:20 2003//TITK-3-0-1
-/testObject.py/1.2/Fri May 23 17:57:49 2003//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Tests/Python/CVS/Repository b/Wrapping/CSwig/Tests/Python/CVS/Repository
deleted file mode 100644
index c5f2e3b2c8e63ef4ee0057f88efcecbeee8dfd4b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Tests/Python
diff --git a/Wrapping/CSwig/Tests/Python/CVS/Root b/Wrapping/CSwig/Tests/Python/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Tests/Python/CVS/Tag b/Wrapping/CSwig/Tests/Python/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Tests/Python/CVS/Template b/Wrapping/CSwig/Tests/Python/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Tests/Python/cannyEdgeDetectionImageFilter.py b/Wrapping/CSwig/Tests/Python/cannyEdgeDetectionImageFilter.py
deleted file mode 100644
index ba47f1155e1f04a0cba37c28d539f94ff3026b29..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/cannyEdgeDetectionImageFilter.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from InsightToolkit import *
-
-reader = itkImageFileReaderF2_New()
-canny = itkCannyEdgeDetectionImageFilterF2F2_New()
-rescaler = itkRescaleIntensityImageFilterF2US2_New()
-writer = itkImageFileWriterUS2_New()
-canny.SetInput(reader.GetOutput())
-rescaler.SetInput(canny.GetOutput())
-writer.SetInput(rescaler.GetOutput())
-
-rescaler.SetOutputMinimum(0)
-rescaler.SetOutputMaximum(65535)
-
-reader.SetFileName("c:/Hoffman/InsightNew/Testing/Data/Input/cthead1.png")
-writer.SetFileName("./testout.png")
-writer.Update()
diff --git a/Wrapping/CSwig/Tests/Python/testDirectory.py b/Wrapping/CSwig/Tests/Python/testDirectory.py
deleted file mode 100644
index c2054a7575c16f470a99a2889c6f28d9d6087f11..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/testDirectory.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from InsightToolkit import *
-d = itkDirectory_New()
-d.Load(".")
-n = d.GetNumberOfFiles()
-i = 0
-while i < n:
- print d.GetFile(i)
- i = i +1
-
-
-
-
-
diff --git a/Wrapping/CSwig/Tests/Python/testObject.py b/Wrapping/CSwig/Tests/Python/testObject.py
deleted file mode 100644
index 1bd7c98d7deee4a22032f2fba8efb1defe95ef14..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Python/testObject.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from InsightToolkit import *
-s = itkObject_New()
-
diff --git a/Wrapping/CSwig/Tests/Tcl/CMakeLists.txt b/Wrapping/CSwig/Tests/Tcl/CMakeLists.txt
deleted file mode 100644
index 12848aa21a0b9a5b4c6642d946f7d109109128b2..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-IF( NOT ITK_DISABLE_TCL_TESTING )
-IF(ITK_CSWIG_TCL)
- SET(TEMP ${ITK_BINARY_DIR}/Testing/Temporary)
- SET(ITK_WISH ${CXX_TEST_PATH}/itkwish)
- ADD_TEST(PrintAllTcl ${ITK_WISH} ${ITK_SOURCE_DIR}/Wrapping/CSwig/Tests/Tcl/PrintAll.tcl ${TEMP}/PrintAll.txt)
-ENDIF(ITK_CSWIG_TCL)
-ENDIF( NOT ITK_DISABLE_TCL_TESTING )
diff --git a/Wrapping/CSwig/Tests/Tcl/CVS/Entries b/Wrapping/CSwig/Tests/Tcl/CVS/Entries
deleted file mode 100644
index ed0517d795dff9192eea755f3b1785cf1078b0cd..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/CVS/Entries
+++ /dev/null
@@ -1,6 +0,0 @@
-/CMakeLists.txt/1.3/Tue Feb 15 04:43:29 2005//TITK-3-0-1
-/PrintAll.tcl/1.4/Wed Apr 7 13:37:43 2004//TITK-3-0-1
-/randomImage.tcl/1.3/Thu May 29 20:16:00 2003//TITK-3-0-1
-/testDirectory.tcl/1.1/Wed May 28 21:56:31 2003//TITK-3-0-1
-/testObject.tcl/1.2/Fri May 23 17:57:49 2003//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/Tests/Tcl/CVS/Repository b/Wrapping/CSwig/Tests/Tcl/CVS/Repository
deleted file mode 100644
index 4ff7006168ce6633e5bbb08ad1e2dd17a5506998..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/Tests/Tcl
diff --git a/Wrapping/CSwig/Tests/Tcl/CVS/Root b/Wrapping/CSwig/Tests/Tcl/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/Tests/Tcl/CVS/Tag b/Wrapping/CSwig/Tests/Tcl/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/Tests/Tcl/CVS/Template b/Wrapping/CSwig/Tests/Tcl/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/Tests/Tcl/PrintAll.tcl b/Wrapping/CSwig/Tests/Tcl/PrintAll.tcl
deleted file mode 100644
index d346bbc1dc3025b3a5e166db507f3c1a1595ee2b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/PrintAll.tcl
+++ /dev/null
@@ -1,20 +0,0 @@
-package require InsightToolkit
-#
-# Exercise the PrintSelf of each class
-#
-if {$argc == 0} {
- set fileid stdout
-} else {
- set fileid [open [lindex $argv 0] w]
-}
-
-set b [itkStringStream]
-set allClasses [info command itk*_New]
-
-foreach class $allClasses {
- puts $fileid "--------------- $class ---------------"
- catch {set a [$class]; $a Print [$b GetStream]; puts $fileid "[$b GetString]"; $b Reset}
-}
-
-exit
-
diff --git a/Wrapping/CSwig/Tests/Tcl/randomImage.tcl b/Wrapping/CSwig/Tests/Tcl/randomImage.tcl
deleted file mode 100644
index 57457d930ba3e10934f8e4eaa69b69d8457da3d5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/randomImage.tcl
+++ /dev/null
@@ -1,83 +0,0 @@
-package require Tk
-package require InsightToolkit
-package require itkinteraction
-
-proc createImageViewer2D {frame image args} {
- # Create the canvas.
- eval canvas $frame.canvas {-scrollregion "1 1 32 32"} \
- {-xscrollcommand "$frame.scrollx set"} \
- {-yscrollcommand "$frame.scrolly set"} $args
- scrollbar $frame.scrollx -orient horizontal \
- -command "$frame.canvas xview"
- scrollbar $frame.scrolly -orient vertical \
- -command "$frame.canvas yview"
- pack $frame.scrollx -side bottom -fill x
- pack $frame.scrolly -side right -fill y
- pack $frame.canvas -expand 1 -fill both
-
- # Create a Tk image on the canvas.
- set i [image create photo]
- $frame.canvas create image 0 0 -image $i -anchor nw
-
- # Setup the TkImageViewer2D instance.
- set viewer [itkTkImageViewer2D_New]
- $viewer SetInput $image
- $viewer SetInterpreter [GetInterp]
- $viewer SetImageName $i
- $viewer SetCanvasName $frame.canvas
- return $viewer
- }
-
-
-
-# Initial sigma value.
-set sigma 1
-
-# Create a random image source.
-set source [itkRandomImageSourceUS2_New]
-$source SetMin 0
-$source SetMax 255
-set a [new_ULArray 2]
-ULArray_setitem $a 0 300
-ULArray_setitem $a 1 300
-$source SetSize $a
-
-
-# Connect the smoothing filter.
-set filter [itkRecursiveGaussianImageFilterUS2US2_New]
-$filter SetInput [$source GetOutput]
-$filter SetSigma $sigma
-$filter SetNormalizeAcrossScale 1
-$filter SetDirection 0
-
-# Setup the GUI.
-frame .control
-frame .in
-frame .out
-frame .in.viewer
-frame .out.viewer
-
-button .control.exit -text "Exit" -command {exit}
-button .control.update -text "Update" -command {
- # Set sigma on the smoothing filter and update the display.
- $filter SetSigma $sigma
- $smoothedV Draw
- $randomV Draw
-}
-label .control.sigma_label -text "Sigma:"
-entry .control.sigma -textvariable sigma
-button .control.interact -text "Interact" -command {wm deiconify .itkInteract}
-
-pack .control -side left -anchor n
-pack .in .out -side left -expand 1 -fill both
-pack .in.viewer .out.viewer -expand 1 -fill both
-pack .control.exit .control.interact .control.update -side top
-pack .control.sigma_label .control.sigma -side left
-
-# Create the image viewers.
-set randomV [createImageViewer2D .in.viewer [$source GetOutput] ]
-set smoothedV [createImageViewer2D .out.viewer [$filter GetOutput] ]
-
-# Run the input pipeline to display the random image.
-update
-$randomV Draw
diff --git a/Wrapping/CSwig/Tests/Tcl/testDirectory.tcl b/Wrapping/CSwig/Tests/Tcl/testDirectory.tcl
deleted file mode 100644
index c699f8dfa067d93eae2b442f2984a341445d33ff..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/testDirectory.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-package require InsightToolkit
-set d [itkDirectory_New]
-$d Load "."
-set n [$d GetNumberOfFiles]
-for {set i 1} {$i < $n} {incr i} {
- puts [$d GetFile $i]
-}
-
-
-
-
diff --git a/Wrapping/CSwig/Tests/Tcl/testObject.tcl b/Wrapping/CSwig/Tests/Tcl/testObject.tcl
deleted file mode 100644
index cfaa3dd61560d6c31c4206f360923e54f7300f24..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/Tests/Tcl/testObject.tcl
+++ /dev/null
@@ -1,4 +0,0 @@
-package require Tk
-package require InsightToolkit
-set o [itkObject_New]
-
diff --git a/Wrapping/CSwig/VXLNumerics/.NoDartCoverage b/Wrapping/CSwig/VXLNumerics/.NoDartCoverage
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/VXLNumerics/CMakeLists.txt b/Wrapping/CSwig/VXLNumerics/CMakeLists.txt
deleted file mode 100644
index 13ba17a40bb80c3a5113b71a7090d978c146dc04..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# create the VXLNumerics libraries
-
-SET(WRAP_SOURCES
- wrap_vnl_matrix
- wrap_vnl_vector
- wrap_vnl_c_vector
- wrap_vnl_diag_matrix
- wrap_vnl_file_matrix
- wrap_vnl_file_vector
- wrap_vnl_fortran_copy
- wrap_vnl_matrix_fixed
- wrap_vnl_matrix_fixed_ref
- wrap_vnl_matrix_ref
- wrap_vnl_vector_ref
-)
-
-
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx")
-
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" VXLNumerics VXLNumerics "" "" "${VXL_NUMERICS_LIBRARIES};itkvnl_inst")
-
diff --git a/Wrapping/CSwig/VXLNumerics/CVS/Entries b/Wrapping/CSwig/VXLNumerics/CVS/Entries
deleted file mode 100644
index d2a416f4d714e6d5bbc47c8b1ce28f5e1420f7f2..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/CVS/Entries
+++ /dev/null
@@ -1,20 +0,0 @@
-/.NoDartCoverage/1.1/Sat Sep 25 17:36:28 2004//TITK-3-0-1
-/CMakeLists.txt/1.9/Wed Feb 18 14:47:41 2004//TITK-3-0-1
-/wrap_VXLNumerics.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_VXLNumerics.h/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_VXLNumericsJava.cxx/1.2/Wed Feb 18 14:47:41 2004//TITK-3-0-1
-/wrap_VXLNumericsPerl.cxx/1.1/Fri Mar 12 22:42:59 2004//TITK-3-0-1
-/wrap_VXLNumericsPython.cxx/1.1/Tue May 13 20:28:38 2003//TITK-3-0-1
-/wrap_VXLNumericsTcl.cxx/1.1/Tue May 13 20:28:38 2003//TITK-3-0-1
-/wrap_vnl_c_vector.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_diag_matrix.cxx/1.1/Mon May 12 22:18:23 2003//TITK-3-0-1
-/wrap_vnl_file_matrix.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_file_vector.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_fortran_copy.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_matrix.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_matrix_fixed.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_matrix_fixed_ref.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_matrix_ref.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-/wrap_vnl_vector.cxx/1.1/Mon May 12 22:18:23 2003//TITK-3-0-1
-/wrap_vnl_vector_ref.cxx/1.2/Wed Sep 10 14:30:12 2003//TITK-3-0-1
-D
diff --git a/Wrapping/CSwig/VXLNumerics/CVS/Repository b/Wrapping/CSwig/VXLNumerics/CVS/Repository
deleted file mode 100644
index 745bb1d2b7f047e21af6a79f3de0de30d6bd1e5e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Insight/Wrapping/CSwig/VXLNumerics
diff --git a/Wrapping/CSwig/VXLNumerics/CVS/Root b/Wrapping/CSwig/VXLNumerics/CVS/Root
deleted file mode 100644
index 18653af53873a5bd698c9e060e491c61d9a9e09d..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@www.itk.org:/cvsroot/Insight
diff --git a/Wrapping/CSwig/VXLNumerics/CVS/Tag b/Wrapping/CSwig/VXLNumerics/CVS/Tag
deleted file mode 100644
index 421a7405e70a6acfebcd7e4e468729899e7e7833..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NITK-3-0-1
diff --git a/Wrapping/CSwig/VXLNumerics/CVS/Template b/Wrapping/CSwig/VXLNumerics/CVS/Template
deleted file mode 100644
index 41a624a6f1f8585935a2e69984faf62b42d8834a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/CVS/Template
+++ /dev/null
@@ -1,22 +0,0 @@
-CVS: ----------------------------------------------------------------------
-CVS: CVS Commits to CMake/ITK/ParaView/VTK require commit type in the
-CVS: comment. Valid commit types are:
-CVS:
-CVS: BUG: - a change made to fix a runtime issue
-CVS: (crash, segmentation fault, exception, or incorrect result,
-CVS: COMP: - a fix for a compilation issue, error or warning,
-CVS: ENH: - new functionality added to the project,
-CVS: PERF: - a performance improvement,
-CVS: STYLE: - a change that does not impact the logic or execution of the
-CVS: code. (improve coding style, comments, documentation).
-CVS:
-CVS: The cvs command to commit the change is:
-CVS:
-CVS: cvs commit -m "BUG: fixed core dump when passed float data" filename
-CVS:
-CVS: you can also use the syntax below which omits the -m flag. In this
-CVS: case cvs will start up an editor for you to enter a comment on why you
-CVS: made the change.
-CVS:
-CVS: cvs commit filename
-CVS: ----------------------------------------------------------------------
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumerics.cxx b/Wrapping/CSwig/VXLNumerics/wrap_VXLNumerics.cxx
deleted file mode 100644
index 3a2a5fb6c327d4d0c529b47794f655199180fc1f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumerics.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_VXLNumerics.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-namespace _cable_
-{
- const char* const package = ITK_WRAP_PACKAGE_NAME(ITK_WRAP_PACKAGE);
- const char* const groups[] =
- {
- ITK_WRAP_GROUP(vnl_matrix),
- ITK_WRAP_GROUP(vnl_vector),
- ITK_WRAP_GROUP(vnl_c_vector),
- ITK_WRAP_GROUP(vnl_diag_matrix),
- ITK_WRAP_GROUP(vnl_file_matrix),
- ITK_WRAP_GROUP(vnl_file_vector),
- ITK_WRAP_GROUP(vnl_fortran_copy),
- ITK_WRAP_GROUP(vnl_matrix_fixed),
- ITK_WRAP_GROUP(vnl_matrix_fixed_ref),
- ITK_WRAP_GROUP(vnl_matrix_ref),
- ITK_WRAP_GROUP(vnl_vector_ref)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumerics.h b/Wrapping/CSwig/VXLNumerics/wrap_VXLNumerics.h
deleted file mode 100644
index 7c2601f3dae25f70fc46b1e58a488a1837c95a0b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumerics.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_VXLNumerics.h,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifndef _wrap_VXLNumerics_h
-#define _wrap_VXLNumerics_h
-
-#include "itkCSwigMacros.h"
-
-
-#define ITK_WRAP_VNL_TYPEDEF(type) \
- typedef ::type<double> type##_double; \
- typedef ::type<vcl_complex<double> > type##_double_complex; \
- typedef ::type<float> type##_float; \
- typedef ::type<vcl_complex<float> > type##_float_complex; \
- typedef ::type<int> type##_int; \
- typedef ::type<long> type##_long; \
- typedef ::type<long double> type##_long_double; \
- typedef ::type<vcl_complex<long double> > type##_long_double_complex; \
- typedef ::type<signed char> type##_schar; \
- typedef ::type<unsigned char> type##_uchar; \
- typedef ::type<unsigned int> type##_uint; \
- typedef ::type<unsigned long> type##_ulong
-
-#define ITK_WRAP_VNL_SIZEOF(type) \
- sizeof(type##_double); \
- sizeof(type##_double_complex); \
- sizeof(type##_float); \
- sizeof(type##_float_complex); \
- sizeof(type##_int); \
- sizeof(type##_long); \
- sizeof(type##_long_double); \
- sizeof(type##_long_double_complex); \
- sizeof(type##_schar); \
- sizeof(type##_uchar); \
- sizeof(type##_uint); \
- sizeof(type##_ulong)
-
-#define ITK_WRAP_VNL(type) \
- namespace _cable_ \
- { \
- const char* const group = ITK_WRAP_GROUP(type); \
- namespace wrappers \
- { \
- ITK_WRAP_VNL_TYPEDEF(type); \
- } \
- } \
- void force_instantiate() \
- { \
- using namespace _cable_::wrappers; \
- ITK_WRAP_VNL_SIZEOF(type); \
- }
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsJava.cxx b/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsJava.cxx
deleted file mode 100644
index 1da31ce66fdfbf95d15f2dbba0e1ac150a98066e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "VXLNumericsJava"
-#include "wrap_VXLNumerics.cxx"
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsPerl.cxx b/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsPerl.cxx
deleted file mode 100644
index 98b29f3a53e89751b0dabb7d8ed4033c60182b88..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsPerl.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "VXLNumericsPerl"
-#include "wrap_VXLNumerics.cxx"
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsPython.cxx b/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsPython.cxx
deleted file mode 100644
index 01ec52456f721e8e2c23215ceaf8517e9e2f3079..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "VXLNumericsPython"
-#include "wrap_VXLNumerics.cxx"
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsTcl.cxx b/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsTcl.cxx
deleted file mode 100644
index bca865feb80c33b217ae78c1ce800295ed0f94ff..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_VXLNumericsTcl.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define ITK_WRAP_PACKAGE "VXLNumericsTcl"
-#include "wrap_VXLNumerics.cxx"
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_c_vector.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_c_vector.cxx
deleted file mode 100644
index c4f003d04acf99286de1f16ea2c4bda64a68cb85..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_c_vector.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_c_vector.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vcl_complex.h"
-#include "vnl/vnl_c_vector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-ITK_WRAP_VNL(vnl_c_vector);
-
-#if 0
-// Could add vnl_c_vector_bool, but it is disabled for ITK's
-// VXLNumerics library.
-namespace _cable_
-{
- namespace wrappers
- {
- typedef vnl_c_vector<bool> vnl_c_vector_bool;
- }
-}
-
-void force_instantiate2()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_c_vector_bool);
-}
-#endif
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_diag_matrix.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_diag_matrix.cxx
deleted file mode 100644
index 7baffab0c07c99cad2633e3446a6fb443b91ed66..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_diag_matrix.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "vcl_complex.h"
-#include "vnl/vnl_diag_matrix.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_diag_matrix);
- typedef vcl_complex<double> double_complex;
- typedef vcl_complex<float> float_complex;
- namespace wrappers
- {
- typedef vnl_diag_matrix<double> vnl_diag_matrix_double;
- typedef vnl_diag_matrix<double_complex> vnl_diag_matrix_double_complex;
- typedef vnl_diag_matrix<float> vnl_diag_matrix_float;
- typedef vnl_diag_matrix<float_complex> vnl_diag_matrix_float_complex;
- typedef vnl_diag_matrix<int> vnl_diag_matrix_int;
- typedef vnl_diag_matrix<long double> vnl_diag_matrix_long_double;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_diag_matrix_double);
- sizeof(vnl_diag_matrix_double_complex);
- sizeof(vnl_diag_matrix_float);
- sizeof(vnl_diag_matrix_float_complex);
- sizeof(vnl_diag_matrix_int);
- sizeof(vnl_diag_matrix_long_double);
-}
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_file_matrix.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_file_matrix.cxx
deleted file mode 100644
index 86a875fb7a2eed8febf06f14bbc1410eb6baba1f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_file_matrix.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_file_matrix.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vnl/vnl_file_matrix.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_file_matrix);
- namespace wrappers
- {
- typedef vnl_file_matrix<double> vnl_file_matrix_double;
- typedef vnl_file_matrix<float> vnl_file_matrix_float;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_file_matrix_double);
- sizeof(vnl_file_matrix_float);
-}
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_file_vector.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_file_vector.cxx
deleted file mode 100644
index 593c03126cdf0ddc0db651da0ec05c026f226421..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_file_vector.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_file_vector.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vnl/vnl_file_vector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_file_vector);
- namespace wrappers
- {
- typedef vnl_file_vector<double> vnl_file_vector_double;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_file_vector_double);
-}
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_fortran_copy.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_fortran_copy.cxx
deleted file mode 100644
index 3da8bfce6e175c7e08b5a99138fc349d2d64e6c7..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_fortran_copy.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_fortran_copy.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vnl/vnl_fortran_copy.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_fortran_copy);
- typedef vcl_complex<double> double_complex;
- typedef vcl_complex<float> float_complex;
- namespace wrappers
- {
- typedef vnl_fortran_copy<double> vnl_fortran_copy_double;
- typedef vnl_fortran_copy<double_complex> vnl_fortran_copy_double_complex;
- typedef vnl_fortran_copy<float> vnl_fortran_copy_float;
- typedef vnl_fortran_copy<float_complex> vnl_fortran_copy_float_complex;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_fortran_copy_double);
- sizeof(vnl_fortran_copy_double_complex);
- sizeof(vnl_fortran_copy_float);
- sizeof(vnl_fortran_copy_float_complex);
-}
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix.cxx
deleted file mode 100644
index 4b79d8fa2b74da4d410e193e54a1433e65f0a065..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_matrix.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vcl_complex.h"
-#include "vnl/vnl_vector.h"
-#include "vnl/vnl_matrix.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-ITK_WRAP_VNL(vnl_matrix);
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_fixed.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_fixed.cxx
deleted file mode 100644
index 0d82e76f1a282f05b6ef929a9e2da6be6e721868..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_fixed.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_matrix_fixed.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vnl/vnl_matrix_fixed.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_matrix_fixed);
- namespace wrappers
- {
- typedef vnl_matrix_fixed<double,2,2> vnl_matrix_fixed_double_2_2;
- typedef vnl_matrix_fixed<double,2,3> vnl_matrix_fixed_double_2_3;
- typedef vnl_matrix_fixed<double,2,6> vnl_matrix_fixed_double_2_6;
- typedef vnl_matrix_fixed<double,3,12> vnl_matrix_fixed_double_3_12;
- typedef vnl_matrix_fixed<double,3,3> vnl_matrix_fixed_double_3_3;
- typedef vnl_matrix_fixed<double,3,4> vnl_matrix_fixed_double_3_4;
- typedef vnl_matrix_fixed<double,4,3> vnl_matrix_fixed_double_4_3;
- typedef vnl_matrix_fixed<double,4,4> vnl_matrix_fixed_double_4_4;
- typedef vnl_matrix_fixed<float,3,3> vnl_matrix_fixed_float_3_3;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_matrix_fixed_double_2_2);
- sizeof(vnl_matrix_fixed_double_2_3);
- sizeof(vnl_matrix_fixed_double_2_6);
- sizeof(vnl_matrix_fixed_double_3_12);
- sizeof(vnl_matrix_fixed_double_3_3);
- sizeof(vnl_matrix_fixed_double_3_4);
- sizeof(vnl_matrix_fixed_double_4_3);
- sizeof(vnl_matrix_fixed_double_4_4);
- sizeof(vnl_matrix_fixed_float_3_3);
-}
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_fixed_ref.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_fixed_ref.cxx
deleted file mode 100644
index 86b6bfa071328b138b6659fb45a4a9c9311e45c5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_fixed_ref.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_matrix_fixed_ref.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vnl/vnl_matrix_fixed_ref.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_matrix_fixed_ref);
- namespace wrappers
- {
- typedef vnl_matrix_fixed_ref<double,2,2> vnl_matrix_fixed_ref_double_2_2;
- typedef vnl_matrix_fixed_ref<double,2,3> vnl_matrix_fixed_ref_double_2_3;
- typedef vnl_matrix_fixed_ref<double,3,12> vnl_matrix_fixed_ref_double_3_12;
- typedef vnl_matrix_fixed_ref<double,3,3> vnl_matrix_fixed_ref_double_3_3;
- typedef vnl_matrix_fixed_ref<double,3,4> vnl_matrix_fixed_ref_double_3_4;
- typedef vnl_matrix_fixed_ref<double,4,3> vnl_matrix_fixed_ref_double_4_3;
- typedef vnl_matrix_fixed_ref<double,4,4> vnl_matrix_fixed_ref_double_4_4;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_matrix_fixed_ref_double_2_2);
- sizeof(vnl_matrix_fixed_ref_double_2_3);
- sizeof(vnl_matrix_fixed_ref_double_3_12);
- sizeof(vnl_matrix_fixed_ref_double_3_3);
- sizeof(vnl_matrix_fixed_ref_double_3_4);
- sizeof(vnl_matrix_fixed_ref_double_4_3);
- sizeof(vnl_matrix_fixed_ref_double_4_4);
-}
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_ref.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_ref.cxx
deleted file mode 100644
index 7de45745f875c31d445f670562153b8bb5dcf413..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_matrix_ref.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_matrix_ref.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vnl/vnl_matrix_ref.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_matrix_ref);
- namespace wrappers
- {
- typedef vnl_matrix_ref<double> vnl_matrix_ref_double;
- typedef vnl_matrix_ref<float> vnl_matrix_ref_float;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_matrix_ref_double);
- sizeof(vnl_matrix_ref_float);
-}
-
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_vector.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_vector.cxx
deleted file mode 100644
index 60807c3c486ac0eec0c370340ecbe37cb99e560e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_vector.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "vcl_complex.h"
-#include "vnl/vnl_matrix.h"
-#include "vnl/vnl_vector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-ITK_WRAP_VNL(vnl_vector);
-#endif
diff --git a/Wrapping/CSwig/VXLNumerics/wrap_vnl_vector_ref.cxx b/Wrapping/CSwig/VXLNumerics/wrap_vnl_vector_ref.cxx
deleted file mode 100644
index e9aeec4252531c6fd6c5c9494ab4c94f2598a686..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/VXLNumerics/wrap_vnl_vector_ref.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_vnl_vector_ref.cxx,v $
- Language: C++
- Date: $Date: 2003/09/10 14:30:12 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "vnl/vnl_vector_ref.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "wrap_VXLNumerics.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(vnl_vector_ref);
- namespace wrappers
- {
- typedef vnl_vector_ref<double> vnl_vector_ref_double;
- typedef vnl_vector_ref<float> vnl_vector_ref_float;
- }
-}
-
-void force_instantiate()
-{
- using namespace _cable_::wrappers;
- sizeof(vnl_vector_ref_double);
- sizeof(vnl_vector_ref_float);
-}
-
-#endif
diff --git a/Wrapping/CSwig/empty.depend.in b/Wrapping/CSwig/empty.depend.in
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Wrapping/CSwig/itk.swg b/Wrapping/CSwig/itk.swg
deleted file mode 100644
index dad06538e8c38b28be5cf7f810332f4fd4cf73f3..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/itk.swg
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This is an itk-specific typemap used by CableSwig. Also see comments
- * and "throws" code in CableSwig.cxx.
- * -- Charl P. Botha <cpbotha AT ieee.org>
- */
-
-#ifdef SWIGPYTHON
-
-/* ------------------------------------------------------------
- * PyObject * - Just pass straight through unmodified
- * This is default behaviour for python.swg, but Cable passes
- * a PyObject * through as a "p._object", so we redo the typemap
- * ------------------------------------------------------------ */
-
-%typemap(in) p._object "$1 = $input;";
-%typemap(out) p._object "$result = $1;";
-
-#endif
-
-%include exception.i
-
-/* A "throws" attribute with the "std::exception" type is added synthetically
- * to each method node by CableSwig.cxx. When gcc_xml starts passing through
- * correct throws types, this typemap could be optionally extended to
- * account for more different types. For now this is sufficient though.
- */
-
-%typemap(throws) std::exception {
- SWIG_exception(SWIG_RuntimeError, const_cast<char*>(_e.what()));
-}
-
-%include std_string.i
-
-/* disable this c linkage warning on windows */
-%{
-#ifdef _WIN32
-#pragma warning ( disable : 4190 )
-#pragma warning ( disable : 4049 )
-#endif
-%}
diff --git a/Wrapping/CSwig/itkCSwigBinaryBallStructuringElement.h b/Wrapping/CSwig/itkCSwigBinaryBallStructuringElement.h
deleted file mode 100644
index 9409c7e6a168f72c0933517c184148bed32e52e8..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/itkCSwigBinaryBallStructuringElement.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "itkNeighborhood.h"
-#include "itkBinaryBallStructuringElement.h"
-
-namespace neighborhood
-{
-
-}
-
-namespace structuringElement
-{
- typedef itk::BinaryBallStructuringElement<float, 2 >::Self F2;
- typedef itk::BinaryBallStructuringElement<float, 3 >::Self F3;
- typedef itk::BinaryBallStructuringElement<unsigned char, 2 >::Self UC2;
- typedef itk::BinaryBallStructuringElement<unsigned char, 3 >::Self UC3;
- typedef itk::BinaryBallStructuringElement<unsigned short, 2 >::Self US2;
- typedef itk::BinaryBallStructuringElement<unsigned short, 3 >::Self US3;
-}
-
-
diff --git a/Wrapping/CSwig/itkCSwigImages.h b/Wrapping/CSwig/itkCSwigImages.h
deleted file mode 100644
index 921b17a7fee30f1b809134101d5d882da1dea34e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/itkCSwigImages.h
+++ /dev/null
@@ -1,4 +0,0 @@
-// Define useful short names to aid wrapper configuration. Only
-// define names for types that have been included by the wrapper
-// configuration file that includes this file.
-#include "otbCSwigImages.h"
diff --git a/Wrapping/CSwig/itkCSwigMacros.h b/Wrapping/CSwig/itkCSwigMacros.h
deleted file mode 100644
index 09de89764a0b1db03c7cadbe82183f437a28ff85..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/itkCSwigMacros.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "itkConfigure.h"
-
-#define ITK_WRAP_GROUP(x) #x
-
-#define ITK_WRAP_PACKAGE_NAME(p) p
-
-// Wrap an itk object, the wrap name is itkname,
-// this is for non-templated itk objects, so
-// ITK_WRAP_OBJECT(Object) would wrap itk::Object to the wrapped name itkObject
-#define ITK_WRAP_OBJECT(name) \
-typedef itk::name::name itk##name; \
-typedef itk::name::Pointer::SmartPointer itk##name##_Pointer
-
-// define the template class wrapper macros
-
-// Wrap an itk object with one template parameter
-// The wrapname is the name that will be used and usually
-// encodes the template parameters, i.e. itk::Image<float, 2> would
-// itkImageF2
-
-#define ITK_WRAP_OBJECT1(name, arg1, wrapname) \
-typedef itk::name<arg1 >::name wrapname; \
-typedef itk::name<arg1 >::Pointer::SmartPointer wrapname##_Pointer
-
-// same as ITK_WRAP_OBJECT1 but also wraps the super class
-#define ITK_WRAP_OBJECT1_WITH_SUPERCLASS(name, arg1, wrapname) \
-ITK_WRAP_OBJECT1(name, arg1, wrapname); \
-typedef itk::name<arg1 >::Superclass::Self wrapname##_Superclass; \
-typedef itk::name<arg1 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
-// same as ITK_WRAP_OBJECT1 but for two template parameters
-#define ITK_WRAP_OBJECT2(name, arg1, arg2, wrapname) \
-typedef itk::name<arg1, arg2 >::name wrapname; \
-typedef itk::name<arg1, arg2 >::Pointer::SmartPointer wrapname##_Pointer
-
-#define ITK_WRAP_OBJECT2_WITH_SUPERCLASS(name, arg1, arg2, wrapname) \
-ITK_WRAP_OBJECT2(name, arg1, arg2, wrapname); \
-typedef itk::name<arg1,arg2 >::Superclass::Self wrapname##_Superclass; \
-typedef itk::name<arg1,arg2 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
-// same as ITK_WRAP_OBJECT2 but for three template parameters
-#define ITK_WRAP_OBJECT3(name, arg1, arg2, arg3, wrapname) \
-typedef itk::name<arg1, arg2, arg3 >::name wrapname; \
-typedef itk::name<arg1, arg2, arg3 >::Pointer::SmartPointer wrapname##_Pointer
-
-#define ITK_WRAP_OBJECT3_WITH_SUPERCLASS(name, arg1, arg2, arg3, wrapname) \
-ITK_WRAP_OBJECT3(name, arg1, arg2, arg3, wrapname); \
-typedef itk::name<arg1,arg2, arg3 >::Superclass::Self wrapname##_Superclass; \
-typedef itk::name<arg1,arg2, arg3 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
-// same as ITK_WRAP_OBJECT4 but for three template parameters
-#define ITK_WRAP_OBJECT4(name, arg1, arg2, arg3, arg4, wrapname) \
-typedef itk::name<arg1, arg2, arg3, arg4 >::name wrapname; \
-typedef itk::name<arg1, arg2, arg3, arg4 >::Pointer::SmartPointer wrapname##_Pointer
-
-#define ITK_WRAP_OBJECT4_WITH_SUPERCLASS(name, arg1, arg2, arg3, arg4, wrapname) \
-ITK_WRAP_OBJECT4(name, arg1, arg2, arg3, arg4, wrapname); \
-typedef itk::name<arg1,arg2, arg3, arg4 >::Superclass::Self wrapname##_Superclass; \
-typedef itk::name<arg1,arg2, arg3, arg4 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
diff --git a/Wrapping/CSwig/otbCSwigImages.h b/Wrapping/CSwig/otbCSwigImages.h
deleted file mode 100644
index 8474cdf2bc1a88a98e8264ba0154b281f4d21466..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCSwigImages.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Define useful short names to aid wrapper configuration. Only
-// define names for types that have been included by the wrapper
-// configuration file that includes this file.
-
-#if defined(__itkVector_h)
-namespace itkvector
-{
- typedef itk::Vector< float, 2> F2;
- typedef itk::Vector< float, 3> F3;
- typedef itk::Vector< double, 2> D2;
- typedef itk::Vector< double, 3> D3;
-}
-#endif
-#if defined(__itkCovariantVector_h)
-namespace covariantvector
-{
- typedef itk::CovariantVector< float, 2> F2;
- typedef itk::CovariantVector< float, 3> F3;
- typedef itk::CovariantVector< double, 2> D2;
- typedef itk::CovariantVector< double, 3> D3;
-}
-#endif
-#if defined(__otbImage_h)
-namespace image
-{
- //typedef itk::Image<bool, 2> B2;
- //typedef itk::Image<bool, 3> B3;
-
- typedef otb::MetaDataKey otbMetaDataKey;
- typedef itk::MetaDataDictionary itkMetaDataDictionary;
- typedef otb::ImageBase otbImageBase;
- typedef otb::Image<float , 2> F2;
- typedef otb::Image<double , 2> D2;
- typedef otb::Image<unsigned char , 2> UC2;
- typedef otb::Image<unsigned short, 2> US2;
- typedef otb::Image<unsigned int , 2> UI2;
- typedef otb::Image<unsigned long , 2> UL2;
- typedef otb::Image<signed char , 2> SC2;
- typedef otb::Image<signed short , 2> SS2;
- typedef otb::Image<signed int , 2> SI2;
- typedef otb::Image<signed long , 2> SL2;
-
-
- typedef otb::Image<float , 3> F3;
- typedef otb::Image<double , 3> D3;
- typedef otb::Image<unsigned char , 3> UC3;
- typedef otb::Image<unsigned short, 3> US3;
- typedef otb::Image<unsigned int , 3> UI3;
- typedef otb::Image<unsigned long , 3> UL3;
- typedef otb::Image<signed char , 3> SC3;
- typedef otb::Image<signed short , 3> SS3;
- typedef otb::Image<signed int , 3> SI3;
- typedef otb::Image<signed long , 3> SL3;
-}
-
-# if defined(__itkVector_h)
-namespace image
-{
- typedef otb::Image< itkvector::F2, 2 > VF2;
- typedef otb::Image< itkvector::F3, 3 > VF3;
- typedef otb::Image< itkvector::F2, 2 > VD2;
- typedef otb::Image< itkvector::F3, 3 > VD3;
- typedef otb::Image< itkvector::F2, 2 > V2F2;
- typedef otb::Image< itkvector::F2, 3 > V2F3;
-}
-# endif
-# if defined(__itkCovariantVector_h)
-namespace image
-{
- typedef otb::Image< covariantvector::F2, 2 > CVF2;
- typedef otb::Image< covariantvector::F3, 3 > CVF3;
- typedef otb::Image< covariantvector::D2, 2 > CVD2;
- typedef otb::Image< covariantvector::D3, 3 > CVD3;
-}
-# endif
-#endif
-#if defined (__otbVectorImage_h)
-namespace image
-{
- typedef otb::VectorImage<float , 2> VIF2;
- typedef otb::VectorImage<double , 2> VID2;
- typedef otb::VectorImage<unsigned char , 2> VIUC2;
- typedef otb::VectorImage<unsigned short, 2> VIUS2;
- typedef otb::VectorImage<unsigned int , 2> VIUI2;
- typedef otb::VectorImage<unsigned long , 2> VIUL2;
- typedef otb::VectorImage<signed char , 2> VISC2;
- typedef otb::VectorImage<signed short , 2> VISS2;
- typedef otb::VectorImage<signed int , 2> VISI2;
- typedef otb::VectorImage<signed long , 2> VISL2;
-}
-#endif
-
-/* namespace imageslist */
-/* { */
-/* typedef otb::ImageList<image::F2> ILF2; */
-/* typedef otb::ImageList<image::D2> ILD2; */
-/* typedef otb::ImageList<image::UC2> ILUC2; */
-/* typedef otb::ImageList<image::US2> ILUS2; */
-/* typedef otb::ImageList<image::UI2> ILUI2; */
-/* typedef otb::ImageList<image::UL2> ILUL2; */
-/* typedef otb::ImageList<image::SC2> ILSC2; */
-/* typedef otb::ImageList<image::SS2> ILSS2; */
-/* typedef otb::ImageList<image::SL2> ILSL2; */
-/* } */
-
-
diff --git a/Wrapping/CSwig/otbCSwigMacros.h b/Wrapping/CSwig/otbCSwigMacros.h
deleted file mode 100644
index 2bbab94fb1707092353d8f4f0e2f4c5e5f1cbd52..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCSwigMacros.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "otbConfigure.h"
-
-#define OTB_WRAP_GROUP(x) #x
-
-#define OTB_WRAP_PACKAGE_NAME(p) p
-
-// Wrap an otb object, the wrap name is otbname,
-// this is for non-templated otb objects, so
-// OTB_WRAP_OBJECT(Object) would wrap otb::Object to the wrapped name otbObject
-#define OTB_WRAP_OBJECT(name) \
-typedef otb::name::name otb##name; \
-typedef otb::name::Pointer::SmartPointer otb##name##_Pointer
-
-// define the template class wrapper macros
-
-// Wrap an otb object with one template parameter
-// The wrapname is the name that will be used and usually
-// encodes the template parameters, i.e. otb::Image<float, 2> would
-// otbImageF2
-
-#define OTB_WRAP_OBJECT1(name, arg1, wrapname) \
-typedef otb::name<arg1 >::name wrapname; \
-typedef otb::name<arg1 >::Pointer::SmartPointer wrapname##_Pointer
-
-// same as OTB_WRAP_OBJECT1 but also wraps the super class
-#define OTB_WRAP_OBJECT1_WITH_SUPERCLASS(name, arg1, wrapname) \
-OTB_WRAP_OBJECT1(name, arg1, wrapname); \
-typedef otb::name<arg1 >::Superclass::Self wrapname##_Superclass; \
-typedef otb::name<arg1 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
-// same as OTB_WRAP_OBJECT1 but for two template parameters
-#define OTB_WRAP_OBJECT2(name, arg1, arg2, wrapname) \
-typedef otb::name<arg1, arg2 >::name wrapname; \
-typedef otb::name<arg1, arg2 >::Pointer::SmartPointer wrapname##_Pointer
-
-#define OTB_WRAP_OBJECT2_WITH_SUPERCLASS(name, arg1, arg2, wrapname) \
-OTB_WRAP_OBJECT2(name, arg1, arg2, wrapname); \
-typedef otb::name<arg1,arg2 >::Superclass::Self wrapname##_Superclass; \
-typedef otb::name<arg1,arg2 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
-// same as OTB_WRAP_OBJECT2 but for three template parameters
-#define OTB_WRAP_OBJECT3(name, arg1, arg2, arg3, wrapname) \
-typedef otb::name<arg1, arg2, arg3 >::name wrapname; \
-typedef otb::name<arg1, arg2, arg3 >::Pointer::SmartPointer wrapname##_Pointer
-
-#define OTB_WRAP_OBJECT3_WITH_SUPERCLASS(name, arg1, arg2, arg3, wrapname) \
-OTB_WRAP_OBJECT3(name, arg1, arg2, arg3, wrapname); \
-typedef otb::name<arg1,arg2, arg3 >::Superclass::Self wrapname##_Superclass; \
-typedef otb::name<arg1,arg2, arg3 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
-// same as OTB_WRAP_OBJECT4 but for three template parameters
-#define OTB_WRAP_OBJECT4(name, arg1, arg2, arg3, arg4, wrapname) \
-typedef otb::name<arg1, arg2, arg3, arg4 >::name wrapname; \
-typedef otb::name<arg1, arg2, arg3, arg4 >::Pointer::SmartPointer wrapname##_Pointer
-
-#define OTB_WRAP_OBJECT4_WITH_SUPERCLASS(name, arg1, arg2, arg3, arg4, wrapname) \
-OTB_WRAP_OBJECT4(name, arg1, arg2, arg3, arg4, wrapname); \
-typedef otb::name<arg1,arg2, arg3, arg4 >::Superclass::Self wrapname##_Superclass; \
-typedef otb::name<arg1,arg2, arg3, arg4 >::Superclass::Pointer::SmartPointer wrapname##_Superclass_Pointer
-
-// Added a new macro.
-#define OTB_WRAP_OBJECT_WITHOUT_SPOINTER(name) \
-typedef otb::name::name otb##name
-
-// Added a new macro.
-#define ITK_WRAP_OBJECT_WITHOUT_SPOINTER(name) \
-typedef itk::name::name otb##name
-
diff --git a/Wrapping/CSwig/otbCommon/CMakeLists.txt b/Wrapping/CSwig/otbCommon/CMakeLists.txt
deleted file mode 100644
index d01baa92ebb677e5d6d1a88f967c74f3f8576f8c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# create a list of cable config files for wrapping
-SET(WRAP_SOURCES
-# wrap_itkImageSource
- wrap_otbImage
- wrap_otbVectorImage
-)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(MASTER_INDEX_FILES
- "${WrapOTB_BINARY_DIR}/otbCommon/OTBCommon.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
-)
-
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" OTBCommon otbCommon "ITKCommonA" "" "OTBIO;OTBCommon")
-
diff --git a/Wrapping/CSwig/otbCommon/wrap_OTBCommon.cxx b/Wrapping/CSwig/otbCommon/wrap_OTBCommon.cxx
deleted file mode 100644
index 841e540c39ec353029a9fe05ee463c9dca322e0f..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/wrap_OTBCommon.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKCommonA.cxx,v $
- Language: C++
- Date: $Date: 2005/05/10 14:37:07 $
- Version: $Revision: 1.3 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigMacros.h"
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const package = OTB_WRAP_PACKAGE_NAME(OTB_WRAP_PACKAGE);
- const char* const groups[] =
- {
- //ITK_WRAP_GROUP(itkImageSource),
- OTB_WRAP_GROUP(otbImage),
- OTB_WRAP_GROUP(otbVectorImage)
- };
-}
-#endif
diff --git a/Wrapping/CSwig/otbCommon/wrap_OTBCommonJava.cxx b/Wrapping/CSwig/otbCommon/wrap_OTBCommonJava.cxx
deleted file mode 100644
index f742eff7eace8edbc96c171af0d83ebeea515b7c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/wrap_OTBCommonJava.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBCommonJava"
-#include "wrap_OTBCommon.cxx"
diff --git a/Wrapping/CSwig/otbCommon/wrap_OTBCommonPython.cxx b/Wrapping/CSwig/otbCommon/wrap_OTBCommonPython.cxx
deleted file mode 100644
index 9886e7257da357e02488966ca76942aae6932912..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/wrap_OTBCommonPython.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBCommonPython"
-#define OTB_PYTHON_WRAP
-#include "wrap_OTBCommon.cxx"
diff --git a/Wrapping/CSwig/otbCommon/wrap_OTBCommonTcl.cxx b/Wrapping/CSwig/otbCommon/wrap_OTBCommonTcl.cxx
deleted file mode 100644
index 1e7b6d1d9a184a21d822fa6bf9609e0228033ac6..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/wrap_OTBCommonTcl.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBCommonTcl"
-#define OTB_TCL_WRAP
-#include "wrap_OTBCommon.cxx"
diff --git a/Wrapping/CSwig/otbCommon/wrap_itkImageSource.cxx b/Wrapping/CSwig/otbCommon/wrap_itkImageSource.cxx
deleted file mode 100644
index abec225e404e6d889aaa39aa8d5c82d892815f88..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/wrap_itkImageSource.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageSource.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbVectorImage.h"
-#include "itkImageToImageFilter.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = ITK_WRAP_GROUP(itkImageSource);
- namespace wrappers
- {
- ITK_WRAP_OBJECT1(ImageSource, image::VIF2 , itkImageSourceVIF2 );
- ITK_WRAP_OBJECT1(ImageSource, image::VID2 , itkImageSourceVID2 );
- ITK_WRAP_OBJECT1(ImageSource, image::VIUC2, itkImageSourceVIUC2);
- ITK_WRAP_OBJECT1(ImageSource, image::VIUS2, itkImageSourceVIUS2);
- ITK_WRAP_OBJECT1(ImageSource, image::VIUI2, itkImageSourceVIUI2);
- ITK_WRAP_OBJECT1(ImageSource, image::VIUL2, itkImageSourceVIUL2);
- ITK_WRAP_OBJECT1(ImageSource, image::VISC2, itkImageSourceVISC2);
- ITK_WRAP_OBJECT1(ImageSource, image::VISS2, itkImageSourceVISS2);
- ITK_WRAP_OBJECT1(ImageSource, image::VISI2, itkImageSourceVISI2);
-
- }
-}
-#endif
diff --git a/Wrapping/CSwig/otbCommon/wrap_otbImage.cxx b/Wrapping/CSwig/otbCommon/wrap_otbImage.cxx
deleted file mode 100644
index 7c45c730599067ed3a4b359754bd61a59e22b81a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/wrap_otbImage.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImage_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-#include "otbCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = OTB_WRAP_GROUP(otbImage);
- namespace wrappers
- {
- typedef otb::ImageBase otbImageBase;
- typedef itk::MetaDataDictionary itkMetaDataDictionary;
- typedef otb::MetaDataKey otbMetaDataKey;
- OTB_WRAP_OBJECT2(Image, float, 2, otbImageF2);
- OTB_WRAP_OBJECT2(Image, double, 2, otbImageD2);
- OTB_WRAP_OBJECT2(Image, unsigned char, 2, otbImageUC2);
- OTB_WRAP_OBJECT2(Image, unsigned short, 2, otbImageUS2);
- OTB_WRAP_OBJECT2(Image, unsigned int, 2, otbImageUI2);
- OTB_WRAP_OBJECT2(Image, unsigned long, 2, otbImageUL2);
- OTB_WRAP_OBJECT2(Image, signed char, 2, otbImageSC2);
- OTB_WRAP_OBJECT2(Image, signed short, 2, otbImageSS2);
- OTB_WRAP_OBJECT2(Image, signed int, 2, otbImageSI2);
- OTB_WRAP_OBJECT2(Image, itkvector::F2, 2, otbImageVF2);
- OTB_WRAP_OBJECT2(Image, itkvector::D2, 2, otbImageVD2);
- OTB_WRAP_OBJECT2(Image, covariantvector::F2, 2, otbImageCVF2);
- OTB_WRAP_OBJECT2(Image, covariantvector::D2, 2, otbImageCVD2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/otbCommon/wrap_otbVectorImage.cxx b/Wrapping/CSwig/otbCommon/wrap_otbVectorImage.cxx
deleted file mode 100644
index 4abce5c46b09e62486241eeb93b9b4ac0ae531ae..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbCommon/wrap_otbVectorImage.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImage_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/04/01 16:30:14 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImage.h"
-#include "otbVectorImage.h"
-#include "itkVector.h"
-#include "itkCovariantVector.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "itkCSwigImages.h"
-#include "itkCSwigMacros.h"
-#include "otbCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const group = OTB_WRAP_GROUP(otbVectorImage);
- namespace wrappers
- {
- OTB_WRAP_OBJECT2(VectorImage, float, 2, otbVectorImageF2);
- OTB_WRAP_OBJECT2(VectorImage, double, 2, otbVectorImageD2);
- OTB_WRAP_OBJECT2(VectorImage, unsigned char, 2, otbVectorImageUC2);
- OTB_WRAP_OBJECT2(VectorImage, unsigned short, 2, otbVectorImageUS2);
- OTB_WRAP_OBJECT2(VectorImage, unsigned int, 2, otbVectorImageUI2);
- OTB_WRAP_OBJECT2(VectorImage, unsigned long, 2, otbVectorImageUL2);
- OTB_WRAP_OBJECT2(VectorImage, signed char, 2, otbVectorImageSC2);
- OTB_WRAP_OBJECT2(VectorImage, signed short, 2, otbVectorImageSS2);
- OTB_WRAP_OBJECT2(VectorImage, signed int, 2, otbVectorImageSI2);
- OTB_WRAP_OBJECT2(VectorImage, itkvector::F2, 2, otbVectorImageVF2);
- OTB_WRAP_OBJECT2(VectorImage, itkvector::D2, 2, otbVectorImageVD2);
- OTB_WRAP_OBJECT2(VectorImage, covariantvector::F2, 2, otbVectorImageCVF2);
- OTB_WRAP_OBJECT2(VectorImage, covariantvector::D2, 2, otbVectorImageCVD2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/otbIO/CMakeLists.txt b/Wrapping/CSwig/otbIO/CMakeLists.txt
deleted file mode 100644
index 721b7aa43705ebaa1af9b7d679fcae72a9e31099..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# create the OTBIOTcl libraries
-SET(WRAP_SOURCES
- wrap_otbIOBase
- wrap_otbImageFileReader
- wrap_otbImageFileWriter
-)
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
-# "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
- "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
- "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
-# "${WrapOTB_BINARY_DIR}/BasicFiltersA/ITKBasicFiltersA.mdx"
-# "${WrapOTB_BINARY_DIR}/BasicFiltersB/ITKBasicFiltersB.mdx"
- "${WrapOTB_BINARY_DIR}/IO/ITKIO.mdx"
- "${WrapOTB_BINARY_DIR}/otbIO/OTBIO.mdx"
- "${WrapOTB_BINARY_DIR}/otbCommon/OTBCommon.mdx"
-)
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" OTBIO otbIO "OTBCommon;ITKIO;ITKCommonA;ITKCommonB" "" "OTBIO;ITKIO;ITKCommon;OTBCommon")
-
diff --git a/Wrapping/CSwig/otbIO/wrap_OTBIO.cxx b/Wrapping/CSwig/otbIO/wrap_OTBIO.cxx
deleted file mode 100644
index 16f037327a601b1a3702f8ca61dc5038c485273a..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/wrap_OTBIO.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKIO.cxx,v $
- Language: C++
- Date: $Date: 2004/04/15 14:42:45 $
- Version: $Revision: 1.9 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const package = OTB_WRAP_PACKAGE_NAME(OTB_WRAP_PACKAGE);
- const char* const groups[] =
- {
- OTB_WRAP_GROUP(otbIOBase),
- OTB_WRAP_GROUP(otbImageFileReader),
- OTB_WRAP_GROUP(otbImageFileWriter),
- };
-}
-#endif
diff --git a/Wrapping/CSwig/otbIO/wrap_OTBIOJava.cxx b/Wrapping/CSwig/otbIO/wrap_OTBIOJava.cxx
deleted file mode 100644
index 50d3938d2d84dcc2971746b80bcca48ee78879d4..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/wrap_OTBIOJava.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBIOJava"
-#define OTB_JAVA_WRAP
-#include "wrap_OTBIO.cxx"
diff --git a/Wrapping/CSwig/otbIO/wrap_OTBIOPython.cxx b/Wrapping/CSwig/otbIO/wrap_OTBIOPython.cxx
deleted file mode 100644
index cb46c2b1ed7278586c9790d019b303a5295901e2..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/wrap_OTBIOPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBIOPython"
-#include "wrap_OTBIO.cxx"
diff --git a/Wrapping/CSwig/otbIO/wrap_OTBIOTcl.cxx b/Wrapping/CSwig/otbIO/wrap_OTBIOTcl.cxx
deleted file mode 100644
index 3cc44c8ecae9871a5a57e4d71088228fc612887e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/wrap_OTBIOTcl.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBIOTcl"
-#define OTB_TCL_WRAP
-#include "wrap_OTBIO.cxx"
diff --git a/Wrapping/CSwig/otbIO/wrap_otbIOBase.cxx b/Wrapping/CSwig/otbIO/wrap_otbIOBase.cxx
deleted file mode 100644
index 2655223027116a732d1c5caaa959d0e5786d3c0c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/wrap_otbIOBase.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_IOBase.cxx,v $
- Language: C++
- Date: $Date: 2005/08/12 23:02:58 $
- Version: $Revision: 1.6 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbBSQImageIOFactory.h"
-#include "otbBSQImageIO.h"
-#include "otbGDALImageIOFactory.h"
-#include "otbGDALImageIO.h"
-#include "otbImageIOFactory.h"
-#include "otbLUMImageIOFactory.h"
-#include "otbLUMImageIO.h"
-#include "otbMSTARImageIOFactory.h"
-#include "otbMSTARImageIO.h"
-#include "otbONERAImageIOFactory.h"
-#include "otbONERAImageIO.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigMacros.h"
-#include "itkCSwigMacros.h"
-namespace _cable_
-{
- const char* const group = OTB_WRAP_GROUP(otbIOBase);
- namespace wrappers
- {
- ITK_WRAP_OBJECT(ImageIOFactory);
- OTB_WRAP_OBJECT(BSQImageIOFactory);
- OTB_WRAP_OBJECT(BSQImageIO);
- OTB_WRAP_OBJECT(GDALImageIOFactory);
- OTB_WRAP_OBJECT(GDALImageIO);
- OTB_WRAP_OBJECT(ImageIOFactory);
- OTB_WRAP_OBJECT(LUMImageIOFactory);
- OTB_WRAP_OBJECT(LUMImageIO);
- OTB_WRAP_OBJECT(MSTARImageIOFactory);
- OTB_WRAP_OBJECT(MSTARImageIO);
- OTB_WRAP_OBJECT(ONERAImageIOFactory);
- OTB_WRAP_OBJECT(ONERAImageIO);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/otbIO/wrap_otbImageFileReader.cxx b/Wrapping/CSwig/otbIO/wrap_otbImageFileReader.cxx
deleted file mode 100644
index 85154fc688c126d482e6155f9983678e89c1f74e..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/wrap_otbImageFileReader.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFileReader_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:39:17 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImageFileReader.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigMacros.h"
-#include "otbCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = OTB_WRAP_GROUP(otbImageFileReader);
- namespace wrappers
- {
- OTB_WRAP_OBJECT1(ImageFileReader, image::F2, otbImageFileReaderF2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::VF2, otbImageFileReaderVF2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::D2, otbImageFileReaderD2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::UC2, otbImageFileReaderUC2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::US2, otbImageFileReaderUS2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::UL2, otbImageFileReaderUL2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::UI2, otbImageFileReaderUI2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::SS2, otbImageFileReaderSS2);
- OTB_WRAP_OBJECT1(ImageFileReader, image::SI2, otbImageFileReaderSI2);
- // Vector images reader
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VIF2, otbImageFileReaderVIF2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VID2, otbImageFileReaderVID2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VIUC2, otbImageFileReaderVIUC2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VIUS2, otbImageFileReaderVIUS2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VIUL2, otbImageFileReaderVIUL2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VIUI2, otbImageFileReaderVIUI2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VISS2, otbImageFileReaderVISS2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileReader, image::VISI2, otbImageFileReaderVISI2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/otbIO/wrap_otbImageFileWriter.cxx b/Wrapping/CSwig/otbIO/wrap_otbImageFileWriter.cxx
deleted file mode 100644
index 2e05a8a773eafd9fae88615633b409a57280ab99..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbIO/wrap_otbImageFileWriter.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFileWriter_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:39:17 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImageFileWriter.h"
-#include "otbImage.h"
-#include "otbVectorImage.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigMacros.h"
-#include "otbCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = OTB_WRAP_GROUP(otbImageFileWriter);
- namespace wrappers
- {
- OTB_WRAP_OBJECT1(ImageFileWriter, image::F2, otbImageFileWriterF2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::VF2, otbImageFileWriterVF2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::D2, otbImageFileWriterD2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::UC2, otbImageFileWriterUC2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::US2, otbImageFileWriterUS2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::UL2, otbImageFileWriterUL2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::UI2, otbImageFileWriterUI2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::SS2, otbImageFileWriterSS2);
- OTB_WRAP_OBJECT1(ImageFileWriter, image::SI2, otbImageFileWriterSI2);
-
- // Vector images writer
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VIF2, otbImageFileWriterVIF2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VID2, otbImageFileWriterVID2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VIUC2, otbImageFileWriterVIUC2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VIUS2, otbImageFileWriterVIUS2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VIUL2, otbImageFileWriterVIUL2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VIUI2, otbImageFileWriterVIUI2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VISS2, otbImageFileWriterVISS2);
- OTB_WRAP_OBJECT1_WITH_SUPERCLASS(ImageFileWriter, image::VISI2, otbImageFileWriterVISI2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/otbVisu/CMakeLists.txt b/Wrapping/CSwig/otbVisu/CMakeLists.txt
deleted file mode 100644
index a28f163090b350c7226f319bc3da622f7b9ccb40..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbVisu/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# create the OTBIOTcl libraries
-SET(WRAP_SOURCES
- wrap_otbImageViewer
-)
-SET(MASTER_INDEX_FILES "${WrapOTB_BINARY_DIR}/VXLNumerics/VXLNumerics.mdx"
-# "${WrapOTB_BINARY_DIR}/Numerics/ITKNumerics.mdx"
-# "${WrapOTB_BINARY_DIR}/CommonA/ITKCommonA.mdx"
-# "${WrapOTB_BINARY_DIR}/CommonB/ITKCommonB.mdx"
-# "${WrapOTB_BINARY_DIR}/BasicFiltersA/ITKBasicFiltersA.mdx"
-# "${WrapOTB_BINARY_DIR}/BasicFiltersB/ITKBasicFiltersB.mdx"
-# "${WrapOTB_BINARY_DIR}/IO/ITKIO.mdx"
- "${WrapOTB_BINARY_DIR}/otbVisu/OTBVisu.mdx"
-)
-ITK_WRAP_LIBRARY("${WRAP_SOURCES}" OTBVisu otbVisu "" ""
-"OTBVisu;OTBGui;OTBIO;OTBCommon")
-
diff --git a/Wrapping/CSwig/otbVisu/wrap_OTBVisu.cxx b/Wrapping/CSwig/otbVisu/wrap_OTBVisu.cxx
deleted file mode 100644
index 58a6e18249861ed10f6d551ae46d93e22c4ef1b5..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbVisu/wrap_OTBVisu.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_ITKIO.cxx,v $
- Language: C++
- Date: $Date: 2004/04/15 14:42:45 $
- Version: $Revision: 1.9 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigMacros.h"
-
-namespace _cable_
-{
- const char* const package = OTB_WRAP_PACKAGE_NAME(OTB_WRAP_PACKAGE);
- const char* const groups[] =
- {
- OTB_WRAP_GROUP(otbImageViewer),
- };
-}
-#endif
diff --git a/Wrapping/CSwig/otbVisu/wrap_OTBVisuJava.cxx b/Wrapping/CSwig/otbVisu/wrap_OTBVisuJava.cxx
deleted file mode 100644
index 3138c6ef27818a52b7add12785901ede2079b0fb..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbVisu/wrap_OTBVisuJava.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBVisuJava"
-#define OTB_JAVA_WRAP
-#include "wrap_OTBVisu.cxx"
diff --git a/Wrapping/CSwig/otbVisu/wrap_OTBVisuPython.cxx b/Wrapping/CSwig/otbVisu/wrap_OTBVisuPython.cxx
deleted file mode 100644
index b5ca06a225ed313b1cd3a0a0168d0ff5e5f51c7c..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbVisu/wrap_OTBVisuPython.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBVisuPython"
-#include "wrap_OTBVisu.cxx"
diff --git a/Wrapping/CSwig/otbVisu/wrap_OTBVisuTcl.cxx b/Wrapping/CSwig/otbVisu/wrap_OTBVisuTcl.cxx
deleted file mode 100644
index 083651dff48aa7951578eef0e0b108f3acc62e28..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbVisu/wrap_OTBVisuTcl.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#define OTB_WRAP_PACKAGE "OTBVisuTcl"
-#define OTB_TCL_WRAP
-#include "wrap_OTBVisu.cxx"
diff --git a/Wrapping/CSwig/otbVisu/wrap_otbImageViewer.cxx b/Wrapping/CSwig/otbVisu/wrap_otbImageViewer.cxx
deleted file mode 100644
index c6653c0b1e3769228e6da77f4128db1000da4ba2..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/otbVisu/wrap_otbImageViewer.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*=========================================================================
-
- Program: Insight Segmentation & Registration Toolkit
- Module: $RCSfile: wrap_itkImageFileReader_2D.cxx,v $
- Language: C++
- Date: $Date: 2005/06/03 08:39:17 $
- Version: $Revision: 1.2 $
-
- Copyright (c) Insight Software Consortium. All rights reserved.
- See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the above copyright notices for more information.
-
-=========================================================================*/
-#include "otbImageViewer.h"
-
-#ifdef CABLE_CONFIGURATION
-#include "otbCSwigMacros.h"
-#include "otbCSwigImages.h"
-
-namespace _cable_
-{
- const char* const group = OTB_WRAP_GROUP(otbImageViewer);
- namespace wrappers
- {
- OTB_WRAP_OBJECT1(ImageViewer,float, otbImageViewerVIF2);
- OTB_WRAP_OBJECT1(ImageViewer,double, otbImageViewerVID2);
- OTB_WRAP_OBJECT1(ImageViewer,unsigned char, otbImageViewerVIUC2);
- OTB_WRAP_OBJECT1(ImageViewer,unsigned short, otbImageViewerVIUS2);
- OTB_WRAP_OBJECT1(ImageViewer,unsigned long , otbImageViewerVIUL2);
- OTB_WRAP_OBJECT1(ImageViewer,unsigned int, otbImageViewerVIUI2);
- OTB_WRAP_OBJECT1(ImageViewer,signed short, otbImageViewerVISS2);
- OTB_WRAP_OBJECT1(ImageViewer,signed int, otbImageViewerVISI2);
- }
-}
-
-#endif
diff --git a/Wrapping/CSwig/pythonfiles.sh.in b/Wrapping/CSwig/pythonfiles.sh.in
deleted file mode 100644
index 7fbfb6df67cfa1c7043a653a6484c5377ec53d99..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/pythonfiles.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-SRC="@EXECUTABLE_OUTPUT_PATH@"
-DST="@CMAKE_INSTALL_PREFIX@@ITK_INSTALL_LIB_DIR@"
-
-cp "${SRC}"/*.py "${DESTDIR}${DST}" >/dev/null 2>&1
-
-echo "pythonfiles.sh"
diff --git a/Wrapping/CSwig/pythonfiles_install.cmake.in b/Wrapping/CSwig/pythonfiles_install.cmake.in
deleted file mode 100644
index db3aa870f30903e59f8842374a3c8e05e10f108b..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/pythonfiles_install.cmake.in
+++ /dev/null
@@ -1,6 +0,0 @@
-FILE(GLOB ITK_PYTHON_FILES "@EXECUTABLE_OUTPUT_PATH@/*.py")
-MESSAGE(STATUS "Installing generated python files.")
-FILE(INSTALL
- DESTINATION "@CMAKE_INSTALL_PREFIX@@ITK_INSTALL_LIB_DIR@"
- TYPE FILE
- FILES ${ITK_PYTHON_FILES})
diff --git a/Wrapping/CSwig/swapItkAndOtbImages.py b/Wrapping/CSwig/swapItkAndOtbImages.py
deleted file mode 100644
index 38c1d122e59d105fa9ca9539abcf3c2835f24957..0000000000000000000000000000000000000000
--- a/Wrapping/CSwig/swapItkAndOtbImages.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/python
-import fileinput,glob,string,sys,os
-from os.path import join
-
-path = join(sys.argv[1],"*")
-
-files = glob.glob(path+"*.cxx")
-for line in fileinput.input(files,inplace=1):
- lineno = 0
- lineno = string.find(line,"itkImage.h")
- if(lineno>0):
- line=line.replace("itkImage.h","otbImage.h")
- sys.stdout.write(line)
-
diff --git a/Wrapping/otbWrapSetup.cmake b/Wrapping/otbWrapSetup.cmake
deleted file mode 100644
index 058561fa45b0a15925cdef648642916b55382dbd..0000000000000000000000000000000000000000
--- a/Wrapping/otbWrapSetup.cmake
+++ /dev/null
@@ -1,67 +0,0 @@
-#-----------------------------------------------------------------------------
-# wrapper config
-OPTION(OTB_CSWIG_TCL "Build cswig Tcl wrapper support (requires CableSwig)." OFF)
-OPTION(OTB_CSWIG_PYTHON "Build cswig Python wrapper support (requires CableSwig)." OFF)
-OPTION(OTB_CSWIG_JAVA "Build cswig Java wrapper support " OFF)
-
-# perl support does not work, contact bill hoffman at kitware
-# if you are interested in perl wrapping. It is close, but
-# not there yet.
-#OPTION(OTB_CSWIG_PERL "Build cswig Perl wrapper support " OFF)
-
-#-----------------------------------------------------------------------------
-# Do we need CableSwig?
-SET(OTB_NEED_CableSwig 0)
-
-IF(USE_WRAP_OTB)
- SET(OTB_NEED_CableSwig 1)
-ENDIF(USE_WRAP_OTB)
-
-IF(OTB_CSWIG_TCL)
- SET(OTB_NEED_CableSwig 1)
-ENDIF(OTB_CSWIG_TCL)
-
-IF(OTB_CSWIG_PYTHON)
-SET(OTB_NEED_CableSwig 1)
-ENDIF(OTB_CSWIG_PYTHON)
-
-IF(OTB_CSWIG_JAVA)
- SET(OTB_NEED_CableSwig 1)
-ENDIF(OTB_CSWIG_JAVA)
-
-IF(OTB_CSWIG_PERL)
- SET(OTB_NEED_CableSwig 1)
-ENDIF(OTB_CSWIG_PERL)
-
-IF(OTB_NEED_CableSwig)
-
- IF(NOT BUILD_SHARED_LIBS)
- MESSAGE(FATAL_ERROR "Wrapping requires a shared build, change BUILD_SHARED_LIBS to ON")
- ENDIF(NOT BUILD_SHARED_LIBS)
-
- # Search first if CableSwig is in the OTB source tree
- IF(EXISTS ${OTB_SOURCE_DIR}/Utilities/CableSwig)
- SET(CMAKE_MODULE_PATH ${OTB_SOURCE_DIR}/Utilities/CableSwig/SWIG/CMake)
-
- # CableSwig is included in the source distribution.
- SET(OTB_BUILD_CABLESWIG 1)
- SET(CableSwig_DIR ${OTB_BINARY_DIR}/Utilities/CableSwig CACHE PATH "CableSwig_DIR: The directory containing CableSwigConfig.cmake.")
- SET(CableSwig_FOUND 1)
- SET(CableSwig_INSTALL_ROOT ${OTB_INSTALL_LIB_DIR}/CSwig)
- INCLUDE(${CableSwig_DIR}/CableSwigConfig.cmake OPTIONAL)
- SUBDIRS(Utilities/CableSwig)
- ELSE(EXISTS ${OTB_SOURCE_DIR}/Utilities/CableSwig)
- # If CableSwig is not in the source tree,
- # then try to find a binary build of CableSwig
- FIND_PACKAGE(CableSwig)
- SET(CMAKE_MODULE_PATH ${CableSwig_DIR}/SWIG/CMake)
- ENDIF(EXISTS ${OTB_SOURCE_DIR}/Utilities/CableSwig)
-
- IF(NOT CableSwig_FOUND)
- # We have not found CableSwig. Complain.
- MESSAGE(FATAL_ERROR "CableSwig is required for CSwig Wrapping.")
- ENDIF(NOT CableSwig_FOUND)
-
-ENDIF(OTB_NEED_CableSwig)
-
-
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index 86c5e08598e051859e18004e1637e21ed53a8202..98fe0a733a26619791a670589d6f2ed242ee1bf1 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -19,7 +19,10 @@ ELSE(OTB_USE_EXTERNAL_BOOST)
)
ENDIF(OTB_USE_EXTERNAL_BOOST)
-
+#-----------------------------------------------------------------------------
+# Include directories from the GDAL build tree.
+SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+ ${GDAL_INCLUDE_DIR} )
# These directories are always needed.
SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
@@ -97,10 +100,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
)
-#-----------------------------------------------------------------------------
-# Include directories from the GDAL build tree.
-SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
- ${GDAL_INCLUDE_DIR} )
+
#-----------------------------------------------------------------------------
# Include directories from the CURL build tree.
IF(OTB_USE_CURL)
@@ -221,10 +221,6 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX} )
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
${OTB_GLU_INCLUDE_PATH} )
-#For GDAL header file
-SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
- ${GDAL_INCLUDE_DIR} )
-
#For EXPAT header file
IF(OTB_USE_EXTERNAL_EXPAT)
SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}