cppcheck fix for openjp2 (#740)

[openjpeg.git] / tests / test_tile_encoder.c

diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c
index 4330fb7d0317365219cf61a38c1cbbe70d467241..d01a7e5245b4da50dd3cd2b1e9ed1b1d1c5121cd 100644 (file)
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -129,7 +129,9 @@ int main (int argc, char *argv[])
        l_data_size = (OPJ_UINT32)tile_width * (OPJ_UINT32)tile_height * (OPJ_UINT32)num_comps * (OPJ_UINT32)(comp_prec/8);
 
        l_data = (OPJ_BYTE*) malloc(l_data_size * sizeof(OPJ_BYTE));
-
+       if(l_data == NULL){
+               return 1;
+       }
        fprintf(stdout, "Encoding random values -> keep in mind that this is very hard to compress\n");
        for (i=0;i<l_data_size;++i)     {
                l_data[i] = (OPJ_BYTE)i; /*rand();*/
@@ -236,6 +238,7 @@ int main (int argc, char *argv[])
     l_codec = opj_create_compress(OPJ_CODEC_J2K);
     }
        if (!l_codec) {
+               free(l_data);
                return 1;
        }
 
@@ -246,6 +249,7 @@ int main (int argc, char *argv[])
 
        l_image = opj_image_tile_create(num_comps,l_params,OPJ_CLRSPC_SRGB);
        if (! l_image) {
+               free(l_data);
                opj_destroy_codec(l_codec);
                return 1;
        }
@@ -260,44 +264,49 @@ int main (int argc, char *argv[])
                fprintf(stderr, "ERROR -> test_tile_encoder: failed to setup the codec!\n");
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);
+               free(l_data);
                return 1;
        }
 
-       l_stream = opj_stream_create_default_file_stream_v3(output_file, OPJ_FALSE);
+    l_stream = opj_stream_create_default_file_stream(output_file, OPJ_FALSE);
     if (! l_stream) {
                fprintf(stderr, "ERROR -> test_tile_encoder: failed to create the stream from the output file %s !\n",output_file );
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);
+               free(l_data);
                return 1;
        }
 
        if (! opj_start_compress(l_codec,l_image,l_stream)) {
                fprintf(stderr, "ERROR -> test_tile_encoder: failed to start compress!\n");
-               opj_stream_destroy_v3(l_stream);
+        opj_stream_destroy(l_stream);
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);
+               free(l_data);
                return 1;
        }
 
        for (i=0;i<l_nb_tiles;++i) {
                if (! opj_write_tile(l_codec,i,l_data,l_data_size,l_stream)) {
                        fprintf(stderr, "ERROR -> test_tile_encoder: failed to write the tile %d!\n",i);
-                       opj_stream_destroy_v3(l_stream);
+            opj_stream_destroy(l_stream);
                        opj_destroy_codec(l_codec);
                        opj_image_destroy(l_image);
+                       free(l_data);
                        return 1;
                }
        }
 
        if (! opj_end_compress(l_codec,l_stream)) {
                fprintf(stderr, "ERROR -> test_tile_encoder: failed to end compress!\n");
-               opj_stream_destroy_v3(l_stream);
+        opj_stream_destroy(l_stream);
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);
+               free(l_data);
                return 1;
        }
 
-       opj_stream_destroy_v3(l_stream);
+    opj_stream_destroy(l_stream);
        opj_destroy_codec(l_codec);
        opj_image_destroy(l_image);