aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-14 13:55:06 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-14 13:55:06 +0000
commit441a0058106d459a6289c861fcbe7bf4a32306bb (patch)
treec5512954d7ff81a8a4458d7de42e121411486a60 /src
parentf7ef56d9104fc651769760df9d5f861ef36de658 (diff)
Fix r6808 fix & some compiler warnings
Diffstat (limited to 'src')
-rw-r--r--src/effects/SkDashPathEffect.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp
index f2e36cc347..4f695ad4dd 100644
--- a/src/effects/SkDashPathEffect.cpp
+++ b/src/effects/SkDashPathEffect.cpp
@@ -198,9 +198,13 @@ bool SkDashPathEffect::filterPath(SkPath* dst, const SkPath& src,
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;