| 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 "SkPngChunkReader.h" | 10 #include "SkPngChunkReader.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 png_structp fPng_ptr; | 53 png_structp fPng_ptr; |
| 54 png_infop fInfo_ptr; | 54 png_infop fInfo_ptr; |
| 55 | 55 |
| 56 // These are stored here so they can be used both by normal decoding and sca
nline decoding. | 56 // These are stored here so they can be used both by normal decoding and sca
nline decoding. |
| 57 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul. | 57 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul. |
| 58 SkAutoTDelete<SkSwizzler> fSwizzler; | 58 SkAutoTDelete<SkSwizzler> fSwizzler; |
| 59 | 59 |
| 60 const int fNumberPasses; | 60 const int fNumberPasses; |
| 61 int fBitDepth; | 61 int fBitDepth; |
| 62 | 62 |
| 63 bool decodePalette(bool premultiply, int* ctableCount); | 63 bool createColorTable(SkColorType dstColorType, bool premultiply, int* ctabl
eCount); |
| 64 void destroyReadStruct(); | 64 void destroyReadStruct(); |
| 65 | 65 |
| 66 typedef SkCodec INHERITED; | 66 typedef SkCodec INHERITED; |
| 67 }; | 67 }; |
| OLD | NEW |