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/bitmapcopy.cpp b/gm/bitmapcopy.cpp
index 249ec43..edf6445 100644
--- a/gm/bitmapcopy.cpp
+++ b/gm/bitmapcopy.cpp
@@ -30,13 +30,17 @@
static void draw_checks(SkCanvas* canvas, int width, int height) {
SkPaint paint;
paint.setColor(SK_ColorRED);
- canvas->drawRectCoords(0, 0, width / 2, height / 2, paint);
+ canvas->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
+ SkIntToScalar(width / 2), SkIntToScalar(height / 2), paint);
paint.setColor(SK_ColorGREEN);
- canvas->drawRectCoords(width / 2, 0, width, height / 2, paint);
+ canvas->drawRectCoords(SkIntToScalar(width / 2), SkIntToScalar(0),
+ SkIntToScalar(width), SkIntToScalar(height / 2), paint);
paint.setColor(SK_ColorBLUE);
- canvas->drawRectCoords(0, height / 2, width / 2, height, paint);
+ canvas->drawRectCoords(SkIntToScalar(0), SkIntToScalar(height / 2),
+ SkIntToScalar(width / 2), SkIntToScalar(height), paint);
paint.setColor(SK_ColorYELLOW);
- canvas->drawRectCoords(width / 2, height / 2, width, height, paint);
+ canvas->drawRectCoords(SkIntToScalar(width / 2), SkIntToScalar(height / 2),
+ SkIntToScalar(width), SkIntToScalar(height), paint);
}
class BitmapCopyGM : public GM {