Fix Out-Of-Bounds Read in sycc42x_to_rgb function (#745)
[openjpeg.git] / src / bin / common / color.c
index f18eb801d5becb2a583407c4f0d76259bda381c2..20aba2ba1092cc29ceb69031680c0a85750af5e0 100644 (file)
@@ -1,9 +1,15 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
@@ -33,6 +39,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
+#include <assert.h>
 
 #include "opj_apps_config.h"
 #include "openjpeg.h"
@@ -84,12 +91,13 @@ static void sycc444_to_rgb(opj_image_t *img)
 {
        int *d0, *d1, *d2, *r, *g, *b;
        const int *y, *cb, *cr;
-       int maxw, maxh, max, i, offset, upb;
+       size_t maxw, maxh, max, i;
+       int offset, upb;
 
-       i = img->comps[0].prec;
-       offset = 1<<(i - 1); upb = (1<<i)-1;
+       upb = (int)img->comps[0].prec;
+       offset = 1<<(upb - 1); upb = (1<<upb)-1;
 
-       maxw = img->comps[0].w; maxh = img->comps[0].h;
+       maxw = (size_t)img->comps[0].w; maxh = (size_t)img->comps[0].h;
        max = maxw * maxh;
 
        y = img->comps[0].data;
@@ -100,29 +108,37 @@ static void sycc444_to_rgb(opj_image_t *img)
        d1 = g = (int*)malloc(sizeof(int) * max);
        d2 = b = (int*)malloc(sizeof(int) * max);
 
-       for(i = 0; i < max; ++i)
-   {
-       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);        
+       if(r == NULL || g == NULL || b == NULL) goto fails;
 
-       ++y; ++cb; ++cr; ++r; ++g; ++b;
-   }   
+       for(i = 0U; i < max; ++i)
+       {
+               sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+               ++y; ++cb; ++cr; ++r; ++g; ++b;
+       }
        free(img->comps[0].data); img->comps[0].data = d0;
        free(img->comps[1].data); img->comps[1].data = d1;
        free(img->comps[2].data); img->comps[2].data = d2;
+       img->color_space = OPJ_CLRSPC_SRGB;
+       return;
 
+fails:
+       free(r);
+       free(g);
+       free(b);
 }/* sycc444_to_rgb() */
 
 static void sycc422_to_rgb(opj_image_t *img)
 {      
        int *d0, *d1, *d2, *r, *g, *b;
        const int *y, *cb, *cr;
-       int maxw, maxh, max, offset, upb;
-       int i, j;
+       size_t maxw, maxh, max, offx, loopmaxw;
+       int offset, upb;
+       size_t i;
 
-       i = img->comps[0].prec;
-       offset = 1<<(i - 1); upb = (1<<i)-1;
+       upb = (int)img->comps[0].prec;
+       offset = 1<<(upb - 1); upb = (1<<upb)-1;
 
-       maxw = img->comps[0].w; maxh = img->comps[0].h;
+       maxw = (size_t)img->comps[0].w; maxh = (size_t)img->comps[0].h;
        max = maxw * maxh;
 
        y = img->comps[0].data;
@@ -133,43 +149,63 @@ static void sycc422_to_rgb(opj_image_t *img)
        d1 = g = (int*)malloc(sizeof(int) * max);
        d2 = b = (int*)malloc(sizeof(int) * max);
 
-       for(i=0; i < maxh; ++i)
-   {
-       for(j=0; j < maxw; j += 2)
-  {
-       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-
-       ++y; ++r; ++g; ++b;
-
-       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+       if(r == NULL || g == NULL || b == NULL) goto fails;
 
-       ++y; ++r; ++g; ++b; ++cb; ++cr;
-  }
-   }
+       /* if img->x0 is odd, then first column shall use Cb/Cr = 0 */
+       offx = img->x0 & 1U;
+       loopmaxw = maxw - offx;
+       
+       for(i=0U; i < maxh; ++i)
+       {
+               size_t j;
+               
+               if (offx > 0U) {
+                       sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
+                       ++y; ++r; ++g; ++b;
+               }
+               
+               for(j=0U; j < (loopmaxw & ~(size_t)1U); j += 2U)
+               {
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+                       ++y; ++r; ++g; ++b;
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+                       ++y; ++r; ++g; ++b; ++cb; ++cr;
+               }
+               if (j < loopmaxw) {
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+                       ++y; ++r; ++g; ++b; ++cb; ++cr;
+               }
+       }
+       
        free(img->comps[0].data); img->comps[0].data = d0;
        free(img->comps[1].data); img->comps[1].data = d1;
        free(img->comps[2].data); img->comps[2].data = d2;
 
-       img->comps[1].w = maxw; img->comps[1].h = maxh;
-       img->comps[2].w = maxw; img->comps[2].h = maxh;
-       img->comps[1].dx = img->comps[0].dx;
-       img->comps[2].dx = img->comps[0].dx;
-       img->comps[1].dy = img->comps[0].dy;
-       img->comps[2].dy = img->comps[0].dy;
+       img->comps[1].w = img->comps[2].w = img->comps[0].w;
+       img->comps[1].h = img->comps[2].h = img->comps[0].h;
+       img->comps[1].dx = img->comps[2].dx = img->comps[0].dx;
+       img->comps[1].dy = img->comps[2].dy = img->comps[0].dy;
+       img->color_space = OPJ_CLRSPC_SRGB;
+       return;
 
+fails:
+       free(r);
+       free(g);
+       free(b);
 }/* sycc422_to_rgb() */
 
 static void sycc420_to_rgb(opj_image_t *img)
 {
        int *d0, *d1, *d2, *r, *g, *b, *nr, *ng, *nb;
        const int *y, *cb, *cr, *ny;
-       int maxw, maxh, max, offset, upb;
-       int i, j;
+       size_t maxw, maxh, max, offx, loopmaxw, offy, loopmaxh;
+       int offset, upb;
+       size_t i;
 
-       i = img->comps[0].prec;
-       offset = 1<<(i - 1); upb = (1<<i)-1;
+       upb = (int)img->comps[0].prec;
+       offset = 1<<(upb - 1); upb = (1<<upb)-1;
 
-       maxw = img->comps[0].w; maxh = img->comps[0].h;
+       maxw = (size_t)img->comps[0].w; maxh = (size_t)img->comps[0].h;
        max = maxw * maxh;
 
        y = img->comps[0].data;
@@ -179,52 +215,106 @@ static void sycc420_to_rgb(opj_image_t *img)
        d0 = r = (int*)malloc(sizeof(int) * max);
        d1 = g = (int*)malloc(sizeof(int) * max);
        d2 = b = (int*)malloc(sizeof(int) * max);
+       
+       if (r == NULL || g == NULL || b == NULL) goto fails;
+       
+       /* if img->x0 is odd, then first column shall use Cb/Cr = 0 */
+       offx = img->x0 & 1U;
+       loopmaxw = maxw - offx;
+       /* if img->y0 is odd, then first line shall use Cb/Cr = 0 */
+       offy = img->y0 & 1U;
+       loopmaxh = maxh - offy;
+       
+       if (offy > 0U) {
+               size_t j;
+               
+               for(j=0; j < maxw; ++j)
+               {
+                       sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
+                       ++y; ++r; ++g; ++b;
+               }
+       }
+
+       for(i=0U; i < (loopmaxh & ~(size_t)1U); i += 2U)
+       {
+               size_t j;
+               
+               ny = y + maxw;
+               nr = r + maxw; ng = g + maxw; nb = b + maxw;
+               
+               if (offx > 0U) {
+                       sycc_to_rgb(offset, upb, *y, 0, 0, r, g, b);
+                       ++y; ++r; ++g; ++b;
+                       sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
+                       ++ny; ++nr; ++ng; ++nb;
+               }
+
+               for(j=0; j < (loopmaxw & ~(size_t)1U); j += 2U)
+               {
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+                       ++y; ++r; ++g; ++b;
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+                       ++y; ++r; ++g; ++b;
+
+                       sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
+                       ++ny; ++nr; ++ng; ++nb;
+                       sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
+                       ++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
+               }
+               if(j < loopmaxw)
+               {
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+                       ++y; ++r; ++g; ++b;
+
+                       sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
+                       ++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
+               }
+               y += maxw; r += maxw; g += maxw; b += maxw;
+       }
+       if(i < loopmaxh)
+       {
+               size_t j;
+               
+               for(j=0U; j < (maxw & ~(size_t)1U); j += 2U)
+               {
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+
+                       ++y; ++r; ++g; ++b;
+
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+
+                       ++y; ++r; ++g; ++b; ++cb; ++cr;
+               }
+               if(j < maxw)
+               {
+                       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+               }
+       }
 
-       for(i=0; i < maxh; i += 2)
-   {
-       ny = y + maxw;
-       nr = r + maxw; ng = g + maxw; nb = b + maxw;
-
-       for(j=0; j < maxw;  j += 2)
-  {
-       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-
-       ++y; ++r; ++g; ++b;
-
-       sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-
-       ++y; ++r; ++g; ++b;
-
-       sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
-
-       ++ny; ++nr; ++ng; ++nb;
-
-       sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
-
-       ++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
-  }
-       y += maxw; r += maxw; g += maxw; b += maxw;
-   }
        free(img->comps[0].data); img->comps[0].data = d0;
        free(img->comps[1].data); img->comps[1].data = d1;
        free(img->comps[2].data); img->comps[2].data = d2;
 
-       img->comps[1].w = maxw; img->comps[1].h = maxh;
-       img->comps[2].w = maxw; img->comps[2].h = maxh;
-       img->comps[1].dx = img->comps[0].dx;
-       img->comps[2].dx = img->comps[0].dx;
-       img->comps[1].dy = img->comps[0].dy;
-       img->comps[2].dy = img->comps[0].dy;
+       img->comps[1].w = img->comps[2].w = img->comps[0].w;
+       img->comps[1].h = img->comps[2].h = img->comps[0].h;
+       img->comps[1].dx = img->comps[2].dx = img->comps[0].dx;
+       img->comps[1].dy = img->comps[2].dy = img->comps[0].dy;
+       img->color_space = OPJ_CLRSPC_SRGB;
+       return;
 
+fails:
+       free(r);
+       free(g);
+       free(b);
 }/* sycc420_to_rgb() */
 
 void color_sycc_to_rgb(opj_image_t *img)
 {
-       if(img->numcomps < 3) 
-   {
-       img->color_space = OPJ_CLRSPC_GRAY;
-       return;
-   }
+       if(img->numcomps < 3)
+       {
+               img->color_space = OPJ_CLRSPC_GRAY;
+               return;
+       }
 
        if((img->comps[0].dx == 1)
        && (img->comps[1].dx == 2)
@@ -233,7 +323,7 @@ void color_sycc_to_rgb(opj_image_t *img)
        && (img->comps[1].dy == 2)
        && (img->comps[2].dy == 2))/* horizontal and vertical sub-sample */
   {
-       sycc420_to_rgb(img);
+               sycc420_to_rgb(img);
   }
        else
        if((img->comps[0].dx == 1)
@@ -243,7 +333,7 @@ void color_sycc_to_rgb(opj_image_t *img)
        && (img->comps[1].dy == 1)
        && (img->comps[2].dy == 1))/* horizontal sub-sample only */
   {
-       sycc422_to_rgb(img);
+               sycc422_to_rgb(img);
   }
        else
        if((img->comps[0].dx == 1)
@@ -253,19 +343,17 @@ void color_sycc_to_rgb(opj_image_t *img)
        && (img->comps[1].dy == 1)
        && (img->comps[2].dy == 1))/* no sub-sample */
   {
-       sycc444_to_rgb(img);
+               sycc444_to_rgb(img);
   }
        else
   {
-       fprintf(stderr,"%s:%d:color_sycc_to_rgb\n\tCAN NOT CONVERT\n",
-        __FILE__,__LINE__);
-       return;
+               fprintf(stderr,"%s:%d:color_sycc_to_rgb\n\tCAN NOT CONVERT\n", __FILE__,__LINE__);
+               return;
   }
-       img->color_space = OPJ_CLRSPC_SRGB;
-
 }/* color_sycc_to_rgb() */
 
 #if defined(OPJ_HAVE_LIBLCMS2) || defined(OPJ_HAVE_LIBLCMS1)
