From 0741818e7ab4e9ea8505b8a8687412f0e3804c65 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Tue, 15 Aug 2017 12:24:02 -0400 Subject: Move calls to conversion_possible to SkCodec Move common code into the base class, so subclasses need not call conversion_possible. Use SkEncodedInfo rather than SkImageInfo, and use the proper frame. API Changes: - SkAndroidCodec: - Add getEncodedInfo(), for SkBitmapRegionCodec - SkEncodedInfo: - Add opaque() helper - SkBitmapRegionDecoder: - Remove unused conversionSupported (Split off from skia-review.googlesource.com/c/25746) Bug: skia:5601 Change-Id: If4a40d4b98a3dd0afde2b6058f92315a393a5baf Reviewed-on: https://skia-review.googlesource.com/34361 Reviewed-by: Mike Klein Reviewed-by: Derek Sollenberger Commit-Queue: Leon Scroggins --- dm/DMSrcSink.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'dm/DMSrcSink.cpp') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index e255dd3cdd..a862969e4a 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -152,10 +152,6 @@ Error BRDSrc::draw(SkCanvas* canvas) const { return Error::Nonfatal(SkStringPrintf("Could not create brd for %s.", fPath.c_str())); } - if (!brd->conversionSupported(colorType)) { - return Error::Nonfatal("Cannot convert to color type."); - } - const uint32_t width = brd->width(); const uint32_t height = brd->height(); // Visually inspecting very small output images is not necessary. -- cgit v1.2.3