From 4f59bcc102643b700102fe5e55c5fc0e1159a00c Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 26 Mar 2012 17:11:27 +0000 Subject: [PATCH] planarfunction build/lint fixes BUG=none TEST=none Review URL: https://webrtc-codereview.appspot.com/460008 git-svn-id: http://libyuv.googlecode.com/svn/trunk@223 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/planar_functions.cc | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.chromium b/README.chromium index cbb11868c..4fd50350c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 222 +Version: 223 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 95090512b..6faea4035 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,7 +11,7 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define INCLUDE_LIBYUV_VERSION 222 +#define INCLUDE_LIBYUV_VERSION 223 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/planar_functions.cc b/source/planar_functions.cc index ead622c08..a24bcdacb 100644 --- a/source/planar_functions.cc +++ b/source/planar_functions.cc @@ -1,4 +1,3 @@ - /* * Copyright (c) 2011 The LibYuv project authors. All Rights Reserved. * @@ -71,6 +70,7 @@ void MirrorPlane(const uint8* src_y, int src_stride_y, MirrorRow = MirrorRow_SSSE3; } #endif + } #endif // Mirror plane @@ -204,10 +204,10 @@ int I422ToARGB(const uint8* src_y, int src_stride_y, dst_stride_argb = -dst_stride_argb; } void (*I420ToARGBRow)(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, - int width) = I420ToARGBRow_C; + const uint8* u_buf, + const uint8* v_buf, + uint8* rgb_buf, + int width) = I420ToARGBRow_C; #if defined(HAS_I420TOARGBROW_NEON) if (TestCpuFlag(kCpuHasNEON)) { I420ToARGBRow = I420ToARGBRow_Any_NEON; @@ -248,10 +248,10 @@ int I444ToARGB(const uint8* src_y, int src_stride_y, dst_stride_argb = -dst_stride_argb; } void (*I444ToARGBRow)(const uint8* y_buf, - const uint8* u_buf, - const uint8* v_buf, - uint8* rgb_buf, - int width) = I444ToARGBRow_C; + const uint8* u_buf, + const uint8* v_buf, + uint8* rgb_buf, + int width) = I444ToARGBRow_C; #if defined(HAS_I444TOARGBROW_SSSE3) if (TestCpuFlag(kCpuHasSSSE3) && IS_ALIGNED(width, 8) && @@ -841,7 +841,7 @@ int ARGBRect(uint8* dst_argb, int dst_stride_argb, } uint8* dst = dst_argb + dst_y * dst_stride_argb + dst_x * 4; #if defined(HAS_SETROW_X86) - SetRows(dst, value, width, dst_stride_argb, height); + SetRows32_X86(dst, value, width, dst_stride_argb, height); #elif defined(HAS_SETROW_NEON) if (TestCpuFlag(kCpuHasNEON) && IS_ALIGNED(width, 16) && IS_ALIGNED(dst, 16) && IS_ALIGNED(dst_stride_argb, 16)) { @@ -849,8 +849,8 @@ int ARGBRect(uint8* dst_argb, int dst_stride_argb, return 0; } SetRows32_C(dst, value, width, dst_stride_argb, height); - return 0; #endif + return 0; } #ifdef __cplusplus