| Index: src/codec/SkCodec_libpng.h
|
| diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h
|
| index 41c68f6463832ef8dfbcaf98a5c862619c6842f2..0f9630a51cdaa7c1e9bfbfcc86ddd5b92eafbf2e 100644
|
| --- a/src/codec/SkCodec_libpng.h
|
| +++ b/src/codec/SkCodec_libpng.h
|
| @@ -18,7 +18,6 @@
|
| #endif
|
| #include "png.h"
|
|
|
| -class SkScanlineDecoder;
|
| class SkStream;
|
|
|
| class SkPngCodec : public SkCodec {
|
| @@ -27,7 +26,6 @@ public:
|
|
|
| // Assume IsPng was called and returned true.
|
| static SkCodec* NewFromStream(SkStream*);
|
| - static SkScanlineDecoder* NewSDFromStream(SkStream*);
|
|
|
| virtual ~SkPngCodec();
|
|
|
| @@ -41,7 +39,7 @@ protected:
|
|
|
| // Helper to set up swizzler and color table. Also calls png_read_update_info.
|
| Result initializeSwizzler(const SkImageInfo& requestedInfo, const Options&,
|
| - SkPMColor*, int* ctableCount);
|
| + SkPMColor*, int* ctableCount, int subsetLeft, int subsetWidth);
|
|
|
| SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop, int, int);
|
|
|
| @@ -74,7 +72,6 @@ private:
|
| SkSwizzler::SrcConfig fSrcConfig;
|
| const int fNumberPasses;
|
| int fBitDepth;
|
| -
|
| AlphaState fAlphaState;
|
|
|
| bool decodePalette(bool premultiply, int* ctableCount);
|
|
|