diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-11-16 09:18:03 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-11-16 09:18:03 +0000 |
| commit | c0259255b0da8a1492400343d5a25e305cd690fa (patch) | |
| tree | 4cf164ee8c1d471c22ad9d0e8ca67b071ebe1bf2 /src | |
| parent | 9398bc1764eada4e2e4851ff396fa5f92960b530 (diff) | |
[trunk] Attempt to fix compilation error with mj2
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/common/color.c | 5 | ||||
| -rw-r--r-- | src/bin/mj2/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/bin/common/color.c b/src/bin/common/color.c index a6fef145..4cefed38 100644 --- 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 d9cc67de..93ba05b8 100644 --- 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} |