commit 31143cf37fa38dc98f71c71e518ecc21c83b5e27
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Nov 09 22:14:19 2012 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Nov 09 22:14:19 2012 +0000
tree efab01dcd9599414a75554c6ec8a7dc2479b8121
parent 3fb91a1fe939c827495ed22d7a95bd093d663efe

shape ops work in progress

first cut at getting binary ops to work
(union/intersection/diff/xor)

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

experimental/Intersection/EdgeDemo.cpp

diff --git a/experimental/Intersection/EdgeDemo.cpp b/experimental/Intersection/EdgeDemo.cpp
index 8586c2b..841678a 100644
--- a/experimental/Intersection/EdgeDemo.cpp
+++ b/experimental/Intersection/EdgeDemo.cpp
@@ -24,9 +24,9 @@
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setStyle(SkPaint::kStroke_Style);
-  //  paint.setStrokeWidth(6);
-  //  paint.setColor(0x1F003f7f);
- //   canvas->drawPath(path, paint);
+//   paint.setStrokeWidth(6);
+ //  paint.setColor(0x1F003f7f);
+ //  canvas->drawPath(path, paint);
     paint.setColor(0xFF305F00);
     paint.setStrokeWidth(1);
     canvas->drawPath(out, paint);
@@ -287,7 +287,7 @@
         textPos[x].fY = height / 2;
     }
     paint.setTextSize(40 + step / 100.0f);
-#if 1
+#if 0
     bool oneShot = false;
     for (int mask = 0; mask < 1 << testStrLen; ++mask) {
         char maskStr[testStrLen];