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

Side by Side Diff: src/codec/SkPngCodec.h

Issue 1911613002: Use SkEncodedInfo in place of SkSwizzler::SrcConfig (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix bmp bug Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « src/codec/SkJpegCodec.cpp ('k') | src/codec/SkPngCodec.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 SkSampler* getSampler(bool createIfNecessary) override { 39 SkSampler* getSampler(bool createIfNecessary) override {
40 SkASSERT(fSwizzler); 40 SkASSERT(fSwizzler);
41 return fSwizzler; 41 return fSwizzler;
42 } 42 }
43 43
44 SkPngCodec(int width, int height, const SkEncodedInfo&, SkStream*, SkPngChun kReader*, 44 SkPngCodec(int width, int height, const SkEncodedInfo&, SkStream*, SkPngChun kReader*,
45 png_structp, png_infop, int, int, sk_sp<SkColorSpace>); 45 png_structp, png_infop, int, int, sk_sp<SkColorSpace>);
46 46
47 png_structp png_ptr() { return fPng_ptr; } 47 png_structp png_ptr() { return fPng_ptr; }
48 SkSwizzler* swizzler() { return fSwizzler; } 48 SkSwizzler* swizzler() { return fSwizzler; }
49 SkSwizzler::SrcConfig srcConfig() const { return fSrcConfig; }
50 int numberPasses() const { return fNumberPasses; } 49 int numberPasses() const { return fNumberPasses; }
51 50
52 private: 51 private:
53 SkAutoTUnref<SkPngChunkReader> fPngChunkReader; 52 SkAutoTUnref<SkPngChunkReader> fPngChunkReader;
54 png_structp fPng_ptr; 53 png_structp fPng_ptr;
55 png_infop fInfo_ptr; 54 png_infop fInfo_ptr;
56 55
57 // 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.
58 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul. 57 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul.
59 SkAutoTDelete<SkSwizzler> fSwizzler; 58 SkAutoTDelete<SkSwizzler> fSwizzler;
60 59
61 SkSwizzler::SrcConfig fSrcConfig;
62 const int fNumberPasses; 60 const int fNumberPasses;
63 int fBitDepth; 61 int fBitDepth;
64 62
65 bool decodePalette(bool premultiply, int* ctableCount); 63 bool decodePalette(bool premultiply, int* ctableCount);
66 void destroyReadStruct(); 64 void destroyReadStruct();
67 65
68 typedef SkCodec INHERITED; 66 typedef SkCodec INHERITED;
69 }; 67 };
OLDNEW
« no previous file with comments | « src/codec/SkJpegCodec.cpp ('k') | src/codec/SkPngCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698