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/jp2 | |
| 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/jp2')
| -rw-r--r-- | src/bin/jp2/opj_compress.c | 2 | ||||
| -rw-r--r-- | src/bin/jp2/opj_decompress.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index 71e767b5..9b79e999 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -1773,7 +1773,7 @@ int main(int argc, char **argv) { } /* Can happen if input file is TIFF or PNG - * and HAVE_LIBTIF or OPJ_HAVE_LIBPNG is undefined + * and OPJ_HAVE_LIBTIF or OPJ_HAVE_LIBPNG is undefined */ if( !image) { fprintf(stderr, "Unable to load file: got no image\n"); diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index 3fced21d..0c65d852 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -57,10 +57,10 @@ #include "convert.h" #include "index.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" @@ -852,7 +852,7 @@ int main(int argc, char **argv) } if(image->icc_profile_buf) { -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(OPJ_HAVE_LIBLCMS1) || defined(OPJ_HAVE_LIBLCMS2) color_apply_icc_profile(image); /* FIXME */ #endif free(image->icc_profile_buf); @@ -935,7 +935,7 @@ int main(int argc, char **argv) break; #endif /* OPJ_HAVE_LIBPNG */ /* Can happen if output file is TIFF or PNG - * and HAVE_LIBTIF or OPJ_HAVE_LIBPNG is undefined + * and OPJ_HAVE_LIBTIF or OPJ_HAVE_LIBPNG is undefined */ default: fprintf(stderr,"Outfile %s not generated\n",parameters.outfile); |