shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@4119 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/EdgeWalker.cpp b/experimental/Intersection/EdgeWalker.cpp
index 8baf727..e74689f 100644
--- a/experimental/Intersection/EdgeWalker.cpp
+++ b/experimental/Intersection/EdgeWalker.cpp
@@ -2292,7 +2292,7 @@
ActiveEdge* activePtr, * nextPtr = edgeList[0];
size_t index;
bool foundCoincident = false;
- int firstIndex = 0;
+ size_t firstIndex = 0;
for (index = 1; index < edgeCount; ++index) {
activePtr = nextPtr;
nextPtr = edgeList[index];
diff --git a/experimental/Intersection/QuadraticIntersection_Test.cpp b/experimental/Intersection/QuadraticIntersection_Test.cpp
index 7c573d4..adf91bd 100644
--- a/experimental/Intersection/QuadraticIntersection_Test.cpp
+++ b/experimental/Intersection/QuadraticIntersection_Test.cpp
@@ -54,8 +54,8 @@
const size_t testSetCount = sizeof(testSet) / sizeof(testSet[0]);
static void oneOffTest() {
- for (int outer = 0; outer < testSetCount - 1; ++outer) {
- for (int inner = outer + 1; inner < testSetCount; ++inner) {
+ for (size_t outer = 0; outer < testSetCount - 1; ++outer) {
+ for (size_t inner = outer + 1; inner < testSetCount; ++inner) {
const Quadratic& quad1 = testSet[outer];
const Quadratic& quad2 = testSet[inner];
Intersections intersections;
diff --git a/experimental/Intersection/QuadraticReduceOrder_Test.cpp b/experimental/Intersection/QuadraticReduceOrder_Test.cpp
index b716cdb..881289a 100644
--- a/experimental/Intersection/QuadraticReduceOrder_Test.cpp
+++ b/experimental/Intersection/QuadraticReduceOrder_Test.cpp
@@ -14,7 +14,7 @@
static void oneOffTest() {
SkDebugf("%s FLT_EPSILON=%1.9g\n", __FUNCTION__, FLT_EPSILON);
- for (int index = 0; index < testSetCount; ++index) {
+ for (size_t index = 0; index < testSetCount; ++index) {
const Quadratic& quad = testSet[index];
Quadratic reduce;
int order = reduceOrder(quad, reduce);
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index 7826c09..f3c095e 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -2145,7 +2145,7 @@
// see if coincidence is formed by clipping non-concident segments
static void coincidenceCheck(SkTDArray<Contour*>& contourList, int winding) {
int contourCount = contourList.count();
- for (size_t cIndex = 0; cIndex < contourCount; ++cIndex) {
+ for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
Contour* contour = contourList[cIndex];
contour->findTooCloseToCall(winding);
}
diff --git a/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp b/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp
index 11b6c01..da2569c 100644
--- a/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp
+++ b/experimental/Intersection/SimplifyAddIntersectingTs_Test.cpp
@@ -49,7 +49,7 @@
static const size_t cubicCount = sizeof(cubics) / sizeof(cubics[0]);
static const size_t testCount = lineCount + quadCount + cubicCount;
-static SkPath::Verb setPath(int outer, SkPath& path, const SkPoint*& pts1) {
+static SkPath::Verb setPath(size_t outer, SkPath& path, const SkPoint*& pts1) {
SkPath::Verb c1Type;
if (outer < lineCount) {
path.moveTo(lines[outer][0].fX, lines[outer][0].fY);
@@ -105,8 +105,8 @@
#endif
}
-static const int firstO = 6;
-static const int firstI = 1;
+static const size_t firstO = 6;
+static const size_t firstI = 1;
void SimplifyAddIntersectingTs_Test() {
const SkPoint* pts1, * pts2;
@@ -117,10 +117,10 @@
SkPath::Verb c2Type = setPath(firstI, path2, pts2);
testPath(path2, pts1, c1Type, pts2, c2Type);
}
- for (int o = 0; o < testCount; ++o) {
+ for (size_t o = 0; o < testCount; ++o) {
SkPath path;
SkPath::Verb c1Type = setPath(o, path, pts1);
- for (int i = 0; i < testCount; ++i) {
+ for (size_t i = 0; i < testCount; ++i) {
SkPath path2(path);
SkPath::Verb c2Type = setPath(i, path2, pts2);
testPath(path2, pts1, c1Type, pts2, c2Type);
diff --git a/experimental/Intersection/SimplifyAngle_Test.cpp b/experimental/Intersection/SimplifyAngle_Test.cpp
index aa291c0..7391588 100644
--- a/experimental/Intersection/SimplifyAngle_Test.cpp
+++ b/experimental/Intersection/SimplifyAngle_Test.cpp
@@ -125,7 +125,7 @@
*angleList[x] < *angleList[x + 1];
SkASSERT(x == quadCount - 1 || *angleList[x] < *angleList[x + 1]);
const SimplifyAngleTest::Angle* angle = angleList[x];
- if (x != angle->start()) {
+ if ((int) x != angle->start()) {
SkDebugf("%s [%d] [%d]\n", __FUNCTION__, x, angle->start());
SkASSERT(0);
}
@@ -147,7 +147,7 @@
QSort<SimplifyAngleTest::Angle>(angleList.begin(), angleList.end() - 1);
for (size_t x = 0; x < cubicCount; ++x) {
const SimplifyAngleTest::Angle* angle = angleList[x];
- if (x != angle->start()) {
+ if ((int) x != angle->start()) {
SkDebugf("%s [%d] [%d]\n", __FUNCTION__, x, angle->start());
SkASSERT(0);
}