coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-06 16:56:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

const warning fix on dither, bump chromium deps and add files to ignore list generated by arm build

Browse Source 
BUG=none
R=harryjin@google.com

Review URL: https://webrtc-codereview.appspot.com/57639004.
This commit is contained in:
Frank Barchard 2015-07-27 11:47:01 -07:00
parent 2fa4f5a3ea
commit 18a9027ad9
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -39,3 +39,9 @@ convert
libgtest.a libgtest.a
libyuv.a libyuv.a
libyuv_unittest libyuv_unittest
# Files generated by winarm.mk build
libyuv_arm.lib
source/*.o

2
DEPS
View File

@ -6,7 +6,7 @@ vars = {
# Roll the Chromium Git hash to pick up newer versions of all the # Roll the Chromium Git hash to pick up newer versions of all the
# dependencies and tools linked to in setup_links.py. # dependencies and tools linked to in setup_links.py.
'chromium_revision': 'c98d446e81bcc18cf4241325c8719ccdc0b7abf3', 'chromium_revision': 'bfea27af55be979d8146ed4d225f07a9cf1fba8b', # 7.27.2015
} }
hooks = [ hooks = [

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1451 Version: 1452
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1451 #define LIBYUV_VERSION 1452
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

6
source/row_common.cc
View File

@ -211,8 +211,8 @@ void ARGBToRGB565DitherRow_C(const uint8* src_argb, uint8* dst_rgb,
const uint32 dither4, int width) { const uint32 dither4, int width) {
int x; int x;
for (x = 0; x < width - 1; x += 2) { for (x = 0; x < width - 1; x += 2) {
int dither0 = ((unsigned char*)(&dither4))[x & 3]; int dither0 = ((const unsigned char*)(&dither4))[x & 3];
int dither1 = ((unsigned char*)(&dither4))[(x + 1) & 3]; int dither1 = ((const unsigned char*)(&dither4))[(x + 1) & 3];
uint8 b0 = clamp255(src_argb[0] + dither0) >> 3; uint8 b0 = clamp255(src_argb[0] + dither0) >> 3;
uint8 g0 = clamp255(src_argb[1] + dither0) >> 2; uint8 g0 = clamp255(src_argb[1] + dither0) >> 2;
uint8 r0 = clamp255(src_argb[2] + dither0) >> 3; 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; src_argb += 8;
} }
if (width & 1) { 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 b0 = clamp255(src_argb[0] + dither0) >> 3;
uint8 g0 = clamp255(src_argb[1] + dither0) >> 2; uint8 g0 = clamp255(src_argb[1] + dither0) >> 2;
uint8 r0 = clamp255(src_argb[2] + dither0) >> 3; uint8 r0 = clamp255(src_argb[2] + dither0) >> 3;