From a2b4bdce8cfd1a91407595a25683ecff982af22e Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 22 Nov 2016 14:21:38 -0700 Subject: 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 Reviewed-by: Hal Canary --- gm/image.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/image.cpp') diff --git a/gm/image.cpp b/gm/image.cpp index 6545c0a5f4..5454ac3966 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -348,13 +348,13 @@ static SkImageGenerator* gen_picture(const SkImageInfo& info) { static SkImageGenerator* gen_png(const SkImageInfo& info) { sk_sp image(make_raster(info, nullptr, draw_opaque_contents)); - sk_sp data(image->encode(SkEncodedImageFormat::kPNG, 100)); + sk_sp data(image->encode(SkImageEncoder::kPNG_Type, 100)); return SkImageGenerator::NewFromEncoded(data.get()); } static SkImageGenerator* gen_jpg(const SkImageInfo& info) { sk_sp image(make_raster(info, nullptr, draw_opaque_contents)); - sk_sp data(image->encode(SkEncodedImageFormat::kJPEG, 100)); + sk_sp data(image->encode(SkImageEncoder::kJPEG_Type, 100)); return SkImageGenerator::NewFromEncoded(data.get()); } @@ -467,7 +467,7 @@ DEF_SIMPLE_GM(new_texture_image, canvas, 225, 60) { // Create encoded image. [bmp] { sk_sp src( - sk_tool_utils::EncodeImageToData(bmp, SkEncodedImageFormat::kPNG, 100)); + SkImageEncoder::EncodeData(bmp, SkImageEncoder::kPNG_Type, 100)); return SkImage::MakeFromEncoded(std::move(src)); }, // Create a picture image. -- cgit v1.2.3