commit 261b8e2ca1cf22303ad95267f0bdc6e87e1bbe70
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 14 17:53:24 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 14 17:53:24 2011 +0000
tree 4790daae42b569ae19627a12a5d7ef8473e58f20
parent 9ccdb95319e36dd58629117d9a5ea3c8581f7759

fix warnings

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

samplecode/SampleShaderText.cpp

diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp
index 36692d2..a3cb680 100644
--- a/samplecode/SampleShaderText.cpp
+++ b/samplecode/SampleShaderText.cpp
@@ -10,7 +10,7 @@
     bm->eraseColor(0);
 
     SkCanvas    canvas(*bm);
-    SkScalar s = w < h ? w : h;
+    SkScalar s = SkIntToScalar(w < h ? w : h);
     SkPoint     pts[] = { 0, 0, s, s };
     SkColor     colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
     SkScalar    pos[] = { 0, SK_Scalar1/2, SK_Scalar1 };
@@ -122,7 +122,7 @@
 
         const char text[] = "Shaded Text";
         const int textLen = SK_ARRAY_COUNT(text) - 1;
-        static int pointSize = SkIntToScalar(48);
+        static int pointSize = 48;
 
         int w = pointSize * textLen;
         int h = pointSize;