From 6219ad32b0061a601be2a5e2a4d338022712f982 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Tue, 20 Dec 2011 17:14:55 +0000 Subject: [PATCH] Import patch from winfried on mailing list: patch for mj2.c in branch --- applications/mj2/mj2.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/applications/mj2/mj2.c b/applications/mj2/mj2.c index fe48415b..b2b2c377 100644 --- a/applications/mj2/mj2.c +++ b/applications/mj2/mj2.c @@ -1098,7 +1098,8 @@ int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio) mj2_box_t box2; int i; opj_jp2_color_t color; - + opj_bool ok; + mj2_read_boxhdr(&box, cio); if (MJ2_MJ2 != box.type) { @@ -1156,11 +1157,17 @@ int mj2_read_smj2(opj_image_t * img, mj2_tk_t * tk, opj_cio_t *cio) cio_skip(cio,2); /* Pre-defined = -1 */ memset(&color, 0, sizeof(opj_jp2_color_t)); - - if (!jp2_read_jp2h(&tk->jp2_struct, cio, &color)) { - opj_event_msg(tk->cinfo, EVT_ERROR, "Error reading JP2H Box\n"); + tk->jp2_struct.cinfo = tk->cinfo; + + ok = jp2_read_jp2h(&tk->jp2_struct, cio, &color); + + tk->jp2_struct.cinfo = NULL; + + if(ok == OPJ_FALSE) + { + opj_event_msg(tk->cinfo, EVT_ERROR, "Error reading JP2H Box\n"); return 1; - } + } tk->jp2_struct.comps = (opj_jp2_comps_t*) opj_malloc(tk->jp2_struct.numcomps * sizeof(opj_jp2_comps_t)); tk->jp2_struct.cl = (unsigned int*) opj_malloc(sizeof(unsigned int));