diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-16 15:50:18 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-16 15:50:18 +0000 |
| commit | 6853e808a464ca75ff1328338d1eb55ff27c4337 (patch) | |
| tree | b87b0d4374b5fd4171fd8eefe4de1c85da65c53a /tests/PathMeasureTest.cpp | |
| parent | 4f8975ea0fdd2127cc2c0611966204b36f1e75ce (diff) | |
Addressed more Windows compiler complaint issues
http://codereview.appspot.com/6007056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3689 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PathMeasureTest.cpp')
| -rw-r--r-- | tests/PathMeasureTest.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp index 2ff9f3a057..bceb427ebc 100644 --- a/tests/PathMeasureTest.cpp +++ b/tests/PathMeasureTest.cpp @@ -61,7 +61,9 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { SkVector tangent; REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fX, -SK_ScalarHalf, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fX, + -SK_ScalarHalf, + SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, position.fY == 0); REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); @@ -84,22 +86,28 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, length == SK_Scalar1 * 6); REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fX, SK_ScalarHalf, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fX, + SK_ScalarHalf, + SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, position.fY == 0); REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); REPORTER_ASSERT(reporter, meas.getPosTan(SK_Scalar1 * 2.5f, &position, &tangent)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fX, SK_Scalar1, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fX, SK_Scalar1, SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, SkScalarNearlyEqual(position.fY, SK_Scalar1 * 1.5f)); REPORTER_ASSERT(reporter, tangent.fX == 0); REPORTER_ASSERT(reporter, tangent.fY == SK_Scalar1); REPORTER_ASSERT(reporter, meas.getPosTan(SK_Scalar1 * 4.5f, &position, &tangent)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fX, SK_Scalar1 * 2.5f, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fX, + SkFloatToScalar(2.5f), + SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fY, SK_Scalar1 * 2.0f, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fY, + SkFloatToScalar(2.0f), + SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); @@ -114,7 +122,9 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, length == SK_Scalar1); REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fX, SK_ScalarHalf, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fX, + SK_ScalarHalf, + SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, position.fY == 0); REPORTER_ASSERT(reporter, tangent.fX == SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); @@ -123,9 +133,13 @@ static void TestPathMeasure(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, length == SK_Scalar1); REPORTER_ASSERT(reporter, meas.getPosTan(SK_ScalarHalf, &position, &tangent)); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fX, SK_Scalar1 * 1.5f, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fX, + SkFloatToScalar(1.5f), + SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, - SkScalarNearlyEqual(position.fY, SK_Scalar1 * 2.0f, SK_Scalar1 * 0.0001)); + SkScalarNearlyEqual(position.fY, + SkFloatToScalar(2.0f), + SkFloatToScalar(0.0001f))); REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1); REPORTER_ASSERT(reporter, tangent.fY == 0); } |