From 6b3155c4be0476bc53541b0431c368a44e69f0a7 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Apr 2017 14:41:44 -0400 Subject: Revert[4] "clean up (partially) colortable api"""" Fixes: - create temp api for android to pass nullptr - don't release and access sk_sp at the same time in parameters This reverts commit b14131c1851eea6acbd34cc42a8f860daed36b21. Bug: skia: Change-Id: Ic0e4f62520ba9f35455499ed30d306ad19d998a8 Reviewed-on: https://skia-review.googlesource.com/11129 Commit-Queue: Mike Reed Reviewed-by: Matt Sarett --- 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