From e2115ac385d5501f0abb098b909b982fc7154a4e Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 31 May 2013 21:10:01 +0000 Subject: [PATCH] scaling from 1x1 will cause dx/dy to be 0. This was confusing the specialized scalers into calling the wrong function. BUG=none TEST=none R=johannkoenig@google.com, noahric@chromium.org Review URL: https://webrtc-codereview.appspot.com/1591004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@713 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 61d1fa372..52f22b608 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 712 +Version: 713 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 51b618b64..e1f297116 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 712 +#define LIBYUV_VERSION 713 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale_argb.cc b/source/scale_argb.cc index d2dd1c731..8648a7595 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -1120,7 +1120,7 @@ static void ScaleARGB(const uint8* src, int src_stride, } // Special case for integer step values. - if (((dx | dy) & 0xffff) == 0) { + if (((dx | dy) & 0xffff) == 0 && dx && dy) { // Optimized even scale down. ie 2, 4, 6, 8, 10x. if (!(dx & 0x10000) && !(dy & 0x10000)) { if ((dx >> 16) == 2) {