| Index: include/core/SkMask.h
|
| diff --git a/include/core/SkMask.h b/include/core/SkMask.h
|
| index 5cfef970c5024fd91bd2b2767c4fd93f33d9cf8d..7be6aff614ce7bdeb3686350f047dde6cbd9e532 100644
|
| --- a/include/core/SkMask.h
|
| +++ b/include/core/SkMask.h
|
| @@ -23,11 +23,10 @@ struct SkMask {
|
| k3D_Format, //!< 3 8bit per pixl planes: alpha, mul, add
|
| kARGB32_Format, //!< SkPMColor
|
| kLCD16_Format, //!< 565 alpha for r/g/b
|
| - kLCD32_Format //!< 888 alpha for r/g/b
|
| };
|
|
|
| enum {
|
| - kCountMaskFormats = kLCD32_Format + 1
|
| + kCountMaskFormats = kLCD16_Format + 1
|
| };
|
|
|
| uint8_t* fImage;
|
| @@ -88,24 +87,11 @@ struct SkMask {
|
|
|
| /**
|
| * Return the address of the specified 32bit mask. In the debug build,
|
| - * this asserts that the mask's format is kLCD32_Format, and that (x,y)
|
| - * are contained in the mask's fBounds.
|
| - */
|
| - uint32_t* getAddrLCD32(int x, int y) const {
|
| - SkASSERT(kLCD32_Format == fFormat);
|
| - SkASSERT(fBounds.contains(x, y));
|
| - SkASSERT(fImage != NULL);
|
| - uint32_t* row = (uint32_t*)(fImage + (y - fBounds.fTop) * fRowBytes);
|
| - return row + (x - fBounds.fLeft);
|
| - }
|
| -
|
| - /**
|
| - * Return the address of the specified 32bit mask. In the debug build,
|
| * this asserts that the mask's format is 32bits, and that (x,y)
|
| * are contained in the mask's fBounds.
|
| */
|
| uint32_t* getAddr32(int x, int y) const {
|
| - SkASSERT(kLCD32_Format == fFormat || kARGB32_Format == fFormat);
|
| + SkASSERT(kARGB32_Format == fFormat);
|
| SkASSERT(fBounds.contains(x, y));
|
| SkASSERT(fImage != NULL);
|
| uint32_t* row = (uint32_t*)(fImage + (y - fBounds.fTop) * fRowBytes);
|
| @@ -116,7 +102,7 @@ struct SkMask {
|
| * Returns the address of the specified pixel, computing the pixel-size
|
| * at runtime based on the mask format. This will be slightly slower than
|
| * using one of the routines where the format is implied by the name
|
| - * e.g. getAddr8 or getAddrLCD32.
|
| + * e.g. getAddr8 or getAddr32.
|
| *
|
| * x,y must be contained by the mask's bounds (this is asserted in the
|
| * debug build, but not checked in the release build.)
|
|
|