Upgrade openjpeg to revision 2997.

core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/tcd.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 69 matching lines @@
         OPJ_UINT32 numpasses;           /* Number of passes in the layer */
         OPJ_UINT32 len;                         /* len of information */
         OPJ_FLOAT64 disto;                      /* add for index (Cfr. Marcela) */
         OPJ_BYTE *data;                         /* data */
 } opj_tcd_layer_t;
 
 /**
 FIXME DOC
 */
 typedef struct opj_tcd_cblk_enc {
-        OPJ_BYTE* data;                                 /* Data */
-        opj_tcd_layer_t* layers;                /* layer information */
-        opj_tcd_pass_t* passes;         /* information about the passes */
-        OPJ_INT32 x0, y0, x1, y1;               /* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
+        OPJ_BYTE* data;               /* Data */
+        opj_tcd_layer_t* layers;      /* layer information */
+        opj_tcd_pass_t* passes;       /* information about the passes */
+        OPJ_INT32 x0, y0, x1, y1;     /* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
         OPJ_UINT32 numbps;
         OPJ_UINT32 numlenbits;
-        OPJ_UINT32 numpasses;                   /* number of pass already done for the code-blocks */
-        OPJ_UINT32 numpassesinlayers;   /* number of passes in the layer */
-        OPJ_UINT32 totalpasses;                 /* total number of passes */
+        OPJ_UINT32 data_size;         /* Size of allocated data buffer */
+        OPJ_UINT32 numpasses;         /* number of pass already done for the code-blocks */
+        OPJ_UINT32 numpassesinlayers; /* number of passes in the layer */
+        OPJ_UINT32 totalpasses;       /* total number of passes */
 } opj_tcd_cblk_enc_t;
 
 
 typedef struct opj_tcd_cblk_dec {
         OPJ_BYTE * data;                                /* Data */
         opj_tcd_seg_t* segs;                    /* segments information */
         OPJ_INT32 x0, y0, x1, y1;               /* position of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
         OPJ_UINT32 numbps;
         OPJ_UINT32 numlenbits;
-    OPJ_UINT32 data_max_size;           /* Size of allocated data buffer */
+        OPJ_UINT32 data_max_size;               /* Size of allocated data buffer */
         OPJ_UINT32 data_current_size;   /* Size of used data buffer */
         OPJ_UINT32 numnewpasses;                /* number of pass added to the code-blocks */
         OPJ_UINT32 numsegs;                             /* number of segments */
         OPJ_UINT32 real_num_segs;
         OPJ_UINT32 m_current_max_segs;
 } opj_tcd_cblk_dec_t;
 
 /**
 FIXME DOC
 */
@@ skipping 236 matching lines @@
  *
  */
 OPJ_BOOL opj_alloc_tile_component_data(opj_tcd_tilecomp_t *l_tilec);
 
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
 /*@}*/
 
 #endif /* __TCD_H */