diff --git a/README.chromium b/README.chromium index 48b2e296f..441cf7581 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 706 +Version: 707 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 2626f123a..5cb5d7f2f 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 706 +#define LIBYUV_VERSION 707 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale.cc b/source/scale.cc index 9fd27a157..f39f1dace 100644 --- a/source/scale.cc +++ b/source/scale.cc @@ -3232,8 +3232,8 @@ static void ScalePlaneSimple(int src_width, int src_height, const uint8* src_ptr, uint8* dst_ptr) { int dx = (Abs(src_width) << 16) / dst_width; int dy = (src_height << 16) / dst_height; - int x = (dx >= 65536) ? ((dx >> 1) - 32768) : (dx >> 1); - int y = (dy >= 65536) ? ((dy >> 1) - 32768) : (dy >> 1); + int x = dx >> 1; + int y = dy >> 1; // Negative src_width means horizontally mirror. if (src_width < 0) { x += (dst_width - 1) * dx; diff --git a/source/scale_argb.cc b/source/scale_argb.cc index 1aaf057c7..248236c24 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -1081,8 +1081,8 @@ static void ScaleARGB(const uint8* src, int src_stride, // Scale step for point sampling duplicates all pixels equally. dx = (Abs(src_width) << 16) / dst_width; dy = (src_height << 16) / dst_height; - x = (dx >= 65536) ? ((dx >> 1) - 32768) : (dx >> 1); - y = (dy >= 65536) ? ((dy >> 1) - 32768) : (dy >> 1); + x = dx >> 1; + y = dy >> 1; } // Negative src_width means horizontally mirror. if (src_width < 0) {