Use opj_image_data_free() where appropriate (adapted from https://github.com/uclouvai...

diff --git a/src/lib/openjp2/image.c b/src/lib/openjp2/image.c
index e29172b2b5d59679ceed8b38ec1b80831c840395..bf7a70194279b43af359a059c73a031d858273e1 100644 (file)
--- 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 c747c9095da8c6217b60a48cb6e19e4e5ed0cef6..84d393273f8c4cf9339534ef5ce9512e133e461d 100644 (file)
--- 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,