commit f75976253ecca8683700b4d6fced056fa7e786dc
author Paul Wilkins <paulwilkins@google.com> Thu Jan 24 11:42:38 2013 +0000
committer Paul Wilkins <paulwilkins@google.com> Thu Jan 24 16:58:41 2013 +0000
tree 02bd93c6c57495a0b1ab8de5d163d9189e8b976e
parent 01cafaab1d99018c48c54178987101b490343a01

MSVS compiler error

Visual Studio reports and error on the line
  static const int bsize2 = bsize >> 1;

"error C2099: initializer is not a constant"

Also warnings on signed/unsigned mismatch

Change-Id: I76cb06f736bd9c90107a26bfb3c130ec3f6c33de

vpxenc.c

diff --git a/vpxenc.c b/vpxenc.c
index 7b784f3..d53d9db 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1449,10 +1449,10 @@
 #define mmin(a, b)  ((a) < (b) ? (a) : (b))
 static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
                           int yloc[2], int uloc[2], int vloc[2]) {
-  static const int bsize = 64;
-  static const int bsize2 = bsize >> 1;
-  int match = 1;
-  int i, j;
+  const unsigned int bsize = 64;
+  const unsigned int bsize2 = bsize >> 1;
+  unsigned int match = 1;
+  unsigned int i, j;
   yloc[0] = yloc[1] = -1;
   for (i = 0, match = 1; match && i < img1->d_h; i += bsize) {
     for (j = 0; match && j < img1->d_w; j += bsize) {
@@ -1518,7 +1518,7 @@
 static int compare_img(vpx_image_t *img1, vpx_image_t *img2)
 {
   int match = 1;
-  int i;
+  unsigned int i;
 
   match &= (img1->fmt == img2->fmt);
   match &= (img1->w == img2->w);