diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-26 14:35:02 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-26 14:35:02 +0000 |
| commit | 2cb1480ff8ae030946cb5f218f9c5cbc1e54c7a9 (patch) | |
| tree | ee7bfa8d603930c9fdb29e86ae0f3bda3af65c47 /include/core/SkBitmap.h | |
| parent | 73a4b4f91fac1783b589eead5e82b0c0771644de (diff) | |
remove kRLE_Index8_Config from SkBitmap
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/17740003
git-svn-id: http://skia.googlecode.com/svn/trunk@9764 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkBitmap.h')
| -rw-r--r-- | include/core/SkBitmap.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 81c0342ff9..dd9dc61bc0 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. */ |