[trunk] rename USE_LEGACY into OPJ_USE_LEGACY for consistency with other #define

diff --git a/src/bin/common/color.c b/src/bin/common/color.c
index 4cefed381c9c0457a32b0e69ba9d5c3663de0fa6..a71b74106cc33a2f9de3a9893655eebfd2963de9 100644 (file)
--- a/src/bin/common/color.c
+++ b/src/bin/common/color.c
@@ -45,7 +45,7 @@
 #include <lcms.h>
 #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 ea5220685382c2f807b800d310e113ecc60f3343..7bb0b496d85b7c3ece6ecd7d013a5e6e64630bbe 100644 (file)
--- 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 93ba05b854d460e9d7bfa488d41219b759bfb76e..a270829febc592f549a44811f89f390febf8b257 100644 (file)
--- 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}