Update to openjpeg r2944

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 104 matching lines @@
 
 /**
 FIXME DOC
 */
 typedef struct opj_tcd_precinct {
         OPJ_INT32 x0, y0, x1, y1;               /* dimension of the precinct : left upper corner (x0, y0) right low corner (x1,y1) */
         OPJ_UINT32 cw, ch;                              /* number of precinct in width and height */
         union{                                                  /* code-blocks information */
                 opj_tcd_cblk_enc_t* enc;
                 opj_tcd_cblk_dec_t* dec;
+                void*               blocks;
         } cblks;
         OPJ_UINT32 block_size;                  /* size taken by cblks (in bytes) */
         opj_tgt_tree_t *incltree;           /* inclusion tree */
         opj_tgt_tree_t *imsbtree;           /* IMSB tree */
 } opj_tcd_precinct_t;
 
 /**
 FIXME DOC
 */
 typedef struct opj_tcd_band {
@@ skipping 13 matching lines @@
         OPJ_UINT32 pw, ph;
         OPJ_UINT32 numbands;                    /* number sub-band for the resolution level */
         opj_tcd_band_t bands[3];                /* subband information */
 } opj_tcd_resolution_t;
 
 /**
 FIXME DOC
 */
 typedef struct opj_tcd_tilecomp
 {
-        OPJ_INT32 x0, y0, x1, y1;                               /* dimension of component : left upper corner (x0, y0) right low corner (x1,y1) */
-        OPJ_UINT32 numresolutions;                              /* number of resolutions level */
-        OPJ_UINT32 minimum_num_resolutions;             /* number of resolutions level to decode (at max)*/
-        opj_tcd_resolution_t *resolutions;      /* resolutions information */
-        OPJ_UINT32 resolutions_size;                    /* size of data for resolutions (in bytes) */
-        OPJ_INT32 *data;                                                /* data of the component */
-        OPJ_UINT32 data_size;                                   /* size of the data of the component */
-        OPJ_INT32 numpix;                                               /* add fixed_quality */
+        OPJ_INT32 x0, y0, x1, y1;           /* dimension of component : left upper corner (x0, y0) right low corner (x1,y1) */
+        OPJ_UINT32 numresolutions;          /* number of resolutions level */
+        OPJ_UINT32 minimum_num_resolutions; /* number of resolutions level to decode (at max)*/
+        opj_tcd_resolution_t *resolutions;  /* resolutions information */
+        OPJ_UINT32 resolutions_size;        /* size of data for resolutions (in bytes) */
+        OPJ_INT32 *data;                    /* data of the component */
+        OPJ_BOOL  ownsData;                 /* if true, then need to free after usage, otherwise do not free */
+        OPJ_UINT32 data_size_needed;        /* we may either need to allocate this amount of data, or re-use image data and ignore this value */
+        OPJ_UINT32 data_size;               /* size of the data of the component */
+        OPJ_INT32 numpix;                   /* add fixed_quality */
 } opj_tcd_tilecomp_t;
 
 
 /**
 FIXME DOC
 */
 typedef struct opj_tcd_tile {
         OPJ_INT32 x0, y0, x1, y1;               /* dimension of the tile : left upper corner (x0, y0) right low corner (x1,y1) */
         OPJ_UINT32 numcomps;                    /* number of components in tile */
         opj_tcd_tilecomp_t *comps;      /* Components information */
@@ skipping 163 matching lines @@
 OPJ_BOOL opj_tcd_init_encode_tile (     opj_tcd_t *p_tcd,
                                                                     OPJ_UINT32 p_tile_no );
 
 /**
  * Copies tile data from the given memory block onto the system.
  */
 OPJ_BOOL opj_tcd_copy_tile_data (opj_tcd_t *p_tcd,
                                  OPJ_BYTE * p_src,
                                  OPJ_UINT32 p_src_length );
 
+/**
+ * Allocates tile component data
+ *
+ *
+ */
+OPJ_BOOL opj_alloc_tile_component_data(opj_tcd_tilecomp_t *l_tilec);
+
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
 /*@}*/
 
 #endif /* __TCD_H */