From b73ce715d2a484d7355639d863d0418a0e5b8858 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 8 Sep 2017 09:16:51 +0200 Subject: [PATCH] Use opj_image_data_free() where appropriate (adapted from https://github.com/uclouvain/openjpeg/pull/1015/commits/dab9db0723a5bb9f3d745f9dd7a0b8b3b18b8054, #1014) --- src/lib/openjp2/image.c | 2 +- src/lib/openjp2/jp2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/openjp2/image.c b/src/lib/openjp2/image.c index e29172b2..bf7a7019 100644 --- a/src/lib/openjp2/image.c +++ b/src/lib/openjp2/image.c @@ -180,7 +180,7 @@ void opj_copy_image_header(const opj_image_t* p_image_src, for (compno = 0; compno < p_image_dest->numcomps; compno++) { opj_image_comp_t *image_comp = &(p_image_dest->comps[compno]); if (image_comp->data) { - opj_free(image_comp->data); + opj_image_data_free(image_comp->data); } } opj_free(p_image_dest->comps); diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index c747c909..84d39327 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -1083,7 +1083,7 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, if (!new_comps[i].data) { while (i > 0) { -- i; - opj_free(new_comps[i].data); + opj_image_data_free(new_comps[i].data); } opj_free(new_comps); opj_event_msg(p_manager, EVT_ERROR,