commit a5e55925ea03e76885804bda77408a1d6f04c335
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 07 18:51:31 2013 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 07 18:51:31 2013 +0000
tree 346772e0d28a5483ca807742cf5e074cf3fb0bb5
parent 3faf1f1fb6157c49bd09cd3c78dc88421e70deb7

path ops -- fix skp bugs

This fixes a series of bugs discovered by running
the small set of Skia skp files through pathops
to flatten the clips.
Review URL: https://codereview.chromium.org/14798004

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

tests/PathOpsExtendedTest.cpp

diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index 8d7ca28..71631c1 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -12,6 +12,7 @@
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkStream.h"
+#include "SkThreadPool.h"
 
 #ifdef SK_BUILD_FOR_MAC
 #include <sys/sysctl.h>
@@ -78,7 +79,7 @@
     showPath(path);
 }
 
-const char* fillTypeStr[] = {
+static const char* fillTypeStr[] = {
     "kWinding_FillType",
     "kEvenOdd_FillType",
     "kInverseWinding_FillType",
@@ -478,7 +479,7 @@
 }
 
 bool testSimplify(skiatest::Reporter* reporter, const SkPath& path) {
-#if FORCE_RELEASE == 0
+#if DEBUG_SHOW_TEST_NAME
     showPathData(path);
 #endif
     SkPath out;
@@ -498,7 +499,7 @@
 
 bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
                  const SkPathOp shapeOp) {
-#if FORCE_RELEASE == 0
+#if DEBUG_SHOW_TEST_NAME
     showPathData(a);
     showOp(shapeOp);
     showPathData(b);
@@ -595,7 +596,7 @@
         while (index > 0 && tests[index].fun != firstTest) {
             --index;
         }
-#if FORCE_RELEASE == 0
+#if DEBUG_SHOW_TEST_NAME
             SkDebugf("<div id=\"%s\">\n", tests[index].str);
             SkDebugf("  %s [%s]\n", __FUNCTION__, tests[index].str);
 #endif
@@ -605,7 +606,7 @@
     size_t last = reverse ? 0 : count - 1;
     do {
         if (tests[index].fun != firstTest) {
-    #if FORCE_RELEASE == 0
+    #if DEBUG_SHOW_TEST_NAME
             SkDebugf("<div id=\"%s\">\n", tests[index].str);
             SkDebugf("  %s [%s]\n", __FUNCTION__, tests[index].str);
     #endif