commit 95ead84e0fe4a81b5a3343204a348ce600b47bb5
author vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 18 17:11:19 2012 +0000
committer vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Apr 18 17:11:19 2012 +0000
tree b04a70bb6fa272dc0dd76884de975058befaf015
parent fec9836e183083915cb678931b621759af6e0859

Fix some float/scalar/int confusion.

Review URL: https://codereview.appspot.com/6064043

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

gm/gammatext.cpp

diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp
index 9a24d79..1ba3827 100644
--- a/gm/gammatext.cpp
+++ b/gm/gammatext.cpp
@@ -172,7 +172,9 @@
 #if 1
                 canvas->drawText(text, len, x, y, paint);
 #else
-                cgDrawText(cg, text, len, x, SkIntToScalar(HEIGHT) - y, paint);
+                cgDrawText(cg, text, len, SkScalarToFloat(x),
+                           static_cast<float>(HEIGHT) - SkScalarToFloat(y),
+                           paint);
 #endif
                 y += paint.getTextSize() * 2;
             }