diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-07-11 14:55:39 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-07-11 14:55:39 +0000 |
| commit | 5ba8d36687e5ee61801e623bb93ff86b901e7bb7 (patch) | |
| tree | cc1f7aa31a7e4c20125b89234331d1936ef51a19 /libopenjpeg/j2k.c | |
| parent | 178236cc5f790bfc1b62d90d1341665b2cc770d9 (diff) | |
[trunk] This fixes issues seen on PDF files
Fixes issue 156
Diffstat (limited to 'libopenjpeg/j2k.c')
| -rw-r--r-- | libopenjpeg/j2k.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index d2e5c927..caa5a781 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -6326,7 +6326,7 @@ opj_bool j2k_update_rates( opj_j2k_v2_t *p_j2k, static void j2k_read_eoc(opj_j2k_t *j2k) { int i, tileno; - opj_bool success; + opj_bool success = false; /* if packets should be decoded */ if (j2k->cp->limit_decoding != DECODE_ALL_BUT_PACKETS) { @@ -6334,11 +6334,16 @@ static void j2k_read_eoc(opj_j2k_t *j2k) { tcd_malloc_decode(tcd, j2k->image, j2k->cp); for (i = 0; i < j2k->cp->tileno_size; i++) { tcd_malloc_decode_tile(tcd, j2k->image, j2k->cp, i, j2k->cstr_info); - tileno = j2k->cp->tileno[i]; - success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info); - opj_free(j2k->tile_data[tileno]); - j2k->tile_data[tileno] = NULL; - tcd_free_decode_tile(tcd, i); + if (j2k->cp->tileno[i] != -1) + { + tileno = j2k->cp->tileno[i]; + success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info); + opj_free(j2k->tile_data[tileno]); + j2k->tile_data[tileno] = NULL; + tcd_free_decode_tile(tcd, i); + } + else + success = false; if (success == OPJ_FALSE) { j2k->state |= J2K_STATE_ERR; break; |