Fix miscellaneous compiler warnings from Visual Studio 2010.
Changes serialization path for MorphologyImageFilter, handling of Windows
HRESULTS; otherwise just tweaks tests.
git-svn-id: http://skia.googlecode.com/svn/trunk@3642 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index fef93cd..fe162b1 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -245,8 +245,8 @@
static void unittest_isfinite(skiatest::Reporter* reporter) {
#ifdef SK_SCALAR_IS_FLOAT
float nan = sk_float_asin(2);
- float inf = 1.0 / make_zero();
- float big = 3.40282e+038;
+ float inf = 1.0f / make_zero();
+ float big = 3.40282e+038f;
REPORTER_ASSERT(reporter, !SkScalarIsNaN(inf));
REPORTER_ASSERT(reporter, !SkScalarIsNaN(-inf));
@@ -416,9 +416,13 @@
for (i = 0; i < 10000; i++) {
SkPoint p;
- p.setLength(rand.nextS(), rand.nextS(), SK_Scalar1);
+ // These random values are being treated as 32-bit-patterns, not as
+ // ints; calling SkIntToScalar() here produces crashes.
+ p.setLength(rand.nextS(),
+ rand.nextS(), SK_Scalar1);
check_length(reporter, p, SK_Scalar1);
- p.setLength(rand.nextS() >> 13, rand.nextS() >> 13, SK_Scalar1);
+ p.setLength(rand.nextS() >> 13,
+ rand.nextS() >> 13, SK_Scalar1);
check_length(reporter, p, SK_Scalar1);
}