Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: src/codec/SkSwizzler.h

Issue 1332053002: Fill incomplete images in SkCodec parent class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase on merged SkCodec and SkScanlineDecoder Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/codec/SkSwizzler.h
diff --git a/src/codec/SkSwizzler.h b/src/codec/SkSwizzler.h
index a7f29b0763deda74c5b654f025674a80c15cada8..9d90ecbf7124c5a8b4b43bdc0295544aaf172206 100644
--- a/src/codec/SkSwizzler.h
+++ b/src/codec/SkSwizzler.h
@@ -136,40 +136,30 @@ public:
/**
* 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 i
*
- * @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.
+ * @param rowBytes
+ * Stride in bytes of the destination.
*
+ * @param colorOrIndex
+ * 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

Powered by Google App Engine
This is Rietveld 408576698