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

Side by Side Diff: bench/CodecBench.cpp

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 | « bench/CmapBench.cpp ('k') | bench/ColorCubeBench.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 "CodecBench.h" 8 #include "CodecBench.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCodec.h" 10 #include "SkCodec.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 SkAutoTDelete<SkCodec> codec; 65 SkAutoTDelete<SkCodec> codec;
66 SkPMColor colorTable[256]; 66 SkPMColor colorTable[256];
67 int colorCount; 67 int colorCount;
68 for (int i = 0; i < n; i++) { 68 for (int i = 0; i < n; i++) {
69 colorCount = 256; 69 colorCount = 256;
70 codec.reset(SkCodec::NewFromData(fData)); 70 codec.reset(SkCodec::NewFromData(fData));
71 #ifdef SK_DEBUG 71 #ifdef SK_DEBUG
72 const SkCodec::Result result = 72 const SkCodec::Result result =
73 #endif 73 #endif
74 codec->getPixels(fInfo, fPixelStorage.get(), fInfo.minRowBytes(), 74 codec->getPixels(fInfo, fPixelStorage.get(), fInfo.minRowBytes(),
75 NULL, colorTable, &colorCount); 75 nullptr, colorTable, &colorCount);
76 SkASSERT(result == SkCodec::kSuccess 76 SkASSERT(result == SkCodec::kSuccess
77 || result == SkCodec::kIncompleteInput); 77 || result == SkCodec::kIncompleteInput);
78 } 78 }
79 } 79 }
OLDNEW
« no previous file with comments | « bench/CmapBench.cpp ('k') | bench/ColorCubeBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698