From 85dc8c130b9b8fc1012e10260917931d1a604d15 Mon Sep 17 00:00:00 2001 From: Mathieu Deltorre <mathieu.deltorre@c-s.fr> Date: Fri, 13 Jun 2008 08:40:34 +0000 Subject: [PATCH] suppression #define USE_OPJ_DEPRECATED --- Testing/Utilities/openJpegDecoder.cxx | 5 ++++- Testing/Utilities/openJpegEncoder.cxx | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Testing/Utilities/openJpegDecoder.cxx b/Testing/Utilities/openJpegDecoder.cxx index e277509d49..7fa6044d79 100644 --- a/Testing/Utilities/openJpegDecoder.cxx +++ b/Testing/Utilities/openJpegDecoder.cxx @@ -23,7 +23,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#define USE_OPJ_DEPRECATED + +// Modif Otb-dev, this option is set in CMakeLists.txt +//#define USE_OPJ_DEPRECATED + /* set this macro to enable profiling for the given test */ /* warning : in order to be effective, openjpeg must have been built with profiling enabled !! */ //#define _PROFILE diff --git a/Testing/Utilities/openJpegEncoder.cxx b/Testing/Utilities/openJpegEncoder.cxx index e78450913b..c36057c0f6 100644 --- a/Testing/Utilities/openJpegEncoder.cxx +++ b/Testing/Utilities/openJpegEncoder.cxx @@ -23,7 +23,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#define USE_OPJ_DEPRECATED + +// Modif Otb-dev, this option is set in CMakeLists.txt +//#define USE_OPJ_DEPRECATED #include "openjpeg.h" #include "profile.h" -- GitLab