Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev

Browse Source
This commit is contained in:
Romain Guy
2012-10-10 17:16:34 -07:00
committed by Android (Google) Code Review
parent 38a6424013 c37f349ecf
commit 1460c8ca09
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/Patch.cpp
View File

@@ -134,7 +134,7 @@ void Patch::updateVertices(const float bitmapWidth, const float bitmapHeight,
const float fixed = bitmapWidth - stretchSize;
const float xStretch = fmaxf(right - left - fixed, 0.0f);
stretchX = xStretch / xStretchTex;
rescaleX = fminf(fmaxf(right - left, 0.0f) / fixed, 1.0f);
rescaleX = fixed == 0.0f ? 0.0f : fminf(fmaxf(right - left, 0.0f) / fixed, 1.0f);
}
if (yStretchCount > 0) {
@@ -146,7 +146,7 @@ void Patch::updateVertices(const float bitmapWidth, const float bitmapHeight,
const float fixed = bitmapHeight - stretchSize;
const float yStretch = fmaxf(bottom - top - fixed, 0.0f);
stretchY = yStretch / yStretchTex;
rescaleY = fminf(fmaxf(bottom - top, 0.0f) / fixed, 1.0f);
rescaleY = fixed == 0.0f ? 0.0f : fminf(fmaxf(bottom - top, 0.0f) / fixed, 1.0f);
}
TextureVertex* vertex = mVertices;