| Index: src/utils/mac/SkCreateCGImageRef.cpp
|
| diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
|
| index 1b52ba31a695300f63933426d8f0187e40a9c8b6..01f2dacdda44116fb8480e41696120ce56e9a96f 100644
|
| --- a/src/utils/mac/SkCreateCGImageRef.cpp
|
| +++ b/src/utils/mac/SkCreateCGImageRef.cpp
|
| @@ -22,13 +22,19 @@ static bool getBitmapInfo(const SkBitmap& bm,
|
| *upscaleTo32 = false;
|
| }
|
|
|
| - switch (bm.config()) {
|
| - case SkBitmap::kRGB_565_Config:
|
| + switch (bm.colorType()) {
|
| + case kRGB_565_SkColorType:
|
| +#if 0
|
| + // doesn't see quite right. Are they thinking 1555?
|
| + *bitsPerComponent = 5;
|
| + *info = kCGBitmapByteOrder16Little | kCGImageAlphaNone;
|
| + break;
|
| +#endif
|
| if (upscaleTo32) {
|
| *upscaleTo32 = true;
|
| }
|
| // fall through
|
| - case SkBitmap::kARGB_8888_Config:
|
| + case kPMColor_SkColorType:
|
| *bitsPerComponent = 8;
|
| #if SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
| *info = kCGBitmapByteOrder32Big;
|
| @@ -60,14 +66,7 @@ This will probably not work.
|
| }
|
| #endif
|
| break;
|
| -#if 0
|
| - case SkBitmap::kRGB_565_Config:
|
| - // doesn't see quite right. Are they thinking 1555?
|
| - *bitsPerComponent = 5;
|
| - *info = kCGBitmapByteOrder16Little | kCGImageAlphaNone;
|
| - break;
|
| -#endif
|
| - case SkBitmap::kARGB_4444_Config:
|
| + case kARGB_4444_SkColorType:
|
| *bitsPerComponent = 4;
|
| *info = kCGBitmapByteOrder16Little;
|
| if (bm.isOpaque()) {
|
|
|