[trunk] Attempt to fix compilation error with mj2

diff --git a/src/bin/common/color.c b/src/bin/common/color.c
index a6fef14535950e28eabd048ff4f4ab6b645de2df..4cefed381c9c0457a32b0e69ba9d5c3663de0fa6 100644 (file)
--- a/src/bin/common/color.c
+++ b/src/bin/common/color.c
@@ -45,11 +45,8 @@
 #include <lcms.h>
 #endif
 
-#ifdef CLRSPC_GRAY
+#ifdef USE_LEGACY
 #define OPJ_CLRSPC_GRAY CLRSPC_GRAY
-#endif
-
-#ifdef CLRSPC_SRGB
 #define OPJ_CLRSPC_SRGB CLRSPC_SRGB
 #endif
 

diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
index d9cc67de5598b24f7511c51101113f79d6e7a46e..93ba05b854d460e9d7bfa488d41219b759bfb76e 100644 (file)
--- a/src/bin/mj2/CMakeLists.txt
+++ b/src/bin/mj2/CMakeLists.txt
@@ -24,6 +24,7 @@ foreach(exe
   opj_mj2_decompress
   opj_mj2_compress
 )
+  add_definitions(-DUSE_LEGACY)
   add_executable(${exe}
     ${exe}.c
     ${common_SRCS}