From 5f1c8ff5249729f140bd4be2400b5a0b54478462 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 9 Nov 2017 14:43:43 -0500 Subject: [PATCH] WebP - allow more scales We previously artificially restricted to using sample sizes. But there is no reason to do so. Android's new API allows arbitrary scaling, so support it. Change-Id: I15f48f9b27b11f8cabb55e3f79ae6ee5ffd39069 Reviewed-on: https://skia-review.googlesource.com/69600 Reviewed-by: Derek Sollenberger Commit-Queue: Leon Scroggins --- src/codec/SkWebpAdapterCodec.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/codec/SkWebpAdapterCodec.cpp b/src/codec/SkWebpAdapterCodec.cpp index 93400d0015..18e1a54911 100644 --- a/src/codec/SkWebpAdapterCodec.cpp +++ b/src/codec/SkWebpAdapterCodec.cpp @@ -24,19 +24,6 @@ bool SkWebpAdapterCodec::onGetSupportedSubset(SkIRect* desiredSubset) const { SkCodec::Result SkWebpAdapterCodec::onGetAndroidPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const AndroidOptions& options) { - // SkWebpCodec will support pretty much any dimensions that we provide, but we want - // to be stricter about the type of scaling that we allow, so we will add an extra - // check here. - SkISize supportedSize; - if (!options.fSubset) { - supportedSize = this->onGetSampledDimensions(options.fSampleSize); - } else { - supportedSize = this->getSampledSubsetDimensions(options.fSampleSize, *options.fSubset); - } - if (supportedSize != info.dimensions()) { - return SkCodec::kInvalidParameters; - } - SkCodec::Options codecOptions; codecOptions.fZeroInitialized = options.fZeroInitialized; codecOptions.fSubset = options.fSubset;