Fixed some fixed point build Windows compiler complaints
http://codereview.appspot.com/6197063/
git-svn-id: http://skia.googlecode.com/svn/trunk@3867 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp
index 9827545..8555992 100644
--- a/samplecode/ClockFaceView.cpp
+++ b/samplecode/ClockFaceView.cpp
@@ -80,7 +80,7 @@
this->INHERITED::begin(uvBounds, dst);
}
// virtual void end(SkPath* dst) {}
- virtual void next(const SkPoint& loc, int u, int v, SkPath* dst)
+ virtual void next(const SkPoint& loc, int u, int v, SkPath* dst)
{
if (fPts) {
*fPts->append() = loc;
@@ -131,7 +131,7 @@
}
static void r7(SkLayerRasterizer* rast, SkPaint& p, SkScalar interp) {
- p.setPathEffect(makepe(interp, NULL))->unref();
+ p.setPathEffect(makepe(SkScalarToFloat(interp), NULL))->unref();
rast->addLayer(p);
#if 0
p.setPathEffect(new InverseFillPE())->unref();
@@ -152,7 +152,7 @@
SkLayerRasterizer* rast = new SkLayerRasterizer;
p.setAntiAlias(true);
- r7(rast, p, scale);
+ r7(rast, p, SkFloatToScalar(scale));
paint->setRasterizer(rast)->unref();
paint->setColor(SK_ColorBLUE);
@@ -163,7 +163,7 @@
SkScalar fInterp;
SkScalar fDx;
public:
- ClockFaceView()
+ ClockFaceView()
{
fFace = SkTypeface::CreateFromFile("/Users/reed/Downloads/p052024l.pfb");
fInterp = 0;
@@ -226,7 +226,7 @@
paint.setTypeface(fFace);
- apply_shader(&paint, fInterp);
+ apply_shader(&paint, SkScalarToFloat(fInterp));
canvas->drawText(str.c_str(), str.size(), x, y, paint);
// drawdots(canvas, paint);