diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-03 17:35:19 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-03 17:35:19 +0000 |
commit | 93f03324189f211db95c312b3cb08b435cc5ac34 (patch) | |
tree | 0eb0f4c0c62ce4cdff52d98c54334a0094d3cc5d /tests | |
parent | 08cb7286c6fe50ceaabc15a16f0020d808390f43 (diff) |
Fixed remaining clang compiler warnings
https://codereview.appspot.com/6865053/
git-svn-id: http://skia.googlecode.com/svn/trunk@6646 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
-rw-r--r-- | tests/MatrixTest.cpp | 3 | ||||
-rw-r--r-- | tests/RoundRectTest.cpp | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp index efbd02d2c6..ed2be1d926 100644 --- a/tests/MatrixTest.cpp +++ b/tests/MatrixTest.cpp @@ -98,7 +98,8 @@ static void test_matrix_recttorect(skiatest::Reporter* reporter) { dst.fRight += SK_Scalar1; matrix.setRectToRect(src, dst, SkMatrix::kFill_ScaleToFit); - REPORTER_ASSERT(reporter, SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask == matrix.getType()); + REPORTER_ASSERT(reporter, + (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask) == matrix.getType()); REPORTER_ASSERT(reporter, matrix.rectStaysRect()); dst = src; diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp index a358c5a66f..e88ed8ad8b 100644 --- a/tests/RoundRectTest.cpp +++ b/tests/RoundRectTest.cpp @@ -136,7 +136,7 @@ static void test_round_rect_rects(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, SkRRect::kRect_Type == rr1.type()); r = rr1.rect(); REPORTER_ASSERT(reporter, rect == r); - for (int i = 0; i < SK_ARRAY_COUNT(pts); ++i) { + for (size_t i = 0; i < SK_ARRAY_COUNT(pts); ++i) { REPORTER_ASSERT(reporter, isIn[i] == rr1.contains(pts[i].fX, pts[i].fY)); } @@ -149,7 +149,7 @@ static void test_round_rect_rects(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, SkRRect::kRect_Type == rr2.type()); r = rr2.rect(); REPORTER_ASSERT(reporter, rect == r); - for (int i = 0; i < SK_ARRAY_COUNT(pts); ++i) { + for (size_t i = 0; i < SK_ARRAY_COUNT(pts); ++i) { REPORTER_ASSERT(reporter, isIn[i] == rr2.contains(pts[i].fX, pts[i].fY)); } @@ -195,7 +195,7 @@ static void test_round_rect_ovals(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, SkRRect::kOval_Type == rr1.type()); oval = rr1.rect(); REPORTER_ASSERT(reporter, oval == rect); - for (int i = 0; i < SK_ARRAY_COUNT(pts); ++i) { + for (size_t i = 0; i < SK_ARRAY_COUNT(pts); ++i) { REPORTER_ASSERT(reporter, isIn[i] == rr1.contains(pts[i].fX, pts[i].fY)); } } @@ -230,7 +230,7 @@ static void test_round_rect_general(skiatest::Reporter* reporter) { rr1.setRectXY(rect, 20, 20); REPORTER_ASSERT(reporter, SkRRect::kSimple_Type == rr1.type()); - for (int i = 0; i < SK_ARRAY_COUNT(pts); ++i) { + for (size_t i = 0; i < SK_ARRAY_COUNT(pts); ++i) { REPORTER_ASSERT(reporter, isIn[i] == rr1.contains(pts[i].fX, pts[i].fY)); } @@ -261,7 +261,7 @@ static void test_round_rect_general(skiatest::Reporter* reporter) { rr2.setRectRadii(rect, radii); REPORTER_ASSERT(reporter, SkRRect::kComplex_Type == rr2.type()); - for (int i = 0; i < SK_ARRAY_COUNT(pts); ++i) { + for (size_t i = 0; i < SK_ARRAY_COUNT(pts); ++i) { REPORTER_ASSERT(reporter, isIn[i] == rr2.contains(pts2[i].fX, pts2[i].fY)); } } |