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/get_images_from_skps.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tools/get_images_from_skps.cpp') diff --git a/tools/get_images_from_skps.cpp b/tools/get_images_from_skps.cpp index 6cd35122ad..d3a2343b88 100644 --- a/tools/get_images_from_skps.cpp +++ b/tools/get_images_from_skps.cpp @@ -65,14 +65,14 @@ struct Sniffer : public SkPixelSerializer { } SkString ext; switch (codec->getEncodedFormat()) { - case SkEncodedFormat::kBMP_SkEncodedFormat: ext = "bmp"; break; - case SkEncodedFormat::kGIF_SkEncodedFormat: ext = "gif"; break; - case SkEncodedFormat::kICO_SkEncodedFormat: ext = "ico"; break; - case SkEncodedFormat::kJPEG_SkEncodedFormat: ext = "jpg"; break; - case SkEncodedFormat::kPNG_SkEncodedFormat: ext = "png"; break; - case SkEncodedFormat::kDNG_SkEncodedFormat: ext = "dng"; break; - case SkEncodedFormat::kWBMP_SkEncodedFormat: ext = "wbmp"; break; - case SkEncodedFormat::kWEBP_SkEncodedFormat: ext = "webp"; break; + case SkEncodedImageFormat::kBMP: ext = "bmp"; break; + case SkEncodedImageFormat::kGIF: ext = "gif"; break; + case SkEncodedImageFormat::kICO: ext = "ico"; break; + case SkEncodedImageFormat::kJPEG: ext = "jpg"; break; + case SkEncodedImageFormat::kPNG: ext = "png"; break; + case SkEncodedImageFormat::kDNG: ext = "dng"; break; + case SkEncodedImageFormat::kWBMP: ext = "wbmp"; break; + case SkEncodedImageFormat::kWEBP: ext = "webp"; break; default: // This should be unreachable because we cannot create a codec if we do not know // the image type. -- cgit v1.2.3