diff --git a/Modules/Core/ImageBase/test/CMakeLists.txt b/Modules/Core/ImageBase/test/CMakeLists.txt index 3d74d3d4230565e3486736f9b1a93ab23ae57ef7..1c9c2b3054130a455fc72f4f6190c18d0f3ee631 100644 --- a/Modules/Core/ImageBase/test/CMakeLists.txt +++ b/Modules/Core/ImageBase/test/CMakeLists.txt @@ -650,23 +650,6 @@ otb_add_test(NAME ioTvMultiChannelROI_p1_06_JPEG2000_2_TIF_res0 COMMAND otbIma ${TEMP}/ioExtractROI_JPEG2K_2_TIF_p1_06_OUT.tif ) -# Only do the following test if we are using the OTB Openjpeg driver, -# because gdal does not report jpeg2000 overview with size < 128 -# pixel, and will therefore interpolate. -if(OTB_USE_OPENJPEG) - -# Read an area inside one tile at resolution 4 (jpeg2000 conformance file with -# specific tile size at different resolution). -otb_add_test(NAME ioTvMultiChannelROI_p1_06_JPEG2000_2_TIF_res4 COMMAND otbImageBaseTestDriver - --compare-image ${EPSILON_9} ${BASELINE}/ioExtractROI_JPEG2K_2_TIF_p1_06_res4.tif - ${TEMP}/ioExtractROI_JPEG2K_2_TIF_p1_06_res4_OUT.tif - otbMultiChannelExtractROI - ${INPUTDATA}/jpeg2000_conf_p1_06.j2k?&resol=4 - ${TEMP}/ioExtractROI_JPEG2K_2_TIF_p1_06_res4_OUT.tif - ) - -endif() - # Read an area inside one tile at resolution 0 (quite similar coding parameter with pleiade # except it a lossless image with no quatization style). otb_add_test(NAME ioTvMultiChannelROI_lena_JPEG2000_2_TIF_res0 COMMAND otbImageBaseTestDriver diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.txx b/Modules/IO/ImageIO/include/otbImageFileReader.txx index 141f5f7f7d5a85d69c6f63bc69a0aec90e705831..e3db0c8507f0264c97d8f8c025da71118a9bbf8a 100644 --- a/Modules/IO/ImageIO/include/otbImageFileReader.txx +++ b/Modules/IO/ImageIO/include/otbImageFileReader.txx @@ -342,9 +342,6 @@ ImageFileReader<TOutputImage, ConvertPixelTraits> itk::EncapsulateMetaData<unsigned int>(dict, MetaDataKey::ResolutionFactor, m_AdditionalNumber); } - // This value is used by JPEG2000ImageIO and not by the others ImageIO - itk::EncapsulateMetaData<unsigned int>(dict, MetaDataKey::CacheSizeInBytes, 135000000); - // Got to allocate space for the image. Determine the characteristics of // the image. // diff --git a/Modules/IO/ImageIO/otb-module.cmake b/Modules/IO/ImageIO/otb-module.cmake index 8c0a036c839d715637db860d85708445e2313361..70df4300da2b6c482f97cf72b29f1d4a44686cca 100644 --- a/Modules/IO/ImageIO/otb-module.cmake +++ b/Modules/IO/ImageIO/otb-module.cmake @@ -20,9 +20,6 @@ otb_module(OTBImageIO OTBObjectList OTBStreaming - OPTIONAL_DEPENDS - OTBIOJPEG2000 - TEST_DEPENDS OTBStatistics OTBTestKernel diff --git a/Modules/IO/ImageIO/src/CMakeLists.txt b/Modules/IO/ImageIO/src/CMakeLists.txt index 96b6e61df93e09ba4a66024b646c2f3169573dd0..6c3889d4e4933d72f66878896cfa36388dcb8c68 100644 --- a/Modules/IO/ImageIO/src/CMakeLists.txt +++ b/Modules/IO/ImageIO/src/CMakeLists.txt @@ -6,7 +6,6 @@ add_library(OTBImageIO ${OTBImageIO_SRC}) target_link_libraries(OTBImageIO ${OTBIORAD_LIBRARIES} ${OTBIOONERA_LIBRARIES} - ${OTBIOJPEG2000_LIBRARIES} ${OTBIOLUM_LIBRARIES} ${OTBImageBase_LIBRARIES} ${OTBIOMW_LIBRARIES} diff --git a/Modules/IO/ImageIO/src/otbImageIOFactory.cxx b/Modules/IO/ImageIO/src/otbImageIOFactory.cxx index ab5701227068dae285da26bd6fab53277028548b..721e47228a43fe1960fbc8bec21822b9709242c3 100644 --- a/Modules/IO/ImageIO/src/otbImageIOFactory.cxx +++ b/Modules/IO/ImageIO/src/otbImageIOFactory.cxx @@ -31,10 +31,6 @@ #include "otbRADImageIOFactory.h" #include "otbMWImageIOFactory.h" -#ifdef OTB_USE_OPENJPEG -#include "otbJPEG2000ImageIOFactory.h" -#endif - #include "otbTileMapImageIOFactory.h" namespace otb @@ -100,9 +96,6 @@ ImageIOFactory::RegisterBuiltInFactories() itk::ObjectFactoryBase::RegisterFactory(RADImageIOFactory::New()); itk::ObjectFactoryBase::RegisterFactory(BSQImageIOFactory::New()); itk::ObjectFactoryBase::RegisterFactory(LUMImageIOFactory::New()); -#ifdef OTB_USE_OPENJPEG - itk::ObjectFactoryBase::RegisterFactory(JPEG2000ImageIOFactory::New()); -#endif itk::ObjectFactoryBase::RegisterFactory(TileMapImageIOFactory::New()); itk::ObjectFactoryBase::RegisterFactory(GDALImageIOFactory::New()); itk::ObjectFactoryBase::RegisterFactory(MWImageIOFactory::New());