Option pour JPEG2000 et factory spécifiques au radar

CMakeLists.txt

@@ -235,7 +235,6 @@ LINK_DIRECTORIES( ${GDAL_LIBRARY_DIRS} )
 OPTION(OTB_USE_EXTERNAL_ITK "Use an outside build of ITK." ON)
 IF(OTB_USE_EXTERNAL_ITK)
   MESSAGE(STATUS "WARNING: Due to conflicting libraries, jpeg2000 support is disabled when using external ITK.")
-  ADD_DEFINITIONS(-DOTB_JPEG2000_DISABLED)
   FIND_PACKAGE(ITK)
   IF(ITK_FOUND)
         INCLUDE(${ITK_USE_FILE})
@@ -243,8 +242,6 @@ IF(OTB_USE_EXTERNAL_ITK)
         MESSAGE(FATAL_ERROR
                   "Cannot build OTB project without ITK.  Please set ITK_DIR or set OTB_USE_EXTERNAL_ITK OFF to use INTERNAL ITK set on OTB/Utilities repository.")
   ENDIF(ITK_FOUND)
-ELSE(OTB_USE_EXTERNAL_ITK)
-  REMOVE_DEFINITIONS(-DOTB_JPEG2000_DISABLED)
 ENDIF(OTB_USE_EXTERNAL_ITK)
 
 

Code/IO/CMakeLists.txt

@@ -5,6 +5,7 @@ FILE(GLOB OTBIO_SRCS "*.cxx" )
 IF(OTB_USE_EXTERNAL_ITK)
 LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIO.cxx" )
 LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIOFactory.cxx" )
+ADD_DEFINITIONS(-DOTB_JPEG2000_DISABLED)
 ENDIF(OTB_USE_EXTERNAL_ITK)
 
 IF( NOT OTB_USE_CURL )
@@ -17,7 +18,7 @@ ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
 IF(OTB_USE_EXTERNAL_ITK)
 TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf )
 ELSE(OTB_USE_EXTERNAL_ITK)
-TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf openjpeg)
+TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf otbopenjpeg)
 ENDIF(OTB_USE_EXTERNAL_ITK)
 
 IF( OTB_USE_CURL )

Code/IO/otbImageFileReader.txx

@@ -33,6 +33,7 @@
 #include "otbImageKeywordlist.h"
 
 #include "imaging/ossimImageHandlerRegistry.h"
+#include "ossim/imaging/ossimImageHandlerSarFactory.h"
 #include "imaging/ossimImageHandler.h"
 #include "init/ossimInit.h"
 #include "base/ossimKeywordlist.h"
@@ -355,7 +356,8 @@ ImageFileReader<TOutputImage>
 
   // Trying to read ossim MetaData
   
-  // Itinialize ossim environment
+  // Add the radar factory
+  ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance());
   ossimImageHandler* handler = ossimImageHandlerRegistry::instance()->open(ossimFilename(lFileNameOssimKeywordlist.c_str()));
   
   if (!handler)

Utilities/CMakeLists.txt

 # Add an option to build or not build the FltkImageViewer Library
 
 IF(NOT OTB_USE_EXTERNAL_ITK)
-	SUBDIRS( ITK )
+	SUBDIRS( ITK otbopenjpeg)
 ENDIF(NOT OTB_USE_EXTERNAL_ITK)
 
 IF(NOT OTB_USE_EXTERNAL_FLTK)
 	SUBDIRS( FLTK )
 ENDIF(NOT OTB_USE_EXTERNAL_FLTK)
 
-#SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbopenjpeg)
 SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib )
 
 IF(BUILD_TESTING)

Utilities/otbopenjpeg/CMakeLists.txt

@@ -73,9 +73,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/opj_configure.h.in
 #-----------------------------------------------------------------------------
 # Always build the library
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-SUBDIRS(
-  libopenjpeg
-  )
+SUBDIRS(libopenjpeg)
 
 #-----------------------------------------------------------------------------
 # For the documentation