Upstream changes from Android.

tests/MatrixTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkMath.h"
 #include "SkMatrix.h"
@@ skipping 20 matching lines @@
     }
     return true;
 }
 
 static bool are_equal(skiatest::Reporter* reporter,
                       const SkMatrix& a,
                       const SkMatrix& b) {
     bool equal = a == b;
     bool cheapEqual = a.cheapEqualTo(b);
     if (equal != cheapEqual) {
-#if SK_SCALAR_IS_FLOAT
+#ifdef SK_SCALAR_IS_FLOAT
         if (equal) {
             bool foundZeroSignDiff = false;
             for (int i = 0; i < 9; ++i) {
                 float aVal = a.get(i);
                 float bVal = b.get(i);
                 int aValI = *SkTCast<int*>(&aVal);
                 int bValI = *SkTCast<int*>(&bVal);
                 if (0 == aVal && 0 == bVal && aValI != bValI) {
                     foundZeroSignDiff = true;
                 } else {
@@ skipping 228 matching lines @@
     // perspective x
     mat.reset();
     mat.setPerspX(SkScalarToPersp(SK_Scalar1 / 2));
     REPORTER_ASSERT(reporter, !mat.isSimilarity());
 
     // perspective y
     mat.reset();
     mat.setPerspY(SkScalarToPersp(SK_Scalar1 / 2));
     REPORTER_ASSERT(reporter, !mat.isSimilarity());
 
-#if SK_SCALAR_IS_FLOAT
+#ifdef SK_SCALAR_IS_FLOAT
     /* We bypass the following tests for SK_SCALAR_IS_FIXED build.
      * The long discussion can be found in this issue:
      *     http://codereview.appspot.com/5999050/
      * In short, we haven't found a perfect way to fix the precision
      * issue, i.e. the way we use tolerance in isSimilarityTransformation
      * is incorrect. The situation becomes worse in fixed build, so
      * we disabled rotation related tests for fixed build.
      */
 
     // rotate
@@ skipping 161 matching lines @@
     REPORTER_ASSERT(reporter, !are_equal(reporter, mat, mat2));
 #endif
 
     test_matrix_max_stretch(reporter);
     test_matrix_is_similarity(reporter);
     test_matrix_recttorect(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Matrix", MatrixTestClass, TestMatrix)