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

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

Issue 1086143003: Update more directories under src/ to follow C++11 style rule for {virtual,override}. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: no copyright Created 5 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 | « no previous file | src/image/SkImage_Raster.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 "SkImageInfo.h" 10 #include "SkImageInfo.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 */ 56 */
57 static SkCodec* NewFromIco(SkStream*); 57 static SkCodec* NewFromIco(SkStream*);
58 58
59 protected: 59 protected:
60 60
61 /* 61 /*
62 * 62 *
63 * Initiates the bmp decode 63 * Initiates the bmp decode
64 * 64 *
65 */ 65 */
66 virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst, 66 Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
67 size_t dstRowBytes, const Options&, SkPMColor*, 67 size_t dstRowBytes, const Options&, SkPMColor*,
68 int*) override; 68 int*) override;
69 69
70 SkEncodedFormat onGetEncodedFormat() const override { return kBMP_SkEncodedF ormat; } 70 SkEncodedFormat onGetEncodedFormat() const override { return kBMP_SkEncodedF ormat; }
71 71
72 private: 72 private:
73 73
74 /* 74 /*
75 * 75 *
76 * Used to define the input format of the bmp 76 * Used to define the input format of the bmp
77 * 77 *
78 */ 78 */
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 SkAutoTUnref<SkColorTable> fColorTable; // owned 184 SkAutoTUnref<SkColorTable> fColorTable; // owned
185 uint32_t fNumColors; 185 uint32_t fNumColors;
186 const uint32_t fBytesPerColor; 186 const uint32_t fBytesPerColor;
187 const uint32_t fOffset; 187 const uint32_t fOffset;
188 const RowOrder fRowOrder; 188 const RowOrder fRowOrder;
189 const size_t fRLEBytes; 189 const size_t fRLEBytes;
190 const bool fIsIco; 190 const bool fIsIco;
191 191
192 typedef SkCodec INHERITED; 192 typedef SkCodec INHERITED;
193 }; 193 };
OLDNEW
« no previous file with comments | « no previous file | src/image/SkImage_Raster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698