diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Code/IO/otbJPEG2000ImageIO.cxx index 3cfdeef494b5165aa0d83e72d5553f9812ae5221..f3626b427364a00e96572dad0bfd6dab2296ad8f 100644 --- a/Code/IO/otbJPEG2000ImageIO.cxx +++ b/Code/IO/otbJPEG2000ImageIO.cxx @@ -24,6 +24,11 @@ #include "itkTimeProbe.h" #include "itkMacro.h" +extern "C" +{ +#include "openjpeg.h" // FIXME otb_openjpeg.h +} + /** sample error debug callback expecting no client object diff --git a/Code/IO/otbJPEG2000ImageIO.h b/Code/IO/otbJPEG2000ImageIO.h index 1119746fd5d00a8e5e15cfce08ee5fa08b86f601..d42ae5f169dc9a0ca90e72c580578eeb4e0dbb7a 100644 --- a/Code/IO/otbJPEG2000ImageIO.h +++ b/Code/IO/otbJPEG2000ImageIO.h @@ -20,14 +20,6 @@ #include "itkImageIOBase.h" -#ifndef USE_OPJ_DEPRECATED -#define USE_OPJ_DEPRECATED -#endif - -extern "C" -{ -#include "openjpeg.h" // FIXME otb_openjpeg.h -} namespace otb { @@ -113,11 +105,6 @@ private: JPEG2000ImageIO(const Self &); //purposely not implemented void operator =(const Self&); //purposely not implemented - /** Openjpeg decoder parameters */ - opj_dparameters_t m_Parameters; - /** Openjpeg codec */ - opj_codec_t * m_Codec; - /** pixel nb of octets */ unsigned int m_BytePerPixel;