Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/jp2.c

 /*
  * 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
@@ skipping 88 matching lines @@
 static OPJ_BOOL opj_jp2_read_bpcc(  opj_jp2_t *jp2,
                                     OPJ_BYTE * p_bpc_header_data,
                                     OPJ_UINT32 p_bpc_header_size,
                                     opj_event_mgr_t * p_manager );
 
 static OPJ_BOOL opj_jp2_read_cdef(      opj_jp2_t * jp2,
                                     OPJ_BYTE * p_cdef_header_data,
                                                                         OPJ_UINT32 p_cdef_header_size,
                                                                         opj_event_mgr_t * p_manager );
 
-static void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color);
+static void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color, opj_event_mgr_t *);
 
 /**
  * Writes the Channel Definition box.
  *
  * @param jp2                                   jpeg2000 file codec.
  * @param p_nb_bytes_written    pointer to store the nb of bytes written by the function.
  *
  * @return      the data being copied.
  */
 static OPJ_BYTE * opj_jp2_write_cdef(   opj_jp2_t *jp2,
@@ skipping 31 matching lines @@
  * @param       p_header_size   the size of the data contained in the FTYP box.
  * @param       p_manager               the user event manager.
  *
  * @return true if the FTYP box is valid.
  */
 static OPJ_BOOL opj_jp2_read_ftyp(      opj_jp2_t *jp2,
                                                                         OPJ_BYTE * p_header_data,
                                                                         OPJ_UINT32 p_header_size,
                                                                         opj_event_mgr_t * p_manager );
 
-OPJ_BOOL opj_jp2_skip_jp2c(     opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_skip_jp2c(      opj_jp2_t *jp2,
                                                     opj_stream_private_t *cio,
                                                     opj_event_mgr_t * p_manager );
 
 /**
  * Reads the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
  *
  * @param       p_header_data   the data contained in the file header box.
  * @param       jp2                             the jpeg2000 file codec.
  * @param       p_header_size   the size of the data contained in the file header box.
  * @param       p_manager               the user event manager.
  *
- * @return true if the JP2 Header box was successfully reconized.
+ * @return true if the JP2 Header box was successfully recognized.
 */
 static OPJ_BOOL opj_jp2_read_jp2h(  opj_jp2_t *jp2,
                                     OPJ_BYTE *p_header_data,
                                     OPJ_UINT32 p_header_size,
                                     opj_event_mgr_t * p_manager );
 
 /**
+ * Writes the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
+ *
+ * @param  jp2      the jpeg2000 file codec.
+ * @param  stream      the stream to write data to.
+ * @param  p_manager  user event manager.
+ *
+ * @return true if writing was successful.
+ */
+static OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
+                                                                                                                opj_stream_private_t *stream,
+                                                                                                                opj_event_mgr_t * p_manager );
+
+/**
  * Writes the Jpeg2000 codestream Header box - JP2C Header box. This function must be called AFTER the coding has been done.
  *
  * @param       cio                     the stream to write data to.
  * @param       jp2                     the jpeg2000 file codec.
  * @param       p_manager       user event manager.
  *
  * @return true if writing was successful.
 */
 static OPJ_BOOL opj_jp2_write_jp2c(     opj_jp2_t *jp2,
                                                                     opj_stream_private_t *cio,
@@ skipping 115 matching lines @@
                                     opj_event_mgr_t * p_manager );
 
 /*@}*/
 
 /*@}*/
 
 /**
  * Sets up the procedures to do on writing header after the codestream.
  * Developpers wanting to extend the library can add their own writing procedures.
  */
-static void opj_jp2_setup_end_header_writing (opj_jp2_t *jp2);
+static OPJ_BOOL opj_jp2_setup_end_header_writing (opj_jp2_t *jp2, opj_event_mgr_t * p_manager);
 
 /**
  * Sets up the procedures to do on reading header after the codestream.
  * Developpers wanting to extend the library can add their own writing procedures.
  */
-static void opj_jp2_setup_end_header_reading (opj_jp2_t *jp2);
+static OPJ_BOOL opj_jp2_setup_end_header_reading (opj_jp2_t *jp2, opj_event_mgr_t * p_manager);
 
 /**
  * Reads a jpeg2000 file header structure.
  *
  * @param jp2 the jpeg2000 file header structure.
  * @param stream the stream to read data from.
  * @param p_manager the user event manager.
  *
  * @return true if the box is valid.
  */
@@ skipping 17 matching lines @@
                                 opj_event_mgr_t * p_manager );
 
 /**
  * Reads a box header. The box is the way data is packed inside a jpeg2000 file structure.
  *
  * @param       cio                                             the input stream to read data from.
  * @param       box                                             the box structure to fill.
  * @param       p_number_bytes_read             pointer to an int that will store the number of bytes read from the stream (shoul usually be 2).
  * @param       p_manager                               user event manager.
  *
- * @return      true if the box is reconized, false otherwise
+ * @return      true if the box is recognized, false otherwise
 */
 static OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box,
                                     OPJ_UINT32 * p_number_bytes_read,
                                     opj_stream_private_t *cio,
                                     opj_event_mgr_t * p_manager);
 
 /**
  * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
  * are valid. Developpers wanting to extend the library can add their own validation procedures.
  */
-static void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2);
+static OPJ_BOOL opj_jp2_setup_encoding_validation (opj_jp2_t *jp2, opj_event_mgr_t * p_manager);
 
 /**
  * Sets up the procedures to do on writing header. Developpers wanting to extend the library can add their own writing procedures.
  */
