Intégration OSSIM.

Testing/CMakeLists.txt

@@ -36,7 +36,7 @@ ELSE(OTB_BINARY_DIR)
   FIND_PACKAGE(OTB)
   IF(OTB_FOUND)
     INCLUDE(${OTB_USE_FILE})
-    SUBDIRS(Code Fa)
+    SUBDIRS(Code Fa Utilities)
   ELSE(OTB_FOUND)
     MESSAGE("OTB not found.  Please set OTB_DIR")
   ENDIF(OTB_FOUND)

Testing/Utilities/ossimIntegrationTest.cxx

@@ -15,29 +15,29 @@
 #include <iostream>
 #include <iterator>
 
-#include "base/data_types/ossimFilename.h"
-#include "base/data_types/ossimString.h"
-#include "imaging/factory/ossimImageHandlerRegistry.h"
-#include "imaging/formats/ossimImageHandler.h"
-#include "imaging/formats/ossimImageFileWriter.h"
-#include "imaging/factory/ossimImageWriterFactoryRegistry.h"
+#include "base/ossimFilename.h"
+#include "base/ossimString.h"
+#include "imaging/ossimImageHandlerRegistry.h"
+#include "imaging/ossimImageHandler.h"
+#include "imaging/ossimImageFileWriter.h"
+#include "imaging/ossimImageWriterFactoryRegistry.h"
 
 // this is an ossim ground point and has a lat, lon, and datum
 // associated with it.
-#include "base/data_types/ossimGpt.h"
+#include "base/ossimGpt.h"
 
 // Base class for accessing projection parameters.
-#include "projections/ossimProjection.h"
+#include "projection/ossimProjection.h"
 
 // the projection used in the reprojection
-#include "projections/map_projections/ossimUtmProjection.h"
+#include "projection/ossimUtmProjection.h"
 
 // used to instantiate a projector
-#include "projections/factory/ossimProjectionFactoryRegistry.h"
+#include "projection/ossimProjectionFactoryRegistry.h"
 
 
 // The heart of the OSSIM resampling process for reprojecting imagery
-#include "imaging/tile_sources/ossimImageRenderer.h"
+#include "imaging/ossimImageRenderer.h"
 
 // this is the most important class and is called as the first line of all applications.
 // without this alll the important factories are not created.

Utilities/OSSIM/src/ossim/CMakeLists.txt

@@ -3,15 +3,15 @@
 
 FILE(GLOB_RECURSE ossim_base_SRCS "base/*.cpp" "base/*.c")
 FILE(GLOB_RECURSE ossim_elevation_SRCS "elevation/*.cpp" "elevation/*.c")
-FILE(GLOB_RECURSE ossim_fonts_SRCS "fonts/*.cpp" "fonts/*.c")
+FILE(GLOB_RECURSE ossim_font_SRCS "font/*.cpp" "font/*.c")
 FILE(GLOB_RECURSE ossim_imaging_SRCS "imaging/*.cpp" "imaging/*.c")
-FILE(GLOB_RECURSE ossim_libpolyclip_SRCS "libpolyclip/*.cpp" "libpolyclip/*.c")
+#FILE(GLOB_RECURSE ossim_libpolyclip_SRCS "libpolyclip/*.cpp" "libpolyclip/*.c")
 FILE(GLOB_RECURSE ossim_matrix_SRCS "matrix/*.cpp" "matrix/*.c")
 FILE(GLOB_RECURSE ossim_parallel_SRCS "parallel/*.cpp" "parallel/*.c")
-FILE(GLOB_RECURSE ossim_projections_SRCS "projections/*.cpp" "projections/*.c")
+FILE(GLOB_RECURSE ossim_projection_SRCS "projection/*.cpp" "projection/*.c")
 FILE(GLOB_RECURSE ossim_support_data_SRCS "support_data/*.cpp" "support_data/*.c")
 FILE(GLOB_RECURSE ossim_vec_SRCS "vec/*.cpp" "vec/*.c")
-FILE(GLOB_RECURSE ossim_vpf_util_SRCS "vpf_util/*.cpp" "vpf_util/*.c")
+FILE(GLOB_RECURSE ossim_vpfutil_SRCS "vpfutil/*.cpp" "vpfutil/*.c")
 FILE(GLOB_RECURSE ossim_plugin_SRCS "plugin/*.cpp" "plugin/*.c")
 FILE(GLOB_RECURSE ossim_init_SRCS "init/*.cpp" "init/*.c")
 FILE(GLOB_RECURSE ossim_kbool_SRCS "kbool/*.cpp" "kbool/*.c")
@@ -19,15 +19,15 @@ FILE(GLOB_RECURSE ossim_kbool_SRCS "kbool/*.cpp" "kbool/*.c")
 ADD_LIBRARY(ossim 
 ${ossim_base_SRCS}
 ${ossim_elevation_SRCS}
-${ossim_fonts_SRCS}
+${ossim_font_SRCS}
 ${ossim_imaging_SRCS}
-${ossim_libpolyclip_SRCS}
+#${ossim_libpolyclip_SRCS}
 ${ossim_matrix_SRCS}
 ${ossim_parallel_SRCS}
-${ossim_projections_SRCS}
+${ossim_projection_SRCS}
 ${ossim_support_data_SRCS}
 ${ossim_vec_SRCS}
-${ossim_vpf_util_SRCS}
+${ossim_vpfutil_SRCS}
 ${ossim_plugin_SRCS}
 ${ossim_init_SRCS}
 ${ossim_kbool_SRCS}

otbIncludeDirectories.cmake

@@ -23,7 +23,9 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
   ${OTB_SOURCE_DIR}/Utilities/BGL
   ${OTB_SOURCE_DIR}/Utilities/BGL/boost
   ${OTB_SOURCE_DIR}/Utilities/otbsvm
+  ${OTB_SOURCE_DIR}/Utilities/OSSIM
   ${OTB_SOURCE_DIR}/Utilities/OSSIM/include
+  ${OTB_SOURCE_DIR}/Utilities/OSSIM/include/ossim
 )
 
 #-----------------------------------------------------------------------------