[trunk] WIP: add a read CBD marker function (JPEG2000 part 2)
[openjpeg.git] / libopenjpeg / j2k.c
index 7b1a7ff516f77d306f923a8098eeab028244b60c..a2d405aa0147c144f1726b712fa99130eb79f935 100644 (file)
@@ -712,6 +712,61 @@ static opj_bool j2k_read_mct (     opj_j2k_v2_t *p_j2k,
                                                                OPJ_UINT32 p_header_size,
                                                                struct opj_event_mgr * p_manager );
 
+/**
+ * Reads a MCC marker (Multiple Component Collection)
+ *
+ * @param      p_header_data   the data contained in the MCC box.
+ * @param      p_j2k                   the jpeg2000 codec.
+ * @param      p_header_size   the size of the data contained in the MCC marker.
+ * @param      p_manager               the user event manager.
+*/
+static opj_bool j2k_read_mcc ( opj_j2k_v2_t *p_j2k,
+                                                       OPJ_BYTE * p_header_data,
+                                                       OPJ_UINT32 p_header_size,
+                                                       struct opj_event_mgr * p_manager );
+
+/**
+ * Reads a MCO marker (Multiple Component Transform Ordering)
+ *
+ * @param      p_header_data   the data contained in the MCO box.
+ * @param      p_j2k                   the jpeg2000 codec.
+ * @param      p_header_size   the size of the data contained in the MCO marker.
+ * @param      p_manager               the user event manager.
+*/
+static opj_bool j2k_read_mco ( opj_j2k_v2_t *p_j2k,
+                                                               OPJ_BYTE * p_header_data,
+                                                               OPJ_UINT32 p_header_size,
+                                                               struct opj_event_mgr * p_manager );
+
+static opj_bool j2k_add_mct(opj_tcp_v2_t * p_tcp, opj_image_t * p_image, OPJ_UINT32 p_index);
+
+static void  j2k_read_int16_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_read_int32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_read_float32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_read_float64_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+
+static void  j2k_read_int16_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_read_int32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_read_float32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_read_float64_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+
+static void  j2k_write_float_to_int16 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_write_float_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_write_float_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+static void  j2k_write_float_to_float64 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+
+/**
+ * Reads a CBD marker (Component bit depth definition)
+ * @param      p_header_data   the data contained in the CBD box.
+ * @param      p_j2k                   the jpeg2000 codec.
+ * @param      p_header_size   the size of the data contained in the CBD marker.
+ * @param      p_manager               the user event manager.
+*/
+static opj_bool j2k_read_cbd ( opj_j2k_v2_t *p_j2k,
+                                                       OPJ_BYTE * p_header_data,
+                                                       OPJ_UINT32 p_header_size,
+                                                       struct opj_event_mgr * p_manager);
+
 
 /**
  * Copy the image header from the jpeg2000 codec into an external image_header
@@ -760,6 +815,32 @@ const OPJ_UINT32 MCT_ELEMENT_SIZE [] =
        8
 };
 
+typedef void (* j2k_mct_function) (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
+
+const j2k_mct_function j2k_mct_read_functions_to_float [] =
+{
+       j2k_read_int16_to_float,
+       j2k_read_int32_to_float,
+       j2k_read_float32_to_float,
+       j2k_read_float64_to_float
+};
+
+const j2k_mct_function j2k_mct_read_functions_to_int32 [] =
+{
+       j2k_read_int16_to_int32,
+       j2k_read_int32_to_int32,
+       j2k_read_float32_to_int32,
+       j2k_read_float64_to_int32
+};
+
+const j2k_mct_function j2k_mct_write_functions_from_float [] =
+{
+       j2k_write_float_to_int16,
+       j2k_write_float_to_int32,
+       j2k_write_float_to_float,
+       j2k_write_float_to_float64
+};
+
 typedef struct opj_dec_memory_marker_handler
 {
        /** marker value */
@@ -817,9 +898,9 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
   {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg_v2},
   {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2},
   {J2K_MS_MCT, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mct},
/*FIXME MSD  {J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd},
+  {J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd},
   {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc},
-  {J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mco}, */
+  {J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mco},
 #ifdef USE_JPWL
 #ifdef TODO_MS /* FIXME */
   {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},