-static void opj_jp2_setup_header_writing (opj_jp2_t *jp2);
+static OPJ_BOOL opj_jp2_setup_header_writing (opj_jp2_t *jp2, opj_event_mgr_t * p_manager);
 
-OPJ_BOOL opj_jp2_default_validation (   opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_default_validation (    opj_jp2_t * jp2,
                                         opj_stream_private_t *cio,
                                         opj_event_mgr_t * p_manager );
 
 /**
  * Finds the image execution function related to the given box id.
  *
  * @param       p_id    the id of the handler to fetch.
  *
  * @return      the given handler or NULL if it could not be found.
  */
 static const opj_jp2_header_handler_t * opj_jp2_img_find_handler (OPJ_UINT32 p_id);
 
 /**
  * Finds the execution function related to the given box id.
  *
  * @param       p_id    the id of the handler to fetch.
  *
  * @return      the given handler or NULL if it could not be found.
  */
 static const opj_jp2_header_handler_t * opj_jp2_find_handler (OPJ_UINT32 p_id );
 
-const opj_jp2_header_handler_t jp2_header [] =
+static const opj_jp2_header_handler_t jp2_header [] =
 {
         {JP2_JP,opj_jp2_read_jp},
         {JP2_FTYP,opj_jp2_read_ftyp},
         {JP2_JP2H,opj_jp2_read_jp2h}
 };
 
-const opj_jp2_header_handler_t jp2_img_header [] =
+static const opj_jp2_header_handler_t jp2_img_header [] =
 {
         {JP2_IHDR,opj_jp2_read_ihdr},
         {JP2_COLR,opj_jp2_read_colr},
         {JP2_BPCC,opj_jp2_read_bpcc},
         {JP2_PCLR,opj_jp2_read_pclr},
         {JP2_CMAP,opj_jp2_read_cmap},
         {JP2_CDEF,opj_jp2_read_cdef}
 
 };
 
 /**
  * Reads a box header. The box is the way data is packed inside a jpeg2000 file structure. Data is read from a character string
  *
  * @param       box                                             the box structure to fill.
  * @param       p_data                                  the character string to read data from.
  * @param       p_number_bytes_read             pointer to an int that will store the number of bytes read from the stream (shoul usually be 2).
  * @param       p_box_max_size                  the maximum number of bytes in the box.
  * @param       p_manager         FIXME DOC
  *
- * @return      true if the box is reconized, false otherwise
+ * @return      true if the box is recognized, false otherwise
 */
 static OPJ_BOOL opj_jp2_read_boxhdr_char(   opj_jp2_box_t *box,
                                             OPJ_BYTE * p_data,
                                             OPJ_UINT32 * p_number_bytes_read,
                                             OPJ_UINT32 p_box_max_size,
                                             opj_event_mgr_t * p_manager );
 
 /**
  * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
  * are valid. Developpers wanting to extend the library can add their own validation procedures.
  */
-static void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2);
+static OPJ_BOOL opj_jp2_setup_decoding_validation (opj_jp2_t *jp2, opj_event_mgr_t * p_manager);
 
 /**
  * Sets up the procedures to do on reading header.
  * Developpers wanting to extend the library can add their own writing procedures.
  */
-static void opj_jp2_setup_header_reading (opj_jp2_t *jp2);
+static OPJ_BOOL opj_jp2_setup_header_reading (opj_jp2_t *jp2, opj_event_mgr_t * p_manager);
 
 /* ----------------------------------------------------------------------- */
- OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box,
+static OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box,
                               OPJ_UINT32 * p_number_bytes_read,
                               opj_stream_private_t *cio,
                               opj_event_mgr_t * p_manager )
 {
         /* read header from file */
         OPJ_BYTE l_data_header [8];
 
         /* preconditions */
         assert(cio != 00);
         assert(box != 00);
@@ skipping 59 matching lines @@
                 }
         }
 
         box.length = cio_tell(cio) - box.init_pos;
         cio_seek(cio, box.init_pos);
         cio_write(cio, box.length, 4);  /* L */
         cio_seek(cio, box.init_pos + box.length);
 }
 #endif
 
-OPJ_BOOL opj_jp2_read_ihdr( opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_ihdr( opj_jp2_t *jp2,
                             OPJ_BYTE *p_image_header_data,
                             OPJ_UINT32 p_image_header_size,
                             opj_event_mgr_t * p_manager )
 {
         /* preconditions */
         assert(p_image_header_data != 00);
         assert(jp2 != 00);
         assert(p_manager != 00);
 
         if (p_image_header_size != 14) {
@@ skipping 27 matching lines @@
         }
 
         opj_read_bytes(p_image_header_data,&(jp2->UnkC),1);                     /* UnkC */
         ++ p_image_header_data;
         opj_read_bytes(p_image_header_data,&(jp2->IPR),1);                      /* IPR */
         ++ p_image_header_data;
 
         return OPJ_TRUE;
 }
 
-OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_t *jp2,
                               OPJ_UINT32 * p_nb_bytes_written
                               )
 {
         OPJ_BYTE * l_ihdr_data,* l_current_ihdr_ptr;
         
         /* preconditions */
         assert(jp2 != 00);
         assert(p_nb_bytes_written != 00);
 
         /* default image header is 22 bytes wide */
@@ skipping 29 matching lines @@
         ++l_current_ihdr_ptr;
         
         opj_write_bytes(l_current_ihdr_ptr, jp2->IPR, 1);               /* IPR, no intellectual property */
         ++l_current_ihdr_ptr;
         
         *p_nb_bytes_written = 22;
         
         return l_ihdr_data;
 }
 
