From 74114559321a0e548834483263458bf45aa5e8e3 Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Mon, 22 Oct 2012 16:15:25 +0000
Subject: [PATCH] Roll to new chrome for vs2012 builds and fix a warning on
 vs2012 BUG=125 TESTED=local build with gtest errors disabled Review URL:
 https://webrtc-codereview.appspot.com/924004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@433 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 DEPS                     | 6 +++++-
 README.chromium          | 2 +-
 include/libyuv/version.h | 2 +-
 util/compare.cc          | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/DEPS b/DEPS
index 2407f1a94..6f4f5e5cc 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ vars = {
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "152335",
+  "chromium_revision": "163202",
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
@@ -24,6 +24,10 @@ deps = {
   "build":
     Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
 
+  # Needed by common.gypi.
+  "google_apis/build":
+    Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"),
+
   "testing":
     Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),
 
diff --git a/README.chromium b/README.chromium
index 352534db4..8ff9d4d56 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 430
+Version: 433
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index ed42f1919..8f1c42561 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 430
+#define LIBYUV_VERSION 433
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/util/compare.cc b/util/compare.cc
index f030c7997..eea1190aa 100644
--- a/util/compare.cc
+++ b/util/compare.cc
@@ -38,10 +38,10 @@ int main(int argc, char** argv) {
   int amt1 = 0;
   int amt2 = 0;
   do {
-    amt1 = fread(buf1, 1, kBlockSize, fin1);
+    amt1 = static_cast<int>(fread(buf1, 1, kBlockSize, fin1));
     if (amt1 > 0) hash1 = libyuv::HashDjb2(buf1, amt1, hash1);
     if (fin2) {
-      amt2 = fread(buf2, 1, kBlockSize, fin2);
+      amt2 = static_cast<int>(fread(buf2, 1, kBlockSize, fin2));
       if (amt2 > 0) hash2 = libyuv::HashDjb2(buf2, amt2, hash2);
       int amt_min = (amt1 < amt2) ? amt1 : amt2;
       size_min += amt_min;