Commit 1132f97e authored by Thomas Feuvrier's avatar Thomas Feuvrier
Browse files

Mise en commentaire PROVISOIRE du JPEG2000.

parent 3f9c2237
......@@ -2,13 +2,20 @@
FILE(GLOB OTBIO_SRCS "*.cxx" )
#PROVISOIRE
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIO.cxx" )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbJPEG2000ImageIOFactory.cxx" )
IF( NOT OTB_USE_CURL )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbTileMapImageIOFactory.cxx" )
LIST(REMOVE_ITEM OTBIO_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/otbTileMapImageIO.cxx" )
ENDIF( NOT OTB_USE_CURL )
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
#PROVISOIRE
#TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf )
TARGET_LINK_LIBRARIES (OTBIO gdal OTBCommon ITKIO ITKCommon otbossim dxf openjpeg)
IF( OTB_USE_CURL )
TARGET_LINK_LIBRARIES (OTBIO ${CURL_LIBRARY})
ENDIF( OTB_USE_CURL )
......
......@@ -28,7 +28,7 @@
#include "otbGDALImageIOFactory.h"
#include "otbLUMImageIOFactory.h"
#include "otbBSQImageIOFactory.h"
#include "otbJPEG2000ImageIOFactory.h"
//#include "otbJPEG2000ImageIOFactory.h"
#ifdef OTB_USE_CURL
#include "otbTileMapImageIOFactory.h"
#endif
......@@ -64,7 +64,7 @@ namespace otb
itk::ObjectFactoryBase::RegisterFactory( LUMImageIOFactory::New() );
// JPEG2000 : New format for OTB
itk::ObjectFactoryBase::RegisterFactory( JPEG2000ImageIOFactory::New() );
// itk::ObjectFactoryBase::RegisterFactory( JPEG2000ImageIOFactory::New() );
// GDAL : New format for OTB
itk::ObjectFactoryBase::RegisterFactory( GDALImageIOFactory::New() );
......
......@@ -1240,15 +1240,15 @@ ADD_TEST(ioTvossimElevManagerTest ${IO_TESTS12}
# --- JPEG2000 can read ---
ADD_TEST(ioTuJPEG2000ImageIOCanRead ${IO_TESTS13}
otbJPEG2000ImageIOTestCanRead
${INPUTDATA}/toto.j2k
)
#ADD_TEST(ioTuJPEG2000ImageIOCanRead ${IO_TESTS13}
# otbJPEG2000ImageIOTestCanRead
# ${INPUTDATA}/toto.j2k
# )
# --- JPEG2000 can write ---
ADD_TEST(ioTuJPEG2000ImageIOCanWrite ${IO_TESTS13}
otbJPEG2000ImageIOTestCanWrite
${INPUTDATA}/toto.j2k
)
#ADD_TEST(ioTuJPEG2000ImageIOCanWrite ${IO_TESTS13}
# otbJPEG2000ImageIOTestCanWrite
# ${INPUTDATA}/toto.j2k
# )
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS14 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -1392,10 +1392,10 @@ otbDEMToImageGeneratorTest.cxx
otbImageGeometryHandlerNew.cxx
otbOssimElevManagerTest.cxx
)
SET(BasicIO_SRCS13
otbJPEG2000ImageIOTestCanRead.cxx
otbJPEG2000ImageIOTestCanWrite.cxx
)
#SET(BasicIO_SRCS13
#otbJPEG2000ImageIOTestCanRead.cxx
#otbJPEG2000ImageIOTestCanWrite.cxx
#)
SET(BasicIO_SRCS14
otbOGRDriverTest.cxx
otbShapeFileDataReaderTest.cxx
......@@ -1444,8 +1444,8 @@ TARGET_LINK_LIBRARIES(otbIOTests11 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests12 otbIOTests12.cxx ${BasicIO_SRCS12})
TARGET_LINK_LIBRARIES(otbIOTests12 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests13 otbIOTests13.cxx ${BasicIO_SRCS13})
TARGET_LINK_LIBRARIES(otbIOTests13 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
#ADD_EXECUTABLE(otbIOTests13 otbIOTests13.cxx ${BasicIO_SRCS13})
#TARGET_LINK_LIBRARIES(otbIOTests13 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
ADD_EXECUTABLE(otbIOTests14 otbIOTests14.cxx ${BasicIO_SRCS14})
TARGET_LINK_LIBRARIES(otbIOTests14 OTBIO OTBCommon gdal ITKIO ITKCommon dxf)
......
......@@ -151,11 +151,11 @@ ADD_TEST(utOssimRadarSatSupport ${UTILITIES_TESTS}
# ------- lib OpenJpeg ------------------------------
ADD_TEST(utOpenJpegEncoder ${UTILITIES_TESTS}
openJpegEncoder)
#ADD_TEST(utOpenJpegEncoder ${UTILITIES_TESTS}
# openJpegEncoder)
ADD_TEST(utOpenJpegDecoder ${UTILITIES_TESTS}
openJpegDecoder)
#ADD_TEST(utOpenJpegDecoder ${UTILITIES_TESTS}
# openJpegDecoder)
# ------- Fichiers sources CXX -----------------------------------
SET(UtilitiesTests_SRCS
......@@ -171,14 +171,15 @@ tinyXMLlibTest.cxx
svmGenericKernelBasicOperationsTest.cxx
otbSVMComposedKernelFunctorTest.cxx
ossimRadarSatSupport.cxx
openJpegEncoder.cxx
openJpegDecoder.cxx
#openJpegEncoder.cxx
#openJpegDecoder.cxx
)
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbUtilitiesTests otbUtilitiesTests.cxx ${UtilitiesTests_SRCS})
TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML openjpeg)
#TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML openjpeg)
TARGET_LINK_LIBRARIES(otbUtilitiesTests OTBIO OTBCommon gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon otbossim otbsvm otb6S tinyXML )
IF(UNIX)
TARGET_LINK_LIBRARIES (otbUtilitiesTests m)
ENDIF(UNIX)
......
......@@ -38,6 +38,6 @@ REGISTER_TEST(tinyXMLlibTest);
REGISTER_TEST(svmGenericKernelBasicOperationsTest);
REGISTER_TEST(otbSVMComposedKernelFunctorTest);
REGISTER_TEST(ossimRadarSatSupport);
REGISTER_TEST(openJpegEncoder);
REGISTER_TEST(openJpegDecoder);
//REGISTER_TEST(openJpegEncoder);
//REGISTER_TEST(openJpegDecoder);
}
......@@ -8,7 +8,8 @@ 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 otbopenjpeg)
SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib )
IF(BUILD_TESTING)
SUBDIRS( Dart )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment