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

if types are already defined, dont define them again.

Browse Source 
BUG=180
TEST=none
Review URL: https://webrtc-codereview.appspot.com/1098004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@558 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-02-05 02:17:18 +00:00
parent 762c050b65
commit 50d7bf4a8b
4 changed files with 6 additions and 4 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: 557 Version: 558
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/basic_types.h
View File

@ -19,6 +19,7 @@
#include <stdint.h> // for uintptr_t #include <stdint.h> // for uintptr_t
#endif #endif
#ifndef GG_LONGLONG
#ifndef INT_TYPES_DEFINED #ifndef INT_TYPES_DEFINED
#define INT_TYPES_DEFINED #define INT_TYPES_DEFINED
#ifdef COMPILER_MSVC #ifdef COMPILER_MSVC
@ -61,6 +62,7 @@ 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
#endif // GG_LONGLONG
// Detect compiler is for x86 or x64. // Detect compiler is for x86 or x64.
#if defined(__x86_64__) || defined(_M_X64) || \ #if defined(__x86_64__) || defined(_M_X64) || \

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 557 #define LIBYUV_VERSION 558
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

4
unit_test/basictypes_test.cc
View File

@ -16,9 +16,9 @@ namespace libyuv {
TEST_F(libyuvTest, Endian) { TEST_F(libyuvTest, Endian) {
uint16 v16 = 0x1234u; uint16 v16 = 0x1234u;
uint8 first_byte = *reinterpret_cast<uint8*>(&v16); uint8 first_byte = *reinterpret_cast<uint8*>(&v16);
#if defined(ARCH_CPU_LITTLE_ENDIAN) #if defined(LIBYUV_LITTLE_ENDIAN)
EXPECT_EQ(0x34u, first_byte); EXPECT_EQ(0x34u, first_byte);
#elif defined(ARCH_CPU_BIG_ENDIAN) #else
EXPECT_EQ(0x12u, first_byte); EXPECT_EQ(0x12u, first_byte);
#endif #endif
} }