Complementary fix to previous commit

diff --git a/src/bin/common/color.c b/src/bin/common/color.c
index 665558f5e59d0f72df19ba713708b8ed2c1a48ad..185b547e6632ecab1aa005d693073ec15c3542f0 100644 (file)
--- a/src/bin/common/color.c
+++ b/src/bin/common/color.c
@@ -655,8 +655,8 @@ fails1:
             nr_samples = (size_t)(max * 3 * sizeof(unsigned char));
             in = inbuf = (unsigned char*)opj_image_data_alloc(nr_samples);
             out = outbuf = (unsigned char*)opj_image_data_alloc(nr_samples);
-            g = (int*)calloc((size_t)max, sizeof(int));
-            b = (int*)calloc((size_t)max, sizeof(int));
+            g = (int*)opj_image_data_alloc((size_t)max * sizeof(int));
+            b = (int*)opj_image_data_alloc((size_t)max * sizeof(int));
 
             if (inbuf == NULL || outbuf == NULL || g == NULL || b == NULL) {
                 goto fails2;
@@ -715,8 +715,8 @@ fails2:
             nr_samples = (size_t)(max * 3U * sizeof(unsigned short));
             in = inbuf = (unsigned short*)opj_image_data_alloc(nr_samples);
             out = outbuf = (unsigned short*)opj_image_data_alloc(nr_samples);
-            g = (int*)calloc((size_t)max, sizeof(int));
-            b = (int*)calloc((size_t)max, sizeof(int));
+            g = (int*)opj_image_data_alloc((size_t)max * sizeof(int));
+            b = (int*)opj_image_data_alloc((size_t)max * sizeof(int));
 
             if (inbuf == NULL || outbuf == NULL || g == NULL || b == NULL) {
                 goto fails3;

diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index 8293a58dcc324a07801dcedba8cfc8b70b58cb82..4e649a74f378d1a08a0f015280d5052f0b54cd3d 100644 (file)
--- a/src/lib/openjp2/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.c
@@ -1011,10 +1011,13 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream(
 
 void* OPJ_CALLCONV opj_image_data_alloc(OPJ_SIZE_T size)
 {
-    return opj_aligned_malloc(size);
+    void* ret = opj_aligned_malloc(size);
+    /* printf("opj_image_data_alloc %p\n", ret); */
+    return ret;
 }
 
 void OPJ_CALLCONV opj_image_data_free(void* ptr)
 {
+    /* printf("opj_image_data_free %p\n", ptr); */
     opj_aligned_free(ptr);
 }