| Index: src/pathops/SkPathOpsDebug.cpp
|
| diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
|
| index 0331f34e8a74d91ffb34f8b6d0b0d7f88f7cab25..cc29ad318cd552048f6bafc1f5710bdd2edf9270 100644
|
| --- a/src/pathops/SkPathOpsDebug.cpp
|
| +++ b/src/pathops/SkPathOpsDebug.cpp
|
| @@ -134,7 +134,7 @@ SkOpAngle* SkOpSegment::debugLastAngle() {
|
| }
|
|
|
| void SkOpSegment::debugReset() {
|
| - this->init(this->fPts, this->contour(), this->verb());
|
| + this->init(this->fPts, this->fWeight, this->contour(), this->verb());
|
| }
|
|
|
| #if DEBUG_ACTIVE_SPANS
|
| @@ -160,6 +160,9 @@ void SkOpSegment::debugShowActiveSpans() const {
|
| for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
|
| SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
|
| }
|
| + if (SkPath::kConic_Verb == fVerb) {
|
| + SkDebugf(" %1.9gf", fWeight);
|
| + }
|
| const SkOpPtT* ptT = span->ptT();
|
| SkDebugf(") t=%1.9g (%1.9g,%1.9g)", ptT->fT, ptT->fPt.fX, ptT->fPt.fY);
|
| SkDebugf(" tEnd=%1.9g", span->next()->t());
|
| @@ -249,6 +252,11 @@ SkString SkOpAngle::debugPart() const {
|
| result.printf(QUAD_DEBUG_STR " id=%d", QUAD_DEBUG_DATA(fCurvePart),
|
| this->segment()->debugID());
|
| break;
|
| + case SkPath::kConic_Verb:
|
| + result.printf(CONIC_DEBUG_STR " id=%d",
|
| + CONIC_DEBUG_DATA(fCurvePart, fCurvePart.fConic.fWeight),
|
| + this->segment()->debugID());
|
| + break;
|
| case SkPath::kCubic_Verb:
|
| result.printf(CUBIC_DEBUG_STR " id=%d", CUBIC_DEBUG_DATA(fCurvePart),
|
| this->segment()->debugID());
|
|
|