-OPJ_BYTE * opj_jp2_write_bpcc(  opj_jp2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_bpcc(   opj_jp2_t *jp2,
                                                         OPJ_UINT32 * p_nb_bytes_written
                                 )
 {
         OPJ_UINT32 i;
         /* room for 8 bytes for box and 1 byte for each component */
         OPJ_UINT32 l_bpcc_size = 8 + jp2->numcomps;
         OPJ_BYTE * l_bpcc_data,* l_current_bpcc_ptr;
         
         /* preconditions */
         assert(jp2 != 00);
@@ skipping 15 matching lines @@
         for (i = 0; i < jp2->numcomps; ++i)  {
                 opj_write_bytes(l_current_bpcc_ptr, jp2->comps[i].bpcc, 1); /* write each component information */
                 ++l_current_bpcc_ptr;
         }
 
         *p_nb_bytes_written = l_bpcc_size;
         
         return l_bpcc_data;
 }
 
-OPJ_BOOL opj_jp2_read_bpcc( opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_bpcc( opj_jp2_t *jp2,
                             OPJ_BYTE * p_bpc_header_data,
                             OPJ_UINT32 p_bpc_header_size,
                             opj_event_mgr_t * p_manager
                             )
 {
         OPJ_UINT32 i;
 
         /* preconditions */
         assert(p_bpc_header_data != 00);
         assert(jp2 != 00);
@@ skipping 61 matching lines @@
                 l_current_cdef_ptr += 2;
                 l_value = jp2->color.jp2_cdef->info[i].asoc;
                 opj_write_bytes(l_current_cdef_ptr,l_value,2);                                  /* Asoci */
                 l_current_cdef_ptr += 2;
         }
         *p_nb_bytes_written = l_cdef_size;
 
         return l_cdef_data;
 }
 
-OPJ_BYTE * opj_jp2_write_colr(  opj_jp2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_colr(  opj_jp2_t *jp2,
                                                             OPJ_UINT32 * p_nb_bytes_written
                                 )
 {
         /* room for 8 bytes for box 3 for common data and variable upon profile*/
         OPJ_UINT32 l_colr_size = 11;
         OPJ_BYTE * l_colr_data,* l_current_colr_ptr;
 
         /* preconditions */
         assert(jp2 != 00);
         assert(p_nb_bytes_written != 00);
@@ skipping 43 matching lines @@
                 ++l_current_colr_ptr;
             }
         }
         }
 
         *p_nb_bytes_written = l_colr_size;
         
         return l_colr_data;
 }
 
-void opj_jp2_free_pclr(opj_jp2_color_t *color)
+static void opj_jp2_free_pclr(opj_jp2_color_t *color)
 {
     opj_free(color->jp2_pclr->channel_sign);
     opj_free(color->jp2_pclr->channel_size);
     opj_free(color->jp2_pclr->entries);
 
         if(color->jp2_pclr->cmap) opj_free(color->jp2_pclr->cmap);
 
     opj_free(color->jp2_pclr); color->jp2_pclr = NULL;
 }
 
@@ skipping 10 matching lines @@
                 /* cdef applies to cmap channels if any */
                 if (color->jp2_pclr && color->jp2_pclr->cmap) {
                         nr_channels = (OPJ_UINT32)color->jp2_pclr->nr_channels;
                 }
 
                 for (i = 0; i < n; i++) {
                         if (info[i].cn >= nr_channels) {
                                 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;
                         }
                 }
 
                 /* issue 397 */
                 /* ISO 15444-1 states that if cdef is present, it shall contain a complete list of channel definitions. */
                 while (nr_channels > 0)
                 {
@@ skipping 51 matching lines @@
                         else
                                 pcol_usage[pcol] = OPJ_TRUE;
                 }
                 /* verify that all components are targeted at least once */
                 for (i = 0; i < nr_channels; i++) {
                         if (!pcol_usage[i] && cmap[i].mtyp != 0) {
                                 opj_event_msg(p_manager, EVT_ERROR, "Component %d doesn't have a mapping.\n", i);
                                 is_sane = OPJ_FALSE;
                         }
                 }
+                /* Issue 235/447 weird cmap */
+                if (1 && is_sane && (image->numcomps==1U)) {
+                        for (i = 0; i < nr_channels; i++) {
+                                if (!pcol_usage[i]) {
+                                        is_sane = 0U;
+                                        opj_event_msg(p_manager, EVT_WARNING, "Component mapping seems wrong. Trying to correct.\n", i);
+                                        break;
+                                }
+                        }
+                        if (!is_sane) {
+                                is_sane = OPJ_TRUE;
+                                for (i = 0; i < nr_channels; i++) {
+                                        cmap[i].mtyp = 1U;
+                                        cmap[i].pcol = (OPJ_BYTE) i;
+                                }
+                        }
+                }
                 opj_free(pcol_usage);
                 if (!is_sane) {
                         return OPJ_FALSE;
                 }
         }
 
         return OPJ_TRUE;
 }
 
 /* file9.jp2 */
-void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color)
+static void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color)
 {
         opj_image_comp_t *old_comps, *new_comps;
         OPJ_BYTE *channel_size, *channel_sign;
         OPJ_UINT32 *entries;
         opj_jp2_cmap_comp_t *cmap;
         OPJ_INT32 *src, *dst;
         OPJ_UINT32 j, max;
         OPJ_UINT16 i, nr_channels, cmp, pcol;
         OPJ_INT32 k, top_k;
 
@@ skipping 75 matching lines @@
         }
 
         opj_free(old_comps);
         image->comps = new_comps;
         image->numcomps = nr_channels;
 
         opj_jp2_free_pclr(color);
 
 }/* apply_pclr() */
 
