From f75976253ecca8683700b4d6fced056fa7e786dc Mon Sep 17 00:00:00 2001
From: Paul Wilkins <paulwilkins@google.com>
Date: Thu, 24 Jan 2013 11:42:38 +0000
Subject: [PATCH] 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 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/vpxenc.c b/vpxenc.c
index 7b784f3242..d53d9db57a 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1449,10 +1449,10 @@ static void show_rate_histogram(struct rate_hist *hist,
#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 void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
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);
--
GitLab