Fixed the bugs that crashed the build bots

git-svn-id: http://skia.googlecode.com/svn/trunk@9845 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/utils/SkPathUtils.cpp b/src/utils/SkPathUtils.cpp
index 3d9bc08..499aecf 100644
--- a/src/utils/SkPathUtils.cpp
+++ b/src/utils/SkPathUtils.cpp
@@ -75,7 +75,7 @@
                 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, 1),
+                path->addRect(SkRect::MakeXYWH(start, lineIdx, i-start, SK_Scalar1),
                               SkPath::kCW_Direction);
             }
         }
@@ -85,10 +85,11 @@
         int end = 0;
         if ( GetBit(line,width-1) ) ++end;
         path->addRect(SkRect::MakeXYWH(start, lineIdx,
-                                       width - 1 + end - start, 1),
+                                       width - SK_Scalar1 + end - start, SK_Scalar1),
                       SkPath::kCW_Direction);
-    } else if ( GetBit(line,width-1) ) { // if last pixel on add rect
-        path->addRect(SkRect::MakeXYWH(width-1, lineIdx, 1, 1),
+    } else if ( GetBit(line, width - SK_Scalar1) ) { // if last pixel on add
+        path->addRect(SkRect::MakeXYWH(width - SK_Scalar1, lineIdx,
+                                       SK_Scalar1, SK_Scalar1),
                       SkPath::kCW_Direction);
     }
 }