[trunk] clean jp2_read_ihdr_v2 interface

[openjpeg.git] / libopenjpeg / t2.h

diff --git a/libopenjpeg/t2.h b/libopenjpeg/t2.h
index fd68331ecce3ba6846048d6ad4cdb3730226bc59..2273c44e8e759d628d4ab5bf945f057790b2c914 100644 (file)
--- a/libopenjpeg/t2.h
+++ b/libopenjpeg/t2.h
@@ -85,6 +85,33 @@ Encode the packets of a tile to a destination buffer
 @param cur_totnum_tp The total number of tile parts in the current tile
 */
 int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino,J2K_T2_MODE t2_mode,int cur_totnum_tp);
+
+/**
+Encode the packets of a tile to a destination buffer
+@param t2 T2 handle
+@param tileno number of the tile encoded
+@param tile the tile for which to write the packets
+@param maxlayers maximum number of layers
+@param dest the destination buffer
+@param len the length of the destination buffer
+@param cstr_info Codestream information structure
+@param tpnum Tile part number of the current tile
+@param tppos The position of the tile part flag in the progression order
+@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
+*/
+opj_bool t2_encode_packets_v2( opj_t2_v2_t* t2,
+                                                               OPJ_UINT32 tileno,
+                                                               struct opj_tcd_tile_v2 *tile,
+                                                               OPJ_UINT32 maxlayers,
+                                                               OPJ_BYTE *dest,
+                                                               OPJ_UINT32 * p_data_written,
+                                                               OPJ_UINT32 len,
+                                                               struct opj_codestream_info *cstr_info,
+                                                               OPJ_UINT32 tpnum,
+                                                               OPJ_INT32 tppos,
+                                                               OPJ_UINT32 pino,
+                                                               J2K_T2_MODE t2_mode);
+
 /**
 Decode the packets of a tile from a source buffer
 @param t2 T2 handle
@@ -104,7 +131,12 @@ Decode the packets of a tile from a source buffer
 @param tileno number that identifies the tile for which to decode the packets
 @param tile tile for which to decode the packets
  */
-opj_bool t2_decode_packets_v2(opj_t2_v2_t *t2, OPJ_UINT32 tileno,struct opj_tcd_tile *tile, OPJ_BYTE *src, OPJ_UINT32 * p_data_read, OPJ_UINT32 len,   struct opj_codestream_info *cstr_info);
+opj_bool t2_decode_packets_v2( opj_t2_v2_t *t2,
+                                                               OPJ_UINT32 tileno,
+                                                               struct opj_tcd_tile_v2 *tile,
+                                                               OPJ_BYTE *src, OPJ_UINT32 * p_data_read,
+                                                               OPJ_UINT32 len,
+                                                               opj_codestream_index_t *cstr_info);
 
 /**
  * Creates a Tier 2 handle
@@ -113,7 +145,7 @@ opj_bool t2_decode_packets_v2(opj_t2_v2_t *t2, OPJ_UINT32 tileno,struct opj_tcd_
  * @param      p_cp            Image coding parameters.
  * @return             a new T2 handle if successful, NULL otherwise.
 */
-opj_t2_v2_t* t2_create_v2(struct opj_image *p_image, opj_cp_v2_t *p_cp);
+opj_t2_v2_t* t2_create_v2(opj_image_t *p_image, opj_cp_v2_t *p_cp);
 
 /**
 Create a T2 handle