[trunk] rename opj_tcd_truct_v2 to opj_tcd_struct

1 files changed, 44 insertions, 44 deletions

diff --git a/src/lib/openjp2/tcd.h b/src/lib/openjp2/tcd.h
index 6df82544..b3bf3349 100644
--- a/src/lib/openjp2/tcd.h
+++ b/src/lib/openjp2/tcd.h
@@ -58,12 +58,12 @@ typedef struct opj_tcd_seg {
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_pass_v2 {
+typedef struct opj_tcd_pass {
 	OPJ_UINT32 rate;
 	OPJ_FLOAT64 distortiondec;
 	OPJ_UINT32 len;
 	OPJ_UINT32 term : 1;
-} opj_tcd_pass_v2_t;
+} opj_tcd_pass_t;
 
 /**
 FIXME DOC
@@ -78,20 +78,20 @@ typedef struct opj_tcd_layer {
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_cblk_enc_v2 {
+typedef struct opj_tcd_cblk_enc {
 	OPJ_BYTE* data;					/* Data */
 	opj_tcd_layer_t* layers;		/* layer information */
-	opj_tcd_pass_v2_t* passes;		/* information about the passes */
+	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_tcd_cblk_enc_v2_t;
+} opj_tcd_cblk_enc_t;
 
 
-typedef struct opj_tcd_cblk_dec_v2 {
+typedef struct opj_tcd_cblk_dec {
 	OPJ_BYTE * data;				/* Data */
 	opj_tcd_seg_t* segs;			/* segments information */
 	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
@@ -102,88 +102,88 @@ typedef struct opj_tcd_cblk_dec_v2 {
 	OPJ_UINT32 numsegs;				/* number of segments */
 	OPJ_UINT32 real_num_segs;
 	OPJ_UINT32 m_current_max_segs;
-} opj_tcd_cblk_dec_v2_t;
+} opj_tcd_cblk_dec_t;
 
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_precinct_v2 {
+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_v2_t* enc;
-		opj_tcd_cblk_dec_v2_t* dec;
+		opj_tcd_cblk_enc_t* enc;
+		opj_tcd_cblk_dec_t* dec;
 	} 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_v2_t;
+} opj_tcd_precinct_t;
 
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_band_v2 {
+typedef struct opj_tcd_band {
 	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the subband : left upper corner (x0, y0) right low corner (x1,y1) */
 	OPJ_UINT32 bandno;
-	opj_tcd_precinct_v2_t *precincts;	/* precinct information */
+	opj_tcd_precinct_t *precincts;	/* precinct information */
 	OPJ_UINT32 precincts_data_size;	/* size of data taken by precincts */
 	OPJ_INT32 numbps;
 	OPJ_FLOAT32 stepsize;
-} opj_tcd_band_v2_t;
+} opj_tcd_band_t;
 
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_resolution_v2 {
+typedef struct opj_tcd_resolution {
 	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the resolution level : left upper corner (x0, y0) right low corner (x1,y1) */
 	OPJ_UINT32 pw, ph;
 	OPJ_UINT32 numbands;			/* number sub-band for the resolution level */
-	opj_tcd_band_v2_t bands[3];		/* subband information */
-} opj_tcd_resolution_v2_t;
+	opj_tcd_band_t bands[3];		/* subband information */
+} opj_tcd_resolution_t;
 
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_tilecomp_v2
+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_v2_t *resolutions;	/* resolutions information */
+	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_tcd_tilecomp_v2_t;
+} opj_tcd_tilecomp_t;
 
 
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_tile_v2 {
+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_v2_t *comps;	/* Components information */
+	opj_tcd_tilecomp_t *comps;	/* Components information */
 	OPJ_INT32 numpix;				/* add fixed_quality */
 	OPJ_FLOAT64 distotile;			/* add fixed_quality */
 	OPJ_FLOAT64 distolayer[100];	/* add fixed_quality */
 	OPJ_UINT32 packno;              /* packet number */
-} opj_tcd_tile_v2_t;
+} opj_tcd_tile_t;
 
 /**
 FIXME DOC
 */
-typedef struct opj_tcd_image_v2
+typedef struct opj_tcd_image
 {
-	opj_tcd_tile_v2_t *tiles;		/* Tiles information */
+	opj_tcd_tile_t *tiles;		/* Tiles information */
 }
-opj_tcd_image_v2_t;
+opj_tcd_image_t;
 
 
 /**
 Tile coder/decoder
 */
-typedef struct opj_tcd_v2
+typedef struct opj_tcd
 {
 	/** Position of the tilepart flag in Progression order*/
 	OPJ_INT32 tp_pos;
@@ -196,7 +196,7 @@ typedef struct opj_tcd_v2
 	/** Current Packet iterator number */
 	OPJ_UINT32 cur_pino;
 	/** info on each image tile */
-	opj_tcd_image_v2_t *tcd_image;
+	opj_tcd_image_t *tcd_image;
 	/** image header */
 	opj_image_t *image;
 	/** coding parameters */
@@ -207,7 +207,7 @@ typedef struct opj_tcd_v2
 	OPJ_UINT32 tcd_tileno;
 	/** tell if the tcd is a decoder. */
 	OPJ_UINT32 m_is_decoder : 1;
-} opj_tcd_v2_t;
+} opj_tcd_t;
 
 /** @name Exported functions */
 /*@{*/
