commit aa0da4fbfc47fa173c4ce6ced79dce2cd4925e77
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 11 19:11:10 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 11 19:11:10 2013 +0000
tree 50aa109f3abf777407447440a8387cf2be2ce3ab
parent ad56de320d1ee74f6aee507652fb7b72a602802a

Correct 32bit pointer assumption in assert in SkMatrix.


git-svn-id: http://skia.googlecode.com/svn/trunk/src@11739 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkMatrix.cpp

diff --git a/core/SkMatrix.cpp b/core/SkMatrix.cpp
index d802e1c..41c0f88 100644
--- a/core/SkMatrix.cpp
+++ b/core/SkMatrix.cpp
@@ -1220,7 +1220,7 @@
 void SkMatrix::mapPoints(SkPoint dst[], const SkPoint src[], int count) const {
     SkASSERT((dst && src && count > 0) || 0 == count);
     // no partial overlap
-    SkASSERT(src == dst || SkAbs32((int32_t)(src - dst)) >= count);
+    SkASSERT(src == dst || &dst[count] <= &src[0] || &src[count] <= &dst[0]);
 
     this->getMapPtsProc()(*this, dst, src, count);
 }