walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

struct opj_j2k: remove unused fields, and add some documentation

This commit is contained in:
Even Rouault 2020-04-18 18:25:44 +02:00
parent 774889a328
commit 64689d05df
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/openjp2/j2k.h
View File

@ -577,15 +577,16 @@ typedef struct opj_j2k {
/** the current tile coder/decoder **/ /** the current tile coder/decoder **/
struct opj_tcd * m_tcd; struct opj_tcd * m_tcd;
/** Number of threads to use */
int m_num_threads;
/** Thread pool */ /** Thread pool */
opj_thread_pool_t* m_tp; opj_thread_pool_t* m_tp;
/** Image width coming from JP2 IHDR box. 0 from a pure codestream */
OPJ_UINT32 ihdr_w; OPJ_UINT32 ihdr_w;
/** Image height coming from JP2 IHDR box. 0 from a pure codestream */
OPJ_UINT32 ihdr_h; 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; unsigned int dump_state;
} }
opj_j2k_t; opj_j2k_t;

4
src/lib/openjp2/jp2.c
View File

@ -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), " "COLR BOX meth value is not a regular value (%d), "
"so we will ignore the entire Colour Specification box. \n", jp2->meth); "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; return OPJ_TRUE;
} }