From 86b82767bd9bcd3739086b381745842ae10f50f4 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Fri, 6 Dec 2013 17:08:50 +0000 Subject: Fix Windows compiler warnings/errors https://codereview.chromium.org/108563002/ git-svn-id: http://skia.googlecode.com/svn/trunk@12533 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/xfermodeimagefilter.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index 9d73b8314a..d2f7806555 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -178,7 +178,8 @@ protected: filter.reset(SkNEW_ARGS(SkXfermodeImageFilter, (mode, offsetBackground, offsetForeground))); paint.setImageFilter(filter); - drawClippedPaint(canvas, clipRect, paint, x, y); + drawClippedPaint(canvas, clipRect, paint, + SkIntToScalar(x), SkIntToScalar(y)); x += fBitmap.width() + MARGIN; if (x + fBitmap.width() > WIDTH) { x = 0; @@ -188,7 +189,8 @@ protected: mode.reset(SkXfermode::Create(SkXfermode::kDarken_Mode)); filter.reset(SkNEW_ARGS(SkXfermodeImageFilter, (mode, offsetBackground, offsetForeground))); paint.setImageFilter(filter); - drawClippedPaint(canvas, clipRect, paint, x, y); + drawClippedPaint(canvas, clipRect, paint, + SkIntToScalar(x), SkIntToScalar(y)); x += fBitmap.width() + MARGIN; if (x + fBitmap.width() > WIDTH) { x = 0; @@ -212,7 +214,8 @@ protected: filter.reset(SkNEW_ARGS(SkXfermodeImageFilter, (mode, offsetBackground, offsetForeground, &rect))); paint.setImageFilter(filter); - drawClippedPaint(canvas, clipRect, paint, x, y); + drawClippedPaint(canvas, clipRect, paint, + SkIntToScalar(x), SkIntToScalar(y)); x += fBitmap.width() + MARGIN; if (x + fBitmap.width() > WIDTH) { x = 0; -- cgit v1.2.3