remove unused kLCD_MaskFormat

include/core/SkMask.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkMask_DEFINED
 #define SkMask_DEFINED
 
 #include "SkRect.h"
 
 /** \class SkMask
     SkMask is used to describe alpha bitmaps, either 1bit, 8bit, or
     the 3-channel 3D format. These are passed to SkMaskFilter objects.
 */
 struct SkMask {
     enum Format {
         kBW_Format, //!< 1bit per pixel mask (e.g. monochrome)
         kA8_Format, //!< 8bits per pixel mask (e.g. antialiasing)
         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;
     SkIRect     fBounds;
     uint32_t    fRowBytes;
     Format      fFormat;
 
     /** Returns true if the mask is empty: i.e. it has an empty bounds.
      */
     bool isEmpty() const { return fBounds.isEmpty(); }
@@ skipping 40 matching lines @@
     uint16_t* getAddrLCD16(int x, int y) const {
         SkASSERT(kLCD16_Format == fFormat);
         SkASSERT(fBounds.contains(x, y));
         SkASSERT(fImage != NULL);
         uint16_t* row = (uint16_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 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);
         return row + (x - fBounds.fLeft);
     }
 
     /**
      *  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.)
      *
      *  This should not be called with kBW_Format, as it will give unspecified
      *  results (and assert in the debug build).
      */
     void* getAddr(int x, int y) const;
 
     static uint8_t* AllocImage(size_t bytes);
@@ skipping 23 matching lines @@
     ~SkAutoMaskFreeImage() {
         SkMask::FreeImage(fImage);
     }
 
 private:
     uint8_t* fImage;
 };
 #define SkAutoMaskFreeImage(...) SK_REQUIRE_LOCAL_VAR(SkAutoMaskFreeImage)
 
 #endif