diff --git a/README.chromium b/README.chromium index 1ba9ed99e..7f22b144e 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 692 +Version: 693 License: BSD License File: LICENSE diff --git a/include/libyuv/scale_argb.h b/include/libyuv/scale_argb.h index cd58198b6..48d5297fd 100644 --- a/include/libyuv/scale_argb.h +++ b/include/libyuv/scale_argb.h @@ -26,6 +26,14 @@ int ARGBScale(const uint8* src_argb, int src_stride_argb, int dst_width, int dst_height, enum FilterMode filtering); +LIBYUV_API +int ARGBScaleClip(const uint8* src_argb, int src_stride_argb, + int src_width, int src_height, + uint8* dst_argb, int dst_stride_argb, + int dst_width, int dst_height, + int clip_x, int clip_y, int clip_width, int clip_height, + enum FilterMode filtering); + #ifdef __cplusplus } // extern "C" } // namespace libyuv diff --git a/include/libyuv/version.h b/include/libyuv/version.h index c67ea7cb8..5feb0d7af 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 692 +#define LIBYUV_VERSION 693 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index 3f251dc17..ff718b12c 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -31,7 +31,7 @@ static int TestFilter(int src_width, int src_height, int src_y_plane_size = (Abs(src_width) + b * 2) * (Abs(src_height) + b * 2); int src_uv_plane_size = (src_width_uv + b * 2) * (src_height_uv + b * 2); - int src_stride_y = b * 2 + Abs(src_width) ; + int src_stride_y = b * 2 + Abs(src_width); int src_stride_uv = b * 2 + src_width_uv; align_buffer_page_end(src_y, src_y_plane_size)