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
This commit is contained in:
reed@google.com 2013-05-28 15:35:47 +00:00
parent f2de1e286b
commit 2f51ae0e6c

View File

@ -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,