From b18fd21d3c27fce69b5c1ed44b89131dedc87284 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Wed, 14 Dec 2016 11:53:55 -0800 Subject: [PATCH] Android420ToI420 - use ptrdiff_t for difference of u and v pointers The difference was assigned to an int, causing a warning on Visual C. BUG=662 TEST=tested with try bots. R=devangelakos@google.com Review-Url: https://codereview.chromium.org/2574373002 . --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/convert.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 9409caf9e..f8ab77846 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1636 +Version: 1637 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index ee286a30a..ba5b5f6d7 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1636 +#define LIBYUV_VERSION 1637 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/convert.cc b/source/convert.cc index c1ff8c438..3779d999d 100644 --- a/source/convert.cc +++ b/source/convert.cc @@ -1496,7 +1496,7 @@ int Android420ToI420(const uint8* src_y, int width, int height) { int y; - const int vu_off = src_v - src_u; + const ptrdiff_t vu_off = src_v - src_u; int halfwidth = (width + 1) >> 1; int halfheight = (height + 1) >> 1; if (!src_u || !src_v || !dst_u || !dst_v || width <= 0 || height == 0) {