diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-07-12 18:09:30 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-07-12 18:09:30 +0200 |
| commit | c887df12a38ff1a2721d0c8a93b74fe1d02701a2 (patch) | |
| tree | ad2f3b1ee0442da204322fc9d1a2670a22a61996 /src/lib/openjp2/j2k.h | |
| parent | d1b053afe2916ad65e53d2c7f4d66e5a8d1df3e7 (diff) | |
Refactor opj_read_ppm
Update uclouvain/openjpeg#470
Update uclouvain/openjpeg#288
Diffstat (limited to 'src/lib/openjp2/j2k.h')
| -rw-r--r-- | src/lib/openjp2/j2k.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h index 3853926a..7f592fc9 100644 --- a/src/lib/openjp2/j2k.h +++ b/src/lib/openjp2/j2k.h @@ -232,11 +232,11 @@ typedef struct opj_simple_mcc_decorrelation_data } opj_simple_mcc_decorrelation_data_t; -typedef struct opj_ppt_struct +typedef struct opj_ppx_struct { - OPJ_BYTE* m_data; /* m_data == NULL => Zppt not read yet */ + OPJ_BYTE* m_data; /* m_data == NULL => Zppx not read yet */ OPJ_UINT32 m_data_size; -} opj_ppt; +} opj_ppx; /** Tile coding parameters : @@ -263,8 +263,8 @@ typedef struct opj_tcp /** number of ppt markers (reserved size) */ OPJ_UINT32 ppt_markers_count; - /** ppt markers data (table indexed by Zppm) */ - opj_ppt* ppt_markers; + /** ppt markers data (table indexed by Zppt) */ + opj_ppx* ppt_markers; /** packet header store there for futur use in t2_decode_packet */ OPJ_BYTE *ppt_data; @@ -371,6 +371,11 @@ typedef struct opj_cp /** number of tiles in heigth */ OPJ_UINT32 th; + /** number of ppm markers (reserved size) */ + OPJ_UINT32 ppm_markers_count; + /** ppm markers data (table indexed by Zppm) */ + opj_ppx* ppm_markers; + /** packet header store there for futur use in t2_decode_packet */ OPJ_BYTE *ppm_data; /** size of the ppm_data*/ |