From 64778d9f275d8ce3df8f4ab39ff334b7ef5b70d3 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 11 Jul 2017 16:00:24 +0000 Subject: Revert "Change image encode api to return sk_sp" This reverts commit dc799550e2d9965aa5b7cda496465b2a76b310a5. Reason for revert: need to fix sites in Document_none Original change's description: > Change image encode api to return sk_sp > > Bug: skia: > Change-Id: I238289bc630be27795cb1384955dd6e887597c05 > Reviewed-on: https://skia-review.googlesource.com/22208 > Commit-Queue: Mike Reed > Reviewed-by: Florin Malita TBR=scroggo@google.com,fmalita@chromium.org,reed@google.com Change-Id: Id7f67027e5f1405a60fdbde29863cdf8daef0cb7 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/22280 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/TextBlobTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/TextBlobTest.cpp') diff --git a/tests/TextBlobTest.cpp b/tests/TextBlobTest.cpp index e0a6c843c9..238d7340b8 100644 --- a/tests/TextBlobTest.cpp +++ b/tests/TextBlobTest.cpp @@ -454,8 +454,8 @@ DEF_TEST(TextBlob_serialize, reporter) { REPORTER_ASSERT(reporter, img0->width() == img1->width()); REPORTER_ASSERT(reporter, img0->height() == img1->height()); - sk_sp enc0 = img0->encodeToData(); - sk_sp enc1 = img1->encodeToData(); + sk_sp enc0(img0->encode()); + sk_sp enc1(img1->encode()); REPORTER_ASSERT(reporter, enc0->equals(enc1.get())); if (false) { // in case you want to actually see the images... SkFILEWStream("textblob_serialize_img0.png").write(enc0->data(), enc0->size()); -- cgit v1.2.3