[Sumover-dev] [svn commit] r3767 - vic/trunk/codec

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

Author: socrates
Date: Fri Jul 21 12:43:50 2006
New Revision: 3767

Modified:
   vic/trunk/codec/dct.cpp
   vic/trunk/codec/decoder-h263.cpp
   vic/trunk/codec/encoder-bvc.cpp
   vic/trunk/codec/encoder-h261.cpp
   vic/trunk/codec/encoder-jpeg.cpp
   vic/trunk/codec/encoder-pvh.cpp

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

Modified: vic/trunk/codec/dct.cpp
==============================================================================
--- vic/trunk/codec/dct.cpp	(original)
+++ vic/trunk/codec/dct.cpp	Fri Jul 21 12:43:50 2006
@@ -54,8 +54,8 @@
 #define FP_NBITS 15
 #define FP_MUL(a, b)	((((a) >> 5) * ((b) >> 5)) >> (FP_NBITS - 10))
 #define FP_SCALE(v)	(int)((double)(v) * double(1 << FP_NBITS) + 0.5)
-#define FP_NORM(v)	((v) + (1 << (FP_NBITS-1)) >> FP_NBITS)
-#define FP_JNORM(v)	((v) + (257 << (FP_NBITS-1)) >> FP_NBITS)
+#define FP_NORM(v)	(((v) + (  1 << (FP_NBITS-1))) >> FP_NBITS)
+#define FP_JNORM(v)	(((v) + (257 << (FP_NBITS-1))) >> FP_NBITS)
 
 #define M(n) ((m0 >> (n)) & 1)
 

Modified: vic/trunk/codec/decoder-h263.cpp
==============================================================================
--- vic/trunk/codec/decoder-h263.cpp	(original)
+++ vic/trunk/codec/decoder-h263.cpp	Fri Jul 21 12:43:50 2006
@@ -164,7 +164,7 @@
 			if (!slot_[x].cc)
 				break;
 			/* A wrong sequence number too. */
-			if ((slot_[x].seqno&0xffff)!= (seqno+(j-H263_SLOTS))&0xffff)
+			if ((slot_[x].seqno & 0xffff) != ((seqno+(j-H263_SLOTS)) & 0xffff)) //SV: vs7 warn fix
 				break;
 			/* A wrong magic at the start (not GSC) is not useful
 			 * as starting block, continue. */
@@ -184,7 +184,7 @@
 			x=(startblock+j)&H263_SLOTMASK;
 
 			/* wrong sequence number -> leave */
-			if ((slot_[x].seqno&0xffff)!= (seqno+j)&0xffff)
+			if ((slot_[x].seqno & 0xffff)!= ((seqno+j) & 0xffff)) //SV: vs7 warn fix
 				break;
 			/* empty entry is a valid endmarker */
 			if (!slot_[x].cc) {

Modified: vic/trunk/codec/encoder-bvc.cpp
==============================================================================
--- vic/trunk/codec/encoder-bvc.cpp	(original)
+++ vic/trunk/codec/encoder-bvc.cpp	Fri Jul 21 12:43:50 2006
@@ -79,10 +79,10 @@
 		bb |= (bits) >> extra; \
 		STORE_BITS(bs, bb) \
 		bs += (NBIT / 8); \
-		bb = (bits) << NBIT - extra; \
+		bb = (bits) << (NBIT - extra);\
 		nbb = extra; \
 	} else \
-		bb |= (bits) << NBIT - (nbb); \
+		bb |= (bits) << (NBIT - (nbb)); \
 }
 
 BvcEncoder::BvcEncoder() : TransmitterModule(FT_YUV_411)

Modified: vic/trunk/codec/encoder-h261.cpp
==============================================================================
--- vic/trunk/codec/encoder-h261.cpp	(original)
+++ vic/trunk/codec/encoder-h261.cpp	Fri Jul 21 12:43:50 2006
@@ -107,10 +107,10 @@
 		bb |= (BB_INT)(bits) >> extra; \
 		STORE_BITS(bb, bc) \
 		bc += sizeof(BB_INT); \
-		bb = (BB_INT)(bits) << NBIT - extra; \
+		bb = (BB_INT)(bits) << (NBIT - extra); \
 		nbb = extra; \
 	} else \
-		bb |= (BB_INT)(bits) << NBIT - (nbb); \
+		bb |= (BB_INT)(bits) << (NBIT - (nbb)); \
 }
 
 

Modified: vic/trunk/codec/encoder-jpeg.cpp
==============================================================================
--- vic/trunk/codec/encoder-jpeg.cpp	(original)
+++ vic/trunk/codec/encoder-jpeg.cpp	Fri Jul 21 12:43:50 2006
@@ -111,13 +111,13 @@
 {									\
     nbb += (n);								\
     if (nbb > NBIT)  {							\
-	u_int extra = (nbb) - NBIT;					\
-	bb |= (BB_INT)(bits) >> extra;					\
-	STORE_BITS(bb, bc)						\
-	bb = (BB_INT)(bits) << (NBIT - extra);				\
-	nbb = extra;							\
+		u_int extra = (nbb) - NBIT;					\
+		bb |= (BB_INT)(bits) >> extra;					\
+		STORE_BITS(bb, bc)						\
+		bb = (BB_INT)(bits) << (NBIT - extra);				\
+		nbb = extra;							\
     } else								\
-	bb |= (BB_INT)(bits) << (NBIT - (nbb));				\
+		bb |= (BB_INT)(bits) << (NBIT - (nbb));				\
 }
 
 class JpegEncoder : public TransmitterModule {

Modified: vic/trunk/codec/encoder-pvh.cpp
==============================================================================
--- vic/trunk/codec/encoder-pvh.cpp	(original)
+++ vic/trunk/codec/encoder-pvh.cpp	Fri Jul 21 12:43:50 2006
@@ -492,8 +492,7 @@
 	while ((code = *sc++) != 0) {
 		if ((code & mask) != 0) {
 			int t = (code >> off) & 1;
-			PVH_PUT_BITS(t, 1, lp->nbb, lp->bb,
-				      lp->bs, refine);
+			PVH_PUT_BITS(t, 1, lp->nbb, lp->bb, lp->bs, refine);
 		}
 	}
 }