aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-04 18:52:16 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-04 18:52:16 +0000
commit4a1362a3c91ae9461a54bf1b04c250b0aa145db4 (patch)
tree413731fb18ab14dc2d4d371ac5ea8fc4b8cf3e27 /src/core
parent34cccde630fc618649b9737bee464203d042bfbb (diff)
add SK_IGNORE_FAST_SCALEMATRIX_INVERT guard for new invert code
git-svn-id: http://skia.googlecode.com/svn/trunk@7025 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkMatrix.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index 6cccc39ece..d7b2ff6e2b 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2006 The Android Open Source Project
*
@@ -6,7 +5,6 @@
* found in the LICENSE file.
*/
-
#include "SkMatrix.h"
#include "Sk64.h"
#include "SkFloatBits.h"
@@ -853,6 +851,7 @@ bool SkMatrix::invertNonIdentity(SkMatrix* inv) const {
TypeMask mask = this->getType();
+#ifndef SK_IGNORE_FAST_SCALEMATRIX_INVERT
if (0 == (mask & ~(kScale_Mask | kTranslate_Mask))) {
if (inv) {
if (mask & kScale_Mask) {
@@ -884,7 +883,8 @@ bool SkMatrix::invertNonIdentity(SkMatrix* inv) const {
}
return true;
}
-
+#endif
+
int isPersp = mask & kPerspective_Mask;
int shift;
SkDetScalar scale = sk_inv_determinant(fMat, isPersp, &shift);