AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make SKColorSetARGB() a macro when not building debug.

Browse Source 
This allows GCC to avoid generating static initializers for code that
uses it.

Patch by: Dave Moore

http://codereview.appspot.com/1883043/show

git-svn-id: http://skia.googlecode.com/svn/trunk@592 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
agl@chromium.org 2010-07-28 17:10:30 +00:00
parent 0afaf9b563
commit c9c9ebbc29
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/core/SkColor.h
View File

@ -36,13 +36,30 @@ typedef uint32_t SkColor;
/** Return a SkColor value from 8 bit component values
*/
static inline SkColor SkColorSetARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b)
static inline SkColor SkColorSetARGBInline(U8CPU a, U8CPU r, U8CPU g, U8CPU b)
{
SkASSERT(a <= 255 && r <= 255 && g <= 255 && b <= 255);
return (a << 24) | (r << 16) | (g << 8) | (b << 0);
}
#define SkColorSetARGBMacro(a, r, g, b) \
static_cast<SkColor>( \
(static_cast<U8CPU>(a) << 24) | \
(static_cast<U8CPU>(r) << 16) | \
(static_cast<U8CPU>(g) << 8) | \
(static_cast<U8CPU>(b) << 0))
/** gcc will generate static initializers for code of this form:
* static const SkColor kMyColor = SkColorSetARGB(0xFF, 0x01, 0x02, 0x03)
* if SkColorSetARGB() is a static inline, but not if it's a macro.
*/
#if defined(NDEBUG)
#define SkColorSetARGB(a, r, g, b) SkColorSetARGBMacro(a, r, g, b)
#else
#define SkColorSetARGB(a, r, g, b) SkColorSetARGBInline(a, r, g, b)
#endif
/** Return a SkColor value from 8 bit component values, with an implied value
of 0xFF for alpha (fully opaque)
*/