AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent webp from producing 0 dimensional images

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1196643002
This commit is contained in:
msarett 2015-06-19 07:34:30 -07:00 committed by Commit bot
parent b8e0b4a328
commit a0c414d7b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codec/SkWebpCodec.cpp
View File

@ -103,8 +103,10 @@ static bool conversion_possible(const SkImageInfo& dst, const SkImageInfo& src)
SkISize SkWebpCodec::onGetScaledDimensions(float desiredScale) const {
SkISize dim = this->getInfo().dimensions();
dim.fWidth = SkScalarRoundToInt(desiredScale * dim.fWidth);
dim.fHeight = SkScalarRoundToInt(desiredScale * dim.fHeight);
// SkCodec treats zero dimensional images as errors, so the minimum size
// that we will recommend is 1x1.
dim.fWidth = SkTMax(1, SkScalarRoundToInt(desiredScale * dim.fWidth));
dim.fHeight = SkTMax(1, SkScalarRoundToInt(desiredScale * dim.fHeight));
return dim;
}