From db6830162eca5b94e61d9825ec93306fc615d204 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 23 Nov 2016 08:55:18 -0700 Subject: SkImageEncoder: simplify API (re-land 248ff02 & 2cb6cb7, with changes) - Hide SkImageEncoder class in private header. - SkImageEncoder::Type becomes SkEncodedImageFormat - SkEncodedFormat becomes SkEncodedImageFormat - SkImageEncoder static functions replaced with single function EncodeImage() - utility wrappers for EncodeImage() are in sk_tool_utils.h TODO: remove link-time registration mechanism. TODO: clean up clients use of API and flip the flag. TODO: implement EncodeImage() in chromeium/skia/ext Change-Id: I47d451e50be4d5c6c130869c7fa7c2857243d9f0 Reviewed-on: https://skia-review.googlesource.com/4909 Reviewed-by: Mike Reed Reviewed-by: Leon Scroggins Reviewed-on: https://skia-review.googlesource.com/5186 Commit-Queue: Hal Canary Reviewed-by: Hal Canary --- tools/skdiff/skdiff_utils.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/skdiff') diff --git a/tools/skdiff/skdiff_utils.cpp b/tools/skdiff/skdiff_utils.cpp index f788ec8cef..f8eed908b7 100644 --- a/tools/skdiff/skdiff_utils.cpp +++ b/tools/skdiff/skdiff_utils.cpp @@ -6,6 +6,7 @@ */ #include "skdiff.h" #include "skdiff_utils.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkCodec.h" #include "SkData.h" @@ -82,8 +83,8 @@ bool write_bitmap(const SkString& path, const SkBitmap& bitmap) { SkBitmap copy; bitmap.copyTo(©, kN32_SkColorType); force_all_opaque(copy); - return SkImageEncoder::EncodeFile(path.c_str(), copy, - SkImageEncoder::kPNG_Type, 100); + return sk_tool_utils::EncodeImageToFile(path.c_str(), copy, + SkEncodedImageFormat::kPNG, 100); } /// Return a copy of the "input" string, within which we have replaced all instances -- cgit v1.2.3