diff --git a/.gitignore b/.gitignore index 9ff3f4f44..7751dddb8 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,9 @@ convert libgtest.a libyuv.a libyuv_unittest + +# Files generated by winarm.mk build +libyuv_arm.lib +source/*.o + + diff --git a/DEPS b/DEPS index bebe699e7..6e29b68ee 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { # Roll the Chromium Git hash to pick up newer versions of all the # dependencies and tools linked to in setup_links.py. - 'chromium_revision': 'c98d446e81bcc18cf4241325c8719ccdc0b7abf3', + 'chromium_revision': 'bfea27af55be979d8146ed4d225f07a9cf1fba8b', # 7.27.2015 } hooks = [ diff --git a/README.chromium b/README.chromium index 10dbb8467..46a25a2fb 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1451 +Version: 1452 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 16062c37e..16294031a 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 1451 +#define LIBYUV_VERSION 1452 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_common.cc b/source/row_common.cc index 43104088f..49875894f 100644 --- a/source/row_common.cc +++ b/source/row_common.cc @@ -211,8 +211,8 @@ void ARGBToRGB565DitherRow_C(const uint8* src_argb, uint8* dst_rgb, const uint32 dither4, int width) { int x; for (x = 0; x < width - 1; x += 2) { - int dither0 = ((unsigned char*)(&dither4))[x & 3]; - int dither1 = ((unsigned char*)(&dither4))[(x + 1) & 3]; + int dither0 = ((const unsigned char*)(&dither4))[x & 3]; + int dither1 = ((const unsigned char*)(&dither4))[(x + 1) & 3]; uint8 b0 = clamp255(src_argb[0] + dither0) >> 3; uint8 g0 = clamp255(src_argb[1] + dither0) >> 2; uint8 r0 = clamp255(src_argb[2] + dither0) >> 3; @@ -225,7 +225,7 @@ void ARGBToRGB565DitherRow_C(const uint8* src_argb, uint8* dst_rgb, src_argb += 8; } if (width & 1) { - int dither0 = ((unsigned char*)(&dither4))[(width - 1) & 3]; + int dither0 = ((const unsigned char*)(&dither4))[(width - 1) & 3]; uint8 b0 = clamp255(src_argb[0] + dither0) >> 3; uint8 g0 = clamp255(src_argb[1] + dither0) >> 2; uint8 r0 = clamp255(src_argb[2] + dither0) >> 3;