diff options
author | Mike Reed <reed@google.com> | 2017-07-11 16:00:24 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-11 16:00:32 +0000 |
commit | 64778d9f275d8ce3df8f4ab39ff334b7ef5b70d3 (patch) | |
tree | d1f3cb8149c09154f736494b229496ac6795b176 /tests | |
parent | dc799550e2d9965aa5b7cda496465b2a76b310a5 (diff) |
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 <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ImageTest.cpp | 8 | ||||
-rw-r--r-- | tests/TextBlobTest.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 69b2a2290d..0b62b00c73 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -160,7 +160,7 @@ static sk_sp<SkImage> create_gpu_image(GrContext* context) { static void test_encode(skiatest::Reporter* reporter, SkImage* image) { const SkIRect ir = SkIRect::MakeXYWH(5, 5, 10, 10); - sk_sp<SkData> origEncoded = image->encodeToData(); + sk_sp<SkData> origEncoded(image->encode()); REPORTER_ASSERT(reporter, origEncoded); REPORTER_ASSERT(reporter, origEncoded->size() > 0); @@ -256,7 +256,7 @@ DEF_TEST(Image_Encode_Serializer, reporter) { return SkData::MakeWithCString(kSerializedData); }); sk_sp<SkImage> image(create_image()); - sk_sp<SkData> encoded = image->encodeToData(&serializer); + sk_sp<SkData> encoded(image->encode(&serializer)); sk_sp<SkData> reference(SkData::MakeWithCString(kSerializedData)); REPORTER_ASSERT(reporter, serializer.didEncode()); @@ -1236,7 +1236,7 @@ DEF_TEST(image_roundtrip_encode, reporter) { make_all_premul(&bm0); auto img0 = SkImage::MakeFromBitmap(bm0); - sk_sp<SkData> data = img0->encodeToData(SkEncodedImageFormat::kPNG, 100); + sk_sp<SkData> data(img0->encode(SkEncodedImageFormat::kPNG, 100)); auto img1 = SkImage::MakeFromEncoded(data); SkBitmap bm1; @@ -1306,7 +1306,7 @@ DEF_TEST(ImageScalePixels, reporter) { test_scale_pixels(reporter, rasterImage.get(), pmRed); // Test encoded image - sk_sp<SkData> data = rasterImage->encodeToData(); + sk_sp<SkData> data(rasterImage->encode()); sk_sp<SkImage> codecImage = SkImage::MakeFromEncoded(data); test_scale_pixels(reporter, codecImage.get(), pmRed); } 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<SkData> enc0 = img0->encodeToData(); - sk_sp<SkData> enc1 = img1->encodeToData(); + sk_sp<SkData> enc0(img0->encode()); + sk_sp<SkData> 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()); |