One more try at fixing warnings

R=robertphillips@google.com

Review URL: https://codereview.chromium.org/24276003

git-svn-id: http://skia.googlecode.com/svn/trunk@11386 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/stringart.cpp

@@ -11,8 +11,8 @@
 
 // Reproduces https://code.google.com/p/chromium/issues/detail?id=279014
 
-static const SkScalar kWidth = SkIntToScalar(640);
-static const SkScalar kHeight = SkIntToScalar(480);
+static const int kWidth = 640;
+static const int kHeight = 480;
 static const SkScalar kAngle = 0.305f;
 
 // Renders a string art shape.
@@ -33,7 +33,7 @@ protected:
 
     virtual void onDraw(SkCanvas* canvas) {
         SkScalar angle = kAngle*SK_ScalarPI + SkScalarHalf(SK_ScalarPI);
-        SkScalar size = SkMinScalar(kWidth, kHeight);
+        SkScalar size = SkIntToScalar(SkMin32(kWidth, kHeight));
         SkPoint center = SkPoint::Make(SkScalarHalf(kWidth), SkScalarHalf(kHeight));
         SkScalar length = 5;
         SkScalar step = angle;