From efc5d9b930223c2b1fd71c7958bfa39d23dccf15 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 18 Mar 2014 22:23:15 +0000 Subject: [PATCH] Warning fix for implicite cast in scaling from int64 to int. BUG=none TESTED=local visual c build R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/10169004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@985 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/scale_argb.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 114352369..5d58be08e 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 984 +Version: 985 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index ef9001336..720111a72 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 984 +#define LIBYUV_VERSION 985 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale_argb.cc b/source/scale_argb.cc index a248e2e1f..e339cd7c7 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -186,7 +186,7 @@ static void ScaleARGBBilinearDown(int src_width, int src_height, if (xr > src_width) { xr = src_width; } - clip_src_width = (xr - xl) * 4; // Width aligned to 4. + clip_src_width = (int)(xr - xl) * 4; // Width aligned to 4. src_argb += xl * 4; x -= (int)(xl << 16); #if defined(HAS_INTERPOLATEROW_SSE2)