projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into travis-matrix
[openjpeg.git]
/
src
/
lib
/
openjp2
/
j2k.h
diff --git
a/src/lib/openjp2/j2k.h
b/src/lib/openjp2/j2k.h
index 2374e559b2c512c92242eba442370f159356284f..358e0739652c0b96481f6c23100c4768cef4c6a6 100644
(file)
--- a/
src/lib/openjp2/j2k.h
+++ b/
src/lib/openjp2/j2k.h
@@
-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 :
this structure is used to store coding/decoding parameters common to all
/**
Tile coding parameters :
this structure is used to store coding/decoding parameters common to all
@@
-254,7
+260,13
@@
typedef struct opj_tcp
OPJ_UINT32 numpocs;
/** progression order changes */
opj_poc_t pocs[32];
OPJ_UINT32 numpocs;
/** progression order changes */
opj_poc_t pocs[32];
- /** packet header store there for futur use in t2_decode_packet */
+
+ /** 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 future use in t2_decode_packet */
OPJ_BYTE *ppt_data;
/** used to keep a track of the allocated memory */
OPJ_BYTE *ppt_buffer;
OPJ_BYTE *ppt_data;
/** used to keep a track of the allocated memory */
OPJ_BYTE *ppt_buffer;
@@
-359,7
+371,12
@@
typedef struct opj_cp
/** number of tiles in heigth */
OPJ_UINT32 th;
/** number of tiles in heigth */
OPJ_UINT32 th;
- /** packet header store there for futur use in t2_decode_packet */
+ /** 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 future use in t2_decode_packet */
OPJ_BYTE *ppm_data;
/** size of the ppm_data*/
OPJ_UINT32 ppm_len;
OPJ_BYTE *ppm_data;
/** size of the ppm_data*/
OPJ_UINT32 ppm_len;