commit 75589257c6ac7fc55a66502b74b8bc09c0212fea
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 10 17:42:21 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 10 17:42:21 2012 +0000
tree 24d452385ad37eba7f91a17aec9b5a7851007229
parent 56dd630c41d662bcf2a3f08100f2c6accda05ba9

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/verttext2.cpp

diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp
index 3bfb471..9ffefec 100644
--- a/gm/verttext2.cpp
+++ b/gm/verttext2.cpp
@@ -73,7 +73,8 @@
         paint.setTextSize(textHeight);
 
         canvas->drawText(string.c_str(), string.size(), y, 
-                alignment == SkPaint::kLeft_Align ? 10 : 240, paint);
+                SkIntToScalar(alignment == SkPaint::kLeft_Align ? 10 : 240),
+                paint);
         y += textHeight;
     }