| Index: include/core/SkRect.h
|
| diff --git a/include/core/SkRect.h b/include/core/SkRect.h
|
| index 06f8abe0e444c2e496c05f9e9cdf36e601124d19..cafc59afa73684f407057dd749fd42da768039bd 100644
|
| --- a/include/core/SkRect.h
|
| +++ b/include/core/SkRect.h
|
| @@ -267,7 +267,7 @@
|
| intersection, otherwise return false and do not change this rectangle.
|
| If either rectangle is empty, do nothing and return false.
|
| */
|
| - bool SK_WARN_UNUSED_RESULT intersect(const SkIRect& r) {
|
| + bool intersect(const SkIRect& r) {
|
| SkASSERT(&r);
|
| return this->intersect(r.fLeft, r.fTop, r.fRight, r.fBottom);
|
| }
|
| @@ -276,7 +276,7 @@
|
| that intersection, otherwise return false and do not change this
|
| rectangle. If either rectangle is empty, do nothing and return false.
|
| */
|
| - bool SK_WARN_UNUSED_RESULT intersect(const SkIRect& a, const SkIRect& b) {
|
| + bool intersect(const SkIRect& a, const SkIRect& b) {
|
|
|
| if (!a.isEmpty() && !b.isEmpty() &&
|
| a.fLeft < b.fRight && b.fLeft < a.fRight &&
|
| @@ -296,7 +296,7 @@
|
| If either is, then the return result is undefined. In the debug build,
|
| we assert that both rectangles are non-empty.
|
| */
|
| - bool SK_WARN_UNUSED_RESULT intersectNoEmptyCheck(const SkIRect& a, const SkIRect& b) {
|
| + bool intersectNoEmptyCheck(const SkIRect& a, const SkIRect& b) {
|
| SkASSERT(!a.isEmpty() && !b.isEmpty());
|
|
|
| if (a.fLeft < b.fRight && b.fLeft < a.fRight &&
|
| @@ -315,8 +315,7 @@
|
| otherwise return false and do not change this rectangle.
|
| If either rectangle is empty, do nothing and return false.
|
| */
|
| - bool SK_WARN_UNUSED_RESULT intersect(int32_t left, int32_t top,
|
| - int32_t right, int32_t bottom) {
|
| + bool intersect(int32_t left, int32_t top, int32_t right, int32_t bottom) {
|
| if (left < right && top < bottom && !this->isEmpty() &&
|
| fLeft < right && left < fRight && fTop < bottom && top < fBottom) {
|
| if (fLeft < left) fLeft = left;
|
| @@ -332,8 +331,8 @@
|
| */
|
| static bool Intersects(const SkIRect& a, const SkIRect& b) {
|
| return !a.isEmpty() && !b.isEmpty() && // check for empties
|
| - a.fLeft < b.fRight && b.fLeft < a.fRight &&
|
| - a.fTop < b.fBottom && b.fTop < a.fBottom;
|
| + a.fLeft < b.fRight && b.fLeft < a.fRight &&
|
| + a.fTop < b.fBottom && b.fTop < a.fBottom;
|
| }
|
|
|
| /**
|
| @@ -657,22 +656,21 @@
|
| intersection, otherwise return false and do not change this rectangle.
|
| If either rectangle is empty, do nothing and return false.
|
| */
|
| - bool SK_WARN_UNUSED_RESULT intersect(const SkRect& r);
|
| + bool intersect(const SkRect& r);
|
|
|
| /** If this rectangle intersects the rectangle specified by left, top, right, bottom,
|
| return true and set this rectangle to that intersection, otherwise return false
|
| and do not change this rectangle.
|
| If either rectangle is empty, do nothing and return false.
|
| */
|
| - bool SK_WARN_UNUSED_RESULT intersect(SkScalar left, SkScalar top,
|
| - SkScalar right, SkScalar bottom);
|
| + bool intersect(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom);
|
|
|
| /**
|
| * If rectangles a and b intersect, return true and set this rectangle to
|
| * that intersection, otherwise return false and do not change this
|
| * rectangle. If either rectangle is empty, do nothing and return false.
|
| */
|
| - bool SK_WARN_UNUSED_RESULT intersect(const SkRect& a, const SkRect& b);
|
| + bool intersect(const SkRect& a, const SkRect& b);
|
|
|
|
|
| private:
|
|
|