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 --- samplecode/SampleDither.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'samplecode/SampleDither.cpp') diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp index 6d91fda3ad..76ebecc25f 100644 --- a/samplecode/SampleDither.cpp +++ b/samplecode/SampleDither.cpp @@ -19,7 +19,6 @@ #include "SkColorPriv.h" #include "SkColorFilter.h" #include "SkDither.h" -#include "sk_tool_utils.h" static void draw_sweep(SkCanvas* c, int width, int height, SkScalar angle) { SkRect r; @@ -112,7 +111,7 @@ public: make_bm(&fBM); make_bm(&fBMPreDither); pre_dither(fBMPreDither); - sk_tool_utils::copy_to(&fBM16, kARGB_4444_SkColorType, fBM); + fBM.copyTo(&fBM16, kARGB_4444_SkColorType); fAngle = 0; -- cgit v1.2.3