diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-12-18 17:46:33 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-12-18 17:46:33 +0000 |
| commit | b65bf4836933355df88a9eb5ce5696dcf3c324ba (patch) | |
| tree | c122b1b7f9cd9120c98edbbc22e4e7f8b07eef52 /src/lib/openjp2/tcd.h | |
| parent | 4c02acb728a0204684cd622007b8366ed373295c (diff) | |
[trunk] merge from branch 1.5 a correction about large code-block data (decoding part) and add tests about issue 5 and issue 62
Diffstat (limited to 'src/lib/openjp2/tcd.h')
| -rw-r--r-- | src/lib/openjp2/tcd.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/openjp2/tcd.h b/src/lib/openjp2/tcd.h index 0a540453..11aec81b 100644 --- a/src/lib/openjp2/tcd.h +++ b/src/lib/openjp2/tcd.h @@ -96,10 +96,11 @@ typedef struct opj_tcd_cblk_enc { 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) */ + OPJ_INT32 x0, y0, x1, y1; /* position of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */ OPJ_UINT32 numbps; OPJ_UINT32 numlenbits; - OPJ_UINT32 len; /* length */ + OPJ_UINT32 data_max_size; /* Size of allocated data buffer */ + OPJ_UINT32 data_current_size; /* Size of used data buffer */ OPJ_UINT32 numnewpasses; /* number of pass added to the code-blocks */ OPJ_UINT32 numsegs; /* number of segments */ OPJ_UINT32 real_num_segs; |