diff options
author | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 18:35:13 +0000 |
---|---|---|
committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 18:35:13 +0000 |
commit | 4bd2bdbf04f21237337616aa931e34d7c8991edc (patch) | |
tree | ade3b197e460003914d462c1eeedc93c203f181c /tests/MatrixTest.cpp | |
parent | 184487c8083e4e3958f9efe6fb6a9b1d4865fdf5 (diff) |
Upstream changes from Android.
Review URL: https://codereview.chromium.org/12699002
git-svn-id: http://skia.googlecode.com/svn/trunk@8045 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MatrixTest.cpp')
-rw-r--r-- | tests/MatrixTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp index 022e4012c7..5dface74d8 100644 --- a/tests/MatrixTest.cpp +++ b/tests/MatrixTest.cpp @@ -38,7 +38,7 @@ static bool are_equal(skiatest::Reporter* reporter, 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) { @@ -287,7 +287,7 @@ static void test_matrix_is_similarity(skiatest::Reporter* reporter) { 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/ |