commit 86b82767bd9bcd3739086b381745842ae10f50f4
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 06 17:08:50 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Dec 06 17:08:50 2013 +0000
tree cc20df3ef7a25fbaaed2b96cb15bb3506e412408
parent 5f8ef4f510509c11c6ba15d1b3308b642de19cde

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

diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp
index 9d73b83..d2f7806 100644
--- a/gm/xfermodeimagefilter.cpp
+++ b/gm/xfermodeimagefilter.cpp
@@ -178,7 +178,8 @@
         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 @@
         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 @@
             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;