diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-31 16:45:04 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 16:45:09 +0000 |
| commit | 1d1165ca6575e082b892c5460492c411618783ad (patch) | |
| tree | d0c8be9303b4033e2eac559a104a9c1129430dbd /tools/Resources.cpp | |
| parent | 43e5fd3e2095aa47630ff3a8b6da4139968d0492 (diff) | |
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 <reed@google.com>
> Reviewed-by: Matt Sarett <msarett@google.com>
>
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 <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools/Resources.cpp')
| -rw-r--r-- | tools/Resources.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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<SkColorTable> 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<SkPMColor*>(ctable->readColors()), &count); } |