-OPJ_BOOL opj_jp2_read_pclr(     opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_pclr(      opj_jp2_t *jp2,
                             OPJ_BYTE * p_pclr_header_data,
                             OPJ_UINT32 p_pclr_header_size,
                             opj_event_mgr_t * p_manager
                             )
 {
         opj_jp2_pclr_t *jp2_pclr;
         OPJ_BYTE *channel_size, *channel_sign;
         OPJ_UINT32 *entries;
         OPJ_UINT16 nr_entries,nr_channels;
         OPJ_UINT16 i, j;
@@ skipping 86 matching lines @@
                         opj_read_bytes(p_pclr_header_data, &l_value , bytes_to_read);   /* Cji */
                         p_pclr_header_data += bytes_to_read;
                         *entries = (OPJ_UINT32) l_value;
                         entries++;
                 }
         }
 
         return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_read_cmap(     opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_read_cmap(      opj_jp2_t * jp2,
                             OPJ_BYTE * p_cmap_header_data,
                             OPJ_UINT32 p_cmap_header_size,
                             opj_event_mgr_t * p_manager
                             )
 {
         opj_jp2_cmap_comp_t *cmap;
         OPJ_BYTE i, nr_channels;
         OPJ_UINT32 l_value;
 
         /* preconditions */
@@ skipping 39 matching lines @@
                 opj_read_bytes(p_cmap_header_data, &l_value, 1);                        /* PCOL^i */
                 ++p_cmap_header_data;
                 cmap[i].pcol = (OPJ_BYTE) l_value;
         }
 
         jp2->color.jp2_pclr->cmap = cmap;
 
         return OPJ_TRUE;
 }
 
