proper handling if SkMatrix::invert failes, addresses hack fix in rev. 3657

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

1 files changed, 4 insertions, 6 deletions

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 56ac2da646..fc308d4058 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1365,12 +1365,10 @@ void SkCanvas::setExternalMatrix(const SkMatrix* matrix) {
         }
         fUseExternalMatrix = false;
     } else {
-        fUseExternalMatrix = true;
-        fDeviceCMDirty = true;  // |= (fExternalMatrix != *matrix)
-
-        fExternalMatrix = *matrix;
-        if (!matrix->invert(&fExternalInverse)) {
-            fExternalInverse.reset();
+        if (matrix->invert(&fExternalInverse)) {
+            fExternalMatrix = *matrix;
+            fUseExternalMatrix = true;
+            fDeviceCMDirty = true;  // |= (fExternalMatrix != *matrix)
         }
     }
 }