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 --- samplecode/SampleSlides.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'samplecode/SampleSlides.cpp') diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index c1c49b4ab1..43221d41a7 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -15,8 +15,6 @@ #include "SkPaint.h" #include "SkView.h" -#include "sk_tool_utils.h" - #define BG_COLOR 0xFFDDDDDD typedef void (*SlideProc)(SkCanvas*); @@ -683,7 +681,7 @@ public: canvas.restore(); SkString str; str.printf("/skimages/slide_" SK_SIZE_T_SPECIFIER ".png", i); - sk_tool_utils::EncodeImageToFile(str.c_str(), bm, SkEncodedImageFormat::kPNG, 100); + SkImageEncoder::EncodeFile(str.c_str(), bm, SkImageEncoder::kPNG_Type, 100); } this->setBGColor(BG_COLOR); } -- cgit v1.2.3