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 --- tools/skdiff/skdiff_utils.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/skdiff') diff --git a/tools/skdiff/skdiff_utils.cpp b/tools/skdiff/skdiff_utils.cpp index f8eed908b7..f788ec8cef 100644 --- a/tools/skdiff/skdiff_utils.cpp +++ b/tools/skdiff/skdiff_utils.cpp @@ -6,7 +6,6 @@ */ #include "skdiff.h" #include "skdiff_utils.h" -#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkCodec.h" #include "SkData.h" @@ -83,8 +82,8 @@ bool write_bitmap(const SkString& path, const SkBitmap& bitmap) { SkBitmap copy; bitmap.copyTo(©, kN32_SkColorType); force_all_opaque(copy); - return sk_tool_utils::EncodeImageToFile(path.c_str(), copy, - SkEncodedImageFormat::kPNG, 100); + return SkImageEncoder::EncodeFile(path.c_str(), copy, + SkImageEncoder::kPNG_Type, 100); } /// Return a copy of the "input" string, within which we have replaced all instances -- cgit v1.2.3