From 34c8a555fae47c62e3be26d39fad49cbfd8f0ed8 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Thu, 8 Dec 2005 14:47:40 +0000 Subject: [PATCH] fixed a bug when specifying a rate '-r' => no distortion info was available in the index --- ChangeLog | 1 + libopenjpeg/t2.c | 4 ++++ libopenjpeg/tcd.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b067d470..ded5290c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ What's New for OpenJPEG + : added December 8, 2005 - 1.1.1 +* [Antonin Descampe] fixed a bug when specifying a rate '-r' => no distortion info was available in the index * [Antonin Descampe] fixed a bug in t1_getwmsedec (stepsize was divided by 8192) December 5, 2005 - 1.1.0 diff --git a/libopenjpeg/t2.c b/libopenjpeg/t2.c index a239a0e9..dda0efca 100644 --- a/libopenjpeg/t2.c +++ b/libopenjpeg/t2.c @@ -558,6 +558,10 @@ int t2_encode_packets(opj_t2_t* t2, int tileno, opj_tcd_tile_t *tile, int maxlay return -999; } + if(image_info) { + image_info->num = 0; + } + for (pino = 0; pino <= cp->tcps[tileno].numpocs; pino++) { while (pi_next(&pi[pino])) { if (pi[pino].layno < maxlayers) { diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c index 92e8c908..088065e3 100644 --- a/libopenjpeg/tcd.c +++ b/libopenjpeg/tcd.c @@ -1083,7 +1083,7 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_image_in lo = thresh; } else { l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, image_info); - opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); + /* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */ if (l == -999) { lo = thresh; continue;