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/gm/imageblur.cpp b/gm/imageblur.cpp
index 841441e..c8dd5d7 100644
--- a/gm/imageblur.cpp
+++ b/gm/imageblur.cpp
@@ -39,8 +39,9 @@
int x = rand() % WIDTH;
int y = rand() % HEIGHT;
paint.setColor(rand() % 0x1000000 | 0xFF000000);
- paint.setTextSize(rand() % 300);
- canvas->drawText(str, strlen(str), x, y, paint);
+ paint.setTextSize(SkIntToScalar(rand() % 300));
+ canvas->drawText(str, strlen(str), SkIntToScalar(x),
+ SkIntToScalar(y), paint);
}
canvas->restore();
}