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/android/SkBitmapRegionCodec.h | 4 +++- src/android/SkBitmapRegionDecoder.cpp | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/android') diff --git a/src/android/SkBitmapRegionCodec.h b/src/android/SkBitmapRegionCodec.h index 5c59d52d71..2c9536c109 100644 --- a/src/android/SkBitmapRegionCodec.h +++ b/src/android/SkBitmapRegionCodec.h @@ -26,7 +26,9 @@ public: bool conversionSupported(SkColorType colorType) override; - SkEncodedFormat getEncodedFormat() override { return fCodec->getEncodedFormat(); } + SkEncodedFormat getEncodedFormat() override { + return (SkEncodedFormat)fCodec->getEncodedFormat(); + } private: diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp index 15a530e21a..8298fb5298 100644 --- a/src/android/SkBitmapRegionDecoder.cpp +++ b/src/android/SkBitmapRegionDecoder.cpp @@ -29,11 +29,10 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( return NULL; } - SkEncodedFormat format = codec->getEncodedFormat(); - switch (format) { - case SkEncodedFormat::kJPEG_SkEncodedFormat: - case SkEncodedFormat::kPNG_SkEncodedFormat: - case SkEncodedFormat::kWEBP_SkEncodedFormat: + switch ((SkEncodedImageFormat)codec->getEncodedFormat()) { + case SkEncodedImageFormat::kJPEG: + case SkEncodedImageFormat::kPNG: + case SkEncodedImageFormat::kWEBP: break; default: return nullptr; -- cgit v1.2.3