+
 #ifdef OPJ_HAVE_LIBLCMS1
 /* Bob Friesenhahn proposed:*/
 #define cmsSigXYZData   icSigXYZData
@@ -282,18 +370,25 @@ void color_sycc_to_rgb(opj_image_t *img)
 
 #endif /* OPJ_HAVE_LIBLCMS1 */
 
+/*#define DEBUG_PROFILE*/
 void color_apply_icc_profile(opj_image_t *image)
 {
        cmsHPROFILE in_prof, out_prof;
        cmsHTRANSFORM transform;
        cmsColorSpaceSignature in_space, out_space;
-       cmsUInt32Number intent, in_type, out_type, nr_samples;
+       cmsUInt32Number intent, in_type, out_type;
        int *r, *g, *b;
-       int prec, i, max, max_w, max_h;
-       OPJ_COLOR_SPACE oldspace;
+       size_t nr_samples;
+       int prec, i, max, max_w, max_h, ok = 0;
+       OPJ_COLOR_SPACE new_space;
 
        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;
 
@@ -302,16 +397,24 @@ void color_apply_icc_profile(opj_image_t *image)
        intent = cmsGetHeaderRenderingIntent(in_prof);
 
        
-       max_w = image->comps[0].w; max_h = image->comps[0].h;
-       prec = image->comps[0].prec;
-       oldspace = image->color_space;
+       max_w = (int)image->comps[0].w;
+  max_h = (int)image->comps[0].h;
+       prec = (int)image->comps[0].prec;
 
        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;
+       new_space = OPJ_CLRSPC_SRGB;
    }
        else
        if(out_space == cmsSigGrayData) /* enumCS 17 */
