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

Side by Side Diff: src/images/SkImageDecoder_pkm.cpp

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/images/SkImageDecoder_libwebp.cpp ('k') | src/images/SkImageDecoder_wbmp.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 2014 Google Inc. 2 * Copyright 2014 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 "SkColorPriv.h" 8 #include "SkColorPriv.h"
9 #include "SkImageDecoder.h" 9 #include "SkImageDecoder.h"
10 #include "SkScaledBitmapSampler.h" 10 #include "SkScaledBitmapSampler.h"
11 #include "SkStream.h" 11 #include "SkStream.h"
12 #include "SkStreamPriv.h" 12 #include "SkStreamPriv.h"
13 #include "SkTextureCompressor.h" 13 #include "SkTextureCompressor.h"
14 #include "SkTypes.h" 14 #include "SkTypes.h"
15 15
16 #include "etc1.h" 16 #include "etc1.h"
17 17
18 class SkPKMImageDecoder : public SkImageDecoder { 18 class SkPKMImageDecoder : public SkImageDecoder {
19 public: 19 public:
20 SkPKMImageDecoder() { } 20 SkPKMImageDecoder() { }
21 21
22 Format getFormat() const SK_OVERRIDE { 22 Format getFormat() const override {
23 return kPKM_Format; 23 return kPKM_Format;
24 } 24 }
25 25
26 protected: 26 protected:
27 Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE; 27 Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
28 28
29 private: 29 private:
30 typedef SkImageDecoder INHERITED; 30 typedef SkImageDecoder INHERITED;
31 }; 31 };
32 32
33 //////////////////////////////////////////////////////////////////////////////// ///////// 33 //////////////////////////////////////////////////////////////////////////////// /////////
34 34
35 SkImageDecoder::Result SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* b m, Mode mode) { 35 SkImageDecoder::Result SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* b m, Mode mode) {
36 SkAutoMalloc autoMal; 36 SkAutoMalloc autoMal;
37 const size_t length = SkCopyStreamToStorage(&autoMal, stream); 37 const size_t length = SkCopyStreamToStorage(&autoMal, stream);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory); 119 static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory);
120 120
121 static SkImageDecoder::Format get_format_pkm(SkStreamRewindable* stream) { 121 static SkImageDecoder::Format get_format_pkm(SkStreamRewindable* stream) {
122 if (is_pkm(stream)) { 122 if (is_pkm(stream)) {
123 return SkImageDecoder::kPKM_Format; 123 return SkImageDecoder::kPKM_Format;
124 } 124 }
125 return SkImageDecoder::kUnknown_Format; 125 return SkImageDecoder::kUnknown_Format;
126 } 126 }
127 127
128 static SkImageDecoder_FormatReg gFormatReg(get_format_pkm); 128 static SkImageDecoder_FormatReg gFormatReg(get_format_pkm);
OLDNEW
« no previous file with comments | « src/images/SkImageDecoder_libwebp.cpp ('k') | src/images/SkImageDecoder_wbmp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698