From 1d1165ca6575e082b892c5460492c411618783ad Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 31 Mar 2017 16:45:04 +0000 Subject: Revert "clean up (partially) colortable api" This reverts commit 2e491a6a113c5e16a3b7bede5fa6f588deeb928d. Reason for revert: Windows unit tests failing? Original change's description: > clean up (partially) colortable api > > Needs this to land: https://codereview.chromium.org/2789853002/ > > Bug: skia: > Change-Id: I38d916a546b7fa64d000d973e695ddda24a589e7 > Reviewed-on: https://skia-review.googlesource.com/10600 > Commit-Queue: Mike Reed > Reviewed-by: Matt Sarett > TBR=msarett@google.com,scroggo@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I626e7edfcea82576a440dcaa851a04cedee6233f Reviewed-on: https://skia-review.googlesource.com/10966 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- tools/Resources.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/Resources.cpp') diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 224bf3f66e..d7f90189a6 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -34,10 +34,9 @@ bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { return false; } SkPMColor ctStorage[256]; - auto ctable = SkColorTable::Make(ctStorage, 256); + sk_sp ctable(new SkColorTable(ctStorage, 256)); int count = ctable->count(); - // ICK -- gotta clean up this pattern of writing to the ctable - return dst->tryAllocPixels(gen->getInfo(), ctable) && + return dst->tryAllocPixels(gen->getInfo(), nullptr, ctable.get()) && gen->getPixels(gen->getInfo().makeColorSpace(nullptr), dst->getPixels(), dst->rowBytes(), const_cast(ctable->readColors()), &count); } -- cgit v1.2.3