Swizzler changes Index8 and 565

src/codec/SkCodec_libbmp.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodec.h"
 #include "SkColorTable.h"
 #include "SkImageInfo.h"
@@ skipping 68 matching lines @@
     enum BitmapInputFormat {
         kStandard_BitmapInputFormat,
         kRLE_BitmapInputFormat,
         kBitMask_BitmapInputFormat,
         kUnknown_BitmapInputFormat
     };
 
     /*
      *
      * Creates the color table
-     *
+     * Sets colorCount to the new color count if it is non-NULL
      */
-     bool createColorTable(SkAlphaType alphaType);
+     bool createColorTable(SkAlphaType alphaType, int* colorCount);
 
     /*
      *
      * Creates a bmp decoder
      * Reads enough of the stream to determine the image format
      *
      */
     static SkCodec* NewFromStream(SkStream*, bool isIco);
 
     /*
@@ skipping 12 matching lines @@
      *
      */
     Result decodeMask(const SkImageInfo& dstInfo, void* dst,
                       size_t dstRowBytes);
 
     /*
      *
      * Set an RLE pixel using the color table
      *
      */
-    void setRLEPixel(SkPMColor* dst, size_t dstRowBytes,
+    void setRLEPixel(void* dst, size_t dstRowBytes,
                      const SkImageInfo& dstInfo, uint32_t x, uint32_t y,
                      uint8_t index);
     /*
      *
      * Set an RLE24 pixel from R, G, B values
      *
      */
-    void setRLE24Pixel(SkPMColor* dst, size_t dstRowBytes,
+    void setRLE24Pixel(void* dst, size_t dstRowBytes,
                        const SkImageInfo& dstInfo, uint32_t x, uint32_t y,
                        uint8_t red, uint8_t green, uint8_t blue);
 
     /*
      *
      * Performs the bitmap decoding for RLE input format
      *
      */
     Result decodeRLE(const SkImageInfo& dstInfo, void* dst,
-                     size_t dstRowBytes);
+                     size_t dstRowBytes, const Options& opts);
 
     /*
      *
      * Performs the bitmap decoding for standard input format
      *
      */
     Result decode(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
 
     /*
      *
@@ skipping 21 matching lines @@
     SkBmpCodec(const SkImageInfo& srcInfo, SkStream* stream,
                uint16_t bitsPerPixel, BitmapInputFormat format,
                SkMasks* masks, uint32_t numColors, uint32_t bytesPerColor,
                uint32_t offset, RowOrder rowOrder, size_t RLEBytes,
                bool isIco);
 
     // Fields
     const uint16_t                      fBitsPerPixel;
     const BitmapInputFormat             fInputFormat;
     SkAutoTDelete<SkMasks>              fMasks;          // owned
-    SkAutoTDelete<SkColorTable>         fColorTable;     // owned
+    SkAutoTUnref<SkColorTable>          fColorTable;     // owned
     uint32_t                            fNumColors;
     const uint32_t                      fBytesPerColor;
     const uint32_t                      fOffset;
     const RowOrder                      fRowOrder;
     const size_t                        fRLEBytes;
     const bool                          fIsIco;
 
     typedef SkCodec INHERITED;
 };