commit 19b8438ffba0de8e280016705f2976bd0a21dff2
author dierk@google.com <dierk@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 01 20:10:56 2013 +0000
committer dierk@google.com <dierk@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 01 20:10:56 2013 +0000
tree 3acabe8b84129c2f2ed6e3f4792d6e8896e2ea44
parent 6bee4ec36af9cd515e74bbc75f449815a8ffd842

Merge remote-tracking branch 'refs/remotes/git-svn'

fixed SkPathUtils.cpp:78

Fixed PathUtils.cpp:90

Fixed the float being passed to an int method

Fixed the bugs that crashed the build bots

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

src/utils/SkPathUtils.cpp

diff --git a/src/utils/SkPathUtils.cpp b/src/utils/SkPathUtils.cpp
index f0bea40..6a0b121 100644
--- a/src/utils/SkPathUtils.cpp
+++ b/src/utils/SkPathUtils.cpp
@@ -75,7 +75,8 @@
                 start = i; // mark beginning of span
             }else { // if transition off add the span as a path
                 inRun = 0;
-                path->addRect(SkRect::MakeXYWH(start, lineIdx, i-start, SK_Scalar1),
+                path->addRect(SkRect::MakeXYWH(start, lineIdx,
+                                               SkIntToScalar(i-start), SK_Scalar1),
                               SkPath::kCW_Direction);
             }
         }