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/imageblur.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gm/imageblur.cpp') diff --git a/gm/imageblur.cpp b/gm/imageblur.cpp index 841441e68d..c8dd5d760c 100644 --- a/gm/imageblur.cpp +++ b/gm/imageblur.cpp @@ -39,8 +39,9 @@ protected: 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(); } -- cgit v1.2.3