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 62becce76f3e3aa10883a8d1a3d2a091f6d72ded..d01a7e5245b4da50dd3cd2b1e9ed1b1d1c5121cd 100644 (file)
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -101,7 +101,7 @@ int main (int argc, char *argv[])
   /* should be test_tile_encoder 3 2000 2000 1000 1000 8 tte1.j2k */
   if( argc == 9 )
     {
-    num_comps = atoi( argv[1] );
+    num_comps = (OPJ_UINT32)atoi( argv[1] );
     image_width = atoi( argv[2] );
     image_height = atoi( argv[3] );
     tile_width = atoi( argv[4] );
@@ -125,14 +125,16 @@ int main (int argc, char *argv[])
     {
     return 1;
     }
-       l_nb_tiles = (image_width/tile_width) * (image_height/tile_height);
-       l_data_size = tile_width * tile_height * num_comps * (comp_prec/8);
-
-       l_data = (OPJ_BYTE*) malloc(tile_width * tile_height * num_comps * (comp_prec/8) * sizeof(OPJ_BYTE));
+       l_nb_tiles = (OPJ_UINT32)(image_width/tile_width) * (OPJ_UINT32)(image_height/tile_height);
+       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] = i; /*rand();*/
+               l_data[i] = (OPJ_BYTE)i; /*rand();*/
        }
 
        opj_set_default_encoder_parameters(&l_param);
@@ -213,11 +215,11 @@ int main (int argc, char *argv[])
                l_current_param_ptr->dx = 1;
                l_current_param_ptr->dy = 1;
 
-               l_current_param_ptr->h = image_height;
-               l_current_param_ptr->w = image_width;
+               l_current_param_ptr->h = (OPJ_UINT32)image_height;
+               l_current_param_ptr->w = (OPJ_UINT32)image_width;
 
                l_current_param_ptr->sgnd = 0;
-               l_current_param_ptr->prec = comp_prec;
+               l_current_param_ptr->prec = (OPJ_UINT32)comp_prec;
 
                l_current_param_ptr->x0 = 0;
                l_current_param_ptr->y0 = 0;
@@ -226,7 +228,7 @@ int main (int argc, char *argv[])
        }
 
   /* should we do j2k or jp2 ?*/
-  len = strlen( output_file );
+  len = (unsigned char)strlen( output_file );
   if( strcmp( output_file + len - 4, ".jp2" ) == 0 )
     {
     l_codec = opj_create_compress(OPJ_CODEC_JP2);
@@ -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,58 +249,64 @@ 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;
        }
 
        l_image->x0 = 0;
        l_image->y0 = 0;
-       l_image->x1 = image_width;
-       l_image->y1 = image_height;
+       l_image->x1 = (OPJ_UINT32)image_width;
+       l_image->y1 = (OPJ_UINT32)image_height;
        l_image->color_space = OPJ_CLRSPC_SRGB;
 
        if (! opj_setup_encoder(l_codec,&l_param,l_image)) {
                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);