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 --- tests/PathOpsConicIntersectionTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/PathOpsConicIntersectionTest.cpp') diff --git a/tests/PathOpsConicIntersectionTest.cpp b/tests/PathOpsConicIntersectionTest.cpp index 41c0acb9fd..1de1583a7b 100644 --- a/tests/PathOpsConicIntersectionTest.cpp +++ b/tests/PathOpsConicIntersectionTest.cpp @@ -110,8 +110,8 @@ static void writePng(const SkConic& c, const SkConic ch[2], const char* name) { canvas.drawPath(path, paint); SkString filename("c:\\Users\\caryclark\\Documents\\"); filename.appendf("%s.png", name); - SkImageEncoder::EncodeFile(filename.c_str(), bitmap, - SkImageEncoder::kPNG_Type, 100); + sk_tool_utils::EncodeImageToFile(filename.c_str(), bitmap, + SkEncodedImageFormat::kPNG, 100); } static void writeDPng(const SkDConic& dC, const char* name) { @@ -152,8 +152,8 @@ static void writeDPng(const SkDConic& dC, const char* name) { canvas.drawPath(path, paint); SkString filename("c:\\Users\\caryclark\\Documents\\"); filename.appendf("%s.png", name); - SkImageEncoder::EncodeFile(filename.c_str(), bitmap, - SkImageEncoder::kPNG_Type, 100); + sk_tool_utils::EncodeImageToFile(filename.c_str(), bitmap, + SkEncodedImageFormat::kPNG, 100); } #endif @@ -290,7 +290,7 @@ static void writeFrames() { } SkString filename("c:\\Users\\caryclark\\Documents\\"); filename.appendf("f%d.png", index); - SkImageEncoder::EncodeFile(filename.c_str(), bitmap, SkImageEncoder::kPNG_Type, 100); + sk_tool_utils::EncodeImageToFile(filename.c_str(), bitmap, SkEncodedImageFormat::kPNG, 100); } } #endif -- cgit v1.2.3