diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-22 14:21:38 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-22 21:23:51 +0000 |
| commit | a2b4bdce8cfd1a91407595a25683ecff982af22e (patch) | |
| tree | 2e8fad7d92be4e8a024db784747944d110a80123 /tests/ImageTest.cpp | |
| parent | 6b77f1cf09f6a3c47a42e29dc28087ac9f9cdb25 (diff) | |
Revert 248ff023 & 2cb6cb72
Revert "SkImageEncoder: simplify API"
This reverts commit 248ff02331d7f73ee4b6c5a7eabeae1080c16cd4.
Revert "Fix bug: can't convert nullptr -> bool"
This reverts commit 2cb6cb7218171b357bb5c934f032ba69c7b78401.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5151
NOTRY=true
Change-Id: I5f6414392d6545f74db0b5bb50608d04f053a8ec
Reviewed-on: https://skia-review.googlesource.com/5151
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tests/ImageTest.cpp')
| -rw-r--r-- | tests/ImageTest.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 020e322f91..18883feded 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -26,8 +26,6 @@ #include "SkUtils.h" #include "Test.h" -#include "sk_tool_utils.h" - #if SK_SUPPORT_GPU #include "GrGpu.h" #endif @@ -155,7 +153,7 @@ static sk_sp<SkImage> create_codec_image() { sk_sp<SkData> data(create_image_data(&info)); SkBitmap bitmap; bitmap.installPixels(info, data->writable_data(), info.minRowBytes()); - sk_sp<SkData> src(sk_tool_utils::EncodeImageToData(bitmap, SkEncodedImageFormat::kPNG, 100)); + sk_sp<SkData> src(SkImageEncoder::EncodeData(bitmap, SkImageEncoder::kPNG_Type, 100)); return SkImage::MakeFromEncoded(std::move(src)); } #if SK_SUPPORT_GPU @@ -1028,7 +1026,7 @@ DEF_TEST(image_roundtrip_encode, reporter) { make_all_premul(&bm0); auto img0 = SkImage::MakeFromBitmap(bm0); - sk_sp<SkData> data(img0->encode(SkEncodedImageFormat::kPNG, 100)); + sk_sp<SkData> data(img0->encode(SkImageEncoder::kPNG_Type, 100)); auto img1 = SkImage::MakeFromEncoded(data); SkBitmap bm1; |