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

Fix crash on encoding if using opj_set_default_encoder_parameters() without defining tcp_numlayers

This commit is contained in:
Even Rouault 2017-08-10 14:43:16 +02:00
parent a4c938181d
commit a316f36dfc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/jp2/opj_compress.c
View File

@ -1618,9 +1618,12 @@ static int parse_cmdline_encoder(int argc, char **argv,
return 1; return 1;
} /* mod fixed_quality */ } /* mod fixed_quality */
/* if no rate entered, lossless by default */ /* if no rate entered, lossless by default */
/* Note: post v2.2.0, this is no longer necessary, but for released */
/* versions at the time of writing, this is needed to avoid crashes */
if (parameters->tcp_numlayers == 0) { if (parameters->tcp_numlayers == 0) {
parameters->tcp_rates[0] = 0; /* MOD antonin : losslessbug */ parameters->tcp_rates[0] = 0;
parameters->tcp_numlayers++; parameters->tcp_numlayers++;
parameters->cp_disto_alloc = 1; parameters->cp_disto_alloc = 1;
} }

7
src/lib/openjp2/j2k.c
View File

@ -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 */ /* see if max_codestream_size does limit input rate */
if (parameters->max_cs_size <= 0) { if (parameters->max_cs_size <= 0) {
if (parameters->tcp_rates[parameters->tcp_numlayers - 1] > 0) { if (parameters->tcp_rates[parameters->tcp_numlayers - 1] > 0) {