aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkBitmap.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2016-11-07 14:13:52 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-07 19:59:56 +0000
commit704cd32e4a92d6c3eae6bfae4adcc20126bf4437 (patch)
treef055a8a0b01f5ed899883f46224a096ed7cc43bd /src/core/SkBitmap.cpp
parente9592f56c859752cf19095fb8ffeb6777835a65b (diff)
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 <bungeman@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/core/SkBitmap.cpp')
-rw-r--r--src/core/SkBitmap.cpp12
1 files changed, 6 insertions, 6 deletions
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<SkColorTable> ctable;
+ sk_sp<SkColorTable> 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<SkColorTable> ctable;
+ sk_sp<SkColorTable> ctable;
if (buffer->readBool()) {
ctable.reset(SkColorTable::Create(*buffer));
if (!ctable) {
@@ -1047,13 +1047,13 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {
}
}
- SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(),
- ctable.get(), data.get()));
+ sk_sp<SkPixelRef> 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;
}