commit b28b5e4e26183b6e14846fb00501cc445a4fdd7e
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 24 14:51:57 2011 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 24 14:51:57 2011 +0000
tree 03b8d668662ea88d8f9b42d33f6a72c2964de8f2
parent ac45f00d5a2d2bbb065efbe67a786efc5ddb60c5

Warn when an SkScalar is passed into SkIntToScalar()  (converted twice)
http://codereview.appspot.com/4548051/



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

gm/shadertext.cpp

diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp
index 045c399..ea87823 100644
--- a/gm/shadertext.cpp
+++ b/gm/shadertext.cpp
@@ -11,8 +11,7 @@
     bm->eraseColor(0);
 
     SkCanvas    canvas(*bm);
-    int         shorterDimensionAsInt = w < h ? w : h;
-    SkScalar    s = SkIntToScalar(shorterDimensionAsInt);
+    SkScalar    s = SkIntToScalar(SkMin32(w, h));
     SkPoint     pts[] = { { 0, 0 }, { s, s } };
     SkColor     colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
     SkScalar    pos[] = { 0, SK_Scalar1/2, SK_Scalar1 };