Modif ITK pour compatibilite avec OpenJpeg.

Utilities/ITK/Code/IO/CMakeLists.txt

@@ -18,9 +18,15 @@ SET(ITKIO_SRCS
   itkDICOMImageIO2Factory.cxx
   itkDICOMSeriesFileNames.cxx
   itkDicomImageIOFactory.cxx
-  itkGDCMImageIO.cxx
-  itkGDCMImageIOFactory.cxx
-  itkGDCMSeriesFileNames.cxx
+
+  #-----------------------------
+  # The folowing lines were commented for the otbopenjpeg pb.
+  # In static, pb of linking between itkopenjpeg and otbopenjeg (method definided twice)
+  #-----------------------------
+  #itkGDCMImageIO.cxx
+  #itkGDCMImageIOFactory.cxx
+  #itkGDCMSeriesFileNames.cxx
+
   itkGE4ImageIO.cxx
   itkGE4ImageIOFactory.cxx
   itkGE5ImageIO.cxx
@@ -78,7 +84,13 @@ ITKNrrdIO
 itkjpeg8
 itkjpeg12
 itkjpeg16
-${ITK_GDCM_LIBRARIES}
+
+#-----------------------------
+# The folowing line was commented for the otbopenjpeg pb.
+# In static, pb of linking between itkopenjpeg and otbopenjeg (method definided twice)
+#-----------------------------
+#${ITK_GDCM_LIBRARIES}
+
 ${ITK_PNG_LIBRARIES}
 ${ITK_ZLIB_LIBRARIES}
 ${ITK_TIFF_LIBRARIES}
@@ -119,6 +131,14 @@ ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
+#-----------------------------
+# The folowing line was added for the otbopenjpeg pb.
+# Don't take gdcm iun account
+#-----------------------------
+  LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/itkGDCMImageIOFactory.h" )
+
+
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
     DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/IO

Utilities/ITK/Code/IO/itkImageIOFactory.cxx

@@ -21,7 +21,13 @@
 #include "itkImageIOFactory.h"
 #include "itkBioRadImageIOFactory.h"
 #include "itkBMPImageIOFactory.h"
-#include "itkGDCMImageIOFactory.h"
+
+//-----------------------------
+// The folowing line was commented for the otbopenjpeg pb.
+// Don't take gdcm iun account
+//-----------------------------
+//#include "itkGDCMImageIOFactory.h"
+
 #include "itkDICOMImageIO2Factory.h"
 #include "itkNiftiImageIOFactory.h"
 #include "itkAnalyzeImageIOFactory.h"
@@ -99,7 +105,11 @@ ImageIOFactory::RegisterBuiltInFactories()
     MutexLockHolder<SimpleMutexLock> mutexHolder( mutex );
     if( firstTime )
       {
-      ObjectFactoryBase::RegisterFactory( GDCMImageIOFactory::New() );
+	//-----------------------------
+	// The folowing line was commented for the otbopenjpeg pb.
+	// Don't take gdcm iun account
+	//-----------------------------
+	//ObjectFactoryBase::RegisterFactory( GDCMImageIOFactory::New() );
       ObjectFactoryBase::RegisterFactory( MetaImageIOFactory::New() );
       ObjectFactoryBase::RegisterFactory( PNGImageIOFactory::New() );
       ObjectFactoryBase::RegisterFactory( VTKImageIOFactory::New() );

Utilities/ITK/Utilities/CMakeLists.txt

@@ -19,8 +19,15 @@ ITK_THIRD_PARTY_SUBDIR(ZLIB itkzlib)
 ITK_THIRD_PARTY_SUBDIR(PNG  itkpng)
 ITK_THIRD_PARTY_SUBDIR(TIFF itktiff)
 SET(OPJ_PREFIX "itk")
-ITK_THIRD_PARTY_SUBDIR(OpenJPEG openjpeg)
-ITK_THIRD_PARTY_SUBDIR(GDCM gdcm)
+
+#-----------------------------
+# The folowing lines are commented for the otbopenjpeg pb.
+# In static, pb of linking between itkopenjpeg and otbopenjeg (method definided twice)
+#-----------------------------
+#ITK_THIRD_PARTY_SUBDIR(OpenJPEG openjpeg)
+#ITK_THIRD_PARTY_SUBDIR(GDCM gdcm)
+
+
 #------------------------------------------------------------------------------
 # Other utilities libraries
 SUBDIRS(MetaIO)

Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt

@@ -65,7 +65,13 @@ TARGET_LINK_LIBRARIES(itkgdcm
   itkjpeg8 
   itkjpeg12
   itkjpeg16
-  itkopenjpeg
+
+  #-----------------------------
+  # The folowing line is commentes for the otbopenjpeg pb.
+  # In static, pb of linking between itkopenjpeg and otbopenjeg (method definided twice)
+  #-----------------------------
+  #itkopenjpeg
+
 )
 IF(WIN32)
   IF(NOT BORLAND)