From 248ff02331d7f73ee4b6c5a7eabeae1080c16cd4 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 22 Nov 2016 09:03:03 -0700 Subject: SkImageEncoder: simplify API - 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 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4909 Change-Id: Ib48b31fdc05cf23cda7f56ebfd67c841c149ce70 Reviewed-on: https://skia-review.googlesource.com/4909 Reviewed-by: Mike Reed Reviewed-by: Leon Scroggins Commit-Queue: Hal Canary --- src/animator/SkSnapshot.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/animator/SkSnapshot.cpp') diff --git a/src/animator/SkSnapshot.cpp b/src/animator/SkSnapshot.cpp index fbaedff730..6be1a53471 100644 --- a/src/animator/SkSnapshot.cpp +++ b/src/animator/SkSnapshot.cpp @@ -30,7 +30,7 @@ DEFINE_GET_MEMBER(SkSnapshot); SkSnapshot::SkSnapshot() { quality = 100 * SK_Scalar1; - type = (SkImageEncoder::Type) -1; + type = (SkEncodedImageFormat) -1; sequence = false; fSeqVal = 0; } @@ -38,7 +38,7 @@ SkSnapshot::SkSnapshot() bool SkSnapshot::draw(SkAnimateMaker& maker) { SkASSERT(type >= 0); SkASSERT(filename.size() > 0); - SkImageEncoder* encoder = SkImageEncoder::Create((SkImageEncoder::Type) type); + SkImageEncoder* encoder = SkImageEncoder::Create((SkEncodedImageFormat) type); if (!encoder) { return false; } @@ -54,9 +54,9 @@ bool SkSnapshot::draw(SkAnimateMaker& maker) { if (++fSeqVal > 999) sequence = false; } - if (type == SkImageEncoder::kJPEG_Type) + if (type == SkEncodedImageFormat::kJPEG) name.append(".jpg"); - else if (type == SkImageEncoder::kPNG_Type) + else if (type == SkEncodedImageFormat::kPNG) name.append(".png"); SkBitmap pixels; -- cgit v1.2.3