Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/j2k.h

 /*
  * 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 214 matching lines @@
 typedef struct opj_simple_mcc_decorrelation_data
 {
         OPJ_UINT32                       m_index;
         OPJ_UINT32                       m_nb_comps;
         opj_mct_data_t *         m_decorrelation_array;
         opj_mct_data_t *         m_offset_array;
         OPJ_UINT32                       m_is_irreversible : 1;
 }
 opj_simple_mcc_decorrelation_data_t;
 
+typedef struct opj_ppx_struct
+{
+        OPJ_BYTE*   m_data; /* m_data == NULL => Zppx not read yet */
+        OPJ_UINT32      m_data_size;
+} opj_ppx;
+
 /**
 Tile coding parameters :
 this structure is used to store coding/decoding parameters common to all
 tiles (information like COD, COC in main header)
 */
 typedef struct opj_tcp
 {
         /** coding style */
         OPJ_UINT32 csty;
         /** progression order */
         OPJ_PROG_ORDER prg;
         /** number of layers */
         OPJ_UINT32 numlayers;
         OPJ_UINT32 num_layers_to_decode;
         /** multi-component transform identifier */
         OPJ_UINT32 mct;
         /** rates of layers */
         OPJ_FLOAT32 rates[100];
         /** number of progression order changes */
         OPJ_UINT32 numpocs;
         /** progression order changes */
         opj_poc_t pocs[32];
-        /** packet header store there for futur use in t2_decode_packet */
+        
+        /** number of ppt markers (reserved size) */
+        OPJ_UINT32 ppt_markers_count;
+        /** ppt markers data (table indexed by Zppt) */
+        opj_ppx* ppt_markers;
+        
+        /** packet header store there for future use in t2_decode_packet */
         OPJ_BYTE *ppt_data;
         /** used to keep a track of the allocated memory */
         OPJ_BYTE *ppt_buffer;
         /** Number of bytes stored inside ppt_data*/
         OPJ_UINT32 ppt_data_size;
         /** size of ppt_data*/
         OPJ_UINT32 ppt_len;
         /** add fixed_quality */
         OPJ_FLOAT32 distoratio[100];
         /** tile-component coding parameters */
@@ skipping 84 matching lines @@
         OPJ_UINT32 tdx;
         /** YTsiz */
         OPJ_UINT32 tdy;
         /** comment */
         OPJ_CHAR *comment;
         /** number of tiles in width */
         OPJ_UINT32 tw;
         /** number of tiles in heigth */
         OPJ_UINT32 th;
 
-        /** packet header store there for futur use in t2_decode_packet */
+        /** number of ppm markers (reserved size) */
+        OPJ_UINT32 ppm_markers_count;
+        /** ppm markers data (table indexed by Zppm) */
+        opj_ppx* ppm_markers;
+        
+        /** packet header store there for future use in t2_decode_packet */
         OPJ_BYTE *ppm_data;
         /** size of the ppm_data*/
         OPJ_UINT32 ppm_len;
         /** size of the ppm_data*/
         OPJ_UINT32 ppm_data_read;
 
         OPJ_BYTE *ppm_data_current;
 
         /** packet header storage original buffer */
         OPJ_BYTE *ppm_buffer;
@@ skipping 103 matching lines @@
         /**
          * Indicate that the current tile-part is assume as the last tile part of the codestream.
          * It is useful in the case of PSot is equal to zero. The sot length will be compute in the
          * SOD reader function. FIXME NOT USED for the moment
          */
         OPJ_BOOL   m_last_tile_part;
         /** to tell that a tile can be decoded. */
         OPJ_UINT32 m_can_decode                 : 1;
         OPJ_UINT32 m_discard_tiles              : 1;
         OPJ_UINT32 m_skip_data                  : 1;
+        /** TNsot correction : see issue 254 **/
+        OPJ_UINT32 m_nb_tile_parts_correction_checked : 1;
+        OPJ_UINT32 m_nb_tile_parts_correction : 1;
 
 } opj_j2k_dec_t;
 
 typedef struct opj_j2k_enc
 {
         /** Tile part number, regardless of poc, for each new poc, tp is reset to 1*/
         OPJ_UINT32 m_current_poc_tile_part_number; /* tp_num */
 
         /** Tile part number currently coding, taking into account POC. m_current_tile_part_number holds the total number of tile parts while encoding the last tile part.*/
         OPJ_UINT32 m_current_tile_part_number; /*cur_tp_num */
@@ skipping 66 matching lines @@
         opj_procedure_list_t *  m_validation_list;
 
         /** helper used to write the index file */
         opj_codestream_index_t *cstr_index;
 
         /** number of the tile curently concern by coding/decoding */
         OPJ_UINT32 m_current_tile_number;
 
         /** the current tile coder/decoder **/
         struct opj_tcd *        m_tcd;
-
 }
 opj_j2k_t;
 
 
 
 
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */
 
@@ skipping 252 matching lines @@
  * codestream.
  */
 OPJ_BOOL opj_j2k_end_compress(  opj_j2k_t *p_j2k,
                                                             opj_stream_private_t *cio,
                                                             opj_event_mgr_t * p_manager);
 
 OPJ_BOOL opj_j2k_setup_mct_encoding (opj_tcp_t * p_tcp, opj_image_t * p_image);
 
 
 #endif /* __J2K_H */