warning fixes
Review URL http://codereview.appspot.com/5328050/
git-svn-id: http://skia.googlecode.com/svn/trunk@2548 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/points.cpp b/gm/points.cpp
index 4aa6597..8ac85b7 100644
--- a/gm/points.cpp
+++ b/gm/points.cpp
@@ -32,8 +32,8 @@
// Compute these independently and store in variables, rather
// than in the parameter-passing expression, to get consistent
// evaluation order across compilers.
- float y = rand->nextUScalar1() * 480;
- float x = rand->nextUScalar1() * 640;
+ SkScalar y = rand->nextUScalar1() * 480;
+ SkScalar x = rand->nextUScalar1() * 640;
pts[i].set(x, y);
}
}
diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp
index 116f5fc..6a2df87 100644
--- a/gm/poly2poly.cpp
+++ b/gm/poly2poly.cpp
@@ -52,7 +52,7 @@
paint->setColor(SK_ColorRED);
paint->setStyle(SkPaint::kFill_Style);
SkScalar x = D/2;
- float y = D/2 - (fm.fAscent + fm.fDescent)/2;
+ SkScalar y = D/2 - (fm.fAscent + fm.fDescent)/2;
SkString str;
str.appendS32(count);
canvas->drawText(str.c_str(), str.size(), x, y, *paint);