-void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
+static void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color, opj_event_mgr_t *manager)
 {
         opj_jp2_cdef_info_t *info;
         OPJ_UINT16 i, n, cn, asoc, acn;
         
         info = color->jp2_cdef->info;
         n = color->jp2_cdef->n;
         
         for(i = 0; i < n; ++i)
         {
                 /* WATCH: acn = asoc - 1 ! */
                 asoc = info[i].asoc;
                 cn = info[i].cn;
                 
                 if( cn >= image->numcomps)
                 {
-                        fprintf(stderr, "cn=%d, numcomps=%d\n", cn, image->numcomps);
+                        opj_event_msg(manager, EVT_WARNING, "opj_jp2_apply_cdef: cn=%d, numcomps=%d\n", cn, image->numcomps);
                         continue;
                 }
                 if(asoc == 0 || asoc == 65535)
                 {
                         image->comps[cn].alpha = info[i].typ;
                         continue;
                 }
                 
                 acn = (OPJ_UINT16)(asoc - 1);
                 if( acn >= image->numcomps )
                 {
-                        fprintf(stderr, "acn=%d, numcomps=%d\n", acn, image->numcomps);
+                        opj_event_msg(manager, EVT_WARNING, "opj_jp2_apply_cdef: acn=%d, numcomps=%d\n", acn, image->numcomps);
                         continue;
                 }
                 
                 /* Swap only if color channel */
                 if((cn != acn) && (info[i].typ == 0))
                 {
                         opj_image_comp_t saved;
                         OPJ_UINT16 j;
                         
                         memcpy(&saved, &image->comps[cn], sizeof(opj_image_comp_t));
@@ skipping 15 matching lines @@
                 
                 image->comps[cn].alpha = info[i].typ;
         }
         
         if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
         
         opj_free(color->jp2_cdef); color->jp2_cdef = NULL;
         
 }/* jp2_apply_cdef() */
 
-OPJ_BOOL opj_jp2_read_cdef(     opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_read_cdef(      opj_jp2_t * jp2,
                             OPJ_BYTE * p_cdef_header_data,
                                                         OPJ_UINT32 p_cdef_header_size,
                                                         opj_event_mgr_t * p_manager
                             )
 {
         opj_jp2_cdef_info_t *cdef_info;
         OPJ_UINT16 i;
         OPJ_UINT32 l_value;
 
         /* preconditions */
@@ skipping 18 matching lines @@
                 opj_event_msg(p_manager, EVT_ERROR, "Number of channel description is equal to zero in CDEF box.\n");
                 return OPJ_FALSE;
         }
 
         if (p_cdef_header_size < 2 + (OPJ_UINT32)(OPJ_UINT16)l_value * 6) {
                 opj_event_msg(p_manager, EVT_ERROR, "Insufficient data for CDEF box.\n");
                 return OPJ_FALSE;
         }
 
         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;
 
         for(i = 0; i < jp2->color.jp2_cdef->n; ++i) {
                 opj_read_bytes(p_cdef_header_data, &l_value, 2);                        /* Cn^i */
                 p_cdef_header_data +=2;
                 cdef_info[i].cn = (OPJ_UINT16) l_value;
 
                 opj_read_bytes(p_cdef_header_data, &l_value, 2);                        /* Typ^i */
                 p_cdef_header_data +=2;
                 cdef_info[i].typ = (OPJ_UINT16) l_value;
 
                 opj_read_bytes(p_cdef_header_data, &l_value, 2);                        /* Asoc^i */
                 p_cdef_header_data +=2;
                 cdef_info[i].asoc = (OPJ_UINT16) l_value;
    }
 
         return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
                             OPJ_BYTE * p_colr_header_data,
                             OPJ_UINT32 p_colr_header_size,
                             opj_event_mgr_t * p_manager
                             )
 {
         OPJ_UINT32 l_value;
 
         /* preconditions */
         assert(jp2 != 00);
         assert(p_colr_header_data != 00);
@@ skipping 20 matching lines @@
         ++p_colr_header_data;
 
         opj_read_bytes(p_colr_header_data,&jp2->approx ,1);                     /* APPROX */
         ++p_colr_header_data;
 
         if (jp2->meth == 1) {
                 if (p_colr_header_size < 7) {
                         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 */
                 OPJ_INT32 it_icc_value = 0;
                 OPJ_INT32 icc_len = (OPJ_INT32)p_colr_header_size - 3;
 
                 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)
                 {
                         opj_read_bytes(p_colr_header_data,&l_value,1);          /* icc values */
                         ++p_colr_header_data;
                         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,
                         opj_stream_private_t *p_stream,
                         opj_image_t* p_image,
                         opj_event_mgr_t * p_manager)
 {
         if (!p_image)
                 return OPJ_FALSE;
 
         /* J2K decoding */
         if( ! opj_j2k_decode(jp2->j2k, p_stream, p_image, p_manager) ) {
                 opj_event_msg(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
                 return OPJ_FALSE;
         }
 
-    if (!jp2->ignore_pclr_cmap_cdef){
-            if (!opj_jp2_check_color(p_image, &(jp2->color), p_manager)) {
-                    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;
+                /* 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));
-            }
+                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 if (p_image->pdfium_use_colorspace)
+                                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));
-            }
+                /* 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->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;
 }
 
-OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
                             opj_stream_private_t *stream,
                             opj_event_mgr_t * p_manager
                             )
 {
         opj_jp2_img_header_writer_handler_t l_writers [4];
         opj_jp2_img_header_writer_handler_t * l_current_writer;
 
         OPJ_INT32 i, l_nb_pass;
         /* size of data for super box*/
         OPJ_UINT32 l_jp2h_size = 8;
@@ skipping 82 matching lines @@
         for (i=0;i<l_nb_pass;++i) {
                 if (l_current_writer->m_data != 00) {
                         opj_free(l_current_writer->m_data );
                 }
                 ++l_current_writer;
         }
 
         return l_result;
 }
 
-OPJ_BOOL opj_jp2_write_ftyp(opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_ftyp(opj_jp2_t *jp2,
                                                         opj_stream_private_t *cio,
                                                         opj_event_mgr_t * p_manager )
 {
         OPJ_UINT32 i;
         OPJ_UINT32 l_ftyp_size = 16 + 4 * jp2->numcl;
         OPJ_BYTE * l_ftyp_data, * l_current_data_ptr;
         OPJ_BOOL l_result;
 
         /* preconditions */
         assert(cio != 00);
@@ skipping 29 matching lines @@
         if (! l_result)
         {
                 opj_event_msg(p_manager, EVT_ERROR, "Error while writing ftyp data to stream\n");
         }
 
         opj_free(l_ftyp_data);
         
         return l_result;
 }
 
-OPJ_BOOL opj_jp2_write_jp2c(opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_jp2c(opj_jp2_t *jp2,
                                                         opj_stream_private_t *cio,
                                                         opj_event_mgr_t * p_manager )
 {
         OPJ_OFF_T j2k_codestream_exit;
         OPJ_BYTE l_data_header [8];
         
         /* preconditions */
         assert(jp2 != 00);
         assert(cio != 00);
         assert(p_manager != 00);
@@ skipping 16 matching lines @@
         }
 
         if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
                 opj_event_msg(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
                 return OPJ_FALSE;
         }
 
         return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_write_jp(      opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_jp(       opj_jp2_t *jp2,
                                             opj_stream_private_t *cio,
                                                 opj_event_mgr_t * p_manager )
 {
         /* 12 bytes will be read */
         OPJ_BYTE l_signature_data [12];
 
         /* preconditions */
         assert(cio != 00);
         assert(jp2 != 00);
         assert(p_manager != 00);
@@ skipping 210 matching lines @@
                                 opj_stream_private_t *cio,
                                 opj_event_mgr_t * p_manager
                                 )
 {
         /* preconditions */
         assert(jp2 != 00);
         assert(cio != 00);
         assert(p_manager != 00);
 
         /* customization of the end encoding */
-        opj_jp2_setup_end_header_reading(jp2);
+        if (! opj_jp2_setup_end_header_reading(jp2, p_manager)) {
+                return OPJ_FALSE;
+        }
 
         /* write header */
         if (! opj_jp2_exec (jp2,jp2->m_procedure_list,cio,p_manager)) {
                 return OPJ_FALSE;
         }
 
         return opj_j2k_end_decompress(jp2->j2k, cio, p_manager);
 }
 
 OPJ_BOOL opj_jp2_end_compress(  opj_jp2_t *jp2,
                                                             opj_stream_private_t *cio,
                                                             opj_event_mgr_t * p_manager
                                 )
 {
         /* preconditions */
         assert(jp2 != 00);
         assert(cio != 00);
         assert(p_manager != 00);
 
         /* customization of the end encoding */
-        opj_jp2_setup_end_header_writing(jp2);
+        if (! opj_jp2_setup_end_header_writing(jp2, p_manager)) {
+                return OPJ_FALSE;
+        }
 
         if (! opj_j2k_end_compress(jp2->j2k,cio,p_manager)) {
                 return OPJ_FALSE;
         }
 
         /* write header */
         return opj_jp2_exec(jp2,jp2->m_procedure_list,cio,p_manager);
 }
 
-void opj_jp2_setup_end_header_writing (opj_jp2_t *jp2)
+static OPJ_BOOL opj_jp2_setup_end_header_writing (opj_jp2_t *jp2, opj_event_mgr_t * p_manager)
 {
         /* preconditions */
         assert(jp2 != 00);
+        assert(p_manager != 00);
 
 #ifdef USE_JPIP
-  if( jp2->jpip_on )
-    opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_iptr );
+        if( jp2->jpip_on ) {
+                if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_iptr, p_manager)) {
+                        return OPJ_FALSE;
+                }
+        }
 #endif
-        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2c );
+        if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2c, p_manager)) {
+                return OPJ_FALSE;
+        }
         /* DEVELOPER CORNER, add your custom procedures */
 #ifdef USE_JPIP
   if( jp2->jpip_on )
-    {
-    opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_cidx );
-    opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_fidx );
-    }
+        {
+                if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_cidx, p_manager)) {
+                        return OPJ_FALSE;
+                }
+                if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_fidx, p_manager)) {
+                        return OPJ_FALSE;
+                }
+        }
 #endif