@@ -319,7 +422,7 @@ void color_apply_icc_profile(opj_image_t *image)
        in_type = TYPE_GRAY_8;
        out_type = TYPE_RGB_8;
        out_prof = cmsCreate_sRGBProfile();
-       image->color_space = OPJ_CLRSPC_SRGB;
+       new_space = OPJ_CLRSPC_SRGB;
    }
        else
        if(out_space == cmsSigYCbCrData) /* enumCS 18 */
@@ -327,7 +430,7 @@ void color_apply_icc_profile(opj_image_t *image)
        in_type = TYPE_YCbCr_16;
        out_type = TYPE_RGB_16;
        out_prof = cmsCreate_sRGBProfile();
-       image->color_space = OPJ_CLRSPC_SRGB;
+       new_space = OPJ_CLRSPC_SRGB;
    }
        else
    {
@@ -335,31 +438,42 @@ void color_apply_icc_profile(opj_image_t *image)
 fprintf(stderr,"%s:%d: color_apply_icc_profile\n\tICC Profile has unknown "
 "output colorspace(%#x)(%c%c%c%c)\n\tICC Profile ignored.\n",
 __FILE__,__LINE__,out_space,
-(out_space>>24) & 0xff,(out_space>>16) & 0xff,
-(out_space>>8) & 0xff, out_space & 0xff);
+       (out_space>>24) & 0xff,(out_space>>16) & 0xff,
+       (out_space>>8) & 0xff, out_space & 0xff);
 #endif
