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

With an asm() away lint, this cleans up most remaining issues.

Browse Source 
BUG=none
TEST=lint filename
Review URL: https://webrtc-codereview.appspot.com/464001

git-svn-id: http://libyuv.googlecode.com/svn/trunk@230 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2012-03-29 02:19:26 +00:00
parent 427f966645
commit 5b22506b14
19 changed files with 90 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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: 229 Version: 230
License: BSD License: BSD
License File: LICENSE License File: LICENSE

12
include/libyuv/basic_types.h
View File

@ -31,8 +31,8 @@ typedef __int64 int64;
#define INT64_F "I64" #define INT64_F "I64"
#else // COMPILER_MSVC #else // COMPILER_MSVC
#ifdef __LP64__ #ifdef __LP64__
typedef unsigned long uint64; typedef unsigned long uint64; // NOLINT
typedef long int64; typedef long int64; // NOLINT
#ifndef INT64_C #ifndef INT64_C
#define INT64_C(x) x ## L #define INT64_C(x) x ## L
#endif #endif
@ -41,8 +41,8 @@ typedef long int64;
#endif #endif
#define INT64_F "l" #define INT64_F "l"
#else // __LP64__ #else // __LP64__
typedef unsigned long long uint64; typedef unsigned long long uint64; // NOLINT
typedef long long int64; typedef long long int64; // NOLINT
#ifndef INT64_C #ifndef INT64_C
#define INT64_C(x) x ## LL #define INT64_C(x) x ## LL
#endif #endif
@ -54,8 +54,8 @@ typedef long long int64;
#endif // COMPILER_MSVC #endif // COMPILER_MSVC
typedef unsigned int uint32; typedef unsigned int uint32;
typedef int int32; typedef int int32;
typedef unsigned short uint16; typedef unsigned short uint16; // NOLINT
typedef short int16; typedef short int16; // NOLINT
typedef unsigned char uint8; typedef unsigned char uint8;
typedef signed char int8; typedef signed char int8;
#endif // INT_TYPES_DEFINED #endif // INT_TYPES_DEFINED

2
include/libyuv/version.h
View File

@ -11,7 +11,7 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ #ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION 229 #define INCLUDE_LIBYUV_VERSION 230
#endif // INCLUDE_LIBYUV_VERSION_H_ #endif // INCLUDE_LIBYUV_VERSION_H_

2
source/compare.cc
View File

@ -116,7 +116,7 @@ static uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b,
} }
} }
#elif (defined(__x86_64__) || defined(__i386__)) && !defined(YUV_DISABLE_ASM) #elif defined(__x86_64__) || defined(__i386__) && !defined(YUV_DISABLE_ASM)
#define HAS_SUMSQUAREERROR_SSE2 #define HAS_SUMSQUAREERROR_SSE2
static uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, static uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b,
int count) { int count) {

18
source/row_common.cc
View File

@ -10,9 +10,10 @@
#include "source/row.h" #include "source/row.h"
#include "libyuv/basic_types.h"
#include <string.h> // For memcpy #include <string.h> // For memcpy
#include "libyuv/basic_types.h"
#ifdef __cplusplus #ifdef __cplusplus
namespace libyuv { namespace libyuv {
extern "C" { extern "C" {
@ -263,11 +264,11 @@ void I400ToARGBRow_C(const uint8* src_y, uint8* dst_argb, int width) {
static __inline uint32 Clip(int32 val) { static __inline uint32 Clip(int32 val) {
if (val < 0) { if (val < 0) {
return (uint32) 0; return static_cast<uint32>(0);
} else if (val > 255) { } else if (val > 255) {
return (uint32) 255; return static_cast<uint32>(255);
} }
return (uint32) val; return static_cast<uint32>(val);
} }
static __inline void YuvPixel(uint8 y, uint8 u, uint8 v, uint8* rgb_buf, static __inline void YuvPixel(uint8 y, uint8 u, uint8 v, uint8* rgb_buf,
@ -469,7 +470,8 @@ void ARGBBlendRow_C(const uint8* src_argb, uint8* dst_argb, int width) {
dst_argb[2] = BLENDER(fr, br, a); dst_argb[2] = BLENDER(fr, br, a);
dst_argb[3] = 255u; dst_argb[3] = 255u;
} else { } else {
*(uint32*)dst_argb = *(uint32*)src_argb; *reinterpret_cast<uint32*>(dst_argb) =
*reinterpret_cast<uint32*>(src_argb);
} }
} }
a = src_argb[4 + 3]; a = src_argb[4 + 3];
@ -486,7 +488,8 @@ void ARGBBlendRow_C(const uint8* src_argb, uint8* dst_argb, int width) {
dst_argb[4 + 2] = BLENDER(fr, br, a); dst_argb[4 + 2] = BLENDER(fr, br, a);
dst_argb[4 + 3] = 255u; dst_argb[4 + 3] = 255u;
} else { } else {
*(uint32*)(dst_argb + 4) = *(uint32*)(src_argb + 4); *reinterpret_cast<uint32*>(dst_argb + 4) =
*reinterpret_cast<uint32*>(src_argb + 4);
} }
} }
src_argb += 8; src_argb += 8;
@ -508,7 +511,8 @@ void ARGBBlendRow_C(const uint8* src_argb, uint8* dst_argb, int width) {
dst_argb[2] = BLENDER(fr, br, a); dst_argb[2] = BLENDER(fr, br, a);
dst_argb[3] = 255u; dst_argb[3] = 255u;
} else { } else {
*(uint32*)dst_argb = *(uint32*)src_argb; *reinterpret_cast<uint32*>(dst_argb) =
*reinterpret_cast<uint32*>(src_argb);
} }
} }
} }