From 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 31 Oct 2013 16:31:11 +0000 Subject: Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning" This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497. git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/Matrix44Test.cpp | 78 ++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 44 deletions(-) (limited to 'tests/Matrix44Test.cpp') diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp index 51a6e7f950..772d7b2cf3 100644 --- a/tests/Matrix44Test.cpp +++ b/tests/Matrix44Test.cpp @@ -73,7 +73,8 @@ static bool nearly_equal(const SkMatrix44& a, const SkMatrix44& b) { } static bool is_identity(const SkMatrix44& m) { - SkMatrix44 identity(SkMatrix44::kIdentity_Constructor); + SkMatrix44 identity; + identity.reset(); return nearly_equal(m, identity); } @@ -84,7 +85,7 @@ static bool bits_isonly(int value, int mask) { static void test_constructor(skiatest::Reporter* reporter) { // Allocate a matrix on the heap - SkMatrix44* placeholderMatrix = new SkMatrix44(SkMatrix44::kUninitialized_Constructor); + SkMatrix44* placeholderMatrix = new SkMatrix44(); SkAutoTDelete deleteMe(placeholderMatrix); for (int row = 0; row < 4; ++row) { @@ -114,8 +115,7 @@ static void test_constructor(skiatest::Reporter* reporter) { } static void test_translate(skiatest::Reporter* reporter) { - SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 inverse(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 mat, inverse; mat.setTranslate(0, 0, 0); REPORTER_ASSERT(reporter, bits_isonly(mat.getType(), SkMatrix44::kIdentity_Mask)); @@ -124,9 +124,7 @@ static void test_translate(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, mat.invert(&inverse)); REPORTER_ASSERT(reporter, bits_isonly(inverse.getType(), SkMatrix44::kTranslate_Mask)); - SkMatrix44 a(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 b(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 c(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 a, b, c; a.set3x3(1, 2, 3, 4, 5, 6, 7, 8, 9); b.setTranslate(10, 11, 12); @@ -142,8 +140,7 @@ static void test_translate(skiatest::Reporter* reporter) { } static void test_scale(skiatest::Reporter* reporter) { - SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 inverse(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 mat, inverse; mat.setScale(1, 1, 1); REPORTER_ASSERT(reporter, bits_isonly(mat.getType(), SkMatrix44::kIdentity_Mask)); @@ -152,9 +149,7 @@ static void test_scale(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, mat.invert(&inverse)); REPORTER_ASSERT(reporter, bits_isonly(inverse.getType(), SkMatrix44::kScale_Mask)); - SkMatrix44 a(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 b(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 c(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 a, b, c; a.set3x3(1, 2, 3, 4, 5, 6, 7, 8, 9); b.setScale(10, 11, 12); @@ -212,7 +207,7 @@ static void test_map2(skiatest::Reporter* reporter, const SkMatrix44& mat) { } static void test_map2(skiatest::Reporter* reporter) { - SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 mat; for (size_t i = 0; i < SK_ARRAY_COUNT(gMakeProcs); ++i) { gMakeProcs[i](&mat); @@ -221,7 +216,7 @@ static void test_map2(skiatest::Reporter* reporter) { } static void test_gettype(skiatest::Reporter* reporter) { - SkMatrix44 matrix(SkMatrix44::kIdentity_Constructor); + SkMatrix44 matrix; REPORTER_ASSERT(reporter, matrix.isIdentity()); REPORTER_ASSERT(reporter, SkMatrix44::kIdentity_Mask == matrix.getType()); @@ -256,7 +251,7 @@ static void test_gettype(skiatest::Reporter* reporter) { } static void test_common_angles(skiatest::Reporter* reporter) { - SkMatrix44 rot(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 rot; // 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) { @@ -269,10 +264,7 @@ static void test_common_angles(skiatest::Reporter* reporter) { static void test_concat(skiatest::Reporter* reporter) { int i; - SkMatrix44 a(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 b(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 c(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 d(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 a, b, c, d; a.setTranslate(10, 10, 10); b.setScale(2, 2, 2); @@ -309,11 +301,11 @@ static void test_concat(skiatest::Reporter* reporter) { } static void test_determinant(skiatest::Reporter* reporter) { - SkMatrix44 a(SkMatrix44::kIdentity_Constructor); + SkMatrix44 a; REPORTER_ASSERT(reporter, nearly_equal_double(1, a.determinant())); a.set(1, 1, 2); REPORTER_ASSERT(reporter, nearly_equal_double(2, a.determinant())); - SkMatrix44 b(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 b; REPORTER_ASSERT(reporter, a.invert(&b)); REPORTER_ASSERT(reporter, nearly_equal_double(0.5, b.determinant())); SkMatrix44 c = b = a; @@ -334,10 +326,11 @@ static void test_determinant(skiatest::Reporter* reporter) { } static void test_invert(skiatest::Reporter* reporter) { - SkMatrix44 inverse(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 inverse; double inverseData[16]; - SkMatrix44 identity(SkMatrix44::kIdentity_Constructor); + SkMatrix44 identity; + identity.setIdentity(); identity.invert(&inverse); inverse.asRowMajord(inverseData); assert16(reporter, inverseData, @@ -346,7 +339,7 @@ static void test_invert(skiatest::Reporter* reporter) { 0, 0, 1, 0, 0, 0, 0, 1); - SkMatrix44 translation(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 translation; translation.setTranslate(2, 3, 4); translation.invert(&inverse); inverse.asRowMajord(inverseData); @@ -356,7 +349,7 @@ static void test_invert(skiatest::Reporter* reporter) { 0, 0, 1, -4, 0, 0, 0, 1); - SkMatrix44 scale(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 scale; scale.setScale(2, 4, 8); scale.invert(&inverse); inverse.asRowMajord(inverseData); @@ -366,7 +359,7 @@ static void test_invert(skiatest::Reporter* reporter) { 0, 0, 0.125, 0, 0, 0, 0, 1); - SkMatrix44 scaleTranslation(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 scaleTranslation; scaleTranslation.setScale(10, 100, 1000); scaleTranslation.preTranslate(2, 3, 4); scaleTranslation.invert(&inverse); @@ -377,10 +370,10 @@ static void test_invert(skiatest::Reporter* reporter) { 0, 0, 0.001, -4, 0, 0, 0, 1); - SkMatrix44 rotation(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 rotation; rotation.setRotateDegreesAbout(0, 0, 1, 90); rotation.invert(&inverse); - SkMatrix44 expected(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 expected; double expectedInverseRotation[16] = {0, 1, 0, 0, -1, 0, 0, 0, @@ -389,7 +382,7 @@ static void test_invert(skiatest::Reporter* reporter) { expected.setRowMajord(expectedInverseRotation); REPORTER_ASSERT(reporter, nearly_equal(expected, inverse)); - SkMatrix44 affine(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 affine; affine.setRotateDegreesAbout(0, 0, 1, 90); affine.preScale(10, 20, 100); affine.preTranslate(2, 3, 4); @@ -402,7 +395,8 @@ static void test_invert(skiatest::Reporter* reporter) { expected.setRowMajord(expectedInverseAffine); REPORTER_ASSERT(reporter, nearly_equal(expected, inverse)); - SkMatrix44 perspective(SkMatrix44::kIdentity_Constructor); + SkMatrix44 perspective; + perspective.setIdentity(); perspective.setDouble(3, 2, 1.0); perspective.invert(&inverse); double expectedInversePerspective[16] = @@ -413,7 +407,8 @@ static void test_invert(skiatest::Reporter* reporter) { expected.setRowMajord(expectedInversePerspective); REPORTER_ASSERT(reporter, nearly_equal(expected, inverse)); - SkMatrix44 affineAndPerspective(SkMatrix44::kIdentity_Constructor); + SkMatrix44 affineAndPerspective; + affineAndPerspective.setIdentity(); affineAndPerspective.setDouble(3, 2, 1.0); affineAndPerspective.preScale(10, 20, 100); affineAndPerspective.preTranslate(2, 3, 4); @@ -428,8 +423,8 @@ static void test_invert(skiatest::Reporter* reporter) { } static void test_transpose(skiatest::Reporter* reporter) { - SkMatrix44 a(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 b(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 a; + SkMatrix44 b; int i = 0; for (int row = 0; row < 4; ++row) { @@ -444,7 +439,7 @@ static void test_transpose(skiatest::Reporter* reporter) { } static void test_get_set_double(skiatest::Reporter* reporter) { - SkMatrix44 a(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 a; for (int row = 0; row < 4; ++row) { for (int col = 0; col < 4; ++col) { a.setDouble(row, col, 3.141592653589793); @@ -459,9 +454,7 @@ static void test_get_set_double(skiatest::Reporter* reporter) { } static void test_set_row_col_major(skiatest::Reporter* reporter) { - SkMatrix44 a(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 b(SkMatrix44::kUninitialized_Constructor); - + SkMatrix44 a, b, c, d; for (int row = 0; row < 4; ++row) { for (int col = 0; col < 4; ++col) { a.setDouble(row, col, row * 4 + col); @@ -496,7 +489,7 @@ static void test_3x3_conversion(skiatest::Reporter* reporter) { 5, 6, 0, 8, 0, 0, 1, 0, 13, 14, 0, 16 }; - SkMatrix44 a44(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 a44; a44.setRowMajor(values4x4); SkMatrix a33 = a44; @@ -505,7 +498,7 @@ static void test_3x3_conversion(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, expected33 == a33); SkMatrix44 a44flattened = a33; - SkMatrix44 expected44flattened(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 expected44flattened; expected44flattened.setRowMajor(values4x4flattened); REPORTER_ASSERT(reporter, nearly_equal(a44flattened, expected44flattened)); @@ -529,12 +522,9 @@ static void test_3x3_conversion(skiatest::Reporter* reporter) { } static void TestMatrix44(skiatest::Reporter* reporter) { - SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 inverse(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 iden1(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 iden2(SkMatrix44::kUninitialized_Constructor); - SkMatrix44 rot(SkMatrix44::kUninitialized_Constructor); + SkMatrix44 mat, inverse, iden1, iden2, rot; + mat.reset(); mat.setTranslate(1, 1, 1); mat.invert(&inverse); iden1.setConcat(mat, inverse); -- cgit v1.2.3