fix int->scalar warnings

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

1 files changed, 5 insertions, 3 deletions

diff --git a/gm/spritebitmap.cpp b/gm/spritebitmap.cpp
index d55d71315e..aa5f6208fb 100644
--- a/gm/spritebitmap.cpp
+++ b/gm/spritebitmap.cpp
@@ -26,7 +26,9 @@ static void draw_2_bitmaps(SkCanvas* canvas, const SkBitmap& bm, bool doClip,
     SkAutoCanvasRestore acr(canvas, true);
     SkPaint paint;
 
-    SkRect clipR = SkRect::MakeXYWH(dx, dy, bm.width(), bm.height());
+    SkRect clipR = SkRect::MakeXYWH(dx, dy,
+                                    SkIntToScalar(bm.width()),
+                                    SkIntToScalar(bm.height()));
 
     paint.setImageFilter(filter);
     clipR.inset(5, 5);
@@ -40,13 +42,13 @@ static void draw_2_bitmaps(SkCanvas* canvas, const SkBitmap& bm, bool doClip,
         canvas->restore();
     }
 
-    canvas->translate(bm.width() + 20, 0);
+    canvas->translate(SkIntToScalar(bm.width() + 20), 0);
 
     if (doClip) {
         canvas->save();
         canvas->clipRect(clipR);
     }
-    canvas->drawBitmap(bm, dx, dy, &paint);
+    canvas->drawBitmap(bm, SkIntToScalar(dx), SkIntToScalar(dy), &paint);
     if (doClip) {
         canvas->restore();
     }