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 | |
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')
-rw-r--r-- | tests/AAClipTest.cpp | 8 | ||||
-rw-r--r-- | tests/ClipCubicTest.cpp | 26 | ||||
-rw-r--r-- | tests/ClipperTest.cpp | 8 | ||||
-rw-r--r-- | tests/PaintTest.cpp | 16 | ||||
-rw-r--r-- | tests/PathCoverageTest.cpp | 4 | ||||
-rw-r--r-- | tests/PathMeasureTest.cpp | 30 | ||||
-rw-r--r-- | tests/ScalarTest.cpp | 2 |
7 files changed, 54 insertions, 40 deletions
diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp index 4817c06738..2898f30880 100644 --- a/tests/AAClipTest.cpp +++ b/tests/AAClipTest.cpp @@ -322,10 +322,10 @@ static void test_regressions(skiatest::Reporter* reporter) { { SkAAClip clip; SkRect r; - r.fLeft = SkFloatToScalar(129.892181); - r.fTop = SkFloatToScalar(10.3999996); - r.fRight = SkFloatToScalar(130.892181); - r.fBottom = SkFloatToScalar(20.3999996); + r.fLeft = SkFloatToScalar(129.892181f); + r.fTop = SkFloatToScalar(10.3999996f); + r.fRight = SkFloatToScalar(130.892181f); + r.fBottom = SkFloatToScalar(20.3999996f); clip.setRect(r, true); } } diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp index 491d0e5f3e..1c9199f4da 100644 --- a/tests/ClipCubicTest.cpp +++ b/tests/ClipCubicTest.cpp @@ -81,7 +81,7 @@ static void TestCubicClipping(skiatest::Reporter* reporter) { SkPoint clipped[4], shouldbe[4]; SkIRect clipRect; bool success; - const float tol = SkFloatToScalar(1e-4); + const float tol = SkFloatToScalar(1e-4f); // Test no clip, with plenty of room. clipRect.set(-2, -2, 6, 14); @@ -119,9 +119,9 @@ static void TestCubicClipping(skiatest::Reporter* reporter) { success = clipper.clipCubic(crv, clipped); REPORTER_ASSERT(reporter, success == true); REPORTER_ASSERT(reporter, CurvesAreEqual(clipped, SetCurve( - 0.5126125216, 1, - 1.841195941, 4.337081432, - 1.297019958, 10.19801331, + 0.5126125216f, 1, + 1.841195941f, 4.337081432f, + 1.297019958f, 10.19801331f, 4, 12, shouldbe), tol)); @@ -131,9 +131,9 @@ static void TestCubicClipping(skiatest::Reporter* reporter) { success = clipper.clipCubic(crv, clipped); REPORTER_ASSERT(reporter, success == true); REPORTER_ASSERT(reporter, CurvesAreEqual(clipped, SetCurve( - 00.8412352204, 2, - 1.767683744, 5.400758266, - 1.55052948, 10.36701965, + 00.8412352204f, 2, + 1.767683744f, 5.400758266f, + 1.55052948f, 10.36701965f, 4, 12, shouldbe), tol)); @@ -144,9 +144,9 @@ static void TestCubicClipping(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, success == true); REPORTER_ASSERT(reporter, CurvesAreEqual(clipped, SetCurve( 0, 0, - 1.742904663, 2.614356995, - 1.207521796, 8.266430855, - 3.026495695, 11, + 1.742904663f, 2.614356995f, + 1.207521796f, 8.266430855f, + 3.026495695f, 11, shouldbe), tol)); // Test clip at 10. @@ -156,9 +156,9 @@ static void TestCubicClipping(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, success == true); REPORTER_ASSERT(reporter, CurvesAreEqual(clipped, SetCurve( 0, 0, - 1.551193237, 2.326789856, - 1.297736168, 7.059780121, - 2.505550385, 10, + 1.551193237f, 2.326789856f, + 1.297736168f, 7.059780121f, + 2.505550385f, 10, shouldbe), tol)); test_giantClip(); diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp index d8949bf07a..d739d31954 100644 --- a/tests/ClipperTest.cpp +++ b/tests/ClipperTest.cpp @@ -52,10 +52,10 @@ static void test_edgeclipper(skiatest::Reporter* reporter) { SkEdgeClipper clipper; const SkPoint pts[] = { - { SkFloatToScalar(3.0995476e+010), SkFloatToScalar(42.929779) }, - { SkFloatToScalar(-3.0995163e+010), SkFloatToScalar(51.050385) }, - { SkFloatToScalar(-3.0995157e+010), SkFloatToScalar(51.050392) }, - { SkFloatToScalar(-3.0995134e+010), SkFloatToScalar(51.050400) }, + { SkFloatToScalar(3.0995476e+010f), SkFloatToScalar(42.929779f) }, + { SkFloatToScalar(-3.0995163e+010f), SkFloatToScalar(51.050385f) }, + { SkFloatToScalar(-3.0995157e+010f), SkFloatToScalar(51.050392f) }, + { SkFloatToScalar(-3.0995134e+010f), SkFloatToScalar(51.050400f) }, }; const SkRect clip = { 0, 0, SkIntToScalar(300), SkIntToScalar(200) }; diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 6350eb5a65..d459b3941e 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -69,14 +69,14 @@ static void regression_cubic(skiatest::Reporter* reporter) { SkPath path, stroke; SkPaint paint; - path.moveTo(SkFloatToFixed(460.2881309415525f), - SkFloatToFixed(303.250847066498)); - path.cubicTo(SkFloatToFixed(463.36378422175284), - SkFloatToFixed(302.1169735073363), - SkFloatToFixed(456.32239330810046), - SkFloatToFixed(304.720354932878), - SkFloatToFixed(453.15255460013304), - SkFloatToFixed(305.788586869862)); + path.moveTo(SkFloatToScalar(460.2881309415525f), + SkFloatToScalar(303.250847066498f)); + path.cubicTo(SkFloatToScalar(463.36378422175284f), + SkFloatToScalar(302.1169735073363f), + SkFloatToScalar(456.32239330810046f), + SkFloatToScalar(304.720354932878f), + SkFloatToScalar(453.15255460013304f), + SkFloatToScalar(305.788586869862f)); SkRect fillR, strokeR; fillR = path.getBounds(); diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp index 91de17802e..4f2f1bee62 100644 --- a/tests/PathCoverageTest.cpp +++ b/tests/PathCoverageTest.cpp @@ -60,8 +60,8 @@ static inline uint32_t compute_pointCount(SkScalar d, SkScalar tol) { if (d < tol) { return 1; } else { - int temp = SkScalarCeil(SkScalarSqrt(SkScalarDiv(d, tol))); - uint32_t count = SkMinScalar(SkNextPow2(temp), MAX_POINTS_PER_CURVE); + int temp = SkScalarCeilToInt(SkScalarSqrt(SkScalarDiv(d, tol))); + uint32_t count = SkMin32(SkNextPow2(temp), MAX_POINTS_PER_CURVE); return count; } } 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); } diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp index 981fb0f5f2..cc88e7420f 100644 --- a/tests/ScalarTest.cpp +++ b/tests/ScalarTest.cpp @@ -20,7 +20,7 @@ static bool isFinite_int(float x) { } static bool isFinite_float(float x) { - return sk_float_isfinite(x); + return SkToBool(sk_float_isfinite(x)); } static bool isFinite_mulzero(float x) { |