| Index: include/core/SkBitmap.h
|
| diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
|
| index 0a26f0dfc6506e6971e2dec79e0a4524f3f9f589..fd3fd3da29fac12c71f377b6dc6f10973749c6c5 100644
|
| --- a/include/core/SkBitmap.h
|
| +++ b/include/core/SkBitmap.h
|
| @@ -53,18 +53,12 @@ public:
|
| kRGB_565_Config, //!< 16-bits per pixel, (see SkColorPriv.h for packing)
|
| kARGB_4444_Config, //!< 16-bits per pixel, (see SkColorPriv.h for packing)
|
| kARGB_8888_Config, //!< 32-bits per pixel, (see SkColorPriv.h for packing)
|
| - /**
|
| - * Custom compressed format, not supported on all platforms.
|
| - * Cannot be used as a destination (target of a canvas).
|
| - * i.e. you may be able to draw from one, but you cannot draw into one.
|
| - */
|
| - kRLE_Index8_Config,
|
| };
|
|
|
| // do not add this to the Config enum, otherwise the compiler will let us
|
| // pass this as a valid parameter for Config.
|
| enum {
|
| - kConfigCount = kRLE_Index8_Config + 1
|
| + kConfigCount = kARGB_8888_Config + 1
|
| };
|
|
|
| /**
|
| @@ -366,9 +360,7 @@ public:
|
| */
|
| bool readyToDraw() const {
|
| return this->getPixels() != NULL &&
|
| - ((this->config() != kIndex8_Config &&
|
| - this->config() != kRLE_Index8_Config) ||
|
| - fColorTable != NULL);
|
| + (this->config() != kIndex8_Config || NULL != fColorTable);
|
| }
|
|
|
| /** Returns the pixelRef's texture, or NULL
|
| @@ -376,7 +368,7 @@ public:
|
| SkGpuTexture* getTexture() const;
|
|
|
| /** Return the bitmap's colortable, if it uses one (i.e. fConfig is
|
| - kIndex8_Config or kRLE_Index8_Config) and the pixels are locked.
|
| + kIndex8_Config) and the pixels are locked.
|
| Otherwise returns NULL. Does not affect the colortable's
|
| reference count.
|
| */
|
|
|