[trunk] WIP: correct a segfault inside j2k_dump output

[openjpeg.git] / libopenjpeg / t2.h

diff --git a/libopenjpeg/t2.h b/libopenjpeg/t2.h
index 55cac98f741fc77276337b7a7e1a65eb23fa0c06..f1637fba4ad8cd3e81a5690d8d00e5ca0f632c51 100644 (file)
--- a/libopenjpeg/t2.h
+++ b/libopenjpeg/t2.h
@@ -60,7 +60,7 @@ typedef struct opj_t2_v2 {
        opj_common_ptr cinfo;
 
        /** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
-       opj_image_header_t *image;
+       opj_image_t *image;
        /** pointer to the image coding parameters */
        opj_cp_v2_t *cp;
 } opj_t2_v2_t;
@@ -106,10 +106,10 @@ Decode the packets of a tile from a source buffer
  */
 opj_bool t2_decode_packets_v2( opj_t2_v2_t *t2,
                                                                OPJ_UINT32 tileno,
-                                                               struct opj_tcd_tile *tile,
+                                                               struct opj_tcd_tile_v2 *tile,
                                                                OPJ_BYTE *src, OPJ_UINT32 * p_data_read,
                                                                OPJ_UINT32 len,
-                                                               struct opj_codestream_info_v2 *cstr_info);
+                                                               opj_codestream_index_t *cstr_info);
 
 /**
  * Creates a Tier 2 handle
@@ -118,7 +118,7 @@ opj_bool t2_decode_packets_v2(      opj_t2_v2_t *t2,
  * @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_header *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