From dd35c0318900832186867bbe852d56ab58bb3f70 Mon Sep 17 00:00:00 2001
From: malaterre <malaterre>
Date: Sat, 21 May 2005 01:44:33 +0000
Subject: [PATCH] COMP: Remove compiler warnings using gcc

---
 src/gdcmmpeg2/src/mpeg2dec/getbits.c  | 1 +
 src/gdcmmpeg2/src/mpeg2dec/getblk.c   | 4 ++++
 src/gdcmmpeg2/src/mpeg2dec/gethdr.c   | 3 ++-
 src/gdcmmpeg2/src/mpeg2dec/getpic.c   | 2 ++
 src/gdcmmpeg2/src/mpeg2dec/getvlc.c   | 6 ++++--
 src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c | 1 +
 src/gdcmmpeg2/src/mpeg2dec/spatscal.c | 8 +++++---
 src/gdcmmpeg2/src/mpeg2dec/store.c    | 2 ++
 src/gdcmmpeg2/src/mpeg2dec/subspic.c  | 1 +
 9 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/gdcmmpeg2/src/mpeg2dec/getbits.c b/src/gdcmmpeg2/src/mpeg2dec/getbits.c
index 9b9b593c..e36f6104 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/getbits.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/getbits.c
@@ -34,6 +34,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h> // for read
 
 #include "config.h"
 #include "global.h"
diff --git a/src/gdcmmpeg2/src/mpeg2dec/getblk.c b/src/gdcmmpeg2/src/mpeg2dec/getblk.c
index ffde10dd..d451a179 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/getblk.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/getblk.c
@@ -264,10 +264,12 @@ int dc_dct_pred[];
   bp = ld1->block[comp];
 
   if (base.scalable_mode==SC_DP)
+    {
     if (base.priority_breakpoint<64)
       ld = &enhan;
     else
       ld = &base;
+    }
 
   cc = (comp<4) ? 0 : (comp&1)+1;
 
@@ -435,10 +437,12 @@ int comp;
   bp = ld1->block[comp];
 
   if (base.scalable_mode==SC_DP)
+    {
     if (base.priority_breakpoint<64)
       ld = &enhan;
     else
       ld = &base;
+    }
 
   qmat = (comp<4 || chroma_format==CHROMA420)
          ? ld1->non_intra_quantizer_matrix
diff --git a/src/gdcmmpeg2/src/mpeg2dec/gethdr.c b/src/gdcmmpeg2/src/mpeg2dec/gethdr.c
index 4155ec55..c3af94cf 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/gethdr.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/gethdr.c
@@ -458,7 +458,7 @@ static void sequence_extension()
   int vertical_size_extension;
   int bit_rate_extension;
   int vbv_buffer_size_extension;
-  int pos;
+  int pos;(void)pos;
 
   /* derive bit position for trace */
 #ifdef VERBOSE
