From a622c1c2fe9bcf09763c1cb4cce105a1990ad206 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 16 Nov 2012 09:31:12 +0000 Subject: [PATCH] [trunk] rename USE_LEGACY into OPJ_USE_LEGACY for consistency with other #define --- src/bin/common/color.c | 2 +- src/bin/jpwl/CMakeLists.txt | 2 +- src/bin/mj2/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/common/color.c b/src/bin/common/color.c index 4cefed38..a71b7410 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -45,7 +45,7 @@ #include #endif -#ifdef USE_LEGACY +#ifdef OPJ_USE_LEGACY #define OPJ_CLRSPC_GRAY CLRSPC_GRAY #define OPJ_CLRSPC_SRGB CLRSPC_SRGB #endif diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt index ea522068..7bb0b496 100644 --- a/src/bin/jpwl/CMakeLists.txt +++ b/src/bin/jpwl/CMakeLists.txt @@ -27,7 +27,7 @@ if(WIN32) endif() endif() -add_definitions(-DUSE_LEGACY) +add_definitions(-DOPJ_USE_LEGACY) foreach(exe decompress compress) set(jpwl_exe opj_jpwl_${exe}) set(jp2_exe opj_${exe}) diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt index 93ba05b8..a270829f 100644 --- a/src/bin/mj2/CMakeLists.txt +++ b/src/bin/mj2/CMakeLists.txt @@ -24,7 +24,7 @@ foreach(exe opj_mj2_decompress opj_mj2_compress ) - add_definitions(-DUSE_LEGACY) + add_definitions(-DOPJ_USE_LEGACY) add_executable(${exe} ${exe}.c ${common_SRCS}