commit fc9a3be3d2b97aba6aad27e0b9a9f105f08287b9
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 12 13:52:14 2012 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 12 13:52:14 2012 +0000
tree 09ed618c96ab7c1be45bf0d04e695a157329c64c
parent c00d5c7902bf15f0f8069fc1ad653818dc1ed05c

always check the result of SkMatrix::invert



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

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 13bc718..c415a10 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1357,7 +1357,9 @@
         fDeviceCMDirty = true;  // |= (fExternalMatrix != *matrix)
 
         fExternalMatrix = *matrix;
-        matrix->invert(&fExternalInverse);
+        if (!matrix->invert(&fExternalInverse)) {
+            fExternalInverse.reset();
+        }
     }
 }
 

src/effects/Sk2DPathEffect.cpp

diff --git a/src/effects/Sk2DPathEffect.cpp b/src/effects/Sk2DPathEffect.cpp
index f2f9e37..dd067be 100644
--- a/src/effects/Sk2DPathEffect.cpp
+++ b/src/effects/Sk2DPathEffect.cpp
@@ -28,7 +28,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 Sk2DPathEffect::Sk2DPathEffect(const SkMatrix& mat) : fMatrix(mat) {
-    mat.invert(&fInverse);
+    if (!mat.invert(&fInverse)) {
+        fInverse.reset();
+    }
 }
 
 bool Sk2DPathEffect::filterPath(SkPath* dst, const SkPath& src, SkScalar* width) {
@@ -78,7 +80,9 @@
     SkASSERT(size <= sizeof(storage));
     buffer.read(storage, size);
     fMatrix.unflatten(storage);
-    fMatrix.invert(&fInverse);
+    if (!fMatrix.invert(&fInverse)) {
+        fInverse.reset();
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////