commit fd3c8c243ab190604e134910a1d6c1326d21e374
author vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 30 21:00:47 2013 +0000
committer vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 30 21:00:47 2013 +0000
tree 246760bd92781ba0531fc641c3fafe3ef4900081
parent 3b416216d1e90cb8b1bba41bb95806fe2d40da88

Fix int/SkScalar mismatch.

Review URL: https://codereview.chromium.org/51043005

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

src/pdf/SkPDFDevice.cpp

diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 91f8e87..d8e7b13 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -1357,7 +1357,8 @@
     if (content.needShape()) {
         SkPath shape;
         shape.addRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
-                                       device->width(), device->height()));
+                                       SkIntToScalar(device->width()),
+                                       SkIntToScalar(device->height())));
         content.setShape(shape);
     }
     if (!content.needSource()) {
@@ -2246,7 +2247,8 @@
     }
     if (content.needShape()) {
         SkPath shape;
-        shape.addRect(SkRect::MakeWH(subset.width(), subset.height()));
+        shape.addRect(SkRect::MakeWH(SkIntToScalar(subset.width()),
+                                     SkIntToScalar( subset.height())));
         shape.transform(matrix);
         content.setShape(shape);
     }