diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-31 15:17:50 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-31 15:17:50 +0000 |
| commit | 277c3f87656c44e0a651ed0dd56efa16c0ab07b4 (patch) | |
| tree | 863b9897fe1ab6263150dfbd8d391cb0f28ea655 /src/pathops/SkOpAngle.cpp | |
| parent | 2d76d933ff8ba2090229599f32bdb2b17fb7ad50 (diff) | |
bump picture version since SkPath has changed (conics)
enable conics in SkPath
git-svn-id: http://skia.googlecode.com/svn/trunk@9370 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pathops/SkOpAngle.cpp')
| -rw-r--r-- | src/pathops/SkOpAngle.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pathops/SkOpAngle.cpp b/src/pathops/SkOpAngle.cpp index aa72394043..dee2906b7f 100644 --- a/src/pathops/SkOpAngle.cpp +++ b/src/pathops/SkOpAngle.cpp @@ -113,11 +113,11 @@ bool SkOpAngle::operator<(const SkOpAngle& rh) const { SkPath::Verb partVerb = useThis ? fVerb : rh.fVerb; ray[0] = partVerb == SkPath::kCubic_Verb && part[0].approximatelyEqual(part[1]) ? part[2] : part[1]; - ray[1].fX = (part[0].fX + part[partVerb].fX) / 2; - ray[1].fY = (part[0].fY + part[partVerb].fY) / 2; + ray[1].fX = (part[0].fX + part[SkPathOpsVerbToPoints(partVerb)].fX) / 2; + ray[1].fY = (part[0].fY + part[SkPathOpsVerbToPoints(partVerb)].fY) / 2; SkASSERT(ray[0] != ray[1]); - roots = (i.*CurveRay[fVerb])(fPts, ray); - rroots = (ri.*CurveRay[rh.fVerb])(rh.fPts, ray); + roots = (i.*CurveRay[SkPathOpsVerbToPoints(fVerb)])(fPts, ray); + rroots = (ri.*CurveRay[SkPathOpsVerbToPoints(rh.fVerb)])(rh.fPts, ray); } while ((roots == 0 || rroots == 0) && (flip ^= true)); if (roots == 0 || rroots == 0) { // FIXME: we don't have a solution in this case. The interim solution @@ -314,8 +314,8 @@ void SkOpAngle::setSpans() { fUnsortable = step > 0 ? thisSpan.fUnsortableStart : nextSpan.fUnsortableEnd; #if DEBUG_UNSORTABLE if (fUnsortable) { - SkPoint iPt = (*CurvePointAtT[fVerb])(fPts, thisSpan.fT); - SkPoint ePt = (*CurvePointAtT[fVerb])(fPts, nextSpan.fT); + SkPoint iPt = (*CurvePointAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, thisSpan.fT); + SkPoint ePt = (*CurvePointAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, nextSpan.fT); SkDebugf("%s unsortable [%d] (%1.9g,%1.9g) [%d] (%1.9g,%1.9g)\n", __FUNCTION__, index, iPt.fX, iPt.fY, fEnd, ePt.fX, ePt.fY); } @@ -330,8 +330,8 @@ void SkOpAngle::setSpans() { } #if 1 #if DEBUG_UNSORTABLE - SkPoint iPt = (*CurvePointAtT[fVerb])(fPts, startT); - SkPoint ePt = (*CurvePointAtT[fVerb])(fPts, endT); + SkPoint iPt = (*CurvePointAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, startT); + SkPoint ePt = (*CurvePointAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, endT); SkDebugf("%s all tiny unsortable [%d] (%1.9g,%1.9g) [%d] (%1.9g,%1.9g)\n", __FUNCTION__, fStart, iPt.fX, iPt.fY, fEnd, ePt.fX, ePt.fY); #endif |