commit b45a1b46ee25e9b19800b028bb1ca925212ac7b4
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 18 20:50:33 2012 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 18 20:50:33 2012 +0000
tree 2a2bc0d004962519eaadd605c4b885386fc252cf
parent a611c3ea53c02ef80baa32fbfb9cca33f999378d

shape ops work in progress

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

experimental/Intersection/EdgeWalker.cpp

diff --git a/experimental/Intersection/EdgeWalker.cpp b/experimental/Intersection/EdgeWalker.cpp
index 002e84c..4aff58f 100644
--- a/experimental/Intersection/EdgeWalker.cpp
+++ b/experimental/Intersection/EdgeWalker.cpp
@@ -767,6 +767,7 @@
         fTs = src.fTs;
         fTopIntercepts = src.fTopIntercepts;
         fBottomIntercepts = src.fBottomIntercepts;
+        return *this;
     }
 
     // OPTIMIZATION: remove this function if it's never called
@@ -1409,7 +1410,8 @@
             curve[1] = &rh.fTangent;
             curve[2] = &rh.fBelow;
         }
-        
+        // FIXME: code has been abandoned, incomplete....
+        return false;
     }
     
     bool abCompare(const SkPoint& a1, const SkPoint& a2, const SkPoint& b1,
@@ -1727,9 +1729,9 @@
             b2 = edge->fTangent.fX;
         }
         if (fabs(t1 - t2) > fabs(b1 - b2)) {
-            ulps = UlpsDiff(t1, t2);
+            ulps = UlpsDiff((float) t1, (float) t2);
         } else {
-            ulps = UlpsDiff(b1, b2);
+            ulps = UlpsDiff((float) b1, (float) b2);
         }
 #if DEBUG_ADJUST_COINCIDENT
         SkDebugf("%s this=%d edge=%d ulps=%d\n", __FUNCTION__, ID(), edge->ID(),