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

Fix the assert and clamping in SkMatrix::get*Scale[s]().

Browse Source 
Follow-up after https://codereview.chromium.org/2143133005/.

BUG=skia:4718
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2154123003

Review-Url: https://codereview.chromium.org/2154123003
This commit is contained in:
kolczyk 2016-07-19 03:49:14 -07:00 committed by Commit bot
parent 2812f03d54
commit 718aab1e3f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/SkMatrix.cpp
View File

@ -1571,19 +1571,22 @@ template <MinMaxOrBoth MIN_MAX_OR_BOTH> bool get_scale_factor(SkMatrix::TypeMask
if (!SkScalarIsFinite(results[0])) {
return false;
}
if (results[0] < 0 && results[0] > -SK_ScalarNearlyZero) {
// Due to the floating point inaccuracy, there might be an error in a, b, c
// calculated by sdot, further deepened by subsequent arithmetic operations
// on them. Therefore, we allow and cap the nearly-zero negative values.
SkASSERT(results[0] >= -SK_ScalarNearlyZero);
if (results[0] < 0) {
results[0] = 0;
}
SkASSERT(results[0] >= 0);
results[0] = SkScalarSqrt(results[0]);
if (kBoth_MinMaxOrBoth == MIN_MAX_OR_BOTH) {
if (!SkScalarIsFinite(results[1])) {
return false;
}
if (results[1] < 0 && results[1] > -SK_ScalarNearlyZero) {
SkASSERT(results[1] >= -SK_ScalarNearlyZero);
if (results[1] < 0) {
results[1] = 0;
}
SkASSERT(results[1] >= 0);
results[1] = SkScalarSqrt(results[1]);
}
return true;