From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Wed, 12 Mar 2014 14:18:25 +0000 (+0000)
Subject: [trunk] Make sure to use 8bits buffer when applying the ICC profile.
X-Git-Tag: version.2.0.1~4^2~43
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=41add6882bc59e754d1ca08a6c651c39dbd26173;hp=dd0d2c2f0ae4f7c7bfd91876e7e19f8f3e791440;p=openjpeg.git

[trunk] Make sure to use 8bits buffer when applying the ICC profile.
Fixes issue 281
---

diff --git a/src/bin/common/color.c b/src/bin/common/color.c
index 8b3d2a7e..47eefa0b 100644
--- a/src/bin/common/color.c
+++ b/src/bin/common/color.c
@@ -326,8 +326,16 @@ void color_apply_icc_profile(opj_image_t *image)
 
 	if(out_space == cmsSigRgbData) /* enumCS 16 */
    {
+  if( prec <= 8 )
+{
+	in_type = TYPE_RGB_8;
+	out_type = TYPE_RGB_8;
+}
+else
+{
 	in_type = TYPE_RGB_16;
 	out_type = TYPE_RGB_16;
+}
 	out_prof = cmsCreate_sRGBProfile();
 	image->color_space = OPJ_CLRSPC_SRGB;
    }
@@ -408,6 +416,41 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 
 	if(image->numcomps > 2)/* RGB, RGBA */
    {
+  if( prec <= 8 )
+{
+	unsigned char *inbuf, *outbuf, *in, *out;
+	max = max_w * max_h;
+  nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned char);
+	in = inbuf = (unsigned char*)malloc(nr_samples);
+	out = outbuf = (unsigned char*)malloc(nr_samples);
+
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*in++ = (unsigned char)*r++;
+	*in++ = (unsigned char)*g++;
+	*in++ = (unsigned char)*b++;
+  }
+
+	cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
+
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*r++ = (int)*out++;
+	*g++ = (int)*out++;
+	*b++ = (int)*out++;
+  }
+	free(inbuf); free(outbuf);
+}
+else
+{
 	unsigned short *inbuf, *outbuf, *in, *out;
 	max = max_w * max_h;
   nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned short);
@@ -438,6 +481,7 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 	*b++ = (int)*out++;
   }
 	free(inbuf); free(outbuf);
+}
    }
 	else /* GRAY, GRAYA */
    {