summaryrefslogtreecommitdiff
path: root/libopenjpeg
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2009-09-10 13:34:19 +0000
committerAntonin Descampe <antonin@gmail.com>2009-09-10 13:34:19 +0000
commitec400c4fa5ed89b85b3694f6424dda2541d25c0b (patch)
tree870eabad965d3d3d17b4c9ff239edf8bca590e51 /libopenjpeg
parentb1d8788a464e0de986eabab0fb22c8d857b89c78 (diff)
V2 branch :
- found a bug in tcd.c that was preventing to find the correct threshold in tcd_rateallocate.c for high-precision images. Applied a temporary patch but a better solution should be found. - Modified the way raw images with more that 8bpp are read and written
Diffstat (limited to 'libopenjpeg')
-rw-r--r--libopenjpeg/openjpeg.c5
-rw-r--r--libopenjpeg/tcd.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 574b5135..dbace581 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -654,6 +654,11 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
parameters->tp_on = 0;
parameters->decod_format = -1;
parameters->cod_format = -1;
+ parameters->tcp_rates[0] = 0;
+ parameters->tcp_numlayers = 0;
+ parameters->cp_disto_alloc = 0;
+ parameters->cp_fixed_alloc = 0;
+ parameters->cp_fixed_quality = 0;
/* UniPG>> */
#ifdef USE_JPWL
parameters->jpwl_epc_on = false;
diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c
index 1cfbc5af..d8bd08b6 100644
--- a/libopenjpeg/tcd.c
+++ b/libopenjpeg/tcd.c
@@ -1019,7 +1019,7 @@ bool tcd_rateallocate(opj_tcd_t *tcd, OPJ_BYTE *dest, OPJ_UINT32 * p_data_writte
}
for
- (i = 0; i < 32; ++i)
+ (i = 0; i < 128; ++i)
{
OPJ_FLOAT64 distoachieved = 0; /* fixed_quality */
thresh = (lo + hi) / 2;