diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-06 20:01:46 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-06 20:01:46 +0000 |
commit | 09042b80d22837c760bb530124aaa67469b19b8f (patch) | |
tree | 1e4e2a5e1f31c6d4eb83d290f9dec0591d1058e8 /tests | |
parent | 419400bf6e475dfbaa424ef0155598a3422cfa67 (diff) |
Fixing Windows compiler complaints
http://codereview.appspot.com/5991056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3626 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Matrix44Test.cpp | 2 | ||||
-rw-r--r-- | tests/PathTest.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp index 485b38bc49..9846e7df07 100644 --- a/tests/Matrix44Test.cpp +++ b/tests/Matrix44Test.cpp @@ -69,7 +69,7 @@ static void test_common_angles(skiatest::Reporter* reporter) { // Test precision of rotation in common cases int common_angles[] = { 0, 90, -90, 180, -180, 270, -270, 360, -360 }; for (int i = 0; i < 9; ++i) { - rot.setRotateDegreesAbout(0, 0, -1, common_angles[i]); + rot.setRotateDegreesAbout(0, 0, -1, SkIntToScalar(common_angles[i])); SkMatrix rot3x3 = rot; REPORTER_ASSERT(reporter, rot3x3.rectStaysRect()); diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index 868ce318b1..c4ad0a6eb3 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -162,7 +162,7 @@ static void stroke_tiny_cubic() { static void check_close(skiatest::Reporter* reporter, const SkPath& path) { for (int i = 0; i < 2; ++i) { - SkPath::Iter iter(path, (bool)i); + SkPath::Iter iter(path, SkToBool(i)); SkPoint mv; SkPoint pts[4]; SkPath::Verb v; @@ -943,7 +943,6 @@ static void test_raw_iter(skiatest::Reporter* reporter) { do { nextVerb = static_cast<SkPath::Verb>((rand.nextU() >> 16) % SkPath::kDone_Verb); } while (lastWasClose && nextVerb == SkPath::kClose_Verb); - int numRequiredPts; switch (nextVerb) { case SkPath::kMove_Verb: expectedPts[numPoints] = randomPts[(rand.nextU() >> 16) % 25]; |