Fill incomplete images in SkCodec parent class

src/codec/SkSwizzler.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.
  */
 
 #ifndef SkSwizzler_DEFINED
 #define SkSwizzler_DEFINED
 
@@ skipping 118 matching lines @@
                         but sampling in X allows the swizzler to skip swizzling pixels and
                         reading from and writing to memory.
      *  @return A new SkSwizzler or nullptr on failure.
      */
     static SkSwizzler* CreateSwizzler(SrcConfig, const SkPMColor* ctable,
                                       const SkImageInfo& dstInfo, SkCodec::ZeroInitialized, 
                                       const SkImageInfo& srcInfo);
     /**
      * Fill the remainder of the destination with a single color
      *
-     * @param dstStartRow
+     * @param fillDst
      * The destination row to fill from.
      *
-     * @param numRows
-     * The number of rows to fill.
+     * @param fillInfo
+     * Contains the width of the rows to fill.
+     * Contains the number of rows to fill.
+     * Contains the color type of the rows to fill.

[scroggo, 2015/10/01 14:48:32]

And, alpha I assume?

[msarett, 2015/10/01 18:14:14]

Yes it does, although the alpha type is actually irrelevant to this function.

+     *
+     * @param rowBytes
+     * Stride in bytes of the destination.
      *
      * @param colorOrIndex
-     * @param colorTable
-     * If dstInfo.colorType() is kIndex8, colorOrIndex is assumed to be a uint8_t
-     * index, and colorTable is ignored. Each 8-bit pixel will be set to (uint8_t)
-     * index.
-     *
-     * If dstInfo.colorType() is kN32, colorOrIndex is treated differently depending on
-     * whether colorTable is nullptr:
-     *
-     * A nullptr colorTable means colorOrIndex is treated as an SkPMColor (premul or
-     * unpremul, depending on dstInfo.alphaType()). Each 4-byte pixel will be set to
-     * colorOrIndex.
-
-     * A non-nullptr colorTable means colorOrIndex is treated as a uint8_t index into
-     * the colorTable. i.e. each 4-byte pixel will be set to
-     * colorTable[(uint8_t) colorOrIndex].
-     *
-     * If dstInfo.colorType() is kGray, colorOrIndex is always treated as an 8-bit color.
-     *
+     * If dstInfo.colorType() is kN32, colorOrIndex is treated as a 32-bit color.
+     * If dstInfo.colorType() is k565, colorOrIndex is treated as a 16-bit color.
+     * If dstInfo.colorType() is kGray, colorOrIndex is treated as an 8-bit color.
+     * If dstInfo.colorType() is kIndex, colorOrIndex is treated as an 8-bit index.
      * Other SkColorTypes are not supported.
      *
      * @param zeroInit
      * Indicates whether memory is already zero initialized.
      *
      */
-    static void Fill(void* dstStartRow, const SkImageInfo& dstInfo, size_t dstRowBytes,
-            uint32_t numRows, uint32_t colorOrIndex, const SkPMColor* colorTable,
-            SkCodec::ZeroInitialized zeroInit);
+    static void Fill(void* fillDst, const SkImageInfo& fillInfo, size_t rowBytes,
+            uint32_t colorOrIndex, SkCodec::ZeroInitialized zeroInit);
 
     /**
      *  Swizzle a line. Generally this will be called height times, once
      *  for each row of source.
      *  By allowing the caller to pass in the dst pointer, we give the caller
      *  flexibility to use the swizzler even when the encoded data does not
      *  store the rows in order.  This also improves usability for scaled and
      *  subset decodes.
      *  @param dst Where we write the output.
      *  @param src The next row of the source data.
@@ skipping 29 matching lines @@
                                           //     deltaSrc is bitsPerPixel
     const SkImageInfo   fDstInfo;
     int                 fCurrY;
     const int           fX0;              // first X coord to sample
     const int           fSampleX;         // step between X samples
 
     SkSwizzler(RowProc proc, const SkPMColor* ctable, int deltaSrc, const SkImageInfo& info, 
                int sampleX);
 };
 #endif // SkSwizzler_DEFINED