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

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

Issue 1288483002: Consolidate SkCodec functions for handling rewind (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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
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 "SkEncodedFormat.h" 10 #include "SkEncodedFormat.h"
(...skipping 17 matching lines...) Expand all
28 // Assume IsPng was called and returned true. 28 // Assume IsPng was called and returned true.
29 static SkCodec* NewFromStream(SkStream*); 29 static SkCodec* NewFromStream(SkStream*);
30 static SkScanlineDecoder* NewSDFromStream(SkStream*); 30 static SkScanlineDecoder* NewSDFromStream(SkStream*);
31 31
32 virtual ~SkPngCodec(); 32 virtual ~SkPngCodec();
33 33
34 protected: 34 protected:
35 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo lor*, int*) 35 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo lor*, int*)
36 override; 36 override;
37 SkEncodedFormat onGetEncodedFormat() const override { return kPNG_SkEncodedF ormat; } 37 SkEncodedFormat onGetEncodedFormat() const override { return kPNG_SkEncodedF ormat; }
38 bool onRewind() override;
38 bool onReallyHasAlpha() const override { return fReallyHasAlpha; } 39 bool onReallyHasAlpha() const override { return fReallyHasAlpha; }
39 private: 40 private:
40 png_structp fPng_ptr; 41 png_structp fPng_ptr;
41 png_infop fInfo_ptr; 42 png_infop fInfo_ptr;
42 43
43 // These are stored here so they can be used both by normal decoding and sca nline decoding. 44 // These are stored here so they can be used both by normal decoding and sca nline decoding.
44 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul. 45 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul.
45 SkAutoTDelete<SkSwizzler> fSwizzler; 46 SkAutoTDelete<SkSwizzler> fSwizzler;
46 47
47 SkSwizzler::SrcConfig fSrcConfig; 48 SkSwizzler::SrcConfig fSrcConfig;
48 int fNumberPasses; 49 int fNumberPasses;
49 bool fReallyHasAlpha; 50 bool fReallyHasAlpha;
50 int fBitDepth; 51 int fBitDepth;
51 52
52 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop, int); 53 SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop, int);
53 54
54 55
55 // Helper to set up swizzler and color table. Also calls png_read_update_inf o. 56 // Helper to set up swizzler and color table. Also calls png_read_update_inf o.
56 Result initializeSwizzler(const SkImageInfo& requestedInfo, const Options&, 57 Result initializeSwizzler(const SkImageInfo& requestedInfo, const Options&,
57 SkPMColor*, int* ctableCount); 58 SkPMColor*, int* ctableCount);
58 59
59 // Calls rewindIfNeeded and returns true if the decoder can continue.
60 bool handleRewind();
61 bool decodePalette(bool premultiply, int* ctableCount); 60 bool decodePalette(bool premultiply, int* ctableCount);
62 void destroyReadStruct(); 61 void destroyReadStruct();
63 62
64 friend class SkPngScanlineDecoder; 63 friend class SkPngScanlineDecoder;
65 friend class SkPngInterlacedScanlineDecoder; 64 friend class SkPngInterlacedScanlineDecoder;
66 65
67 typedef SkCodec INHERITED; 66 typedef SkCodec INHERITED;
68 }; 67 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698