@@ -223,13 +223,13 @@ Create a new TCD handle
 @param p_is_decoder FIXME DOC
 @return Returns a new TCD handle if successful returns NULL otherwise
 */
-opj_tcd_v2_t* opj_tcd_create(opj_bool p_is_decoder);
+opj_tcd_t* opj_tcd_create(opj_bool p_is_decoder);
 
 /**
 Destroy a previously created TCD handle
 @param tcd TCD handle to destroy
 */
-void opj_tcd_destroy(opj_tcd_v2_t *tcd);
+void opj_tcd_destroy(opj_tcd_t *tcd);
 
 /**
  * Initialize the tile coder and may reuse some memory.
@@ -239,7 +239,7 @@ void opj_tcd_destroy(opj_tcd_v2_t *tcd);
  *
  * @return true if the encoding values could be set (false otherwise).
 */
-opj_bool opj_tcd_init(	opj_tcd_v2_t *p_tcd,
+opj_bool opj_tcd_init(	opj_tcd_t *p_tcd,
 						opj_image_t * p_image,
 						opj_cp_v2_t * p_cp );
 
@@ -252,18 +252,18 @@ opj_bool opj_tcd_init(	opj_tcd_v2_t *p_tcd,
  *
  * @return	true if the remaining data is sufficient.
  */
-opj_bool opj_tcd_init_decode_tile(opj_tcd_v2_t *p_tcd, OPJ_UINT32 p_tile_no);
+opj_bool opj_tcd_init_decode_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no);
 
-void opj_tcd_makelayer_fixed(opj_tcd_v2_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 final);
+void opj_tcd_makelayer_fixed(opj_tcd_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 final);
 
-void opj_tcd_rateallocate_fixed(opj_tcd_v2_t *tcd);
+void opj_tcd_rateallocate_fixed(opj_tcd_t *tcd);
 
-void opj_tcd_makelayer(	opj_tcd_v2_t *tcd,
+void opj_tcd_makelayer(	opj_tcd_t *tcd,
 						OPJ_UINT32 layno,
 						OPJ_FLOAT64 thresh,
 						OPJ_UINT32 final);
 
-opj_bool opj_tcd_rateallocate(	opj_tcd_v2_t *tcd,
+opj_bool opj_tcd_rateallocate(	opj_tcd_t *tcd,
 								OPJ_BYTE *dest,
 								OPJ_UINT32 * p_data_written,
 								OPJ_UINT32 len,
@@ -272,7 +272,7 @@ opj_bool opj_tcd_rateallocate(	opj_tcd_v2_t *tcd,
 /**
  * Gets the maximum tile size that will be taken by the tile once decoded.
  */
-OPJ_UINT32 opj_tcd_get_decoded_tile_size (opj_tcd_v2_t *p_tcd );
+OPJ_UINT32 opj_tcd_get_decoded_tile_size (opj_tcd_t *p_tcd );
 
 /**
  * Encodes a tile from the raw image into the given buffer.
@@ -284,7 +284,7 @@ OPJ_UINT32 opj_tcd_get_decoded_tile_size (opj_tcd_v2_t *p_tcd );
  * @param	p_cstr_info		Codestream information structure
  * @return  true if the coding is successfull.
 */
-opj_bool opj_tcd_encode_tile(   opj_tcd_v2_t *p_tcd,
+opj_bool opj_tcd_encode_tile(   opj_tcd_t *p_tcd,
 							    OPJ_UINT32 p_tile_no,
 							    OPJ_BYTE *p_dest,
 							    OPJ_UINT32 * p_data_written,
@@ -300,7 +300,7 @@ Decode a tile from a buffer into a raw image
 @param tileno Number that identifies one of the tiles to be decoded
 @param cstr_info  FIXME DOC
 */
-opj_bool opj_tcd_decode_tile(   opj_tcd_v2_t *tcd,
+opj_bool opj_tcd_decode_tile(   opj_tcd_t *tcd,
 							    OPJ_BYTE *src,
 							    OPJ_UINT32 len,
 							    OPJ_UINT32 tileno,
@@ -310,14 +310,14 @@ opj_bool opj_tcd_decode_tile(   opj_tcd_v2_t *tcd,
 /**
  * Copies tile data from the system onto the given memory block.
  */
-opj_bool opj_tcd_update_tile_data (	opj_tcd_v2_t *p_tcd,
+opj_bool opj_tcd_update_tile_data (	opj_tcd_t *p_tcd,
 								    OPJ_BYTE * p_dest,
 								    OPJ_UINT32 p_dest_length );
 
 /**
  *
  */
-OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_v2_t *p_tcd );
+OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_t *p_tcd );
 
 /**
  * Initialize the tile coder and may reuse some meory.
@@ -327,13 +327,13 @@ OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_v2_t *p_tcd );
  *
  * @return true if the encoding values could be set (false otherwise).
 */
-opj_bool opj_tcd_init_encode_tile (	opj_tcd_v2_t *p_tcd,
+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_v2_t *p_tcd,
+opj_bool opj_tcd_copy_tile_data (opj_tcd_t *p_tcd,
                                  OPJ_BYTE * p_src,
                                  OPJ_UINT32 p_src_length );