diff options
| author |  mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-22 20:43:54 +0000 |
|---|---|---|
| committer | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-22 20:43:54 +0000 |
| commit | 6e223af090c6f17e3bcd48f049e592ca30a95c5c (patch) | |
| tree | f3b18aced478da890d855f33c0598e0e91958944 | |
| parent | d6ca4ac1ee2a0096b42b02e9408181c9e0387939 (diff) | |
I feel like my clang is especially sensitive to unused variables.
BUG=
Review URL: https://codereview.chromium.org/82913006
git-svn-id: http://skia.googlecode.com/svn/trunk@12369 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkMatrix.cpp | 5 | ||||
| -rw-r--r-- | tests/PathOpsAngleTest.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp index a6405190e0..3caf51a0cf 100644 --- a/src/core/SkMatrix.cpp +++ b/src/core/SkMatrix.cpp @@ -48,13 +48,16 @@ enum { #ifdef SK_SCALAR_IS_FLOAT static const int32_t kScalar1Int = 0x3f800000; - static const int32_t kPersp1Int = 0x3f800000; #else #define scalarAsInt(x) (x) static const int32_t kScalar1Int = (1 << 16); static const int32_t kPersp1Int = (1 << 30); #endif +#ifdef SK_SCALAR_SLOW_COMPARES + static const int32_t kPersp1Int = 0x3f800000; +#endif + uint8_t SkMatrix::computePerspectiveTypeMask() const { #ifdef SK_SCALAR_SLOW_COMPARES if (SkScalarAs2sCompliment(fMat[kMPersp0]) | diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp index 6037592997..e1fb038a24 100644 --- a/tests/PathOpsAngleTest.cpp +++ b/tests/PathOpsAngleTest.cpp @@ -169,12 +169,12 @@ static const SortSet set12[] = { {lines[9], 2, 0.5, 0, {0, 0}}, }; -static const SortSet set13[] = { +/*static const SortSet set13[] = { {cubics[13], 4, 0.5, 0.400631046, {0, 0}}, {lines[10], 2, 0.791666667, 0.928, {0, 0}}, {lines[10], 2, 0.791666667, 0.333333333, {0, 0}}, {cubics[13], 4, 0.5, 0.866666667, {0, 0}}, -}; +};*/ static const SortSet set14[] = { {quads[2], 3, 0.5, 0.310102051, {0, 0}}, |