summaryrefslogtreecommitdiff
path: root/src/lib/openjp2/bench_dwt.c
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2017-09-19 12:46:20 +0200
committerEven Rouault <even.rouault@spatialys.com>2017-09-19 12:46:20 +0200
commitfdef69b43ce5222ac0f2a87f2fad1442ece340e8 (patch)
tree10efa6578035cc1f5fb6064bebac759d880c2c70 /src/lib/openjp2/bench_dwt.c
parent18f6696372f4c32334385f8dcc8d39ad8ac24601 (diff)
Fix warnings and errors when compiling with a c++ compiler (#1021)
Diffstat (limited to 'src/lib/openjp2/bench_dwt.c')
-rw-r--r--src/lib/openjp2/bench_dwt.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/openjp2/bench_dwt.c b/src/lib/openjp2/bench_dwt.c
index 0dc278f3..103b681a 100644
--- a/src/lib/openjp2/bench_dwt.c
+++ b/src/lib/openjp2/bench_dwt.c
@@ -62,13 +62,14 @@ void init_tilec(opj_tcd_tilecomp_t * l_tilec,
l_tilec->y1 = y1;
nValues = (size_t)(l_tilec->x1 - l_tilec->x0) *
(size_t)(l_tilec->y1 - l_tilec->y0);
- l_tilec->data = opj_malloc(sizeof(OPJ_INT32) * nValues);
+ l_tilec->data = (OPJ_INT32*) opj_malloc(sizeof(OPJ_INT32) * nValues);
for (i = 0; i < nValues; i++) {
l_tilec->data[i] = getValue((OPJ_UINT32)i);
}
l_tilec->numresolutions = numresolutions;
- l_tilec->resolutions = opj_calloc(l_tilec->numresolutions,
- sizeof(opj_tcd_resolution_t));
+ l_tilec->resolutions = (opj_tcd_resolution_t*) opj_calloc(
+ l_tilec->numresolutions,
+ sizeof(opj_tcd_resolution_t));
l_level_no = l_tilec->numresolutions;
l_res = l_tilec->resolutions;