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

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

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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/SkCodec_libico.h ('k') | src/codec/SkCodec_libpng.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 "SkEncodedFormat.h" 10 #include "SkEncodedFormat.h"
11 #include "SkImageInfo.h" 11 #include "SkImageInfo.h"
12 #include "SkRefCnt.h" 12 #include "SkRefCnt.h"
13 #include "SkSwizzler.h" 13 #include "SkSwizzler.h"
14 14
15 extern "C" { 15 extern "C" {
16 #include "png.h" 16 #include "png.h"
17 } 17 }
18 18
19 class SkScanlineDecoder; 19 class SkScanlineDecoder;
20 class SkStream; 20 class SkStream;
21 21
22 class SkPngCodec : public SkCodec { 22 class SkPngCodec : public SkCodec {
23 public: 23 public:
24 // Assumes IsPng was called and returned true. 24 // Assumes IsPng was called and returned true.
25 static SkCodec* NewFromStream(SkStream*); 25 static SkCodec* NewFromStream(SkStream*);
26 static bool IsPng(SkStream*); 26 static bool IsPng(SkStream*);
27 protected: 27 protected:
28 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo lor*, int*) 28 Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMCo lor*, int*)
29 SK_OVERRIDE; 29 override;
30 SkEncodedFormat onGetEncodedFormat() const SK_OVERRIDE { return kPNG_SkEncod edFormat; } 30 SkEncodedFormat onGetEncodedFormat() const override { return kPNG_SkEncodedF ormat; }
31 SkScanlineDecoder* onGetScanlineDecoder(const SkImageInfo& dstInfo) SK_OVERR IDE; 31 SkScanlineDecoder* onGetScanlineDecoder(const SkImageInfo& dstInfo) override ;
32 bool onReallyHasAlpha() const SK_OVERRIDE { return fReallyHasAlpha; } 32 bool onReallyHasAlpha() const override { return fReallyHasAlpha; }
33 private: 33 private:
34 png_structp fPng_ptr; 34 png_structp fPng_ptr;
35 png_infop fInfo_ptr; 35 png_infop fInfo_ptr;
36 36
37 // These are stored here so they can be used both by normal decoding and sca nline decoding. 37 // These are stored here so they can be used both by normal decoding and sca nline decoding.
38 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul. 38 SkAutoTUnref<SkColorTable> fColorTable; // May be unpremul.
39 SkAutoTDelete<SkSwizzler> fSwizzler; 39 SkAutoTDelete<SkSwizzler> fSwizzler;
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&);
51 bool decodePalette(bool premultiply); 51 bool decodePalette(bool premultiply);
52 void finish(); 52 void finish();
53 53
54 friend class SkPngScanlineDecoder; 54 friend class SkPngScanlineDecoder;
55 55
56 typedef SkCodec INHERITED; 56 typedef SkCodec INHERITED;
57 }; 57 };
OLDNEW
« no previous file with comments | « src/codec/SkCodec_libico.h ('k') | src/codec/SkCodec_libpng.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698