+       cmsCloseProfile(in_prof);
+
+       return;
+   }
+       if(out_prof == NULL)
+   {
+       cmsCloseProfile(in_prof);
+
        return;
    }
 
 #ifdef DEBUG_PROFILE
 fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tchannels(%d) prec(%d) w(%d) h(%d)"
 "\n\tprofile: in(%p) out(%p)\n",__FILE__,__LINE__,image->numcomps,prec,
-max_w,max_h, (void*)in_prof,(void*)out_prof);
+       max_w,max_h, (void*)in_prof,(void*)out_prof);
 
 fprintf(stderr,"\trender_intent (%u)\n\t"
 "color_space: in(%#x)(%c%c%c%c)   out:(%#x)(%c%c%c%c)\n\t"
 "       type: in(%u)              out:(%u)\n",
-intent,
-in_space,
-(in_space>>24) & 0xff,(in_space>>16) & 0xff,
-(in_space>>8) & 0xff, in_space & 0xff,
+       intent,
+       in_space,
+       (in_space>>24) & 0xff,(in_space>>16) & 0xff,
+       (in_space>>8) & 0xff, in_space & 0xff,
 
-out_space,
-(out_space>>24) & 0xff,(out_space>>16) & 0xff,
-(out_space>>8) & 0xff, out_space & 0xff,
+       out_space,
+       (out_space>>24) & 0xff,(out_space>>16) & 0xff,
+       (out_space>>8) & 0xff, out_space & 0xff,
 
-in_type,out_type
+       in_type,out_type
  );
