commit 441a0058106d459a6289c861fcbe7bf4a32306bb
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 14 13:55:06 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 14 13:55:06 2012 +0000
tree c5512954d7ff81a8a4458d7de42e121411486a60
parent f7ef56d9104fc651769760df9d5f861ef36de658

Fix r6808 fix & some compiler warnings

https://codereview.appspot.com/6948047/



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

src/effects/SkDashPathEffect.cpp

diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp
index f2e36cc..4f695ad 100644
--- a/src/effects/SkDashPathEffect.cpp
+++ b/src/effects/SkDashPathEffect.cpp
@@ -198,9 +198,13 @@
                 addedSegment = true;
 
                 if (specialLine) {
-                    lineRec.addSegment(distance, distance + dlen, dst);
+                    lineRec.addSegment(SkDoubleToScalar(distance), 
+                                       SkDoubleToScalar(distance + dlen), 
+                                       dst);
                 } else {
-                    meas.getSegment(distance, distance + dlen, dst, true);
+                    meas.getSegment(SkDoubleToScalar(distance), 
+                                    SkDoubleToScalar(distance + dlen), 
+                                    dst, true);
                 }
             }
             distance += dlen;