summaryrefslogtreecommitdiff
path: root/third_party/libopenjpeg20/j2k.h
diff options
context:
space:
mode:
authorJun Fang <jun_fang@foxitsoftware.com>2015-10-13 15:28:55 +0800
committerJun Fang <jun_fang@foxitsoftware.com>2015-10-13 15:28:55 +0800
commitc212b684cb028a5d98e57f711c9eed931b853a44 (patch)
treef2c937d16b1156f57d8dbc86ec21db11a5b34174 /third_party/libopenjpeg20/j2k.h
parent3acb1ef909a22368507ed13817c4988c818e3aee (diff)
downloadpdfium-c212b684cb028a5d98e57f711c9eed931b853a44.tar.xz
upgrade openjpeg to commit# cf352af
BUG=457480,497355 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1338973005 .
Diffstat (limited to 'third_party/libopenjpeg20/j2k.h')
-rw-r--r--third_party/libopenjpeg20/j2k.h25
1 files changed, 22 insertions, 3 deletions
diff --git a/third_party/libopenjpeg20/j2k.h b/third_party/libopenjpeg20/j2k.h
index 10e22aa6b4..358e073965 100644
--- a/third_party/libopenjpeg20/j2k.h
+++ b/third_party/libopenjpeg20/j2k.h
@@ -232,6 +232,12 @@ typedef struct opj_simple_mcc_decorrelation_data
}
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
@@ -254,7 +260,13 @@ typedef struct opj_tcp
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;
@@ -359,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;
@@ -483,6 +500,9 @@ typedef struct opj_j2k_dec
OPJ_UINT32 m_can_decode : 1;
OPJ_UINT32 m_discard_tiles : 1;
OPJ_UINT32 m_skip_data : 1;
+ /** TNsot correction : see issue 254 **/
+ OPJ_UINT32 m_nb_tile_parts_correction_checked : 1;
+ OPJ_UINT32 m_nb_tile_parts_correction : 1;
} opj_j2k_dec_t;
@@ -569,7 +589,6 @@ typedef struct opj_j2k
/** the current tile coder/decoder **/
struct opj_tcd * m_tcd;
-
}
opj_j2k_t;