[trunk] merge rev 1333 from 1.5 to trunk

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 19c0080c01b393f3b2ac575cdc3c2573d61c862c..f60e9e49b41dd3aa0559cd3c59c8faaf6005c45d 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -1374,7 +1374,7 @@ opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color)
     jp2_read_boxhdr(cinfo, cio, &box);
     continue;
   }
-    if(box.type == JP2_CDEF)
+    if(box.type == JP2_CDEF && !jp2->ignore_pclr_cmap_cdef)
   {
     if( !jp2_read_cdef(jp2, cio, &box, color))
  {
@@ -1384,7 +1384,7 @@ opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color)
     jp2_read_boxhdr(cinfo, cio, &box);
     continue;
   }
-    if(box.type == JP2_PCLR)
+    if(box.type == JP2_PCLR && !jp2->ignore_pclr_cmap_cdef)
   {
     if( !jp2_read_pclr(jp2, cio, &box, color))
  {
@@ -1394,7 +1394,7 @@ opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color)
     jp2_read_boxhdr(cinfo, cio, &box);
     continue;
   }
-    if(box.type == JP2_CMAP)
+    if(box.type == JP2_CMAP && !jp2->ignore_pclr_cmap_cdef)
   {
     if( !jp2_read_cmap(jp2, cio, &box, color))
  {
@@ -1448,8 +1448,10 @@ opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio,
        opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
        return NULL;
    }
+   
+    if (!jp2->ignore_pclr_cmap_cdef){
 
-/* Set Image Color Space */
+    /* Set Image Color Space */
        if (jp2->enumcs == 16)
                image->color_space = CLRSPC_SRGB;
        else if (jp2->enumcs == 17)
@@ -1477,6 +1479,8 @@ opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio,
        color.icc_profile_buf = NULL;
        image->icc_profile_len = color.icc_profile_len;
    }
+   }
+   
        return image;
 
 }/* opj_jp2_decode() */
@@ -1796,6 +1800,7 @@ void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters) {
        /* setup the J2K codec */
        j2k_setup_decoder(jp2->j2k, parameters);
        /* further JP2 initializations go here */
+       jp2->ignore_pclr_cmap_cdef = parameters->flags & OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
 }
 
 void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)

diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h
index 40aaf813236a224b52c0cb14c567401155d571f7..fad4aa78c9bd5f8caa4176c88ecd1dca601630d7 100644 (file)
--- a/libopenjpeg/jp2.h
+++ b/libopenjpeg/jp2.h
@@ -175,6 +175,7 @@ typedef struct opj_jp2 {
        unsigned int j2k_codestream_offset;
        unsigned int j2k_codestream_length;
        opj_bool jpip_on;
+       opj_bool ignore_pclr_cmap_cdef;
 } opj_jp2_t;
 
 /**

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 4470887d4894f6b50a448865640238ba6112b118..1adc126d51c6fedee39cb4e10b8530a6f77a4aa1 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -418,6 +418,7 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete
 
                parameters->decod_format = -1;
                parameters->cod_format = -1;
+               parameters->flags = 0;          
 /* UniPG>> */
 #ifdef USE_JPWL
                parameters->jpwl_correct = OPJ_FALSE;

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 36f83f8f18f95c0760e9fb00e2c2ba44e0c7707b..26698abcd9cd61aac38f3dcaac3a464f6d4eb065 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -419,6 +419,8 @@ typedef struct opj_cparameters {
        opj_bool jpip_on;
 } opj_cparameters_t;
 
+#define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG     0x0001
+
 /**
  * Decompression parameters
  * */
@@ -488,6 +490,7 @@ typedef struct opj_dparameters {
        */
        OPJ_LIMIT_DECODING cp_limit_decoding;
 
+       unsigned int flags;
 } opj_dparameters_t;