diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-09-17 02:12:27 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-09-17 02:12:27 +0200 |
| commit | 4bb5e24d234dbf239119524edae4e23f39de7ee4 (patch) | |
| tree | 4f354880eb794d70ed20edde5ebba693f48092aa /src | |
| parent | 66d890bf225a4edc49658803b4aa6a65031479e4 (diff) | |
| parent | 6cb56b36f627194fdfb13e306d27925b956af63f (diff) | |
Merge branch 'master' into coc-qcc
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/common/color.c | 12 | ||||
| -rw-r--r-- | src/bin/common/color.h | 2 | ||||
| -rw-r--r-- | src/bin/jp2/opj_decompress.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/tcd.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/bin/common/color.c b/src/bin/common/color.c index 98a4cec8..3b0eb97b 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -562,7 +562,7 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. " #endif }/* color_apply_icc_profile() */ -void color_apply_conversion(opj_image_t *image) +void color_cielab_to_rgb(opj_image_t *image) { int *row; int enumcs, numcomps; @@ -581,7 +581,7 @@ void color_apply_conversion(opj_image_t *image) row = (int*)image->icc_profile_buf; enumcs = row[0]; - if(enumcs == 14)// CIELab + if(enumcs == 14) /* CIELab */ { int *L, *a, *b, *red, *green, *blue; int *src0, *src1, *src2, *dst0, *dst1, *dst2; @@ -599,13 +599,13 @@ void color_apply_conversion(opj_image_t *image) transform = cmsCreateTransform(in, TYPE_Lab_DBL, out, TYPE_RGB_16, INTENT_PERCEPTUAL, 0); -#ifdef HAVE_LIBLCMS2 +#ifdef OPJ_HAVE_LIBLCMS2 cmsCloseProfile(in); cmsCloseProfile(out); #endif if(transform == NULL) { -#ifdef HAVE_LIBLCMS1 +#ifdef OPJ_HAVE_LIBLCMS1 cmsCloseProfile(in); cmsCloseProfile(out); #endif @@ -662,7 +662,7 @@ void color_apply_conversion(opj_image_t *image) *blue++ = RGB[2]; } cmsDeleteTransform(transform); -#ifdef HAVE_LIBLCMS1 +#ifdef OPJ_HAVE_LIBLCMS1 cmsCloseProfile(in); cmsCloseProfile(out); #endif @@ -681,7 +681,7 @@ void color_apply_conversion(opj_image_t *image) fprintf(stderr,"%s:%d:\n\tenumCS %d not handled. Ignoring.\n", __FILE__,__LINE__, enumcs); }// color_apply_conversion() -#endif // HAVE_LIBLCMS2 || HAVE_LIBLCMS1 +#endif // OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 void color_cmyk_to_rgb(opj_image_t *image) { diff --git a/src/bin/common/color.h b/src/bin/common/color.h index c329f87f..0cd78e89 100644 --- a/src/bin/common/color.h +++ b/src/bin/common/color.h @@ -40,7 +40,7 @@ extern void color_sycc_to_rgb(opj_image_t *img); extern void color_apply_icc_profile(opj_image_t *image); -extern void color_apply_conversion(opj_image_t *image); +extern void color_cielab_to_rgb(opj_image_t *image); extern void color_cmyk_to_rgb(opj_image_t *image); extern void color_esycc_to_rgb(opj_image_t *image); diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index ac17b69d..da566ac2 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -1371,7 +1371,7 @@ int main(int argc, char **argv) if(image->icc_profile_len) color_apply_icc_profile(image); else - color_apply_conversion(image); + color_cielab_to_rgb(image); #endif free(image->icc_profile_buf); image->icc_profile_buf = NULL; image->icc_profile_len = 0; diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index 8f1c9410..2fccff1c 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -268,7 +268,7 @@ void opj_tcd_makelayer( opj_tcd_t *tcd, n = passno + 1; continue; } - if (dd / dr >= thresh) + if (thresh - (dd / dr) < DBL_EPSILON) /* do not rely on float equality, check with DBL_EPSILON margin */ n = passno + 1; } |