X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjpegls%2FDecoder%2Fglobal.c;h=9375585e8e0e834e59984da2e57c7e235dc28f39;hb=f80c00b9d21990c7f843dc801e6cd251a887d4ca;hp=62922b4fb062516dfee600232420bbd58f295599;hpb=8a8b4ae83ad19690f0cc51ebc9091d75ffc1cd8d;p=gdcm.git

diff --git a/src/gdcmjpegls/Decoder/global.c b/src/gdcmjpegls/Decoder/global.c
index 62922b4f..9375585e 100644
--- a/src/gdcmjpegls/Decoder/global.c
+++ b/src/gdcmjpegls/Decoder/global.c
@@ -52,6 +52,11 @@
 
 #include <time.h>
 #include "global.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#else
+#include <io.h>
+#endif
 
 
 
@@ -69,7 +74,7 @@ without the written permission of the copyright holder.\n\
 FILE *in, *out;
 FILE *c_in[MAX_COMPONENTS];
 FILE *c_out[MAX_COMPONENTS];
-FILE *msgfile = stdout;
+FILE *msgfile = NULL; /* = stdout;*/
 
 /* Context quantization thresholds  - initially unset */
 int     T3 = -1,
@@ -141,13 +146,14 @@ void *safecalloc(size_t numels, size_t size) {
 double get_utime()
 {
   clock_t c;
+  (void)c;
 
   return (double)clock()/CLOCKS_PER_SEC;
 }
 
 
 /* Set thresholds to default unless specified by header: */
-set_thresholds(int alfa, int NEAR, int *T1p, int *T2p, int *T3p)
+int set_thresholds(int alfa, int NEAR, int *T1p, int *T2p, int *T3p)
 {
   int lambda,
       ilambda = 256/alfa,
@@ -155,6 +161,8 @@ set_thresholds(int alfa, int NEAR, int *T1p, int *T2p, int *T3p)
       T1 = *T1p, 
       T2 = *T2p, 
       T3 = *T3p;
+  /* Unused */
+  (void)quant;
   
   if (alfa<4096)
      lambda = (alfa+127)/256;
@@ -220,7 +228,7 @@ set_thresholds(int alfa, int NEAR, int *T1p, int *T2p, int *T3p)
 
 /* We first check compatibility with JPEG-LS, then with this implementation */
 
-void check_compatibility(jpeg_ls_header *head_frame, jpeg_ls_header *head_scan, int n_s) 
+void check_compatibility(jpeg_ls_header *head_frame, jpeg_ls_header *head_scan, int n_s)
 {
 
     int  number_of_scans,i;  
@@ -322,31 +330,31 @@ char *ttyfilename = "CON";
 
 #define PAUSE  20
 
-fprint_disclaimer(FILE *fp, int nopause)
+void fprint_disclaimer(FILE *fp, int nopause)
 {
-    char *p0, *p1;
-    FILE *ttyf;
-    int  i, c;
+  char *p0, *p1;
+  FILE *ttyf;
+  int  i; /*, c;*/
 
-    nopause = nopause | !isatty(fileno(fp));
+  nopause = nopause | !isatty(fileno(fp));
 
-    if ( !nopause && (ttyf=fopen(ttyfilename,"r"))==NULL ) {
-  nopause = 1;
-    }
+  if ( !nopause && (ttyf=fopen(ttyfilename,"r"))==NULL ) {
+    nopause = 1;
+  }
 
-    for ( i=1, p0=disclaimer; ; i++ ) {
-  if ( !(*p0)  ) break;
-  if ( !nopause && i%PAUSE==0 ) {
+  for ( i=1, p0=disclaimer; ; i++ ) {
+    if ( !(*p0)  ) break;
+    if ( !nopause && i%PAUSE==0 ) {
       fflush(fp);
       fprintf(stderr, "--- (press RETURN to continue) ---"); 
       fflush(stderr);
-      c = getc(ttyf);
-  }
-  for ( p1=p0; (*p1 != '\n') && (*p1 != 0); p1++ );
-  *p1 = 0;
-  fprintf(fp,"%s\n",p0);
-  p0 = p1+1;
+/*      c = getc(ttyf);*/
     }
-    fprintf(fp,"\n"); fflush(fp);
-    if ( !nopause) fclose(ttyf);
+    for ( p1=p0; (*p1 != '\n') && (*p1 != 0); p1++ );
+    *p1 = 0;
+    fprintf(fp,"%s\n",p0);
+    p0 = p1+1;
+  }
+  fprintf(fp,"\n"); fflush(fp);
+  if ( !nopause) fclose(ttyf);
 }