diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-10 17:13:36 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2012-10-10 17:13:36 -0700 |
| commit | c37f349ecff54f15ed31d57c1b886897c91430af (patch) | |
| tree | 431ab2a4385f6c3b61818e0c48b49bcf4e7ffff6 /libs | |
| parent | 41d35aef06c2a570a45474a01ca95a6cb9c29d9e (diff) | |
| download | frameworks_base-c37f349ecff54f15ed31d57c1b886897c91430af.zip frameworks_base-c37f349ecff54f15ed31d57c1b886897c91430af.tar.gz frameworks_base-c37f349ecff54f15ed31d57c1b886897c91430af.tar.bz2 | |
Prevent possible divide by 0
Bug #7307304
Should never happen, but eh :))
Change-Id: Ic7a09fd5c7a3622e6b4963f9ee6920e232018e2e
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/Patch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Patch.cpp b/libs/hwui/Patch.cpp index b3631df..902c82f 100644 --- a/libs/hwui/Patch.cpp +++ b/libs/hwui/Patch.cpp @@ -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; |