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/sk_tool_utils.h | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'tools/sk_tool_utils.h') diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h index 526f0ef505..c6abbcf7c2 100644 --- a/tools/sk_tool_utils.h +++ b/tools/sk_tool_utils.h @@ -225,31 +225,6 @@ namespace sk_tool_utils { SkTDArray fDependencies; }; - template - inline bool EncodeImageToFile(const char* path, const T& src, SkEncodedImageFormat f, int q) { - SkFILEWStream file(path); - return file.isValid() && SkEncodeImage(&file, src, f, q); - } - - template - inline sk_sp EncodeImageToData(const T& src, SkEncodedImageFormat f, int q) { - SkDynamicMemoryWStream buf; - return SkEncodeImage(&buf, src , f, q) ? buf.detachAsData() : nullptr; - } - - /** - * Uses SkEncodeImage to serialize images that are not already - * encoded as SkEncodedImageFormat::kPNG images. - */ - inline sk_sp MakePixelSerializer() { - struct EncodeImagePixelSerializer final : SkPixelSerializer { - bool onUseEncodedData(const void*, size_t) override { return true; } - SkData* onEncode(const SkPixmap& pmap) override { - return EncodeImageToData(pmap, SkEncodedImageFormat::kPNG, 100).release(); - } - }; - return sk_make_sp(); - } } // namespace sk_tool_utils #endif // sk_tool_utils_DEFINED -- cgit v1.2.3