[Sumover-dev] [svn commit] r3768 - vic/trunk/codec/h263

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

Author: socrates
Date: Fri Jul 21 12:44:46 2006
New Revision: 3768

Modified:
   vic/trunk/codec/h263/defs.h
   vic/trunk/codec/h263/motion.c

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

Modified: vic/trunk/codec/h263/defs.h
==============================================================================
--- vic/trunk/codec/h263/defs.h	(original)
+++ vic/trunk/codec/h263/defs.h	Fri Jul 21 12:44:46 2006
@@ -8,9 +8,11 @@
 
 #define NUM_LAYERS 4
 
+#ifndef _WIN32
 #ifndef RAND_MAX
 # define RAND_MAX 32767		/* sos4 has it not */
 #endif
+#endif
 
 #ifdef FALSE
 #undef FALSE

Modified: vic/trunk/codec/h263/motion.c
==============================================================================
--- vic/trunk/codec/h263/motion.c	(original)
+++ vic/trunk/codec/h263/motion.c	Fri Jul 21 12:44:46 2006
@@ -1098,9 +1098,11 @@
   int sdx = SGN(dx), sdy = SGN(dy);
   int adx = ABS(dx), ady = ABS(dy);
   int e = 0;
+  int res;
 
 
-  switch (ady < adx) {
+  res = (ady < adx);
+  switch (res) {
   case 0:
     for (y = y1; (sdy >= 0) ? y <= y2 : y >= y2; y += sdy) {
       e += 2 * adx;