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 102 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,

[scroggo, 2015/04/02 19:20:31]

Why did these change?

[msarett, 2015/04/03 18:01:32]

I wanted to setRLEPixels for kN32 and for kIndex8, so it made more sense to pass
a void* than a SkPMColor*.  After the fact, I removed the capability to
setRLEPixels for kIndex8 because of the fact that some pixels in a decoded RLE
may be left transparent, and we do not have a transparent index to create a
valid kIndex8 representation.

However, I left the change to void* because I think it is cleaner to pass a
generic destination to setRLEPixels and then to cast the pointer in setRLEPixels
to the color type indicated by dstInfo.

[scroggo, 2015/04/06 14:55:11]

sgtm

                      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
+    SkPMColor*                          fColorTable;     // unowned
     uint32_t                            fNumColors;
     const uint32_t                      fBytesPerColor;
     const uint32_t                      fOffset;
     const RowOrder                      fRowOrder;
     const size_t                        fRLEBytes;
     const bool                          fIsIco;
 
     typedef SkCodec INHERITED;
 };