From 0122af08f6af0dee490e1a4f35b552377d0d4753 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Thu, 27 Apr 2017 20:08:39 +0000 Subject: Revert "Delete copyTo(Allocator), hide copyTo() behind flag" This reverts commit d4a338f4d0a0cdc08d7d3668931c60997f0fa971. Reason for revert: Looks like I missed something I was supposed to delete in Android. Original change's description: > Delete copyTo(Allocator), hide copyTo() behind flag > > Replace uses of copyTo() in Skia. > > Bug: skia:6464 > Change-Id: I921dc53a1c29a5176d18f05741f7c0b5a008e548 > Reviewed-on: https://skia-review.googlesource.com/14502 > Commit-Queue: Matt Sarett > Reviewed-by: Mike Reed > TBR=msarett@google.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I4d252940cc6a2462b030007055ea6c229471fc6e Reviewed-on: https://skia-review.googlesource.com/14602 Reviewed-by: Matt Sarett Commit-Queue: Matt Sarett --- tools/picture_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/picture_utils.cpp') diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index bd32f1938e..27e91ccdeb 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -126,7 +126,7 @@ namespace sk_tools { // Convert smaller formats up to premul linear 8-bit (in SkPMColor order). if (bitmap.colorType() != kN32_SkColorType) { SkBitmap n32; - if (!sk_tool_utils::copy_to(&n32, kN32_SkColorType, bitmap)) { + if (!bitmap.copyTo(&n32, kN32_SkColorType)) { return nullptr; } bitmap = n32; -- cgit v1.2.3