diff options
| -rw-r--r-- | src/core/SkPathRef.cpp | 12 | ||||
| -rw-r--r-- | tests/PathOpsOpTest.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp index e5efefcceb..844c40a505 100644 --- a/src/core/SkPathRef.cpp +++ b/src/core/SkPathRef.cpp @@ -677,6 +677,9 @@ uint8_t SkPathRef::Iter::peek() const { } #ifdef SK_DEBUG + +#include "SkNx.h" + void SkPathRef::validate() const { SkASSERT(static_cast<ptrdiff_t>(fFreeSpace) >= 0); SkASSERT(reinterpret_cast<intptr_t>(fVerbs) - reinterpret_cast<intptr_t>(fPoints) >= 0); @@ -700,11 +703,13 @@ void SkPathRef::validate() const { if (!fBoundsIsDirty && !fBounds.isEmpty()) { bool isFinite = true; + Sk2s leftTop = Sk2s(fBounds.fLeft, fBounds.fTop); + Sk2s rightBot = Sk2s(fBounds.fRight, fBounds.fBottom); for (int i = 0; i < fPointCnt; ++i) { + Sk2s point = Sk2s(fPoints[i].fX, fPoints[i].fY); #ifdef SK_DEBUG if (fPoints[i].isFinite() && - (fPoints[i].fX < fBounds.fLeft || fPoints[i].fX > fBounds.fRight || - fPoints[i].fY < fBounds.fTop || fPoints[i].fY > fBounds.fBottom)) { + ((point < leftTop).anyTrue() || (point > rightBot).anyTrue())) { SkDebugf("bounds: %f %f %f %f\n", fBounds.fLeft, fBounds.fTop, fBounds.fRight, fBounds.fBottom); for (int j = 0; j < fPointCnt; ++j) { @@ -717,8 +722,7 @@ void SkPathRef::validate() const { #endif SkASSERT(!fPoints[i].isFinite() || - (fPoints[i].fX >= fBounds.fLeft && fPoints[i].fX <= fBounds.fRight && - fPoints[i].fY >= fBounds.fTop && fPoints[i].fY <= fBounds.fBottom)); + (!(point < leftTop).anyTrue() && !(point > rightBot).anyTrue())); if (!fPoints[i].isFinite()) { isFinite = false; } diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp index b480700d26..4244fd7caf 100644 --- a/tests/PathOpsOpTest.cpp +++ b/tests/PathOpsOpTest.cpp @@ -6298,10 +6298,6 @@ static void fuzz763_1b(skiatest::Reporter* reporter, const char* filename) { } static void fuzz763_1a(skiatest::Reporter* reporter, const char* filename) { -// FIXME: fails on Nexus5 by generating a path with points that are not inside the path bounds -#if DEBUG_UNDER_DEVELOPMENT - return; -#endif SkPath path; path.setFillType((SkPath::FillType) 0); path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0 |