| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2015 Google Inc. | 2  * Copyright 2015 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "SkCodec.h" | 8 #include "SkCodec.h" | 
| 9 #include "SkColorTable.h" | 9 #include "SkColorTable.h" | 
| 10 #include "SkEncodedFormat.h" | 10 #include "SkEncodedFormat.h" | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 40 | 40 | 
| 41     SkSwizzler::SrcConfig       fSrcConfig; | 41     SkSwizzler::SrcConfig       fSrcConfig; | 
| 42     int                         fNumberPasses; | 42     int                         fNumberPasses; | 
| 43     bool                        fReallyHasAlpha; | 43     bool                        fReallyHasAlpha; | 
| 44 | 44 | 
| 45     SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop); | 45     SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop); | 
| 46     ~SkPngCodec(); | 46     ~SkPngCodec(); | 
| 47 | 47 | 
| 48     // Helper to set up swizzler and color table. Also calls png_read_update_inf
    o. | 48     // Helper to set up swizzler and color table. Also calls png_read_update_inf
    o. | 
| 49     Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst, | 49     Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst, | 
| 50                               size_t rowBytes, const Options&); | 50                               size_t rowBytes, const Options&, int* ctableCount)
    ; | 
| 51     // Calls rewindIfNeeded, and returns true if the decoder can continue. | 51     // Calls rewindIfNeeded, and returns true if the decoder can continue. | 
| 52     bool handleRewind(); | 52     bool handleRewind(); | 
| 53     bool decodePalette(bool premultiply); | 53     bool decodePalette(bool premultiply, int bitDepth, int* ctableCount); | 
| 54     void finish(); | 54     void finish(); | 
| 55     void destroyReadStruct(); | 55     void destroyReadStruct(); | 
| 56 | 56 | 
| 57     friend class SkPngScanlineDecoder; | 57     friend class SkPngScanlineDecoder; | 
| 58 | 58 | 
| 59     typedef SkCodec INHERITED; | 59     typedef SkCodec INHERITED; | 
| 60 }; | 60 }; | 
| OLD | NEW | 
|---|