aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/MatrixTest.cpp
diff options
context:
space:
mode:
authorGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-27 15:27:51 +0000
committerGravatar tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-27 15:27:51 +0000
commit83a444602ec580a0040713eed588c245b4ae0ee9 (patch)
tree118af159669bc015ee8219a47065d6649a7e06d2 /tests/MatrixTest.cpp
parent71dd3e0359b1c1e09fea751cd58f1728e467e750 (diff)
Remove warnings (trailing \, signed vs unsigned, parenthesization).
Convert some tabs into spaces. git-svn-id: http://skia.googlecode.com/svn/trunk@2541 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MatrixTest.cpp')
-rw-r--r--tests/MatrixTest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 7bad9de9e9..c9a696c548 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -92,7 +92,7 @@ void test_matrix_max_stretch(skiatest::Reporter* reporter) {
SkMatrix baseMats[] = {scale, rot90Scale, rotate,
translate, perspX, perspY};
SkMatrix mats[2*SK_ARRAY_COUNT(baseMats)];
- for (int i = 0; i < SK_ARRAY_COUNT(baseMats); ++i) {
+ for (size_t i = 0; i < SK_ARRAY_COUNT(baseMats); ++i) {
mats[i] = baseMats[i];
bool invertable = mats[i].invert(&mats[i + SK_ARRAY_COUNT(baseMats)]);
REPORTER_ASSERT(reporter, invertable);
@@ -125,7 +125,7 @@ void test_matrix_max_stretch(skiatest::Reporter* reporter) {
static const SkScalar gMaxStretchTol = (97 * SK_Scalar1) / 100;
SkScalar max = 0;
SkVector vectors[1000];
- for (int i = 0; i < SK_ARRAY_COUNT(vectors); ++i) {
+ for (size_t i = 0; i < SK_ARRAY_COUNT(vectors); ++i) {
vectors[i].fX = rand.nextSScalar1();
vectors[i].fY = rand.nextSScalar1();
if (!vectors[i].normalize()) {
@@ -134,7 +134,7 @@ void test_matrix_max_stretch(skiatest::Reporter* reporter) {
}
}
mat.mapVectors(vectors, SK_ARRAY_COUNT(vectors));
- for (int i = 0; i < SK_ARRAY_COUNT(vectors); ++i) {
+ for (size_t i = 0; i < SK_ARRAY_COUNT(vectors); ++i) {
SkScalar d = vectors[i].length();
REPORTER_ASSERT(reporter, SkScalarDiv(d, stretch) < gStretchTol);
if (max < d) {