commit 9da1ae3f35a6f25adf4f58ae2589129ceec6d11b
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 22 17:06:15 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 22 17:06:15 2009 +0000
tree 605a3b78b919bfb4e92f92ffa288f354b0ca7c74
parent f03642675ee92889ed8c2def1665ac0d7bc71af7

fix NaN in path iterator
fix case where cubic is big/degenerate, and never returns a valid edge



git-svn-id: http://skia.googlecode.com/svn/trunk@280 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkPath.cpp

diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 082d2e8..794681c 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -986,8 +986,8 @@
         // A special case: if both points are NaN, SkPoint::operation== returns
         // false, but the iterator expects that they are treated as the same.
         // (consider SkPoint is a 2-dimension float point).
-        if (SkScalarIsNaN(fLastPt.fX) && SkScalarIsNaN(fLastPt.fY) &&
-            SkScalarIsNaN(fMoveTo.fX) && SkScalarIsNaN(fMoveTo.fY)) {
+        if (SkScalarIsNaN(fLastPt.fX) || SkScalarIsNaN(fLastPt.fY) ||
+            SkScalarIsNaN(fMoveTo.fX) || SkScalarIsNaN(fMoveTo.fY)) {
             return kClose_Verb;
         }