+#else
+  (void)prec;
+  (void)in_space;
 #endif /* DEBUG_PROFILE */
 
        transform = cmsCreateTransform(in_prof, in_type,
@@ -377,7 +491,7 @@ in_type,out_type
 fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 "ICC Profile ignored.\n",__FILE__,__LINE__);
 #endif
-       image->color_space = oldspace;
+
 #ifdef OPJ_HAVE_LIBLCMS1
        cmsCloseProfile(in_prof);
        cmsCloseProfile(out_prof);
@@ -387,77 +501,204 @@ 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 = (size_t)(max * 3 * sizeof(unsigned char));
+       in = inbuf = (unsigned char*)malloc(nr_samples);
+       out = outbuf = (unsigned char*)malloc(nr_samples);
+
+       if(inbuf == NULL || outbuf == NULL) goto fails0;
+
+       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++;
+ }
+       ok = 1;
+
+fails0:
+       if(inbuf) free(inbuf);
+       if(outbuf) free(outbuf);
+  }
+       else /* prec > 8 */
+  {
        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 = (size_t)(max * 3 * sizeof(unsigned short));
        in = inbuf = (unsigned short*)malloc(nr_samples);
        out = outbuf = (unsigned short*)malloc(nr_samples);
 
+       if(inbuf == NULL || outbuf == NULL) goto fails1;
+
        r = image->comps[0].data;
        g = image->comps[1].data;
        b = image->comps[2].data;
 
        for(i = 0; i < max; ++i)
 {
+ {
        *in++ = (unsigned short)*r++;
        *in++ = (unsigned short)*g++;
        *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;
        b = image->comps[2].data;
 
        for(i = 0; i < max; ++i)
 {
+ {
        *r++ = (int)*out++;
        *g++ = (int)*out++;
        *b++ = (int)*out++;
+ }
+       ok = 1;
+
+fails1:
+       if(inbuf) free(inbuf); 
+       if(outbuf) free(outbuf);
   }
-       free(inbuf); free(outbuf);
    }
-       else /* GRAY, GRAYA */
+       else /* image->numcomps <= 2 : GRAY, GRAYA */
    {
+       if(prec <= 8)
+  {
        unsigned char *in, *inbuf, *out, *outbuf;
+       opj_image_comp_t *new_comps;
 
-       max = max_w * max_h; nr_samples = max * 3 * sizeof(unsigned char);
+       max = max_w * max_h;
+       nr_samples = (size_t)(max * 3 * sizeof(unsigned char));
        in = inbuf = (unsigned char*)malloc(nr_samples);
        out = outbuf = (unsigned char*)malloc(nr_samples);
+       g = (int*)calloc((size_t)max, sizeof(int));
+       b = (int*)calloc((size_t)max, sizeof(int));
+
+       if(inbuf == NULL || outbuf == NULL || g == NULL || b == NULL) goto fails2;
 
-       image->comps = (opj_image_comp_t*)
+       new_comps = (opj_image_comp_t*)
         realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t));
 
+       if(new_comps == NULL) goto fails2;
+
+       image->comps = new_comps;
+
        if(image->numcomps == 2)
         image->comps[3] = image->comps[1];
 
        image->comps[1] = image->comps[0];
        image->comps[2] = image->comps[0];
 
-       image->comps[1].data = (int*)calloc(max, sizeof(int));
-       image->comps[2].data = (int*)calloc(max, sizeof(int));
+       image->comps[1].data = g;
+       image->comps[2].data = b;
 
        image->numcomps += 2;
 
        r = image->comps[0].data;
 
        for(i = 0; i < max; ++i)
 {
+ {
        *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;
        b = image->comps[2].data;
 
        for(i = 0; i < max; ++i)
 {
+ {
        *r++ = (int)*out++; *g++ = (int)*out++; *b++ = (int)*out++;
+ }
+       r = g = b = NULL;
+       ok = 1;
+
+fails2:
+       if(inbuf) free(inbuf);
+       if(outbuf) free(outbuf);
+       if(g) free(g);
+       if(b) free(b);
   }
-       free(inbuf); free(outbuf);
+       else /* prec > 8 */
+  {
+       unsigned short *in, *inbuf, *out, *outbuf;
+       opj_image_comp_t *new_comps;
+
+       max = max_w * max_h;
+       nr_samples = (size_t)(max * 3 * sizeof(unsigned short));
+       in = inbuf = (unsigned short*)malloc(nr_samples);
+       out = outbuf = (unsigned short*)malloc(nr_samples);
+       g = (int*)calloc((size_t)max, sizeof(int));
+       b = (int*)calloc((size_t)max, sizeof(int));
+
+       if(inbuf == NULL || outbuf == NULL || g == NULL || b == NULL) goto fails3;
+
+       new_comps = (opj_image_comp_t*)
+        realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t));
+
+       if(new_comps == NULL) goto fails3;
 
-   }/* if(image->numcomps */
+       image->comps = new_comps;
+
+       if(image->numcomps == 2)
+        image->comps[3] = image->comps[1];
+
+       image->comps[1] = image->comps[0];
+       image->comps[2] = image->comps[0];
+
+       image->comps[1].data = g;
+       image->comps[2].data = b;
+
+       image->numcomps += 2;
+
+       r = image->comps[0].data;
+
+       for(i = 0; i < max; ++i)
+ {
+       *in++ = (unsigned short)*r++;
+ }
+       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++;
+ }
+       r = g = b = NULL;
+       ok = 1;
+
+fails3:
+       if(inbuf) free(inbuf);
+       if(outbuf) free(outbuf);
+       if(g) free(g);
+       if(b) free(b);
+  }
+   }/* if(image->numcomps > 2) */
 
        cmsDeleteTransform(transform);
 
