Commit 3ad68277 authored by Guillaume Pasero's avatar Guillaume Pasero

ENH: remove code using JPEG2000ImageIO

parent fe775e6b
......@@ -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
......
......@@ -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.
//
......
......@@ -20,9 +20,6 @@ otb_module(OTBImageIO
OTBObjectList
OTBStreaming
OPTIONAL_DEPENDS
OTBIOJPEG2000
TEST_DEPENDS
OTBStatistics
OTBTestKernel
......
......@@ -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}
......
......@@ -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());
......
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