diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-03-24 11:21:19 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-03-24 11:21:19 +0000 |
| commit | 73b4d326382e1c7e0f10ea98cc9f1b4672aa3fb2 (patch) | |
| tree | e5f10dc589853a7bd7ec36ebb34f2e2e6e5b32db /libopenjpeg/pi.c | |
| parent | 67b5ab3c045fae8da28392596ee49ac1bbdbec40 (diff) | |
Code improvements using 'g++-4.4.0' to trace the code (v2.0). Thanks to Winfried for this patch.
Diffstat (limited to 'libopenjpeg/pi.c')
| -rw-r--r-- | libopenjpeg/pi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libopenjpeg/pi.c b/libopenjpeg/pi.c index 97efc38b..5dc75dc2 100644 --- a/libopenjpeg/pi.c +++ b/libopenjpeg/pi.c @@ -586,13 +586,15 @@ opj_pi_iterator_t *pi_create_decode( l_bound = l_tcp->numpocs+1; l_data_stride = 4 * J2K_MAXRLVLS; - l_tmp_data = opj_malloc(l_data_stride * p_image->numcomps * sizeof(OPJ_UINT32)); + l_tmp_data = (OPJ_UINT32*)opj_malloc( + l_data_stride * p_image->numcomps * sizeof(OPJ_UINT32)); if (! l_tmp_data) { return 00; } - l_tmp_ptr = opj_malloc(p_image->numcomps * sizeof(OPJ_UINT32 *)); + l_tmp_ptr = (OPJ_UINT32**)opj_malloc( + p_image->numcomps * sizeof(OPJ_UINT32 *)); if (! l_tmp_ptr) { @@ -871,13 +873,15 @@ opj_pi_iterator_t *pi_initialise_encode( l_bound = l_tcp->numpocs+1; l_data_stride = 4 * J2K_MAXRLVLS; - l_tmp_data = opj_malloc(l_data_stride * p_image->numcomps * sizeof(OPJ_UINT32)); + l_tmp_data = (OPJ_UINT32*)opj_malloc( + l_data_stride * p_image->numcomps * sizeof(OPJ_UINT32)); if (! l_tmp_data) { return 00; } - l_tmp_ptr = opj_malloc(p_image->numcomps * sizeof(OPJ_UINT32 *)); + l_tmp_ptr = (OPJ_UINT32**)opj_malloc( + p_image->numcomps * sizeof(OPJ_UINT32 *)); if (! l_tmp_ptr) { |