[trunk] Fix warning about signed/unsigned mismatch

diff --git a/tests/unit/testempty1.c b/tests/unit/testempty1.c
index ed9d636f9beaee8f4e47264db5d1d6a6e0846449..01547e3db7d2f349ee3af5c77255167ebe9e71a0 100644 (file)
--- a/tests/unit/testempty1.c
+++ b/tests/unit/testempty1.c
@@ -57,15 +57,15 @@ int main(int argc, char *argv[])
   const char * v = opj_version();
 
   const OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_GRAY;
-  int numcomps = 1;
+  unsigned int numcomps = 1;
   int i;
-  int image_width = 256;
-  int image_height = 256;
+  unsigned int image_width = 256;
+  unsigned int image_height = 256;
 
   opj_cparameters_t parameters;
 
-  int subsampling_dx = 0;
-  int subsampling_dy = 0;
+  unsigned int subsampling_dx = 0;
+  unsigned int subsampling_dy = 0;
 
   opj_image_cmptparm_t cmptparm;
   opj_image_t *image;

diff --git a/tests/unit/testempty2.c b/tests/unit/testempty2.c
index e342e01503cdc63d9b40d85b3fb396e14cfb63cd..dbbbaf93039f216ee2024106fd0f6b6fc14a2b81 100644 (file)
--- a/tests/unit/testempty2.c
+++ b/tests/unit/testempty2.c
@@ -58,15 +58,15 @@ int main(int argc, char *argv[])
   const char * v = opj_version();
 
   const OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_GRAY;
-  int numcomps = 1;
+  unsigned int numcomps = 1;
   int i;
-  int image_width = 256;
-  int image_height = 256;
+  unsigned int image_width = 256;
+  unsigned int image_height = 256;
 
   opj_cparameters_t parameters;
 
-  int subsampling_dx = parameters.subsampling_dx;
-  int subsampling_dy = parameters.subsampling_dy;
+  unsigned int subsampling_dx;
+  unsigned int subsampling_dy;
   const char outputfile[] = "testempty2.j2k";
 
   opj_image_cmptparm_t cmptparm;
@@ -80,6 +80,8 @@ int main(int argc, char *argv[])
   opj_set_default_encoder_parameters(&parameters);
   parameters.cod_format = J2K_CFMT;
   puts(v);
+  subsampling_dx = (unsigned int)parameters.subsampling_dx;
+  subsampling_dy = (unsigned int)parameters.subsampling_dy;
   cmptparm.prec = 8;
   cmptparm.bpp = 8;
   cmptparm.sgnd = 0;