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

Unified Diff: bench/subset/SubsetSingleBench.cpp

Issue 1213983003: Fix CodecSubset benches seg faults for kIndex8 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | bench/subset/SubsetTranslateBench.cpp » ('j') | bench/subset/SubsetTranslateBench.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/subset/SubsetSingleBench.cpp
diff --git a/bench/subset/SubsetSingleBench.cpp b/bench/subset/SubsetSingleBench.cpp
index 68c94cd246b125a27ba26e6bec7a2f6409006bb4..697eabb75d5b79bc7ab6a2b34a612c37b5af9637 100644
--- a/bench/subset/SubsetSingleBench.cpp
+++ b/bench/subset/SubsetSingleBench.cpp
@@ -70,7 +70,12 @@ void SubsetSingleBench::onDraw(const int n, SkCanvas* canvas) {
info, NULL, colors, &colorCount);
SkBitmap bitmap;
- bitmap.allocPixels(info.makeWH(fSubsetWidth, fSubsetHeight));
+ if (kIndex_8_SkColorType == fColorType) {
scroggo 2015/06/30 16:40:19 I agree that this is better (I think in patch set
msarett 2015/06/30 18:40:28 Acknowledged.
+ bitmap.allocPixels(info.makeWH(fSubsetWidth, fSubsetHeight), NULL,
+ SkNEW_ARGS(SkColorTable, (colors, colorCount)));
scroggo 2015/06/30 16:40:19 According to the documentation for tryAllocPixels
msarett 2015/06/30 18:40:27 You're right. Sorry should have put a little more
+ } else {
+ bitmap.allocPixels(info.makeWH(fSubsetWidth, fSubsetHeight));
+ }
scanlineDecoder->skipScanlines(fOffsetTop);
uint32_t bpp = info.bytesPerPixel();
« no previous file with comments | « no previous file | bench/subset/SubsetTranslateBench.cpp » ('j') | bench/subset/SubsetTranslateBench.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698