diff options
| author |  Mike Reed <reed@google.com> | 2017-04-03 14:41:44 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-03 19:29:38 +0000 |
| commit | 6b3155c4be0476bc53541b0431c368a44e69f0a7 (patch) | |
| tree | 2de5a87716b38a587c475731df815e5c8178e133 /tools/Resources.cpp | |
| parent | 2db3232c88cbaec5585f263111f334ca7272fe10 (diff) | |
Revert[4] "clean up (partially) colortable api""""
Fixes:
- create temp api for android to pass nullptr
- don't release and access sk_sp<SkData> 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 <reed@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'tools/Resources.cpp')
| -rw-r--r-- | tools/Resources.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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<SkColorTable> 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<SkPMColor*>(ctable->readColors()), &count); } |