projects / openjpeg.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix resource leak in opj_j2k_encode
[openjpeg.git] / src / lib / openjp2 / jp2.c
diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 96599a70e5a39108fb1bef56301c9a83f6bc7e42..af692d59a3f0f696a58d92cf2a366d19e7cec748 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -849,6 +849,8 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color,
                                opj_event_msg(p_manager, EVT_ERROR, "Invalid component index %d (>= %d).\n", info[i].cn, nr_channels);
                                return OPJ_FALSE;
                        }
+                       if (info[i].asoc == 65535U) continue;
+
                        if (info[i].asoc > 0 && (OPJ_UINT32)(info[i].asoc - 1) >= nr_channels) {
                                opj_event_msg(p_manager, EVT_ERROR, "Invalid component index %d (>= %d).\n", info[i].asoc - 1, nr_channels);
                                return OPJ_FALSE;
@@ -1313,15 +1315,15 @@ static OPJ_BOOL opj_jp2_read_cdef(      opj_jp2_t * jp2,
        }
 
        cdef_info = (opj_jp2_cdef_info_t*) opj_malloc(l_value * sizeof(opj_jp2_cdef_info_t));
-    if (!cdef_info)
-        return OPJ_FALSE;
+       if (!cdef_info)
+               return OPJ_FALSE;
 
        jp2->color.jp2_cdef = (opj_jp2_cdef_t*)opj_malloc(sizeof(opj_jp2_cdef_t));
-    if(!jp2->color.jp2_cdef)
-    {
-        opj_free(cdef_info);
-        return OPJ_FALSE;
-    }
+       if(!jp2->color.jp2_cdef)
+       {
+               opj_free(cdef_info);
+               return OPJ_FALSE;
+       }
        jp2->color.jp2_cdef->info = cdef_info;
        jp2->color.jp2_cdef->n = (OPJ_UINT16) l_value;
 
@@ -1383,14 +1385,59 @@ static OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
                        opj_event_msg(p_manager, EVT_ERROR, "Bad COLR header box (bad size: %d)\n", p_colr_header_size);
                        return OPJ_FALSE;
                }
-               if (p_colr_header_size > 7) {
+               if ((p_colr_header_size > 7) && (jp2->enumcs != 14)) { /* handled below for CIELab) */
                        /* testcase Altona_Technical_v20_x4.pdf */
                        opj_event_msg(p_manager, EVT_WARNING, "Bad COLR header box (bad size: %d)\n", p_colr_header_size);
                }
 
                opj_read_bytes(p_colr_header_data,&jp2->enumcs ,4);                     /* EnumCS */
-        
-        jp2->color.jp2_has_colr = 1;
+
+               p_colr_header_data += 4;
+
+               if(jp2->enumcs == 14)/* CIELab */
+               {
+                       OPJ_UINT32 *cielab;
+                       OPJ_UINT32 rl, ol, ra, oa, rb, ob, il;
+
+                       cielab = (OPJ_UINT32*)opj_malloc(9 * sizeof(OPJ_UINT32));
+                       cielab[0] = 14; /* enumcs */
+                       
+                       /* default values */
+                       rl = ra = rb = ol = oa = ob = 0;
+                       il = 0x00443530; /* D50 */
+                       cielab[1] = 0x44454600;/* DEF */
+
+                       if(p_colr_header_size == 35)
+                       {
+                               opj_read_bytes(p_colr_header_data, &rl, 4);
+                               p_colr_header_data += 4;
+                               opj_read_bytes(p_colr_header_data, &ol, 4);
+                               p_colr_header_data += 4;
+                               opj_read_bytes(p_colr_header_data, &ra, 4);
+                               p_colr_header_data += 4;
+                               opj_read_bytes(p_colr_header_data, &oa, 4);
+                               p_colr_header_data += 4;
+                               opj_read_bytes(p_colr_header_data, &rb, 4);
+                               p_colr_header_data += 4;
+                               opj_read_bytes(p_colr_header_data, &ob, 4);
+                               p_colr_header_data += 4;
+                               opj_read_bytes(p_colr_header_data, &il, 4);
+                               p_colr_header_data += 4;
+                               
+                               cielab[1] = 0;
+                       }
+                       else if(p_colr_header_size != 7)
+                       {
+                               opj_event_msg(p_manager, EVT_WARNING, "Bad COLR header box (CIELab, bad size: %d)\n", p_colr_header_size);
+                       }
+                       cielab[2] = rl; cielab[4] = ra; cielab[6] = rb;
+                       cielab[3] = ol; cielab[5] = oa; cielab[7] = ob;
+                       cielab[8] = il;
+
+                       jp2->color.icc_profile_buf = (OPJ_BYTE*)cielab;
+                       jp2->color.icc_profile_len = 0;
+               }
+               jp2->color.jp2_has_colr = 1;
        }
        else if (jp2->meth == 2) {
                /* ICC profile */
@@ -1399,11 +1446,11 @@ static OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
 
                jp2->color.icc_profile_len = (OPJ_UINT32)icc_len;
                jp2->color.icc_profile_buf = (OPJ_BYTE*) opj_calloc(1,(size_t)icc_len);
-        if (!jp2->color.icc_profile_buf)
-        {
-            jp2->color.icc_profile_len = 0;
-            return OPJ_FALSE;
-        }
+               if (!jp2->color.icc_profile_buf)
+               {
+                       jp2->color.icc_profile_len = 0;
+                       return OPJ_FALSE;
+               }
 
                for (it_icc_value = 0; it_icc_value < icc_len; ++it_icc_value)
                {
@@ -1412,16 +1459,16 @@ static OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
                        jp2->color.icc_profile_buf[it_icc_value] = (OPJ_BYTE) l_value;
                }
            
-        jp2->color.jp2_has_colr = 1;
+               jp2->color.jp2_has_colr = 1;
        }
        else if (jp2->meth > 2)
