From 75589257c6ac7fc55a66502b74b8bc09c0212fea Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 10 Apr 2012 17:42:21 +0000 Subject: 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 --- gm/bitmapcopy.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gm/bitmapcopy.cpp') diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp index 249ec436b0..edf6445911 100644 --- a/gm/bitmapcopy.cpp +++ b/gm/bitmapcopy.cpp @@ -30,13 +30,17 @@ SkBitmap::Config gConfigs[] = { 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 { -- cgit v1.2.3