X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjpegls%2FDecoder%2Fbitio.c;h=7283e5a5378d2f1e9278b85f7696e6059cdb5dff;hb=57ec56658548c34052a1c1678ffcb6907c3faeec;hp=13d9f4596167ae360c8bb002ff884caf9846a7cd;hpb=94015b89675cf4431c7e4953a597b70cfde03bcc;p=gdcm.git

diff --git a/src/gdcmjpegls/Decoder/bitio.c b/src/gdcmjpegls/Decoder/bitio.c
index 13d9f459..7283e5a5 100644
--- a/src/gdcmjpegls/Decoder/bitio.c
+++ b/src/gdcmjpegls/Decoder/bitio.c
@@ -51,11 +51,12 @@
 
 #include "global.h"
 #include "bitio.h"
+#include <string.h> /* for memset */
 
 
-extern int zeroLUT[];     /* lookup table to find number of leading zeroes */
+/*extern int zeroLUT[];  */   /* lookup table to find number of leading zeroes */
 
-extern FILE *in, *out;
+/*extern FILE *in, *out; */
 
 byte negbuff[BUFSIZE+4];    /* byte I/O buffer, allowing for 4 "negative" 
                    locations  */
@@ -77,7 +78,7 @@ int zeroLUT[256];      /* table to find out number of leading zeros */
 /* BIT I/O variables */
 dword reg; /* BIT buffer for input/output */
 int bits;  /* number of bits free in bit buffer (on output) */
-     /* (number of bits free)-8 in bit buffer (on input)*/
+           /* (number of bits free)-8 in bit buffer (on input)*/
 
 
 /****************************************************************************
@@ -186,11 +187,11 @@ void bitiflush()  {
     }
     discard = filled-k;
     if ( treg != (reg<<discard) ) {
-      fprintf(stderr,"bitiflush: inconsistent bits=%d discard=%d reg=%08x treg=%08x\n",bits, discard, reg, treg);
+      fprintf(stderr,"bitiflush: inconsistent bits=%d discard=%d reg=%08lx treg=%08x\n",bits, discard, reg, treg);
       exit(10);
     }
     if ( reg & (((1<<discard)-1)<<(BITBUFSIZE-discard)) )
-      fprintf(stderr,"bitiflush: Warning: discarding nonzero bits; reg=%08x bits=%d discard=%d\n",reg,bits,discard);
+      fprintf(stderr,"bitiflush: Warning: discarding nonzero bits; reg=%08lx bits=%d discard=%d\n",reg,bits,discard);
 
     fp -= dbytes;  /* do the unget */
     if ( buff[fp-1]==0xff && buff[fp]==0 ) fp++;