@@ -966,6 +966,7 @@ void marker_bit(text)
 char *text;
 {
   int marker;
+  (void)text;
 
   marker = Get_Bits(1);
 
diff --git a/src/gdcmmpeg2/src/mpeg2dec/getpic.c b/src/gdcmmpeg2/src/mpeg2dec/getpic.c
index d75b574b..8cfda605 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/getpic.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/getpic.c
@@ -150,6 +150,7 @@ int framenum, MBAmax;
   int stwtype, stwclass;
   int SNRMBA, SNRMBAinc;
   int ret;
+  (void)framenum;
 
   MBA = 0; /* macroblock address */
   MBAinc = 0;
@@ -911,6 +912,7 @@ int PMV[2][2][2];
 {
   unsigned int code;
   int slice_vert_pos_ext;
+  (void)MBAmax;
 
   ld = &base;
 
diff --git a/src/gdcmmpeg2/src/mpeg2dec/getvlc.c b/src/gdcmmpeg2/src/mpeg2dec/getvlc.c
index 0b019246..ff18191b 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/getvlc.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/getvlc.c
@@ -108,6 +108,7 @@ static int Get_I_macroblock_type()
   return 17;
 }
 
+#ifdef TRACE
 static char *MBdescr[]={
   "",                  "Intra",        "No MC, Coded",         "",
   "Bwd, Not Coded",    "",             "Bwd, Coded",           "",
@@ -118,6 +119,7 @@ static char *MBdescr[]={
   "",                  "",             "Fwd, Coded, Quant",    "",
   "",                  "",             "Interp, Coded, Quant", ""
 };
+#endif /* TRACE */
 
 static int Get_P_macroblock_type()
 {
@@ -347,7 +349,7 @@ static int Get_SNR_macroblock_type()
 #ifdef TRACE    /* *CH* */
   if (Trace_Flag)
     printf("macroblock_type(SNR) (");
-#endif TRACE
+#endif /* TRACE */
 
   code = Show_Bits(3);
 
@@ -367,7 +369,7 @@ static int Get_SNR_macroblock_type()
     Print_Bits(code,3,SNRMBtab[code].len);
     printf("): %s (%d)\n",MBdescr[(int)SNRMBtab[code].val],SNRMBtab[code].val);
   }
-#endif TRACE
+#endif /* TRACE */
 
 
   return SNRMBtab[code].val;
diff --git a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
index cb213760..09a4ae27 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <unistd.h> // for lseek
 
 #define GLOBAL
 #include "config.h"
diff --git a/src/gdcmmpeg2/src/mpeg2dec/spatscal.c b/src/gdcmmpeg2/src/mpeg2dec/spatscal.c
index 55d26f24..94557677 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/spatscal.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/spatscal.c
@@ -1,5 +1,7 @@
 
 #include <stdio.h>
+#include <string.h> // for strcat
+#include <stdlib.h> // for exit
 #include "config.h"
 #include "global.h"
 
@@ -92,7 +94,7 @@ static void Read_Lower_Layer_Component_Framewise(comp,lw,lh)
 #ifdef VERBOSE
   if (Verbose_Flag>1)
     printf("reading %s\n",fname);
-#endif VERBOSE
+#endif /* VERBOSE */
   fd=fopen(fname,"rb");
   if (fd==NULL) exit(-1);
   for (j=0; j<lh; j++) {
@@ -123,7 +125,7 @@ static void Read_Lower_Layer_Component_Fieldwise(comp,lw,lh)
 #ifdef VERBOSE
   if (Verbose_Flag>1)
     printf("reading %s\n",fname);
-#endif VERBOSE
+#endif /* VERBOSE */
   fd=fopen(fname,"rb");
   if (fd==NULL) exit(-1);
   for (j=0; j<lh; j+=lower_layer_progressive_frame?1:2)
@@ -137,7 +139,7 @@ static void Read_Lower_Layer_Component_Fieldwise(comp,lw,lh)
 #ifdef VERBOSE
     if (Verbose_Flag>1)
       printf("reading %s\n",fname);
-#endif VERBOSE
+#endif /* VERBOSE */
     fd=fopen(fname,"rb");
     if (fd==NULL) exit(-1);
     for (j=1; j<lh; j+=2)
diff --git a/src/gdcmmpeg2/src/mpeg2dec/store.c b/src/gdcmmpeg2/src/mpeg2dec/store.c
index 8867416a..628938bf 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/store.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/store.c
@@ -30,6 +30,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <unistd.h> // for write
+#include <string.h> // for strcat
 
 #include "config.h"
 #include "global.h"
diff --git a/src/gdcmmpeg2/src/mpeg2dec/subspic.c b/src/gdcmmpeg2/src/mpeg2dec/subspic.c
index 67bb555d..70f68b77 100644
--- a/src/gdcmmpeg2/src/mpeg2dec/subspic.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/subspic.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <unistd.h> // for read
 
 #include "config.h"
 #include "global.h"
-- 
2.48.1