Refactor opj_j2k_read_ppt

Update uclouvain/openjpeg#470
Update uclouvain/openjpeg#532

1 files changed, 12 insertions, 0 deletions

diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h
index 2374e559..3853926a 100644
--- 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;
 
+typedef struct opj_ppt_struct
+{
+	OPJ_BYTE*   m_data; /* m_data == NULL => Zppt not read yet */
+	OPJ_UINT32	m_data_size;
+} opj_ppt;
+
 /**
 Tile coding parameters :
 this structure is used to store coding/decoding parameters common to all
@@ -254,6 +260,12 @@ typedef struct opj_tcp
 	OPJ_UINT32 numpocs;
 	/** progression order changes */
 	opj_poc_t pocs[32];
+	
+	/** number of ppt markers (reserved size) */
+	OPJ_UINT32 ppt_markers_count;
+	/** ppt markers data (table indexed by Zppm) */
+	opj_ppt* ppt_markers;
+	
 	/** packet header store there for futur use in t2_decode_packet */
 	OPJ_BYTE *ppt_data;
 	/** used to keep a track of the allocated memory */