aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-10 16:58:02 +0000
committerGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-10 16:58:02 +0000
commit59a6a2b98302adc4732fc26873043bad1a94e9f1 (patch)
tree97e967d38c43cfb863c57b13be0aed8a34350452 /src
parent99452e6d15f4e3c01a4a20c3bf50ff698e62f261 (diff)
Fix assertion caused by change in 7117.
SkRect::intersect returns false if either rectange is empty. SkCanvas::quickReject returns true if an empty rectange is entirely contained within the clip bounds. git-svn-id: http://skia.googlecode.com/svn/trunk@7118 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/core/SkBBoxRecord.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkBBoxRecord.cpp b/src/core/SkBBoxRecord.cpp
index 78559a4a65..bec6ff6e13 100644
--- a/src/core/SkBBoxRecord.cpp
+++ b/src/core/SkBBoxRecord.cpp
@@ -274,7 +274,7 @@ bool SkBBoxRecord::transformBounds(const SkRect& bounds, const SkPaint* paint) {
}
}
- if (!this->quickReject(outBounds)) {
+ if (!outBounds.isEmpty() && !this->quickReject(outBounds)) {
this->getTotalMatrix().mapRect(&outBounds);
this->handleBBox(outBounds);
return true;