diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-01-11 19:14:50 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-01-11 19:14:50 +0000 |
| commit | b7b72bbf974f4f8b2ae5f578e78a3cc67cbfb02c (patch) | |
| tree | ca2c7ea6831a0497596887806ecc6d272f67e6d7 /libopenjpeg | |
| parent | e1340fe0874b7648d57639ffb244f835a537f9b7 (diff) | |
BUG: 4 Apply patch from stefan.
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/jpwl/jpwl.c | 4 | ||||
| -rw-r--r-- | libopenjpeg/tcd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/jpwl/jpwl.c b/libopenjpeg/jpwl/jpwl.c index a910ea78..4247f750 100644 --- a/libopenjpeg/jpwl/jpwl.c +++ b/libopenjpeg/jpwl/jpwl.c @@ -168,8 +168,8 @@ void j2k_add_marker(opj_codestream_info_t *cstr_info, unsigned short int type, i /* expand the list? */
if ((cstr_info->marknum + 1) > cstr_info->maxmarknum) {
- cstr_info->maxmarknum = 100 + (int) ((float) cstr_info->maxmarknum * 1.0F);
- cstr_info->marker = (opj_marker_info_t*)opj_realloc(cstr_info->marker, cstr_info->maxmarknum);
+ cstr_info->maxmarknum += 100;
+ cstr_info->marker = (opj_marker_info_t*)opj_realloc(cstr_info->marker, cstr_info->maxmarknum * sizeof(opj_marker_info_t));
}
/* add the marker */
diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c index 7eabce55..18cdbc78 100644 --- a/libopenjpeg/tcd.c +++ b/libopenjpeg/tcd.c @@ -1352,7 +1352,7 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno } else { cstr_info->tile[tileno].pdx[resno] = 15; - cstr_info->tile[tileno].pdx[resno] = 15; + cstr_info->tile[tileno].pdy[resno] = 15; } } } |