diff options
| author |  caryclark <caryclark@google.com> | 2014-09-18 11:00:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-18 11:00:40 -0700 |
| commit | a10742c69ce47d346e3cf23e7be909c9f29b401e (patch) | |
| tree | 0855675b6829d526c19481ccbeef537aa9d237e4 /include/core | |
| parent | 95b7144adffc376e62c50c6d5010a3880dec61fa (diff) | |
update to accommodate latest clang in chrome toolchain
remove asserts for null pointers to references
change var args signature to pointer instead of array
R=mtklein@google.com, reed@android.com, reed@google.com, mtklein, reed
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/577243002
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkRect.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/core/SkRect.h b/include/core/SkRect.h index 77051c2d8b..c8fc7c65c8 100644 --- a/include/core/SkRect.h +++ b/include/core/SkRect.h @@ -277,7 +277,6 @@ struct SK_API SkIRect { rectangle. If either rectangle is empty, do nothing and return false. */ bool intersect(const SkIRect& a, const SkIRect& b) { - SkASSERT(&a && &b); if (!a.isEmpty() && !b.isEmpty() && a.fLeft < b.fRight && b.fLeft < a.fRight && @@ -298,7 +297,6 @@ struct SK_API SkIRect { we assert that both rectangles are non-empty. */ bool intersectNoEmptyCheck(const SkIRect& a, const SkIRect& b) { - SkASSERT(&a && &b); SkASSERT(!a.isEmpty() && !b.isEmpty()); if (a.fLeft < b.fRight && b.fLeft < a.fRight && |