summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2017-08-10 14:43:16 +0200
committerEven Rouault <even.rouault@spatialys.com>2017-08-10 14:43:16 +0200
commita316f36dfc7cc4217bfce0ac6d23b47f90cf8fd9 (patch)
tree517961aad3a937e7d38cf88e837de58f694289b9 /src/lib
parenta4c938181deb2cb48e408ac6e358062927060125 (diff)
Fix crash on encoding if using opj_set_default_encoder_parameters() without defining tcp_numlayers
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/j2k.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index 44de79a7..496d4fe4 100644
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -6769,6 +6769,13 @@ OPJ_BOOL opj_j2k_setup_encoder(opj_j2k_t *p_j2k,
}
}
+ /* If no explicit layers are provided, use lossless settings */
+ if (parameters->tcp_numlayers == 0) {
+ parameters->tcp_numlayers = 1;
+ parameters->cp_disto_alloc = 1;
+ parameters->tcp_rates[0] = 0;
+ }
+
/* see if max_codestream_size does limit input rate */
if (parameters->max_cs_size <= 0) {
if (parameters->tcp_rates[parameters->tcp_numlayers - 1] > 0) {