From 9920b10f5292838f00600f676c4578cd11705e60 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Sat, 1 Apr 2017 12:14:57 -0400 Subject: Revert[2] "clean up (partially) colortable api"" This reverts commit 1d1165ca6575e082b892c5460492c411618783ad. Bug: skia: Change-Id: Idbc0634ae3cec2e79f592d252de8751b077e6408 Reviewed-on: https://skia-review.googlesource.com/11024 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tools/Resources.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/Resources.cpp') diff --git a/tools/Resources.cpp b/tools/Resources.cpp index d7f90189a6..224bf3f66e 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -34,9 +34,10 @@ bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { return false; } SkPMColor ctStorage[256]; - sk_sp ctable(new SkColorTable(ctStorage, 256)); + auto ctable = SkColorTable::Make(ctStorage, 256); int count = ctable->count(); - return dst->tryAllocPixels(gen->getInfo(), nullptr, ctable.get()) && + // ICK -- gotta clean up this pattern of writing to the ctable + return dst->tryAllocPixels(gen->getInfo(), ctable) && gen->getPixels(gen->getInfo().makeColorSpace(nullptr), dst->getPixels(), dst->rowBytes(), const_cast(ctable->readColors()), &count); } -- cgit v1.2.3