+        return OPJ_TRUE;
 }
 
-void opj_jp2_setup_end_header_reading (opj_jp2_t *jp2)
+static OPJ_BOOL opj_jp2_setup_end_header_reading (opj_jp2_t *jp2, opj_event_mgr_t * p_manager)
 {
         /* preconditions */
         assert(jp2 != 00);
-        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_read_header_procedure );
+        assert(p_manager != 00);
+        
+        if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_read_header_procedure, p_manager)) {
+                return OPJ_FALSE;
+        }
         /* DEVELOPER CORNER, add your custom procedures */
+        
+        return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_default_validation (   opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_default_validation (    opj_jp2_t * jp2,
                                         opj_stream_private_t *cio,
                                         opj_event_mgr_t * p_manager
                                         )
 {
         OPJ_BOOL l_is_valid = OPJ_TRUE;
         OPJ_UINT32 i;
 
         /* preconditions */
         assert(jp2 != 00);
         assert(cio != 00);
@@ skipping 33 matching lines @@
         /* METH */
         l_is_valid &= ((jp2->meth > 0) && (jp2->meth < 3));
 
         /* stream validation */
         /* back and forth is needed */
         l_is_valid &= opj_stream_has_seek(cio);
 
         return l_is_valid;
 }
 
-OPJ_BOOL opj_jp2_read_header_procedure(  opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_header_procedure(  opj_jp2_t *jp2,
                                                 opj_stream_private_t *stream,
                                                 opj_event_mgr_t * p_manager
                                                 )
 {
         opj_jp2_box_t box;
         OPJ_UINT32 l_nb_bytes_read;
         const opj_jp2_header_handler_t * l_current_handler;
+        const opj_jp2_header_handler_t * l_current_handler_misplaced;
         OPJ_UINT32 l_last_data_size = OPJ_BOX_SIZE;
         OPJ_UINT32 l_current_data_size;
         OPJ_BYTE * l_current_data = 00;
 
         /* preconditions */
         assert(stream != 00);
         assert(jp2 != 00);
         assert(p_manager != 00);
 
         l_current_data = (OPJ_BYTE*)opj_calloc(1,l_last_data_size);
@@ skipping 23 matching lines @@
                         return OPJ_FALSE;
                 }
                 /* testcase 1851.pdf.SIGSEGV.ce9.948 */
         else if (box.length < l_nb_bytes_read) {
                         opj_event_msg(p_manager, EVT_ERROR, "invalid box size %d (%x)\n", box.length, box.type);
                         opj_free(l_current_data);
                         return OPJ_FALSE;
                 }
 
                 l_current_handler = opj_jp2_find_handler(box.type);
+                l_current_handler_misplaced = opj_jp2_img_find_handler(box.type);
                 l_current_data_size = box.length - l_nb_bytes_read;
 
-                if (l_current_handler != 00) {
+                if ((l_current_handler != 00) || (l_current_handler_misplaced != 00)) {
+                        if (l_current_handler == 00) {
+                                opj_event_msg(p_manager, EVT_WARNING, "Found a misplaced '%c%c%c%c' box outside jp2h box\n", (OPJ_BYTE)(box.type>>24), (OPJ_BYTE)(box.type>>16), (OPJ_BYTE)(box.type>>8), (OPJ_BYTE)(box.type>>0));
+                                if (jp2->jp2_state & JP2_STATE_HEADER) {
+                                        /* read anyway, we already have jp2h */
+                                        l_current_handler = l_current_handler_misplaced;
+                                } else {
+                                        opj_event_msg(p_manager, EVT_WARNING, "JPEG2000 Header box not read yet, '%c%c%c%c' box will be ignored\n", (OPJ_BYTE)(box.type>>24), (OPJ_BYTE)(box.type>>16), (OPJ_BYTE)(box.type>>8), (OPJ_BYTE)(box.type>>0));
+                                        jp2->jp2_state |= JP2_STATE_UNKNOWN;
+                                        if (opj_stream_skip(stream,l_current_data_size,p_manager) != l_current_data_size) {
+                                                        opj_event_msg(p_manager, EVT_ERROR, "Problem with skipping JPEG2000 box, stream error\n");
+                                                        opj_free(l_current_data);
+                                                        return OPJ_FALSE;
+                                        }
+                                        continue;
+                                }
+                        }
                         if ((OPJ_OFF_T)l_current_data_size > opj_stream_get_number_byte_left(stream)) {
                                 /* do not even try to malloc if we can't read */
                                 opj_event_msg(p_manager, EVT_ERROR, "Invalid box size %d for box '%c%c%c%c'. Need %d bytes, %d bytes remaining \n", box.length, (OPJ_BYTE)(box.type>>24), (OPJ_BYTE)(box.type>>16), (OPJ_BYTE)(box.type>>8), (OPJ_BYTE)(box.type>>0), l_current_data_size, (OPJ_UINT32)opj_stream_get_number_byte_left(stream));
                                 opj_free(l_current_data);
                                 return OPJ_FALSE;
                         }
                         if (l_current_data_size > l_last_data_size) {
                                 OPJ_BYTE* new_current_data = (OPJ_BYTE*)opj_realloc(l_current_data,l_current_data_size);
                                 if (!new_current_data) {
                                         opj_free(l_current_data);
@@ skipping 86 matching lines @@
                                 opj_image_t * p_image,
                                 opj_event_mgr_t * p_manager
                                 )
 {
         /* preconditions */
         assert(jp2 != 00);
         assert(stream != 00);
         assert(p_manager != 00);
 
         /* customization of the validation */
-        opj_jp2_setup_encoding_validation (jp2);
+        if (! opj_jp2_setup_encoding_validation (jp2, p_manager)) {
+                return OPJ_FALSE;
+        }
 
         /* validation of the parameters codec */
         if (! opj_jp2_exec(jp2,jp2->m_validation_list,stream,p_manager)) {
                 return OPJ_FALSE;
         }
 
         /* customization of the encoding */
-        opj_jp2_setup_header_writing(jp2);
+        if (! opj_jp2_setup_header_writing(jp2, p_manager)) {
+                return OPJ_FALSE;
+        }
 
         /* write header */
         if (! opj_jp2_exec (jp2,jp2->m_procedure_list,stream,p_manager)) {
                 return OPJ_FALSE;
         }
 
         return opj_j2k_start_compress(jp2->j2k,stream,p_image,p_manager);
 }
 
-const opj_jp2_header_handler_t * opj_jp2_find_handler (OPJ_UINT32 p_id)
+static const opj_jp2_header_handler_t * opj_jp2_find_handler (OPJ_UINT32 p_id)
 {
         OPJ_UINT32 i, l_handler_size = sizeof(jp2_header) / sizeof(opj_jp2_header_handler_t);
 
         for (i=0;i<l_handler_size;++i) {
                 if (jp2_header[i].id == p_id) {
                         return &jp2_header[i];
                 }
         }
         return NULL;
 }
@@ skipping 127 matching lines @@
         {
                 opj_read_bytes(p_header_data,&jp2->cl[i],4);            /* CLi */
                 p_header_data += 4;
         }
 
         jp2->jp2_state |= JP2_STATE_FILE_TYPE;
 
         return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_skip_jp2c(     opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_skip_jp2c(      opj_jp2_t *jp2,
                                                 opj_stream_private_t *stream,
                                                 opj_event_mgr_t * p_manager )
 {
         /* preconditions */
         assert(jp2 != 00);
         assert(stream != 00);
         assert(p_manager != 00);
 
         jp2->j2k_codestream_offset = opj_stream_tell(stream);
 
@@ skipping 23 matching lines @@
 }
 
 /**
  * Reads the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
  *
  * @param       p_header_data   the data contained in the file header box.
  * @param       jp2                             the jpeg2000 file codec.
  * @param       p_header_size   the size of the data contained in the file header box.
  * @param       p_manager               the user event manager.
  *
- * @return true if the JP2 Header box was successfully reconized.
+ * @return true if the JP2 Header box was successfully recognized.
 */
 static OPJ_BOOL opj_jp2_read_jp2h(  opj_jp2_t *jp2,
                                     OPJ_BYTE *p_header_data,
                                     OPJ_UINT32 p_header_size,
                                     opj_event_mgr_t * p_manager
                                     )
 {
         OPJ_UINT32 l_box_size=0, l_current_data_size = 0;
         opj_jp2_box_t box;
         const opj_jp2_header_handler_t * l_current_handler;
@@ skipping 49 matching lines @@
         if (l_has_ihdr == 0) {
                 opj_event_msg(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box: no 'ihdr' box.\n");
                 return OPJ_FALSE;
         }
 
         jp2->jp2_state |= JP2_STATE_HEADER;
 
         return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_read_boxhdr_char(   opj_jp2_box_t *box,
+static OPJ_BOOL opj_jp2_read_boxhdr_char(   opj_jp2_box_t *box,
                                      OPJ_BYTE * p_data,
                                      OPJ_UINT32 * p_number_bytes_read,
                                      OPJ_UINT32 p_box_max_size,
                                      opj_event_mgr_t * p_manager
                                      )
 {
         OPJ_UINT32 l_value;
 
         /* preconditions */
         assert(p_data != 00);
@@ skipping 61 matching lines @@
                                 opj_image_t ** p_image,
                                 opj_event_mgr_t * p_manager
                                 )
 {
         /* preconditions */
         assert(jp2 != 00);
         assert(p_stream != 00);
         assert(p_manager != 00);
 
         /* customization of the validation */
-        opj_jp2_setup_decoding_validation (jp2);
+        if (! opj_jp2_setup_decoding_validation (jp2, p_manager)) {
+                return OPJ_FALSE;
+        }
 
         /* customization of the encoding */
-        opj_jp2_setup_header_reading(jp2);
+        if (! opj_jp2_setup_header_reading(jp2, p_manager)) {
+                return OPJ_FALSE;
+        }
 
         /* validation of the parameters codec */
         if (! opj_jp2_exec(jp2,jp2->m_validation_list,p_stream,p_manager)) {
                 return OPJ_FALSE;
         }
 
         /* read header */
         if (! opj_jp2_exec (jp2,jp2->m_procedure_list,p_stream,p_manager)) {
                 return OPJ_FALSE;
         }
 
         return opj_j2k_read_header(     p_stream,
                                                         jp2->j2k,
                                                         p_image,
                                                         p_manager);
 }
 
-void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2)
+static OPJ_BOOL opj_jp2_setup_encoding_validation (opj_jp2_t *jp2, opj_event_mgr_t * p_manager)
 {
         /* preconditions */
         assert(jp2 != 00);
+        assert(p_manager != 00);
 
-        opj_procedure_list_add_procedure(jp2->m_validation_list, (opj_procedure)opj_jp2_default_validation);
+        if (! opj_procedure_list_add_procedure(jp2->m_validation_list, (opj_procedure)opj_jp2_default_validation, p_manager)) {
+                return OPJ_FALSE;
+        }
         /* DEVELOPER CORNER, add your custom validation procedure */
+        
+        return OPJ_TRUE;
 }
 
-void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2)
+static OPJ_BOOL opj_jp2_setup_decoding_validation (opj_jp2_t *jp2, opj_event_mgr_t * p_manager)
 {
         /* preconditions */
         assert(jp2 != 00);
+        assert(p_manager != 00);
+        
         /* DEVELOPER CORNER, add your custom validation procedure */
+        
+        return OPJ_TRUE;
 }
 
-void opj_jp2_setup_header_writing (opj_jp2_t *jp2)
+static OPJ_BOOL opj_jp2_setup_header_writing (opj_jp2_t *jp2, opj_event_mgr_t * p_manager)
 {
         /* preconditions */
         assert(jp2 != 00);
+        assert(p_manager != 00);
 
-        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp );
-        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_ftyp );
-        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2h );
-  if( jp2->jpip_on )
-    opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_skip_iptr );
-        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_skip_jp2c );
+        if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp, p_manager)) {
+                return OPJ_FALSE;
+        }
+        if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_ftyp, p_manager)) {
+                return OPJ_FALSE;
+        }
+        if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2h, p_manager)) {
+                return OPJ_FALSE;
+        }
+        if( jp2->jpip_on ) {
+                if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_skip_iptr, p_manager)) {
+                        return OPJ_FALSE;
+                }
+        }
+        if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_skip_jp2c,p_manager)) {
+                return OPJ_FALSE;
+        }
 
         /* DEVELOPER CORNER, insert your custom procedures */
 
