diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-03-17 17:03:00 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-03-17 17:03:00 +0000 |
| commit | a13e4a77e022be5978284b6ed6d6156d4af1378c (patch) | |
| tree | ecce8f95ec60a26e3dd68a0eef7bc1ae8626d3a7 /src/bin/mj2 | |
| parent | 6de2271e2a3a5489399302c992b53ab2a0f01a8c (diff) | |
[trunk] use everywhere the new opj_ prefix for HAVE variables and use the opj_apps_config file (thanks to winfried)
Diffstat (limited to 'src/bin/mj2')
| -rw-r--r-- | src/bin/mj2/opj_mj2_compress.c | 2 | ||||
| -rw-r--r-- | src/bin/mj2/opj_mj2_decompress.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/mj2/opj_mj2_compress.c b/src/bin/mj2/opj_mj2_compress.c index 73ddcbe8..c8f6642b 100644 --- a/src/bin/mj2/opj_mj2_compress.c +++ b/src/bin/mj2/opj_mj2_compress.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <string.h> -#include "opj_config.h" +#include "opj_apps_config.h" #include "openjpeg.h" #include "j2k_lib.h" #include "cio.h" diff --git a/src/bin/mj2/opj_mj2_decompress.c b/src/bin/mj2/opj_mj2_decompress.c index ee312f61..e9278a50 100644 --- a/src/bin/mj2/opj_mj2_decompress.c +++ b/src/bin/mj2/opj_mj2_decompress.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <string.h> -#include "opj_config.h" +#include "opj_apps_config.h" #include "openjpeg.h" #include "j2k_lib.h" #include "cio.h" @@ -38,10 +38,10 @@ #include "mj2.h" #include "mj2_convert.h" -#ifdef HAVE_LIBLCMS2 +#ifdef OPJ_HAVE_LIBLCMS2 #include <lcms2.h> #endif -#ifdef HAVE_LIBLCMS1 +#ifdef OPJ_HAVE_LIBLCMS1 #include <lcms.h> #endif #include "color.h" @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) { if(img->icc_profile_buf) { -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(OPJ_HAVE_LIBLCMS1) || defined(OPJ_HAVE_LIBLCMS2) color_apply_icc_profile(img); #endif |