@@ -465,7 +706,260 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
        cmsCloseProfile(in_prof);
        cmsCloseProfile(out_prof);
 #endif
+       if(ok)
+   {
+       image->color_space = new_space;
+   }
 }/* color_apply_icc_profile() */
 
+void color_cielab_to_rgb(opj_image_t *image)
+{
+       int *row;
+       int enumcs, numcomps;
+       OPJ_COLOR_SPACE new_space;
+
+       numcomps = (int)image->numcomps;
+       
+       if(numcomps != 3)
+       {
+               fprintf(stderr,"%s:%d:\n\tnumcomps %d not handled. Quitting.\n",
+                                               __FILE__,__LINE__,numcomps);
+               return;
+       }
+       
+       row = (int*)image->icc_profile_buf;
+       enumcs = row[0];
+       
+       if(enumcs == 14) /* CIELab */
+       {
+               int *L, *a, *b, *red, *green, *blue;
+               int *src0, *src1, *src2, *dst0, *dst1, *dst2;
+               double rl, ol, ra, oa, rb, ob, prec0, prec1, prec2;
+               double minL, maxL, mina, maxa, minb, maxb;
+               unsigned int default_type;
+               unsigned int i, max;
+               cmsHPROFILE in, out;
+               cmsHTRANSFORM transform;
+               cmsUInt16Number RGB[3];
+               cmsCIELab Lab;
+               
+               in = cmsCreateLab4Profile(NULL);
+               if(in == NULL){
+                       return;
+               }
+               out = cmsCreate_sRGBProfile();
+               if(out == NULL){
+                       cmsCloseProfile(in);
+                       return;
+               }
+               transform = cmsCreateTransform(in, TYPE_Lab_DBL, out, TYPE_RGB_16, INTENT_PERCEPTUAL, 0);
+               
+#ifdef OPJ_HAVE_LIBLCMS2
+               cmsCloseProfile(in);
+               cmsCloseProfile(out);
+#endif
+               if(transform == NULL)
+               {
+#ifdef OPJ_HAVE_LIBLCMS1
+                       cmsCloseProfile(in);
+                       cmsCloseProfile(out);
+#endif
+                       return;
+               }
+               new_space = OPJ_CLRSPC_SRGB;
+
+               prec0 = (double)image->comps[0].prec;
+               prec1 = (double)image->comps[1].prec;
+               prec2 = (double)image->comps[2].prec;
+               
+               default_type = (unsigned int)row[1];
+               
+               if(default_type == 0x44454600)/* DEF : default */
+               {
+                       rl = 100; ra = 170; rb = 200;
+                       ol = 0;
+                       oa = pow(2, prec1 - 1);
+                       ob = pow(2, prec2 - 2) +  pow(2, prec2 - 3);
+               }
+               else
+               {
+                       rl = row[2]; ra = row[4]; rb = row[6];
+                       ol = row[3]; oa = row[5]; ob = row[7];
+               }
+               
+               L = src0 = image->comps[0].data;
+               a = src1 = image->comps[1].data;
+               b = src2 = image->comps[2].data;
+               
+               max = image->comps[0].w * image->comps[0].h;
+               
+               red = dst0 = (int*)malloc(max * sizeof(int));
+               green = dst1 = (int*)malloc(max * sizeof(int));
+               blue = dst2 = (int*)malloc(max * sizeof(int));
+
+               if(red == NULL || green == NULL || blue == NULL) goto fails;
+
+               minL = -(rl * ol)/(pow(2, prec0)-1);
+               maxL = minL + rl;
+               
+               mina = -(ra * oa)/(pow(2, prec1)-1);
+               maxa = mina + ra;
+               
+               minb = -(rb * ob)/(pow(2, prec2)-1);
+               maxb = minb + rb;
+               
+               for(i = 0; i < max; ++i)
+               {
+                       Lab.L = minL + (double)(*L) * (maxL - minL)/(pow(2, prec0)-1); ++L;
+                       Lab.a = mina + (double)(*a) * (maxa - mina)/(pow(2, prec1)-1); ++a;
+                       Lab.b = minb + (double)(*b) * (maxb - minb)/(pow(2, prec2)-1); ++b;
+               
+                       cmsDoTransform(transform, &Lab, RGB, 1);
+               
+                       *red++ = RGB[0];
+                       *green++ = RGB[1];
+                       *blue++ = RGB[2];
+               }
+               cmsDeleteTransform(transform);
+#ifdef OPJ_HAVE_LIBLCMS1
+               cmsCloseProfile(in);
+               cmsCloseProfile(out);
+#endif
+               free(src0); image->comps[0].data = dst0;
+               free(src1); image->comps[1].data = dst1;
+               free(src2); image->comps[2].data = dst2;
+               
+               image->color_space = new_space;
+               image->comps[0].prec = 16;
+               image->comps[1].prec = 16;
+               image->comps[2].prec = 16;
+               
+               return;
+
+fails:
+               cmsDeleteTransform(transform);
+#ifdef OPJ_HAVE_LIBLCMS1
+               cmsCloseProfile(in);
+               cmsCloseProfile(out);
+#endif
+               if(red) free(red);
+               if(green) free(green);
+               if(blue) free(blue);
+               return;
+       }
+       
+       fprintf(stderr,"%s:%d:\n\tenumCS %d not handled. Ignoring.\n", __FILE__,__LINE__, enumcs);
+}/* color_cielab_to_rgb() */
+
 #endif /* OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 */
 
