Merge "move LOCAL_GCC_VERSION def to dsp.h"

This commit is contained in:
pascal massimino 2014-04-27 02:04:08 -07:00 committed by Gerrit Code Review
commit de3cb6c820
2 changed files with 9 additions and 5 deletions

View File

@ -23,6 +23,14 @@ extern "C" {
//------------------------------------------------------------------------------
// CPU detection
#if defined(__GNUC__)
# define LOCAL_GCC_VERSION ((__GNUC__ << 8) | __GNUC_MINOR__)
# define LOCAL_GCC_PREREQ(maj, min) \
(LOCAL_GCC_VERSION >= (((maj) << 8) | (min)))
#else
# define LOCAL_GCC_PREREQ(maj, min) 0
#endif
#if defined(_MSC_VER) && _MSC_VER > 1310 && \
(defined(_M_X64) || defined(_M_IX86))
#define WEBP_MSC_SSE2 // Visual C++ SSE2 targets

View File

@ -26,11 +26,7 @@
//------------------------------------------------------------------------------
// Colorspace conversion functions
#if defined(__GNUC__)
#define LOCAL_GCC_VERSION ((__GNUC__ << 8) | __GNUC_MINOR__)
#endif
#if defined(LOCAL_GCC_VERSION) && (LOCAL_GCC_VERSION >= 0x408)
#if LOCAL_GCC_PREREQ(4,8)
// gcc 4.6.0 had some trouble (NDK-r9) with this code. We only use it for
// gcc-4.8.x at least.
static void ConvertBGRAToRGBA(const uint32_t* src,