diff options
| -rw-r--r-- | experimental/Intersection/Simplify.cpp | 6 | ||||
| -rw-r--r-- | src/core/SkMatrix.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPath.cpp | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index cbf33d0439..c798a3a5ca 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -3178,14 +3178,14 @@ the same winding is shared by both. #if DEBUG_UNSORTABLE SkDebugf("%s start id=%d [%d] (%1.9g,%1.9g)\n", __FUNCTION__, fID, start, xAtT(start), yAtT(start)); -#endif +#endif span->fUnsortableStart = true; } else { --span; #if DEBUG_UNSORTABLE SkDebugf("%s end id=%d [%d] (%1.9g,%1.9g) next:(%1.9g,%1.9g)\n", __FUNCTION__, fID, start - 1, xAtT(start - 1), yAtT(start - 1), xAtT(start), yAtT(start)); -#endif +#endif span->fUnsortableEnd = true; } if (!span->fUnsortableStart || !span->fUnsortableEnd || span->fDone) { @@ -4341,7 +4341,7 @@ public: #endif } } - + void calcCoincidentWinding() { int count = fCoincidences.count(); for (int index = 0; index < count; ++index) { diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp index 1eabc78fba..5c9547e8a7 100644 --- a/src/core/SkMatrix.cpp +++ b/src/core/SkMatrix.cpp @@ -1826,7 +1826,7 @@ bool SkTreatAsSprite(const SkMatrix& mat, int width, int height, SkRect dst; SkIRect isrc = { 0, 0, width, height }; - + { SkRect src; src.set(isrc); diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 88d7c43d6b..5e0d198182 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -1034,38 +1034,38 @@ bool SkPath::hasOnlyMoveTos() const { void SkPath::addRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry, Direction dir) { assert_known_direction(dir); - + SkScalar w = rect.width(); SkScalar halfW = SkScalarHalf(w); SkScalar h = rect.height(); SkScalar halfH = SkScalarHalf(h); - + if (halfW <= 0 || halfH <= 0) { return; } - + bool skip_hori = rx >= halfW; bool skip_vert = ry >= halfH; - + if (skip_hori && skip_vert) { this->addOval(rect, dir); return; } - + fDirection = this->hasOnlyMoveTos() ? dir : kUnknown_Direction; - + SkAutoPathBoundsUpdate apbu(this, rect); SkAutoDisableDirectionCheck(this); - + if (skip_hori) { rx = halfW; } else if (skip_vert) { ry = halfH; } - + SkScalar sx = SkScalarMul(rx, CUBIC_ARC_FACTOR); SkScalar sy = SkScalarMul(ry, CUBIC_ARC_FACTOR); - + this->incReserve(17); this->moveTo(rect.fRight - rx, rect.fTop); if (dir == kCCW_Direction) { |