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 --- bench/BitmapBench.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'bench/BitmapBench.cpp') diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp index 8e881a665b..fdf17e90b1 100644 --- a/bench/BitmapBench.cpp +++ b/bench/BitmapBench.cpp @@ -44,10 +44,8 @@ static void convertToIndex666(const SkBitmap& src, SkBitmap* dst, SkAlphaType aT } } } - SkColorTable* ctable = new SkColorTable(storage, 216); dst->allocPixels(SkImageInfo::Make(src.width(), src.height(), kIndex_8_SkColorType, aType), - nullptr, ctable); - ctable->unref(); + SkColorTable::Make(storage, 216)); SkAutoLockPixels alps(src); SkAutoLockPixels alpd(*dst); -- cgit v1.2.3