commit 5f0310376388ce9ce9b7b51eb28d7d6165a47b7b
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 21 17:59:19 2013 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 21 17:59:19 2013 +0000
tree ae59dbd11072b6fa72570723e521c3f944c0ae8d
parent d2a4ea1bd5caf2095590043f42fbb2cb489bbc99

fix compiler error where SK_SCALAR_IS_FLOAT is not defined.

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

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

core/SkMatrix.cpp

diff --git a/core/SkMatrix.cpp b/core/SkMatrix.cpp
index cd7bcea..e9bbfb9 100644
--- a/core/SkMatrix.cpp
+++ b/core/SkMatrix.cpp
@@ -51,14 +51,13 @@
 #else
     #define scalarAsInt(x)  (x)
     static const int32_t kScalar1Int = (1 << 16);
-    static const int32_t kPersp1Int  = (1 << 30);
 #endif
 
 uint8_t SkMatrix::computePerspectiveTypeMask() const {
 #ifdef SK_SCALAR_SLOW_COMPARES
     if (SkScalarAs2sCompliment(fMat[kMPersp0]) |
             SkScalarAs2sCompliment(fMat[kMPersp1]) |
-            (SkScalarAs2sCompliment(fMat[kMPersp2]) - kPersp1Int)) {
+            (SkScalarAs2sCompliment(fMat[kMPersp2]) - SK_Fract1)) {
         return SkToU8(kORableMasks);
     }
 #else
@@ -84,7 +83,7 @@
 #ifdef SK_SCALAR_SLOW_COMPARES
     if (SkScalarAs2sCompliment(fMat[kMPersp0]) |
             SkScalarAs2sCompliment(fMat[kMPersp1]) |
-            (SkScalarAs2sCompliment(fMat[kMPersp2]) - kPersp1Int)) {
+            (SkScalarAs2sCompliment(fMat[kMPersp2]) - SK_Fract1)) {
         return SkToU8(kORableMasks);
     }