@@ -837,11 +918,211 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
 
 
 
+void  j2k_read_int16_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_UINT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_bytes(l_src_data,&l_temp,2);
+
+               l_src_data+=sizeof(OPJ_INT16);
+
+               *(l_dest_data++) = (OPJ_FLOAT32) l_temp;
+       }
+}
+
+void  j2k_read_int32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_UINT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_bytes(l_src_data,&l_temp,4);
+
+               l_src_data+=sizeof(OPJ_INT32);
+
+               *(l_dest_data++) = (OPJ_FLOAT32) l_temp;
+       }
+}
+
+void  j2k_read_float32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_FLOAT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_float(l_src_data,&l_temp);
+
+               l_src_data+=sizeof(OPJ_FLOAT32);
+
+               *(l_dest_data++) = l_temp;
+       }
+}
+
+void  j2k_read_float64_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_FLOAT64 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_double(l_src_data,&l_temp);
+
+               l_src_data+=sizeof(OPJ_FLOAT64);
+
+               *(l_dest_data++) = (OPJ_FLOAT32) l_temp;
+       }
+}
+
+void  j2k_read_int16_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_UINT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_bytes(l_src_data,&l_temp,2);
+
+               l_src_data+=sizeof(OPJ_INT16);
+
+               *(l_dest_data++) = (OPJ_INT32) l_temp;
+       }
+}
+
+void  j2k_read_int32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_UINT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_bytes(l_src_data,&l_temp,4);
+
+               l_src_data+=sizeof(OPJ_INT32);
+
+               *(l_dest_data++) = (OPJ_INT32) l_temp;
+       }
+}
+
+void  j2k_read_float32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_FLOAT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_float(l_src_data,&l_temp);
+
+               l_src_data+=sizeof(OPJ_FLOAT32);
+
+               *(l_dest_data++) = (OPJ_INT32) l_temp;
+       }
+}
+
+void  j2k_read_float64_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
+       OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
+       OPJ_UINT32 i;
+       OPJ_FLOAT64 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               opj_read_double(l_src_data,&l_temp);
+
+               l_src_data+=sizeof(OPJ_FLOAT64);
+
+               *(l_dest_data++) = (OPJ_INT32) l_temp;
+       }
+}
+
+void  j2k_write_float_to_int16 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
+       OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
+       OPJ_UINT32 i;
+       OPJ_UINT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               l_temp = (OPJ_UINT32) *(l_src_data++);
+
+               opj_write_bytes(l_dest_data,l_temp,sizeof(OPJ_INT16));
+
+               l_dest_data+=sizeof(OPJ_INT16);
+       }
+}
+
+void  j2k_write_float_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
+       OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
+       OPJ_UINT32 i;
+       OPJ_UINT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               l_temp = (OPJ_UINT32) *(l_src_data++);
+
+               opj_write_bytes(l_dest_data,l_temp,sizeof(OPJ_INT32));
+
+               l_dest_data+=sizeof(OPJ_INT32);
+       }
+}
+
+void  j2k_write_float_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
+       OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
+       OPJ_UINT32 i;
+       OPJ_FLOAT32 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               l_temp = (OPJ_FLOAT32) *(l_src_data++);
+
+               opj_write_float(l_dest_data,l_temp);
+
+               l_dest_data+=sizeof(OPJ_FLOAT32);
+       }
+}
+
+void  j2k_write_float_to_float64 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
+{
+       OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
+       OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
+       OPJ_UINT32 i;
+       OPJ_FLOAT64 l_temp;
+
+       for (i=0;i<p_nb_elem;++i) {
+               l_temp = (OPJ_FLOAT64) *(l_src_data++);
+
+               opj_write_double(l_dest_data,l_temp);
+
+               l_dest_data+=sizeof(OPJ_FLOAT64);
+       }
+}
+
+
+/**
+ * Converts an enum type progression order to string type.
+ *
+ * @param prg_order            the progression order to get.
+ *
+ * @return     the string representation of the given progression order.
+ */
 char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order){
        j2k_prog_order_t *po;
        for(po = j2k_prog_order_list; po->enum_prog != -1; po++ ){
                if(po->enum_prog == prg_order){
-                       break;
+                       return po->str_prog;
                }
        }
        return po->str_prog;
@@ -4164,6 +4445,428 @@ opj_bool j2k_read_mct ( opj_j2k_v2_t *p_j2k,
        return OPJ_TRUE;
 }
 
+/**
+ * Reads a MCC marker (Multiple Component Collection)
+ *
+ * @param      p_header_data   the data contained in the MCC box.
+ * @param      p_j2k                   the jpeg2000 codec.
+ * @param      p_header_size   the size of the data contained in the MCC marker.
+ * @param      p_manager               the user event manager.
+*/
+opj_bool j2k_read_mcc (        opj_j2k_v2_t *p_j2k,
+                                       OPJ_BYTE * p_header_data,
+                                       OPJ_UINT32 p_header_size,
+                                       struct opj_event_mgr * p_manager )
+{
+       OPJ_UINT32 i,j;
+       OPJ_UINT32 l_tmp;
+       OPJ_UINT32 l_indix;
+       opj_tcp_v2_t * l_tcp;
+       opj_simple_mcc_decorrelation_data_t * l_mcc_record;
+       opj_mct_data_t * l_mct_data;
+       OPJ_UINT32 l_nb_collections;
+       OPJ_UINT32 l_nb_comps;
+       OPJ_UINT32 l_nb_bytes_by_comp;
+
+
+       /* preconditions */
+       assert(p_header_data != 00);
+       assert(p_j2k != 00);
+       assert(p_manager != 00);
+
+       l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
+                       &p_j2k->m_cp.tcps[p_j2k->m_current_tile_number] :
+                       p_j2k->m_specific_param.m_decoder.m_default_tcp;
+
+       if (p_header_size < 2) {
+               opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+               return OPJ_FALSE;
+       }
+
+       /* first marker */
+       opj_read_bytes(p_header_data,&l_tmp,2);                         /* Zmcc */
+       p_header_data += 2;
+       if (l_tmp != 0) {
+               opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple data spanning\n");
+               return OPJ_TRUE;
+       }
+
+       if (p_header_size < 7) {
+               opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+               return OPJ_FALSE;
+       }
+
+       opj_read_bytes(p_header_data,&l_indix,1); /* Imcc -> no need for other values, take the first */
+       ++p_header_data;
+
+       l_mcc_record = l_tcp->m_mcc_records;
+
+       for(i=0;i<l_tcp->m_nb_mcc_records;++i) {
+               if (l_mcc_record->m_index == l_indix) {
+                       break;
+               }
+               ++l_mcc_record;
+       }
+
+       /** NOT FOUND */
+       if (i == l_tcp->m_nb_mcc_records) {
+               if (l_tcp->m_nb_mcc_records == l_tcp->m_nb_max_mcc_records) {
+                       l_tcp->m_nb_max_mcc_records += J2K_MCC_DEFAULT_NB_RECORDS;
+
+                       l_tcp->m_mcc_records = (opj_simple_mcc_decorrelation_data_t*)
+                                       opj_realloc(l_tcp->m_mcc_records,l_tcp->m_nb_max_mcc_records * sizeof(opj_simple_mcc_decorrelation_data_t));
+                       if (! l_tcp->m_mcc_records) {
+                               opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+                               return OPJ_FALSE;
+                       }
+                       l_mcc_record = l_tcp->m_mcc_records + l_tcp->m_nb_mcc_records;
+                       memset(l_mcc_record,0,(l_tcp->m_nb_max_mcc_records-l_tcp->m_nb_mcc_records) * sizeof(opj_simple_mcc_decorrelation_data_t));
+               }
+               l_mcc_record = l_tcp->m_mcc_records + l_tcp->m_nb_mcc_records;
+       }
+       l_mcc_record->m_index = l_indix;
+
+       /* only one marker atm */
+       opj_read_bytes(p_header_data,&l_tmp,2);                         /* Ymcc */
+       p_header_data+=2;
+       if (l_tmp != 0) {
+               opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple data spanning\n");
+               return OPJ_TRUE;
+       }
+
+       opj_read_bytes(p_header_data,&l_nb_collections,2);                              /* Qmcc -> number of collections -> 1 */
+       p_header_data+=2;
+
+       if (l_nb_collections > 1) {
+               opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple collections\n");
+               return OPJ_TRUE;
+       }
+
+       p_header_size -= 7;
+
+       for (i=0;i<l_nb_collections;++i) {
+               if (p_header_size < 3) {
+                       opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+                       return OPJ_FALSE;
+               }
+
+               opj_read_bytes(p_header_data,&l_tmp,1); /* Xmcci type of component transformation -> array based decorrelation */
+               ++p_header_data;
+
+               if (l_tmp != 1) {
+                       opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections other than array decorrelation\n");
+                       return OPJ_TRUE;
+               }
+
+               opj_read_bytes(p_header_data,&l_nb_comps,2);
+
+               p_header_data+=2;
+               p_header_size-=3;
+
+               l_nb_bytes_by_comp = 1 + (l_nb_comps>>15);
+               l_mcc_record->m_nb_comps = l_nb_comps & 0x7fff;
+
+               if (p_header_size < (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 2)) {
+                       opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+                       return OPJ_FALSE;
+               }
+
+               p_header_size -= (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 2);
+
+               for (j=0;j<l_mcc_record->m_nb_comps;++j) {
+                       opj_read_bytes(p_header_data,&l_tmp,l_nb_bytes_by_comp);        /* Cmccij Component offset*/
+                       p_header_data+=l_nb_bytes_by_comp;
+
+                       if (l_tmp != j) {
+                               opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections with indix shuffle\n");
+                               return OPJ_TRUE;
+                       }
+               }
+
+               opj_read_bytes(p_header_data,&l_nb_comps,2);
+               p_header_data+=2;
+
+               l_nb_bytes_by_comp = 1 + (l_nb_comps>>15);
+               l_nb_comps &= 0x7fff;
+
+               if (l_nb_comps != l_mcc_record->m_nb_comps) {
+                       opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections without same number of indixes\n");
+                       return OPJ_TRUE;
+               }
+
+               if (p_header_size < (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 3)) {
+                       opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+                       return OPJ_FALSE;
+               }
+
+               p_header_size -= (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 3);
+
+               for (j=0;j<l_mcc_record->m_nb_comps;++j) {
+                       opj_read_bytes(p_header_data,&l_tmp,l_nb_bytes_by_comp);        /* Wmccij Component offset*/
+                       p_header_data+=l_nb_bytes_by_comp;
+
+                       if (l_tmp != j) {
+                               opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections with indix shuffle\n");
+                               return OPJ_TRUE;
+                       }
+               }
+
+               opj_read_bytes(p_header_data,&l_tmp,3); /* Wmccij Component offset*/
+               p_header_data += 3;
+
+               l_mcc_record->m_is_irreversible = ! ((l_tmp>>16) & 1);
+               l_mcc_record->m_decorrelation_array = 00;
+               l_mcc_record->m_offset_array = 00;
+
+               l_indix = l_tmp & 0xff;
+               if (l_indix != 0) {
+                       l_mct_data = l_tcp->m_mct_records;
+                       for (j=0;j<l_tcp->m_nb_mct_records;++j) {
+                               if (l_mct_data->m_index == l_indix) {
+                                       l_mcc_record->m_decorrelation_array = l_mct_data;
+                                       break;
+                               }
+                               ++l_mct_data;
+                       }
+
+                       if (l_mcc_record->m_decorrelation_array == 00) {
+                               opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+                               return OPJ_FALSE;
+                       }
+               }
+
+               l_indix = (l_tmp >> 8) & 0xff;
+               if (l_indix != 0) {
+                       l_mct_data = l_tcp->m_mct_records;
+                       for (j=0;j<l_tcp->m_nb_mct_records;++j) {
+                               if (l_mct_data->m_index == l_indix) {
+                                       l_mcc_record->m_offset_array = l_mct_data;
+                                       break;
+                               }
+                               ++l_mct_data;
+                       }
+
+                       if (l_mcc_record->m_offset_array == 00) {
+                               opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+                               return OPJ_FALSE;
+                       }
+               }
+       }
+
+       if (p_header_size != 0) {
+               opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
+               return OPJ_FALSE;
+       }
+
+       ++l_tcp->m_nb_mcc_records;
+
+       return OPJ_TRUE;
+}
+
+/**
+ * Reads a MCO marker (Multiple Component Transform Ordering)
+ *
+ * @param      p_header_data   the data contained in the MCO box.
+ * @param      p_j2k                   the jpeg2000 codec.
+ * @param      p_header_size   the size of the data contained in the MCO marker.
+ * @param      p_manager               the user event manager.
+*/
+opj_bool j2k_read_mco (        opj_j2k_v2_t *p_j2k,
+                                               OPJ_BYTE * p_header_data,
+                                               OPJ_UINT32 p_header_size,
+                                               struct opj_event_mgr * p_manager )
+{
+       OPJ_UINT32 l_tmp, i;
+       OPJ_UINT32 l_nb_stages;
+       opj_tcp_v2_t * l_tcp;
+       opj_tccp_t * l_tccp;
+       opj_image_t * l_image;
+       opj_image_comp_t * l_img_comp;
+
+       /* preconditions */
+       assert(p_header_data != 00);
+       assert(p_j2k != 00);
+       assert(p_manager != 00);
+
+       l_image = p_j2k->m_image;
+       l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
+                       &p_j2k->m_cp.tcps[p_j2k->m_current_tile_number] :
+                       p_j2k->m_specific_param.m_decoder.m_default_tcp;
+
+       if (p_header_size < 1) {
+               opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCO marker\n");
+               return OPJ_FALSE;
+       }
+
+       opj_read_bytes(p_header_data,&l_nb_stages,1);                           /* Nmco : only one tranform stage*/
+       ++p_header_data;
+
+       if (l_nb_stages > 1) {
+               opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple transformation stages.\n");
+               return OPJ_TRUE;
+       }
+
+       if (p_header_size != l_nb_stages + 1) {
+               opj_event_msg_v2(p_manager, EVT_WARNING, "Error reading MCO marker\n");
+               return OPJ_FALSE;
+       }
+
+       l_tccp = l_tcp->tccps;
+       l_img_comp = l_image->comps;
+
+       for (i=0;i<l_image->numcomps;++i) {
+               l_tccp->m_dc_level_shift = 0;
+               ++l_tccp;
+       }
+
+       if (l_tcp->m_mct_decoding_matrix) {
+               opj_free(l_tcp->m_mct_decoding_matrix);
+               l_tcp->m_mct_decoding_matrix = 00;
+       }
+
+       for (i=0;i<l_nb_stages;++i) {
+               opj_read_bytes(p_header_data,&l_tmp,1);
+               ++p_header_data;
+
+               if (! j2k_add_mct(l_tcp,p_j2k->m_image,l_tmp)) {
+                       return OPJ_FALSE;
+               }
+       }
+
+       return OPJ_TRUE;
+}
+
+opj_bool j2k_add_mct(opj_tcp_v2_t * p_tcp, opj_image_t * p_image, OPJ_UINT32 p_index)
+{
+       OPJ_UINT32 i;
+       opj_simple_mcc_decorrelation_data_t * l_mcc_record;
+       opj_mct_data_t * l_deco_array, * l_offset_array;
+       OPJ_UINT32 l_data_size,l_mct_size, l_offset_size;
+       OPJ_UINT32 l_nb_elem;
+       OPJ_UINT32 * l_offset_data, * l_current_offset_data;
+       opj_tccp_t * l_tccp;
+
+       /* preconditions */
+       assert(p_tcp != 00);
+
+       l_mcc_record = p_tcp->m_mcc_records;
+
+       for (i=0;i<p_tcp->m_nb_mcc_records;++i) {
+               if (l_mcc_record->m_index == p_index) {
+                       break;
+               }
+       }
+
+       if (i==p_tcp->m_nb_mcc_records) {
+               /** element discarded **/
+               return OPJ_TRUE;
+       }
+
+       if (l_mcc_record->m_nb_comps != p_image->numcomps) {
+               /** do not support number of comps != image */
+               return OPJ_TRUE;
+       }
+
+       l_deco_array = l_mcc_record->m_decorrelation_array;
+
+       if (l_deco_array) {
+               l_data_size = MCT_ELEMENT_SIZE[l_deco_array->m_element_type] * p_image->numcomps * p_image->numcomps;
+               if (l_deco_array->m_data_size != l_data_size) {
+                       return OPJ_FALSE;
+               }
+
+               l_nb_elem = p_image->numcomps * p_image->numcomps;
+               l_mct_size = l_nb_elem * sizeof(OPJ_FLOAT32);
+               p_tcp->m_mct_decoding_matrix = (OPJ_FLOAT32*)opj_malloc(l_mct_size);
+
+               if (! p_tcp->m_mct_decoding_matrix ) {
+                       return OPJ_FALSE;
+               }
+
+               j2k_mct_read_functions_to_float[l_deco_array->m_element_type](l_deco_array->m_data,p_tcp->m_mct_decoding_matrix,l_nb_elem);
+       }
+
+       l_offset_array = l_mcc_record->m_offset_array;
+
+       if (l_offset_array) {
+               l_data_size = MCT_ELEMENT_SIZE[l_offset_array->m_element_type] * p_image->numcomps;
+               if (l_offset_array->m_data_size != l_data_size) {
+                       return OPJ_FALSE;
+               }
+
+               l_nb_elem = p_image->numcomps;
+               l_offset_size = l_nb_elem * sizeof(OPJ_UINT32);
+               l_offset_data = (OPJ_UINT32*)opj_malloc(l_offset_size);
+
+               if (! l_offset_data ) {
+                       return OPJ_FALSE;
+               }
+
+               j2k_mct_read_functions_to_int32[l_offset_array->m_element_type](l_offset_array->m_data,l_offset_data,l_nb_elem);
+
+               l_tccp = p_tcp->tccps;
+               l_current_offset_data = l_offset_data;
+
+               for (i=0;i<p_image->numcomps;++i) {
+                       l_tccp->m_dc_level_shift = *(l_current_offset_data++);
+                       ++l_tccp;
+               }
+
+               opj_free(l_offset_data);
+       }
+
+       return OPJ_TRUE;
+}
+
+/**
+ * Reads a CBD marker (Component bit depth definition)
+ * @param      p_header_data   the data contained in the CBD box.
+ * @param      p_j2k                   the jpeg2000 codec.
+ * @param      p_header_size   the size of the data contained in the CBD marker.
+ * @param      p_manager               the user event manager.
+*/
+opj_bool j2k_read_cbd (        opj_j2k_v2_t *p_j2k,
+                                               OPJ_BYTE * p_header_data,
+                                               OPJ_UINT32 p_header_size,
+                                               struct opj_event_mgr * p_manager)
+{
+       OPJ_UINT32 l_nb_comp,l_num_comp;
+       OPJ_UINT32 l_comp_def;
+       OPJ_UINT32 i;
+       opj_image_comp_t * l_comp = 00;
+
+       /* preconditions */
+       assert(p_header_data != 00);
+       assert(p_j2k != 00);
+       assert(p_manager != 00);
+
+       l_num_comp = p_j2k->m_image->numcomps;
+
+       if (p_header_size != (p_j2k->m_image->numcomps + 2)) {
+               opj_event_msg_v2(p_manager, EVT_ERROR, "Crror reading CBD marker\n");
+               return OPJ_FALSE;
+       }
+
+       opj_read_bytes(p_header_data,&l_nb_comp,2);                             /* Ncbd */
+       p_header_data+=2;
+
+       if (l_nb_comp != l_num_comp) {
+               opj_event_msg_v2(p_manager, EVT_ERROR, "Crror reading CBD marker\n");
+               return OPJ_FALSE;
+       }
+
+       l_comp = p_j2k->m_image->comps;
+       for (i=0;i<l_num_comp;++i) {
+               opj_read_bytes(p_header_data,&l_comp_def,1);                    /* Component bit depth */
+               ++p_header_data;
+        l_comp->sgnd = (l_comp_def>>7) & 1;
+               l_comp->prec = (l_comp_def&0x7f) + 1;
+               ++l_comp;
+       }
+
+       return OPJ_TRUE;
+}
+
 
 /* ----------------------------------------------------------------------- */
 /* J2K / JPT decoder interface                                             */