diff --git a/README.chromium b/README.chromium index f47e9eed9..a8092917c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 904 +Version: 905 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 2714f8a21..7e23d9cc3 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 904 +#define LIBYUV_VERSION 905 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale.cc b/source/scale.cc index e48d80cfa..4f19742a2 100644 --- a/source/scale.cc +++ b/source/scale.cc @@ -656,6 +656,7 @@ void ScalePlaneBilinearUp(int src_width, int src_height, if (y > max_y) { y = max_y; yi = y >> 16; + src = src_ptr + yi * src_stride; } if (yi != lasty) { ScaleFilterCols(rowptr, src, dst_width, x, dx); diff --git a/source/scale_argb.cc b/source/scale_argb.cc index c19b9e9be..5ed6b6d31 100644 --- a/source/scale_argb.cc +++ b/source/scale_argb.cc @@ -324,6 +324,7 @@ static void ScaleARGBBilinearUp(int src_width, int src_height, if (y > max_y) { y = max_y; yi = y >> 16; + src = src_argb + yi * src_stride; } if (yi != lasty) { ScaleARGBFilterCols(rowptr, src, dst_width, x, dx); @@ -500,6 +501,10 @@ static void ScaleYUVToARGBBilinearUp(int src_width, int src_height, if (y > max_y) { y = max_y; yi = y >> 16; + uv_yi = yi >> kYShift; + src_row_y = src_y + yi * src_stride_y; + src_row_u = src_u + uv_yi * src_stride_u; + src_row_v = src_v + uv_yi * src_stride_v; } if (yi != lasty) { // TODO(fbarchard): Convert the clipped region of row.