fix cheapComputeDirection() in the non-convex case to pivot on the y-max point

rather than pivoting on the next. Also remove the loop, as it is just logically
wrong to think we can use this trick only a non-extrema pt.



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

1 files changed, 3 insertions, 15 deletions

diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 50c7c59265..fc2ba42346 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -1947,21 +1947,9 @@ bool SkPath::cheapComputeDirection(Direction* dir) const {
             }
         } else {
             int i = find_max_y(pts, n);
-            // loop around until we get a non-zero cross
-            for (int j = 0; j < n; ++j) {
-                if (i < n - 2) {
-                    cross = cross_prod(pts[i], pts[i + 1], pts[i + 2]);
-                } else {
-                    cross = cross_prod(pts[i], pts[(i + 1) % n], pts[(i + 2) % n]);
-                }
-                if (cross) {
-                    break;
-                }
-                SkASSERT(i < n);
-                if (++i == n) {
-                    i = 0;
-                }
-            }
+            // can't always say (i-1) % n, in case i-1 goes negative, so we
+            // use (i+n-1) % n instead
+            cross = cross_prod(pts[(i + n - 1) % n], pts[i], pts[(i + 1) % n]);
         }
         if (cross) {
             if (dir) {