Index: src/image/SkImagePriv.cpp |
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp |
index f5b785877c7374f427b11c8a80e439195fa9462c..bde47e71eba07853b720d75be2ce6bae779d5cf8 100644 |
--- a/src/image/SkImagePriv.cpp |
+++ b/src/image/SkImagePriv.cpp |
@@ -9,45 +9,6 @@ |
#include "SkCanvas.h" |
#include "SkPicture.h" |
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG |
-SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType colorType) { |
- switch (colorType) { |
- case kAlpha_8_SkColorType: |
- return SkBitmap::kA8_Config; |
- |
- case kARGB_4444_SkColorType: |
- return SkBitmap::kARGB_4444_Config; |
- |
- case kRGB_565_SkColorType: |
- return SkBitmap::kRGB_565_Config; |
- |
- case kN32_SkColorType: |
- return SkBitmap::kARGB_8888_Config; |
- |
- case kIndex_8_SkColorType: |
- return SkBitmap::kIndex8_Config; |
- |
- default: |
- // break for unsupported colortypes |
- break; |
- } |
- return SkBitmap::kNo_Config; |
-} |
- |
-SkColorType SkBitmapConfigToColorType(SkBitmap::Config config) { |
- static const SkColorType gCT[] = { |
- kUnknown_SkColorType, // kNo_Config |
- kAlpha_8_SkColorType, // kA8_Config |
- kIndex_8_SkColorType, // kIndex8_Config |
- kRGB_565_SkColorType, // kRGB_565_Config |
- kARGB_4444_SkColorType, // kARGB_4444_Config |
- kN32_SkColorType, // kARGB_8888_Config |
- }; |
- SkASSERT((unsigned)config < SK_ARRAY_COUNT(gCT)); |
- return gCT[config]; |
-} |
-#endif |
- |
SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) { |
const SkImageInfo info = bm.info(); |
if (kUnknown_SkColorType == info.colorType()) { |