commit 0899696e9fec7d376b63655bedaed76871cb15c2
author qiankun.miao <qiankun.miao@intel.com> Mon Jan 12 07:50:25 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Jan 12 07:50:25 2015 -0800
tree e6ec2b00fa2934e5b410265b3f24e5eab491b657
parent 815e9b5e23710d05b7bd2f5842e90ef2f3ad5ccf

Fix overlap test for 64-bit pointers in SkMatrix

BUG=skia:3297

Review URL: https://codereview.chromium.org/803493008

src/core/SkMatrix.cpp

diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index 77036bc..9658177 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1025,7 +1025,7 @@
 void SkMatrix::mapHomogeneousPoints(SkScalar dst[], const SkScalar src[], int count) const {
     SkASSERT((dst && src && count > 0) || 0 == count);
     // no partial overlap
-    SkASSERT(src == dst || SkAbs32((int32_t)(src - dst)) >= 3*count);
+    SkASSERT(src == dst || &dst[3*count] <= &src[0] || &src[3*count] <= &dst[0]);
 
     if (count > 0) {
         if (this->isIdentity()) {