Commit dd9fa80e authored by Julien Michel's avatar Julien Michel

ENH: Restoring optional OpenJPEG build and logic to register the driver in the...

ENH: Restoring optional OpenJPEG build and logic to register the driver in the factory if OTB_USE_OPENJPEG
parent 8bbf6ddb
......@@ -14,7 +14,7 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#define OTB_USE_OPENCV
#include "otbConfigure.h"
#include "otbWrapperApplicationFactory.h"
......
......@@ -3,27 +3,30 @@ writing of remote sensing images.")
otb_module(OTBImageIO
DEPENDS
OTBIOMW
OTBIORAD
OTBIOMSTAR
OTBITK
OTBITKPendingPatches
OTBIOLUM
OTBBoost
OTBCommon
OTBExtendedFilename
OTBIOBSQ
OTBIOGDAL
OTBIOLUM
OTBIOMSTAR
OTBIOMW
OTBIOONERA
OTBIORAD
OTBIOTileMap
OTBCommon
OTBITK
OTBITKPendingPatches
OTBImageBase
OTBStreaming
OTBExtendedFilename
OTBOSSIMAdapters
OTBObjectList
OTBStreaming
OPTIONAL_DEPENDS
OTBIOJPEG2000
TEST_DEPENDS
OTBTestKernel
OTBStatistics
OTBTestKernel
DESCRIPTION
"${DOCUMENTATION}"
......
......@@ -31,8 +31,8 @@
#include "otbRADImageIOFactory.h"
#include "otbMWImageIOFactory.h"
#ifdef OTB_USE_JPEG2000
# include "otbJPEG2000ImageIOFactory.h"
#ifdef OTB_USE_OPENJPEG
#include "otbJPEG2000ImageIOFactory.h"
#endif
#include "otbTileMapImageIOFactory.h"
......@@ -100,7 +100,7 @@ ImageIOFactory::RegisterBuiltInFactories()
itk::ObjectFactoryBase::RegisterFactory(RADImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(BSQImageIOFactory::New());
itk::ObjectFactoryBase::RegisterFactory(LUMImageIOFactory::New());
#ifdef OTB_USE_JPEG2000
#ifdef OTB_USE_OPENJPEG
itk::ObjectFactoryBase::RegisterFactory(JPEG2000ImageIOFactory::New());
#endif
itk::ObjectFactoryBase::RegisterFactory(TileMapImageIOFactory::New());
......
......@@ -4,3 +4,5 @@ otb_module(OTBOpenJPEG
DESCRIPTION
"${DOCUMENTATION}"
)
otb_module_activation_option("Enable OpenJpeg dependent modules. Note that this may not be needed if your GDal has a JPEG2000 compatible driver (other than jasper)" ON)
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