+        return OPJ_TRUE;
 }
 
-void opj_jp2_setup_header_reading (opj_jp2_t *jp2)
+static OPJ_BOOL opj_jp2_setup_header_reading (opj_jp2_t *jp2, opj_event_mgr_t * p_manager)
 {
         /* preconditions */
         assert(jp2 != 00);
+        assert(p_manager != 00);
 
-        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_read_header_procedure );
+        if (! opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_read_header_procedure, p_manager)) {
+                return OPJ_FALSE;
+        }
+        
         /* DEVELOPER CORNER, add your custom procedures */
+        
+        return OPJ_TRUE;
 }
 
 OPJ_BOOL opj_jp2_read_tile_header ( opj_jp2_t * p_jp2,
                                     OPJ_UINT32 * p_tile_index,
                                     OPJ_UINT32 * p_data_size,
                                     OPJ_INT32 * p_tile_x0,
                                     OPJ_INT32 * p_tile_y0,
                                     OPJ_INT32 * p_tile_x1,
                                     OPJ_INT32 * p_tile_y1,
                                     OPJ_UINT32 * p_nb_comps,
@@ skipping 135 matching lines @@
                 return OPJ_FALSE;
         }
 
         /* Set Image Color Space */
         if (p_jp2->enumcs == 16)
                 p_image->color_space = OPJ_CLRSPC_SRGB;
         else if (p_jp2->enumcs == 17)
                 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;
 
         if(p_jp2->color.jp2_pclr) {
                 /* Part 1, I.5.3.4: Either both or none : */
                 if( !p_jp2->color.jp2_pclr->cmap)
                         opj_jp2_free_pclr(&(p_jp2->color));
                 else
                         opj_jp2_apply_pclr(p_image, &(p_jp2->color));
         }
         
         /* Apply the color space if needed */
         if(p_jp2->color.jp2_cdef) {
-                opj_jp2_apply_cdef(p_image, &(p_jp2->color));
+                opj_jp2_apply_cdef(p_image, &(p_jp2->color), p_manager);
         }
 
         if(p_jp2->color.icc_profile_buf) {
                 p_image->icc_profile_buf = p_jp2->color.icc_profile_buf;
                 p_image->icc_profile_len = p_jp2->color.icc_profile_len;
                 p_jp2->color.icc_profile_buf = NULL;
         }
 
         return OPJ_TRUE;
 }
@@ skipping 245 matching lines @@
   len = opj_stream_tell(cio)-lenp;
   opj_stream_skip(cio, lenp, p_manager);
   opj_write_bytes(l_data_header,len,4);/* L              */
   opj_stream_write_data(cio,l_data_header,4,p_manager);
   opj_stream_seek(cio, lenp+len,p_manager);
 
   return len;
 }
 #endif
 #endif /* USE_JPIP */