From: jpr <jpr>
Date: Tue, 8 Nov 2005 13:42:32 +0000 (+0000)
Subject: Avoid some warnings
X-Git-Tag: OpenJPEG.Version1.2~16
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b582494f1dac6646daed03beaab461613965842e;p=gdcm.git

Avoid some warnings
---

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k.c b/src/gdcmopenjpeg/libopenjpeg/j2k.c
index 08df3d21..09868ca6 100644
--- a/src/gdcmopenjpeg/libopenjpeg/j2k.c
+++ b/src/gdcmopenjpeg/libopenjpeg/j2k.c
@@ -988,7 +988,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output,
       int len, char *index)
 {
   int tileno, compno, layno, resno, precno, pack_nb, x, y;
-  char *dest = NULL;
+  unsigned char *dest = NULL;
   FILE *INDEX = NULL;
   FILE *f = NULL;
   
@@ -1002,7 +1002,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output,
       fprintf(stderr, "failed to open %s for writing\n", output);
       return 1;
     }
-    dest = (char *) malloc(len);
+    dest = (unsigned char *) malloc(len);
     cio_init(dest, len);
   }
   
@@ -1062,7 +1062,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output,
     if (cp->intermed_file == 1) {
       /* new dest for each tile  */
       free(dest);
-      dest = (char *) malloc(len);
+      dest = (unsigned char *) malloc(len);
       cio_init(dest, len);
     }
     j2k_curtileno = tileno;
@@ -1124,7 +1124,7 @@ j2k_encode(j2k_image_t * img, j2k_cp_t * cp, char *output,
   
   if (cp->intermed_file == 1) {
     free(dest);
-    dest = (char *) malloc(len);
+    dest = (unsigned char *) malloc(len);
     cio_init(dest, len);
   }
   
diff --git a/src/gdcmopenjpeg/libopenjpeg/jp2.c b/src/gdcmopenjpeg/libopenjpeg/jp2.c
index f257eb32..1886eafa 100644
--- a/src/gdcmopenjpeg/libopenjpeg/jp2.c
+++ b/src/gdcmopenjpeg/libopenjpeg/jp2.c
@@ -88,7 +88,7 @@ int jp2_init_stdjp2(jp2_struct_t * jp2_struct)
   jp2_struct->brand = JP2_JP2;   /* BR         */
   jp2_struct->minversion = 0;   /* MinV       */
   jp2_struct->numcl = 1;
-  jp2_struct->cl = (int *) malloc(jp2_struct->numcl * sizeof(int));
+  jp2_struct->cl = (unsigned int *) malloc(jp2_struct->numcl * sizeof(int));
   jp2_struct->cl[0] = JP2_JP2;   /* CL0 : JP2  */
 
   jp2_struct->C = 7;      /* C : Always 7*/