+void color_cmyk_to_rgb(opj_image_t *image)
+{
+       float C, M, Y, K;
+       float sC, sM, sY, sK;
+       unsigned int w, h, max, i;
+
+       w = image->comps[0].w;
+       h = image->comps[0].h;
+
+       if(image->numcomps < 4) return;
+
+       max = w * h;
+       
+       sC = 1.0F / (float)((1 << image->comps[0].prec) - 1);
+       sM = 1.0F / (float)((1 << image->comps[1].prec) - 1);
+       sY = 1.0F / (float)((1 << image->comps[2].prec) - 1);
+       sK = 1.0F / (float)((1 << image->comps[3].prec) - 1);
+
+       for(i = 0; i < max; ++i)
+       {
+               /* CMYK values from 0 to 1 */
+               C = (float)(image->comps[0].data[i]) * sC;
+               M = (float)(image->comps[1].data[i]) * sM;
+               Y = (float)(image->comps[2].data[i]) * sY;
+               K = (float)(image->comps[3].data[i]) * sK;
+               
+               /* Invert all CMYK values */
+               C = 1.0F - C;
+               M = 1.0F - M;
+               Y = 1.0F - Y;
+               K = 1.0F - K;
+
+               /* CMYK -> RGB : RGB results from 0 to 255 */
+               image->comps[0].data[i] = (int)(255.0F * C * K); /* R */
+               image->comps[1].data[i] = (int)(255.0F * M * K); /* G */
+               image->comps[2].data[i] = (int)(255.0F * Y * K); /* B */
+       }
+
+       free(image->comps[3].data); image->comps[3].data = NULL;
+       image->comps[0].prec = 8;
+       image->comps[1].prec = 8;
+       image->comps[2].prec = 8;
+       image->numcomps -= 1;
+       image->color_space = OPJ_CLRSPC_SRGB;
+       
+       for (i = 3; i < image->numcomps; ++i) {
+               memcpy(&(image->comps[i]), &(image->comps[i+1]), sizeof(image->comps[i]));
+       }
+
+}/* color_cmyk_to_rgb() */
+
+/*
+ * This code has been adopted from sjpx_openjpeg.c of ghostscript
+ */
+void color_esycc_to_rgb(opj_image_t *image)
+{
+       int y, cb, cr, sign1, sign2, val;
+       unsigned int w, h, max, i;
+       int flip_value = (1 << (image->comps[0].prec-1));
+       int max_value = (1 << image->comps[0].prec) - 1;
+       
+       if (
+                   (image->numcomps < 3)
+                || (image->comps[0].dx != image->comps[1].dx) || (image->comps[0].dx != image->comps[2].dx)
+                || (image->comps[0].dy != image->comps[1].dy) || (image->comps[0].dy != image->comps[2].dy)
+          ) {
+               fprintf(stderr,"%s:%d:color_esycc_to_rgb\n\tCAN NOT CONVERT\n", __FILE__,__LINE__);
+               return;
+       }
+       
+       w = image->comps[0].w;
+       h = image->comps[0].h;
+       
+       sign1 = (int)image->comps[1].sgnd;
+       sign2 = (int)image->comps[2].sgnd;
+       
+       max = w * h;
+       
+       for(i = 0; i < max; ++i)
+       {
+               
+               y = image->comps[0].data[i]; cb = image->comps[1].data[i]; cr = image->comps[2].data[i];
+               
+               if( !sign1) cb -= flip_value;
+               if( !sign2) cr -= flip_value;
+               
+               val = (int)
+               ((float)y - (float)0.0000368 * (float)cb
+                + (float)1.40199 * (float)cr + (float)0.5);
+               
+               if(val > max_value) val = max_value; else if(val < 0) val = 0;
+               image->comps[0].data[i] = val;
+               
+               val = (int)
+               ((float)1.0003 * (float)y - (float)0.344125 * (float)cb
+                - (float)0.7141128 * (float)cr + (float)0.5);
+               
+               if(val > max_value) val = max_value; else if(val < 0) val = 0;
+               image->comps[1].data[i] = val;
+               
+               val = (int)
+               ((float)0.999823 * (float)y + (float)1.77204 * (float)cb
+                - (float)0.000008 *(float)cr + (float)0.5);
+               
+               if(val > max_value) val = max_value; else if(val < 0) val = 0;
+               image->comps[2].data[i] = val;
+       }
+       image->color_space = OPJ_CLRSPC_SRGB;
+
+}/* color_esycc_to_rgb() */