From 704cd32e4a92d6c3eae6bfae4adcc20126bf4437 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 7 Nov 2016 14:13:52 -0500 Subject: src/core: s/SkAutoTUnref/sk_sp/g BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4492 Change-Id: I753ad01b03e891221965252e3befe280d09cdb9f Reviewed-on: https://skia-review.googlesource.com/4492 Reviewed-by: Ben Wagner Commit-Queue: Hal Canary --- src/core/SkBitmap.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/SkBitmap.cpp') diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index beeda4fb42..7ea49a8c6c 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -803,11 +803,11 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, Allocator* alloc) } // allocate colortable if srcConfig == kIndex8_Config - SkAutoTUnref ctable; + sk_sp ctable; if (dstColorType == kIndex_8_SkColorType) { ctable.reset(SkRef(srcPM.ctable())); } - if (!tmpDst.tryAllocPixels(alloc, ctable)) { + if (!tmpDst.tryAllocPixels(alloc, ctable.get())) { return false; } @@ -1021,7 +1021,7 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) { SkASSERT(srcRow == dstRow); // first row does not need to be moved } - SkAutoTUnref ctable; + sk_sp ctable; if (buffer->readBool()) { ctable.reset(SkColorTable::Create(*buffer)); if (!ctable) { @@ -1047,13 +1047,13 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) { } } - SkAutoTUnref pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(), - ctable.get(), data.get())); + sk_sp pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(), + ctable.get(), data.get())); if (!pr.get()) { return false; } bitmap->setInfo(pr->info()); - bitmap->setPixelRef(pr, 0, 0); + bitmap->setPixelRef(pr.get(), 0, 0); return true; } -- cgit v1.2.3