aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-09 16:57:01 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-09 16:57:01 +0000
commit64527e9caa4d38c0c113ce3de3ccf3c6e40eef05 (patch)
tree49eae5d97f1d8ed4bf2912231b743afce7b85de4 /samplecode
parentd43f6449129f11c9823bdeb0fb8ac38ab6d76a28 (diff)
Fix Win7 compiler warnings/errors in r9934
git-svn-id: http://skia.googlecode.com/svn/trunk@9935 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SamplePathUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SamplePathUtils.cpp b/samplecode/SamplePathUtils.cpp
index d7a7e54833..d1943630ea 100644
--- a/samplecode/SamplePathUtils.cpp
+++ b/samplecode/SamplePathUtils.cpp
@@ -64,7 +64,7 @@ protected:
/////////////////////////////////////////////////////////////
virtual void onDrawContent(SkCanvas* canvas) {
- SkScalar intervals[8] = {.5, .3, .5, .3, .5, .3, .5, .3};
+ SkScalar intervals[8] = { .5f, .3f, .5f, .3f, .5f, .3f, .5f, .3f };
SkDashPathEffect dash(intervals, 2, fPhase);
SkCornerPathEffect corner(.25f);
SkComposePathEffect compose(&dash, &corner);
@@ -93,7 +93,7 @@ protected:
}
// for animated pathEffect
- fPhase += .01;
+ fPhase += .01f;
this->inval(NULL);
}