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

fix config check to include SkColorPriv.h so we don't get the warning w/o need

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@245 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@android.com 2009-06-29 17:07:19 +00:00
parent 4516f4786f
commit a545a5598e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/utils/mac/SkCreateCGImageRef.cpp
View File

@ -1,5 +1,6 @@
#include "SkCGUtils.h" #include "SkCGUtils.h"
#include "SkBitmap.h" #include "SkBitmap.h"
#include "SkColorPriv.h"
extern CGImageRef SkCreateCGImageRef(const SkBitmap&); extern CGImageRef SkCreateCGImageRef(const SkBitmap&);
@ -8,21 +9,23 @@ static void SkBitmap_ReleaseInfo(void* info, const void* pixelData, size_t size)
delete bitmap; delete bitmap;
} }
static SkBitmap* prepareForImageRef(const SkBitmap& bm,
size_t* bitsPerComponent,
CGBitmapInfo* info) {
switch (bm.config()) {
case SkBitmap::kARGB_8888_Config:
*bitsPerComponent = 8;
// try to match our rgba ordering in SkColorPriv, but take into
// account that the data layout could have been overridden in
// SkUserConfig.
#define HAS_ARGB_SHIFTS(a, r, g, b) \ #define HAS_ARGB_SHIFTS(a, r, g, b) \
(SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \ (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \
&& SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b)) && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b))
static SkBitmap* prepareForImageRef(const SkBitmap& bm,
size_t* bitsPerComponent,
CGBitmapInfo* info) {
#if 0
SkDebugf("---- %d %d %d %d\n", SK_A32_SHIFT, SK_R32_SHIFT,
SK_G32_SHIFT, SK_B32_SHIFT);
#endif
switch (bm.config()) {
case SkBitmap::kARGB_8888_Config:
*bitsPerComponent = 8;
#if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 0, 8, 16) \ #if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 0, 8, 16) \
|| defined(SK_CPU_BENDIAN) && HAS_ARGB_SHIFTS(0, 24, 16, 8) || defined(SK_CPU_BENDIAN) && HAS_ARGB_SHIFTS(0, 24, 16, 8)
// The default rgba ordering from SkColorPriv.h
*info = kCGBitmapByteOrder32Big | *info = kCGBitmapByteOrder32Big |
kCGImageAlphaPremultipliedLast; kCGImageAlphaPremultipliedLast;
#elif defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0) \ #elif defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0) \
@ -40,7 +43,6 @@ static SkBitmap* prepareForImageRef(const SkBitmap& bm,
*info = kCGBitmapByteOrder32Big | *info = kCGBitmapByteOrder32Big |
kCGImageAlphaPremultipliedLast; kCGImageAlphaPremultipliedLast;
#endif #endif
#undef HAS_ARGB_SHIFTS
break; break;
case SkBitmap::kRGB_565_Config: case SkBitmap::kRGB_565_Config:
// doesn't see quite right. Are they thinking 1555? // doesn't see quite right. Are they thinking 1555?
@ -58,6 +60,8 @@ static SkBitmap* prepareForImageRef(const SkBitmap& bm,
return new SkBitmap(bm); return new SkBitmap(bm);
} }
#undef HAS_ARGB_SHIFTS
CGImageRef SkCreateCGImageRef(const SkBitmap& bm) { CGImageRef SkCreateCGImageRef(const SkBitmap& bm) {
size_t bitsPerComponent; size_t bitsPerComponent;
CGBitmapInfo info; CGBitmapInfo info;