-    {
-        /*     ISO/IEC 15444-1:2004 (E), Table I.9 Legal METH values:
-        conforming JP2 reader shall ignore the entire Colour Specification box.*/
-        opj_event_msg(p_manager, EVT_INFO, "COLR BOX meth value is not a regular value (%d), " 
-            "so we will ignore the entire Colour Specification box. \n", jp2->meth);
-    }
-    return OPJ_TRUE;
+       {
+               /*      ISO/IEC 15444-1:2004 (E), Table I.9 Legal METH values:
+               conforming JP2 reader shall ignore the entire Colour Specification box.*/
+               opj_event_msg(p_manager, EVT_INFO, "COLR BOX meth value is not a regular value (%d), "
+                       "so we will ignore the entire Colour Specification box. \n", jp2->meth);
+       }
+       return OPJ_TRUE;
 }
 
 OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2,
@@ -1438,42 +1485,44 @@ OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2,
                return OPJ_FALSE;
        }
 
-    if (!jp2->ignore_pclr_cmap_cdef){
-           if (!opj_jp2_check_color(p_image, &(jp2->color), p_manager)) {
-                   return OPJ_FALSE;
-           }
-
-           /* Set Image Color Space */
-           if (jp2->enumcs == 16)
-                   p_image->color_space = OPJ_CLRSPC_SRGB;
-           else if (jp2->enumcs == 17)
-                   p_image->color_space = OPJ_CLRSPC_GRAY;
-           else if (jp2->enumcs == 18)
-                   p_image->color_space = OPJ_CLRSPC_SYCC;
-            else if (jp2->enumcs == 24)
-                    p_image->color_space = OPJ_CLRSPC_EYCC;
-           else
-                   p_image->color_space = OPJ_CLRSPC_UNKNOWN;
-
-           if(jp2->color.jp2_pclr) {
-                   /* Part 1, I.5.3.4: Either both or none : */
-                   if( !jp2->color.jp2_pclr->cmap)
-                           opj_jp2_free_pclr(&(jp2->color));
-                   else
-                           opj_jp2_apply_pclr(p_image, &(jp2->color));
-           }
-
-           /* Apply the color space if needed */
-           if(jp2->color.jp2_cdef) {
-                   opj_jp2_apply_cdef(p_image, &(jp2->color), p_manager);
-           }
-
-           if(jp2->color.icc_profile_buf) {
-                   p_image->icc_profile_buf = jp2->color.icc_profile_buf;
-                   p_image->icc_profile_len = jp2->color.icc_profile_len;
-                   jp2->color.icc_profile_buf = NULL;
-           }
-    }
+       if (!jp2->ignore_pclr_cmap_cdef){
+               if (!opj_jp2_check_color(p_image, &(jp2->color), p_manager)) {
+                       return OPJ_FALSE;
+               }
+
+               /* Set Image Color Space */
+               if (jp2->enumcs == 16)
+                       p_image->color_space = OPJ_CLRSPC_SRGB;
+               else if (jp2->enumcs == 17)
+                       p_image->color_space = OPJ_CLRSPC_GRAY;
+               else if (jp2->enumcs == 18)
+                       p_image->color_space = OPJ_CLRSPC_SYCC;
+               else if (jp2->enumcs == 24)
+                       p_image->color_space = OPJ_CLRSPC_EYCC;
+               else if (jp2->enumcs == 12)
+                       p_image->color_space = OPJ_CLRSPC_CMYK;
+               else
+                       p_image->color_space = OPJ_CLRSPC_UNKNOWN;
+
+               if(jp2->color.jp2_pclr) {
+                       /* Part 1, I.5.3.4: Either both or none : */
+                       if( !jp2->color.jp2_pclr->cmap)
+                               opj_jp2_free_pclr(&(jp2->color));
+                       else
+                               opj_jp2_apply_pclr(p_image, &(jp2->color));
+               }
+
+               /* Apply the color space if needed */
+               if(jp2->color.jp2_cdef) {
+                       opj_jp2_apply_cdef(p_image, &(jp2->color), p_manager);
+               }
+
+               if(jp2->color.icc_profile_buf) {
+                       p_image->icc_profile_buf = jp2->color.icc_profile_buf;
+                       p_image->icc_profile_len = jp2->color.icc_profile_len;
+                       jp2->color.icc_profile_buf = NULL;
+               }
+       }
 
        return OPJ_TRUE;
 }
@@ -2824,6 +2873,10 @@ OPJ_BOOL opj_jp2_get_tile(       opj_jp2_t *p_jp2,
                p_image->color_space = OPJ_CLRSPC_GRAY;
        else if (p_jp2->enumcs == 18)
                p_image->color_space = OPJ_CLRSPC_SYCC;
+       else if (p_jp2->enumcs == 24)
+               p_image->color_space = OPJ_CLRSPC_EYCC;
+       else if (p_jp2->enumcs == 12)
+               p_image->color_space = OPJ_CLRSPC_CMYK;
        else
                p_image->color_space = OPJ_CLRSPC_UNKNOWN;
 
Fork of openjpeg with some changes used by DCP-o-matic.