Index: include/core/SkBitmap.h |
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h |
index ddeac2573b8a4e9e5de56850f4a6c86ec5c53009..d3c33a8e034d23e9c7ee00f0bf571e2e0b43ece3 100644 |
--- a/include/core/SkBitmap.h |
+++ b/include/core/SkBitmap.h |
@@ -38,6 +38,7 @@ class SK_API SkBitmap { |
public: |
class SK_API Allocator; |
+#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG |
enum Config { |
kNo_Config, //!< bitmap has not been configured |
kA8_Config, //!< 8-bits per pixel, with only alpha specified (0 is transparent, 0xFF is opaque) |
@@ -58,6 +59,7 @@ public: |
SK_ATTR_DEPRECATED("use config()") |
Config getConfig() const { return this->config(); } |
+#endif |
/** |
* Default construct creates a bitmap with zero width and height, and no pixels. |
@@ -895,11 +897,13 @@ inline SkPMColor SkBitmap::getIndex8Color(int x, int y) const { |
return (*fColorTable)[*((const uint8_t*)fPixels + y * fRowBytes + x)]; |
} |
+#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG |
/////////////////////////////////////////////////////////////////////////////// |
// |
// Helpers until we can fully deprecate SkBitmap::Config |
// |
extern SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType); |
extern SkColorType SkBitmapConfigToColorType(SkBitmap::Config); |
+#endif |
#endif |