summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-04-18 18:25:44 +0200
committerEven Rouault <even.rouault@spatialys.com>2020-04-18 18:25:44 +0200
commit64689d05dfaaf52105581d93fb1eb173b20829a4 (patch)
treeaf9686a48d75cc19f02aaec33826138394a9602e
parent774889a328abd5d3c280d9a897f1ac4c672cb0e5 (diff)
struct opj_j2k: remove unused fields, and add some documentation
-rw-r--r--src/lib/openjp2/j2k.h9
-rw-r--r--src/lib/openjp2/jp2.c4
2 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h
index 5d393c98..3ea6395f 100644
--- a/src/lib/openjp2/j2k.h
+++ b/src/lib/openjp2/j2k.h
@@ -577,15 +577,16 @@ typedef struct opj_j2k {
/** the current tile coder/decoder **/
struct opj_tcd * m_tcd;
- /** Number of threads to use */
- int m_num_threads;
-
/** Thread pool */
opj_thread_pool_t* m_tp;
+ /** Image width coming from JP2 IHDR box. 0 from a pure codestream */
OPJ_UINT32 ihdr_w;
+
+ /** Image height coming from JP2 IHDR box. 0 from a pure codestream */
OPJ_UINT32 ihdr_h;
- OPJ_UINT32 enumcs;
+
+ /** Set to 1 by the decoder initialization if OPJ_DPARAMETERS_DUMP_FLAG is set */
unsigned int dump_state;
}
opj_j2k_t;
diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 4402ffe3..a2363666 100644
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -1584,9 +1584,7 @@ static OPJ_BOOL opj_jp2_read_colr(opj_jp2_t *jp2,
"COLR BOX meth value is not a regular value (%d), "
"so we will ignore the entire Colour Specification box. \n", jp2->meth);
}
- if (jp2->color.jp2_has_colr) {
- jp2->j2k->enumcs = jp2->enumcs;
- }
+
return OPJ_TRUE;
}