diff options
| -rw-r--r-- | include/core/SkPoint.h | 11 | ||||
| -rw-r--r-- | src/core/SkPoint.cpp | 10 | ||||
| -rw-r--r-- | src/core/SkRect.cpp | 11 |
3 files changed, 15 insertions, 17 deletions
diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h index 6f32d98c75..18b371f2ca 100644 --- a/include/core/SkPoint.h +++ b/include/core/SkPoint.h @@ -212,7 +212,16 @@ struct SK_API SkPoint { v[2].set(r, b); v[3].set(r, t); } - void setRectFan(SkScalar l, SkScalar t, SkScalar r, SkScalar b, size_t stride); + + void setRectFan(SkScalar l, SkScalar t, SkScalar r, SkScalar b, size_t stride) { + SkASSERT(stride >= sizeof(SkPoint)); + + ((SkPoint*)((intptr_t)this + 0 * stride))->set(l, t); + ((SkPoint*)((intptr_t)this + 1 * stride))->set(l, b); + ((SkPoint*)((intptr_t)this + 2 * stride))->set(r, b); + ((SkPoint*)((intptr_t)this + 3 * stride))->set(r, t); + } + static void Offset(SkPoint points[], int count, const SkPoint& offset) { Offset(points, count, offset.fX, offset.fY); diff --git a/src/core/SkPoint.cpp b/src/core/SkPoint.cpp index 5fee0e80c2..2970e35c54 100644 --- a/src/core/SkPoint.cpp +++ b/src/core/SkPoint.cpp @@ -43,16 +43,6 @@ void SkPoint::setIRectFan(int l, int t, int r, int b, size_t stride) { SkIntToScalar(t)); } -void SkPoint::setRectFan(SkScalar l, SkScalar t, SkScalar r, SkScalar b, - size_t stride) { - SkASSERT(stride >= sizeof(SkPoint)); - - ((SkPoint*)((intptr_t)this + 0 * stride))->set(l, t); - ((SkPoint*)((intptr_t)this + 1 * stride))->set(l, b); - ((SkPoint*)((intptr_t)this + 2 * stride))->set(r, b); - ((SkPoint*)((intptr_t)this + 3 * stride))->set(r, t); -} - void SkPoint::rotateCW(SkPoint* dst) const { SkASSERT(dst); diff --git a/src/core/SkRect.cpp b/src/core/SkRect.cpp index 2814375abb..12f76526a5 100644 --- a/src/core/SkRect.cpp +++ b/src/core/SkRect.cpp @@ -146,8 +146,7 @@ bool SkRect::intersect(const SkRect& a, const SkRect& b) { return false; } -void SkRect::join(SkScalar left, SkScalar top, SkScalar right, - SkScalar bottom) { +void SkRect::join(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom) { // do nothing if the params are empty if (left >= right || top >= bottom) { return; @@ -157,9 +156,9 @@ void SkRect::join(SkScalar left, SkScalar top, SkScalar right, if (fLeft >= fRight || fTop >= fBottom) { this->set(left, top, right, bottom); } else { - if (left < fLeft) fLeft = left; - if (top < fTop) fTop = top; - if (right > fRight) fRight = right; - if (bottom > fBottom) fBottom = bottom; + fLeft = SkMinScalar(fLeft, left); + fTop = SkMinScalar(fTop, top); + fRight = SkMaxScalar(fRight, right); + fBottom = SkMaxScalar(fBottom, bottom); } } |