[trunk] Attempt to fix compilation error with mj2

2012-11-16 09:18:03 +00:00 · 2012-11-16 09:18:03 +00:00 · c0259255b0
parent 9398bc1764
commit c0259255b0
2 changed files with 2 additions and 4 deletions
--- 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

--- 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}