diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-10-05 16:27:16 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-10-05 16:27:16 +0000 |
| commit | ee0e8a3aadbf56004ff51649cfe5d06cb5c61326 (patch) | |
| tree | c049eec446b8d43cbb3ff6d3e6e7396a9d1ec647 /libopenjpeg/tcd.h | |
| parent | f4734d6b4dd45e744b6f088414486353721d4b4c (diff) | |
[trunk] WIP: fix the decoding process with conformance files and V2 framework
Diffstat (limited to 'libopenjpeg/tcd.h')
| -rw-r--r-- | libopenjpeg/tcd.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libopenjpeg/tcd.h b/libopenjpeg/tcd.h index 30921233..5e65a037 100644 --- a/libopenjpeg/tcd.h +++ b/libopenjpeg/tcd.h @@ -172,8 +172,8 @@ typedef struct opj_tcd_precinct_v2 { opj_tcd_cblk_dec_v2_t* dec; } cblks; OPJ_UINT32 block_size; /* size taken by cblks (in bytes) */ - struct opj_tgt_tree *incltree; /* inclusion tree */ - struct opj_tgt_tree *imsbtree; /* IMSB tree */ + opj_tgt_tree_t *incltree; /* inclusion tree */ + opj_tgt_tree_t *imsbtree; /* IMSB tree */ } opj_tcd_precinct_v2_t; /** @@ -331,7 +331,7 @@ typedef struct opj_tcd_v2 /** info on each image tile */ opj_tcd_image_v2_t *tcd_image; /** image header */ - struct opj_image_header *image_header; + opj_image_t *image; /** coding parameters */ struct opj_cp_v2 *cp; /** coding/decoding parameters common to all tiles */ @@ -379,11 +379,8 @@ void tcd_destroy_v2(opj_tcd_v2_t *tcd); * * @return true if the encoding values could be set (false otherwise). */ -opj_bool tcd_init_v2( - opj_tcd_v2_t *p_tcd, - //struct opj_image * p_image, - opj_image_header_t * p_image_header, - //struct opj_cp * p_cp +opj_bool tcd_init_v2( opj_tcd_v2_t *p_tcd, + opj_image_t * p_image, opj_cp_v2_t * p_cp ); |