use explicit conversion for int->scalar

gm/filterbitmap.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkGradientShader.h"
 
@@ skipping 18 matching lines @@
     canvas.drawText("Hamburgefons", 12, 10, 50, paint);
     paint.setTypeface(SkTypeface::CreateFromName("Times", SkTypeface::kBold))->unref();
     canvas.drawText("Hamburgefons", 12, 10, 75, paint);
     paint.setTypeface(SkTypeface::CreateFromName("Times", SkTypeface::kBoldItalic))->unref();
     canvas.drawText("Hamburgefons", 12, 10, 100, paint);
 }
 
 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,
                      SkScalar dx) {
     SkPaint paint;
 
     SkAutoCanvasRestore acr(canvas, true);
 
     canvas->drawBitmapMatrix(bm, mat, &paint);
 
@@ skipping 55 matching lines @@
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new FilterBitmapGM; )