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/codec/SkBmpRLECodec.h

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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/SkBmpMaskCodec.cpp ('k') | src/codec/SkBmpRLECodec.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 "SkBmpCodec.h" 8 #include "SkBmpCodec.h"
9 #include "SkColorTable.h" 9 #include "SkColorTable.h"
10 #include "SkImageInfo.h" 10 #include "SkImageInfo.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 protected: 42 protected:
43 43
44 Result onGetPixels(const SkImageInfo& dstInfo, void* dst, 44 Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
45 size_t dstRowBytes, const Options&, SkPMColor*, 45 size_t dstRowBytes, const Options&, SkPMColor*,
46 int*) override; 46 int*) override;
47 47
48 private: 48 private:
49 49
50 /* 50 /*
51 * Creates the color table 51 * Creates the color table
52 * Sets colorCount to the new color count if it is non-NULL 52 * Sets colorCount to the new color count if it is non-nullptr
53 */ 53 */
54 bool createColorTable(int* colorCount); 54 bool createColorTable(int* colorCount);
55 55
56 bool initializeStreamBuffer(); 56 bool initializeStreamBuffer();
57 57
58 /* 58 /*
59 * Before signalling kIncompleteInput, we should attempt to load the 59 * Before signalling kIncompleteInput, we should attempt to load the
60 * stream buffer with additional data. 60 * stream buffer with additional data.
61 * 61 *
62 * @return the number of bytes remaining in the stream buffer after 62 * @return the number of bytes remaining in the stream buffer after
(...skipping 23 matching lines...) Expand all
86 SkAutoTUnref<SkColorTable> fColorTable; // owned 86 SkAutoTUnref<SkColorTable> fColorTable; // owned
87 const uint32_t fNumColors; 87 const uint32_t fNumColors;
88 const uint32_t fBytesPerColor; 88 const uint32_t fBytesPerColor;
89 const uint32_t fOffset; 89 const uint32_t fOffset;
90 SkAutoTDeleteArray<uint8_t> fStreamBuffer; 90 SkAutoTDeleteArray<uint8_t> fStreamBuffer;
91 size_t fRLEBytes; 91 size_t fRLEBytes;
92 uint32_t fCurrRLEByte; 92 uint32_t fCurrRLEByte;
93 93
94 typedef SkBmpCodec INHERITED; 94 typedef SkBmpCodec INHERITED;
95 }; 95 };
OLDNEW
« no previous file with comments | « src/codec/SkBmpMaskCodec.cpp ('k') | src/codec/SkBmpRLECodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698