Index: src/codec/SkBmpStandardCodec.h |
diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h |
index b5f56f0a2aef048096c80fd3e4e906394abac09b..4cc3263a83150152ab8eee7e02d3f4e2b759e4d4 100644 |
--- a/src/codec/SkBmpStandardCodec.h |
+++ b/src/codec/SkBmpStandardCodec.h |
@@ -27,17 +27,19 @@ public: |
* @param srcInfo contains the source width and height |
* @param stream the stream of encoded image data |
* @param bitsPerPixel the number of bits used to store each pixel |
- * @param format the format of the bmp file |
* @param numColors the number of colors in the color table |
* @param bytesPerColor the number of bytes in the stream used to represent |
each color in the color table |
* @param offset the offset of the image pixel data from the end of the |
* headers |
* @param rowOrder indicates whether rows are ordered top-down or bottom-up |
+ * @param isOpaque indicates if the bmp itself is opaque (before applying |
+ * the icp mask, if there is one) |
+ * @param inIco indicates if the bmp is embedded in an ico file |
scroggo
2016/02/11 18:05:13
nit: inIco here, and isIco down below. I don't hav
msarett
2016/02/11 18:15:47
Using inIco.
|
*/ |
SkBmpStandardCodec(const SkImageInfo& srcInfo, SkStream* stream, |
uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor, |
- uint32_t offset, SkCodec::SkScanlineOrder rowOrder, |
+ uint32_t offset, SkCodec::SkScanlineOrder rowOrder, bool isOpaque, |
bool isIco); |
protected: |
@@ -90,6 +92,7 @@ private: |
SkAutoTDelete<SkSwizzler> fSwizzler; |
const size_t fSrcRowBytes; |
SkAutoTDeleteArray<uint8_t> fSrcBuffer; |
+ const bool fIsOpaque; |
const bool fInIco; |
const size_t fAndMaskRowBytes; // only used for fInIco decodes |