Update color_apply_icc_profile

applications/common/color.c

@@ -289,37 +289,47 @@ void color_apply_icc_profile(opj_image_t *image)
 	
 	in_prof =
 	cmsOpenProfileFromMem(image->icc_profile_buf, image->icc_profile_len);
+#ifdef DEBUG_PROFILE
+	FILE *icm = fopen("debug.icm","wb");
+	fwrite( image->icc_profile_buf,1, image->icc_profile_len,icm);
+	fclose(icm);
+#endif
 	
 	if(in_prof == NULL) return;
 	
 	in_space = cmsGetPCS(in_prof);
-  (void)in_space;
 	out_space = cmsGetColorSpace(in_prof);
 	intent = cmsGetHeaderRenderingIntent(in_prof);
 	
 	
-	max_w = image->comps[0].w; max_h = image->comps[0].h;
+	max_w = (int)image->comps[0].w;
-	prec = image->comps[0].prec;
+	max_h = (int)image->comps[0].h;
-  (void)prec;
+	prec = (int)image->comps[0].prec;
 	oldspace = image->color_space;
 	
 	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 = CLRSPC_SRGB;
 	}
-	else
+	else if(out_space == cmsSigGrayData) /* enumCS 17 */
-	if(out_space == cmsSigGrayData) /* enumCS 17 */
 	{
 		in_type = TYPE_GRAY_8;
 		out_type = TYPE_RGB_8;
 		out_prof = cmsCreate_sRGBProfile();
 		image->color_space = CLRSPC_SRGB;
 	}
-	else
+	else if(out_space == cmsSigYCbCrData) /* enumCS 18 */
-	if(out_space == cmsSigYCbCrData) /* enumCS 18 */
 	{
 		in_type = TYPE_YCbCr_16;
 		out_type = TYPE_RGB_16;
@@ -357,10 +367,12 @@ out_space,
 					
 					in_type,out_type
 					);
+#else
+	(void)prec;
+	(void)in_space;
 #endif /* DEBUG_PROFILE */
 	
-	transform = cmsCreateTransform(in_prof, in_type,
+	transform = cmsCreateTransform(in_prof, in_type, out_prof, out_type, intent, 0);
-	 out_prof, out_type, intent, 0);
 	
 #ifdef HAVE_LIBLCMS2
 	/* Possible for: LCMS_VERSION >= 2000 :*/
@@ -383,9 +395,45 @@ 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 = max * 3 * sizeof(unsigned short);
+			max = max_w * max_h;
+			nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned short);
 			in = inbuf = (unsigned short*)malloc(nr_samples);
 			out = outbuf = (unsigned short*)malloc(nr_samples);
 		
@@ -400,7 +448,7 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 				*in++ = (unsigned short)*b++;
 			}
 		
-	cmsDoTransform(transform, inbuf, outbuf, max);
+			cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
 		
 			r = image->comps[0].data;
 			g = image->comps[1].data;
@@ -414,16 +462,16 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 			}
 			free(inbuf); free(outbuf);
 		}
+	}
 	else /* GRAY, GRAYA */
 	{
 		unsigned char *in, *inbuf, *out, *outbuf;
-
+		max = max_w * max_h;
-	max = max_w * max_h; nr_samples = max * 3 * sizeof(unsigned char);
+		nr_samples = (cmsUInt32Number)max * 3 * sizeof(unsigned char);
 		in = inbuf = (unsigned char*)malloc(nr_samples);
 		out = outbuf = (unsigned char*)malloc(nr_samples);
 		
-	image->comps = (opj_image_comp_t*)
+		image->comps = (opj_image_comp_t*)realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t));
-	 realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t));
 		
 		if(image->numcomps == 2)
 			image->comps[3] = image->comps[1];
@@ -431,8 +479,8 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 		image->comps[1] = image->comps[0];
 		image->comps[2] = image->comps[0];
 		
-	image->comps[1].data = (int*)calloc(max, sizeof(int));
+		image->comps[1].data = (int*)calloc((size_t)max, sizeof(int));
-	image->comps[2].data = (int*)calloc(max, sizeof(int));
+		image->comps[2].data = (int*)calloc((size_t)max, sizeof(int));
 		
 		image->numcomps += 2;
 		
@@ -442,7 +490,7 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 		{
 			*in++ = (unsigned char)*r++;
 		}
-	cmsDoTransform(transform, inbuf, outbuf, max);
+		cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
 		
 		r = image->comps[0].data;
 		g = image->comps[1].data;