use explicit conversion for int->scalar

BUG=

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

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

diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp
index efb3d10..371666d 100644 (file)
--- a/gm/filterbitmap.cpp
+++ b/gm/filterbitmap.cpp
@@ -36,7 +36,8 @@ static void load_bm(SkBitmap* bm) {
 static SkSize computeSize(const SkBitmap& bm, const SkMatrix& mat) {
     SkRect bounds = { 0, 0, bm.width(), bm.height() };
     mat.mapRect(&bounds);
-    return SkSize::Make(bounds.width(), bounds.height());
+    return SkSize::Make(SkIntToScalar(bounds.width()),
+                        SkIntToScalar(bounds.height()));
 }
 
 static void draw_col(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& mat,