diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-13 20:41:48 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-13 20:41:48 +0000 |
| commit | 1ab0aac67247bf3ec1f23b220456d316d9a80b45 (patch) | |
| tree | 47c2fa15529ebe0538a355f671f6352c94105e33 /experimental/Intersection | |
| parent | 1304bb25aa3b0baa61fc2e2900fabcef88801b59 (diff) | |
shape ops -- fix errors
git-svn-id: http://skia.googlecode.com/svn/trunk@8138 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/Intersection')
| -rw-r--r-- | experimental/Intersection/EdgeWalker_TestUtility.cpp | 2 | ||||
| -rw-r--r-- | experimental/Intersection/Simplify.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/experimental/Intersection/EdgeWalker_TestUtility.cpp b/experimental/Intersection/EdgeWalker_TestUtility.cpp index 163bd51917..7926ee9822 100644 --- a/experimental/Intersection/EdgeWalker_TestUtility.cpp +++ b/experimental/Intersection/EdgeWalker_TestUtility.cpp @@ -370,7 +370,7 @@ void comparePathsTiny(const SkPath& one, const SkPath& two) { for (int y = 0; y < bitHeight; ++y) { uint8_t* addr1 = bits.getAddr1(0, y); uint8_t* addr2 = bits.getAddr1(bitWidth, y); - for (int x = 0; x < bits.rowBytes(); ++x) { + for (unsigned x = 0; x < bits.rowBytes(); ++x) { SkASSERT(addr1[x] == addr2[x]); } } diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index 7c72d8c59b..bedee71652 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -2107,7 +2107,7 @@ public: } void buildAnglesInner(int index, SkTDArray<Angle>& angles) const { - Span* span = &fTs[index]; + const Span* span = &fTs[index]; Segment* other = span->fOther; // if there is only one live crossing, and no coincidence, continue // in the same direction @@ -3644,7 +3644,7 @@ the same winding is shared by both. return true; } - Segment* nextChase(int& index, const int step, int& min, Span*& last) const { + Segment* nextChase(int& index, const int step, int& min, Span*& last) { int end = nextExactSpan(index, step); SkASSERT(end >= 0); if (multipleSpans(end)) { @@ -4376,6 +4376,8 @@ the same winding is shared by both. case SkPath::kCubic_Verb: SkDebugf(CUBIC_DEBUG_STR, CUBIC_DEBUG_DATA(segment.fPts)); break; + default: + SkASSERT(0); } SkDebugf(" tStart=%1.9g tEnd=%1.9g", sSpan.fT, eSpan.fT); #endif |