Fixing Windows compiler complaints
http://codereview.appspot.com/5991056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3626 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp
index 062eca3..83f962e 100644
--- a/samplecode/SampleFontScalerTest.cpp
+++ b/samplecode/SampleFontScalerTest.cpp
@@ -104,7 +104,7 @@
SkAutoCanvasRestore acr(canvas, true);
canvas->translate(SkIntToScalar(50 + i * 230),
SkIntToScalar(20));
- rotate_about(canvas, i * 5, x, y * 10);
+ rotate_about(canvas, SkIntToScalar(i * 5), x, y * 10);
{
SkPaint p;
diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp
index 99d1275..76e18b6 100644
--- a/samplecode/TransitionView.cpp
+++ b/samplecode/TransitionView.cpp
@@ -146,7 +146,7 @@
fEnd[kPrevX] = -lr;
fEnd[kPrevY] = -ud;
fEnd[kNextX] = fEnd[kNextY] = 0;
- SkScalar blend[] = {0.8, 0.0, 0.0, 1.0};
+ SkScalar blend[] = {0.8f, 0.0f, 0.0f, 1.0f};
fInterp.setKeyFrame(0, SkTime::GetMSecs(), fBegin, blend);
fInterp.setKeyFrame(1, SkTime::GetMSecs()+500, fEnd, blend);
}