diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-06 17:08:50 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-06 17:08:50 +0000 |
| commit | 86b82767bd9bcd3739086b381745842ae10f50f4 (patch) | |
| tree | cc20df3ef7a25fbaaed2b96cb15bb3506e412408 /gm/xfermodeimagefilter.cpp | |
| parent | 5f8ef4f510509c11c6ba15d1b3308b642de19cde (diff) | |
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
Diffstat (limited to 'gm/xfermodeimagefilter.cpp')
| -rw-r--r-- | gm/xfermodeimagefilter.cpp | 9 |
1 files 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; |