Merge pull request #735 from senbox-org/cppcheck_fix_openjp2

[openjpeg.git] / src / lib / openjp2 / j2k.h

diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h
index 3853926a2852bc3029a8ebe5704ff4bf2ce08340..358e0739652c0b96481f6c23100c4768cef4c6a6 100644 (file)
--- 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,10 +263,10 @@ 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 */
+       /** 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;
@@ -371,7 +371,12 @@ typedef struct opj_cp
        /** 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;