From c1267e534cb427666871f4cd653bf43bb94a7424 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sat, 5 Nov 2011 13:21:59 +0100
Subject: [PATCH] ENH: move #include openjpeg.h in CXX
---
Code/IO/otbJPEG2000ImageIO.cxx | 5 +++++
Code/IO/otbJPEG2000ImageIO.h | 13 -------------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Code/IO/otbJPEG2000ImageIO.cxx
index 3cfdeef494..f3626b4273 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 1119746fd5..d42ae5f169 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;
--
GitLab