X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmopenjpeg%2Fcodec%2Fconvert.c;h=324a6877e80e85bea180242861eea19755414265;hb=e2b53c6ca71e08414aaab01dac851c36a6530903;hp=a711f9e897894e7b13702cc5efdde947814ab4cf;hpb=7452f3039ff4dd2574fcbf3343b530a2f20f9623;p=gdcm.git

diff --git a/src/gdcmopenjpeg/codec/convert.c b/src/gdcmopenjpeg/codec/convert.c
index a711f9e8..324a6877 100644
--- a/src/gdcmopenjpeg/codec/convert.c
+++ b/src/gdcmopenjpeg/codec/convert.c
@@ -104,7 +104,7 @@ int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
     File_h.bfSize = getc(IN);
     File_h.bfSize = (getc(IN) << 8) + File_h.bfSize;
     File_h.bfSize = (getc(IN) << 16) + File_h.bfSize;
-    File_h.bfSize = (getc(IN) << 24) + File_h.bfSize;
+    File_h.bfSize = (getc(IN) << 24) + File_h.bfSize;convert.c
 
     File_h.bfReserved1 = getc(IN);
     File_h.bfReserved1 = (getc(IN) << 8) + File_h.bfReserved1;
@@ -220,8 +220,8 @@ int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
       W = Info_h.biWidth;
       H = Info_h.biHeight;
 
-      // PAD = 4 - (3 * W) % 4;
-      // PAD = (PAD == 4) ? 0 : PAD;
+      /* PAD = 4 - (3 * W) % 4;*/
+      /* PAD = (PAD == 4) ? 0 : PAD; */
       PAD = (3 * W) % 4 ? 4 - (3 * W) % 4 : 0;
 
 
@@ -769,7 +769,7 @@ int pnmtoimage(char *filename, j2k_image_t * img, int subsampling_dx,
     }
     for (i = 0; i < w * h; i++) {
       unsigned int l;
-      fscanf(f, "%d", &l);
+      fscanf(f, "%d", &(unsigned int)l);
       fprintf(Compo0, "%c", l);
     }
     fclose(Compo0);