commit 59f46b81f8bdd1b524f5cc43bc27603f9604c71a
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 17:30:58 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 17:30:58 2012 +0000
tree c074f4d76c87c4ab67e32405327a0c10201ed7e8
parent 676e66096c60615bac52f365111596de5c4ca8a6

Fixed Windows compiler complaints

http://codereview.appspot.com/6392044



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

tools/bench_pictures_main.cpp

diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index b2a7b7d..1c3dd4a 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -85,7 +85,8 @@
 };
 
 static void clip_tile(SkPicture* picture, const TileInfo& tile) {
-    SkRect clip = SkRect::MakeWH(picture->width(), picture->height());
+    SkRect clip = SkRect::MakeWH(SkIntToScalar(picture->width()), 
+                                 SkIntToScalar(picture->height()));
     tile.fCanvas->clipRect(clip);
 }
 
@@ -98,7 +99,8 @@
                                      options.fTileWidth, options.fTileHeight);
     bitmap.extractSubset(tile.fBitmap, rect);
     tile.fCanvas = new SkCanvas(*(tile.fBitmap));
-    tile.fCanvas->translate(-tile_x_start, -tile_y_start);
+    tile.fCanvas->translate(SkIntToScalar(-tile_x_start), 
+                            SkIntToScalar(-tile_y_start));
 
     clip_tile(picture, tile);
 }