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

Side by Side Diff: bench/subset/SubsetBenchPriv.h

Issue 1213983003: Fix CodecSubset benches seg faults for kIndex8 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 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 | bench/subset/SubsetSingleBench.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 The Android Open Source Project 2 * Copyright 2015 The Android Open Source Project
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 #ifndef SubsetBenchPriv_DEFINED 8 #ifndef SubsetBenchPriv_DEFINED
9 #define SubsetBenchPriv_DEFINED 9 #define SubsetBenchPriv_DEFINED
10 10
(...skipping 14 matching lines...) Expand all
25 return "Gray8"; 25 return "Gray8";
26 case kIndex_8_SkColorType: 26 case kIndex_8_SkColorType:
27 return "Index8"; 27 return "Index8";
28 case kAlpha_8_SkColorType: 28 case kAlpha_8_SkColorType:
29 return "Alpha8"; 29 return "Alpha8";
30 default: 30 default:
31 return "Unknown"; 31 return "Unknown";
32 } 32 }
33 } 33 }
34 34
35 /*
36 * If we plan to decode to kIndex8, we must create a color table and pass it to the
37 * bitmap when we allocate pixels. Otherwise, we simply allocate pixels using t he
38 * decode info.
39 */
40 static inline void alloc_pixels(SkBitmap* bitmap, const SkImageInfo& info, SkPMC olor* colors,
41 int colorCount) {
42 if (kIndex_8_SkColorType == info.colorType()) {
43 SkAutoTUnref<SkColorTable> colorTable(SkNEW_ARGS(SkColorTable, (colors, colorCount)));
44 bitmap->allocPixels(info, NULL, colorTable);
45 } else {
46 bitmap->allocPixels(info);
47 }
48 }
49
35 #endif // SubsetBenchPriv_DEFINED 50 #endif // SubsetBenchPriv_DEFINED
OLDNEW
« no previous file with comments | « no previous file | bench/subset/SubsetSingleBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698