[Sumover-dev] [svn commit] r3771 - vic/trunk/codec/tmndec

[sumover-dev at cs.ucl.ac.uk]

Author: socrates
Date: Fri Jul 21 12:47:04 2006
New Revision: 3771

Modified:
   vic/trunk/codec/tmndec/getbits.c
   vic/trunk/codec/tmndec/gethdr.c
   vic/trunk/codec/tmndec/getvlc.c
   vic/trunk/codec/tmndec/global.h
   vic/trunk/codec/tmndec/tmndec.h

Log:
Got rid of multiple Windows compile-time warnings (VS7.0).

Modified: vic/trunk/codec/tmndec/getbits.c
==============================================================================
--- vic/trunk/codec/tmndec/getbits.c	(original)
+++ vic/trunk/codec/tmndec/getbits.c	Fri Jul 21 12:47:04 2006
@@ -58,6 +58,7 @@
 
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "config.h"
 #include "tmndec.h"

Modified: vic/trunk/codec/tmndec/gethdr.c
==============================================================================
--- vic/trunk/codec/tmndec/gethdr.c	(original)
+++ vic/trunk/codec/tmndec/gethdr.c	Fri Jul 21 12:47:04 2006
@@ -88,7 +88,7 @@
     {
 
       fprintf (trace_file, "\nPSC: ");
-      printbits ((code << 5 + gob), 22, 22);
+      printbits ((code << (5 + gob)), 22, 22);
     }
     getpicturehdr ();
     if (syntax_arith_coding)    /* reset decoder after receiving */
@@ -100,7 +100,7 @@
     {
 
       fprintf (trace_file, "\nGBSC: ");
-      printbits ((code << 5 + gob), 22, 22);
+      printbits ((code << (5 + gob)), 22, 22);
     }
   }
   return gob + 1;
@@ -553,7 +553,7 @@
         fprintf (trace_file, "\nextended_temporal_reference: ");
         printbits (extended_temporal_reference, 2, 2);
       }
-      temp_ref = extended_temporal_reference << 8 + temp_ref;
+      temp_ref = extended_temporal_reference << (8 + temp_ref);
 
       if (PCT_B == pict_type)
       {

Modified: vic/trunk/codec/tmndec/getvlc.c
==============================================================================
--- vic/trunk/codec/tmndec/getvlc.c	(original)
+++ vic/trunk/codec/tmndec/getvlc.c	Fri Jul 21 12:47:04 2006
@@ -383,6 +383,9 @@
       break;
 
   }    
+
+  //should not reach here
+  return INVALID_MBTYPE; //XXX
 }
 
 int getMODB ()

Modified: vic/trunk/codec/tmndec/global.h
==============================================================================
--- vic/trunk/codec/tmndec/global.h	(original)
+++ vic/trunk/codec/tmndec/global.h	Fri Jul 21 12:47:04 2006
@@ -62,6 +62,7 @@
  * defined) GLOBAL is defined in exactly one file (tmndec.c) */
 
 #include <stdio.h>
+#include <memory.h>
 
 #ifndef GLOBAL
 #define EXTERN extern

Modified: vic/trunk/codec/tmndec/tmndec.h
==============================================================================
--- vic/trunk/codec/tmndec/tmndec.h	(original)
+++ vic/trunk/codec/tmndec/tmndec.h	Fri Jul 21 12:47:04 2006
@@ -165,3 +165,9 @@
 #define PAR_CIF_STRETCHED               4  /* 0100 */
 #define PAR_525_STRETCHED               5  /* 0101 */
 #define PAR_EXTENDED                    15 /* 1111 */
+
+
+#ifdef WINDOWS
+int initDisplay (int pels, int lines);
+int closeDisplay ();
+#endif
\ No newline at end of file