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

[trunk] JP3D codec was trying to pull information from the registration parameter in COM. This is non-standard.

This commit is contained in:
Mathieu Malaterre 2012-11-28 13:37:50 +00:00
parent 863fdafcd5
commit ba630816bc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/openjp3d/jp3d.c
View File

@ -799,9 +799,8 @@ static void j3d_read_com(opj_j3d_t *j3d) {
opj_cio_t *cio = j3d->cio; opj_cio_t *cio = j3d->cio;
len = cio_read(cio, 2); len = cio_read(cio, 2);
cio_read(cio, 2); // read registration
j3d->cp->transform_format = (OPJ_TRANSFORM) cio_read(cio, 1);
j3d->cp->encoding_format = (OPJ_ENTROPY_CODING) cio_read(cio, 1);
/*opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);*/ /*opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);*/
cio_skip(cio, len - 4); /*posible comments*/ cio_skip(cio, len - 4); /*posible comments*/
@ -1686,8 +1685,9 @@ void j3d_setup_decoder(opj_j3d_t *j3d, opj_dparameters_t *parameters) {
cp->layer = parameters->cp_layer; cp->layer = parameters->cp_layer;
cp->bigendian = parameters->bigendian; cp->bigendian = parameters->bigendian;
/* MM: Settings of the following two member variables would take
cp->encoding_format = ENCOD_2EB; place during j3d_read_com. FIXME */
cp->encoding_format = ENCOD_3EB;
cp->transform_format = TRF_2D_DWT; cp->transform_format = TRF_2D_DWT;
/* keep a link to cp so that we can destroy it later in j3d_destroy_decompress */ /* keep a link to cp so that we can destroy it later in j3d_destroy_decompress */