walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #533 from mayeut/refactor-read-ppX 

Refactor opj_j2k_read_ppm & opj_j2k_read_ppt
Fixes uclouvain/openjpeg#470
Fixes uclouvain/openjpeg#288
Fixes uclouvain/openjpeg#532
This commit is contained in:
Matthieu Darbois 2015-07-21 01:26:02 +02:00
parent 2c7dab7655 c887df12a3
commit 28c6f54798
2 changed files with 478 additions and 530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

991
src/lib/openjp2/j2k.c
View File

File diff suppressed because it is too large Load Diff

17
src/lib/openjp2/j2k.h
View File

@ -232,6 +232,12 @@ typedef struct opj_simple_mcc_decorrelation_data
} }
opj_simple_mcc_decorrelation_data_t; opj_simple_mcc_decorrelation_data_t;
typedef struct opj_ppx_struct
{
OPJ_BYTE* m_data; /* m_data == NULL => Zppx not read yet */
OPJ_UINT32 m_data_size;
} opj_ppx;
/** /**
Tile coding parameters : Tile coding parameters :
this structure is used to store coding/decoding parameters common to all this structure is used to store coding/decoding parameters common to all
@ -254,6 +260,12 @@ typedef struct opj_tcp
OPJ_UINT32 numpocs; OPJ_UINT32 numpocs;
/** progression order changes */ /** progression order changes */
opj_poc_t pocs[32]; opj_poc_t pocs[32];
/** number of ppt markers (reserved size) */
OPJ_UINT32 ppt_markers_count;
/** ppt markers data (table indexed by Zppt) */
opj_ppx* ppt_markers;
/** packet header store there for futur use in t2_decode_packet */ /** packet header store there for futur use in t2_decode_packet */
OPJ_BYTE *ppt_data; OPJ_BYTE *ppt_data;
/** used to keep a track of the allocated memory */ /** used to keep a track of the allocated memory */
@ -359,6 +371,11 @@ typedef struct opj_cp
/** number of tiles in heigth */ /** number of tiles in heigth */
OPJ_UINT32 th; 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 */ /** packet header store there for futur use in t2_decode_packet */
OPJ_BYTE *ppm_data; OPJ_BYTE *ppm_data;
/** size of the ppm_data*/ /** size of the ppm_data*/