Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Unified Diff: gm/xfermodeimagefilter.cpp

Issue 108563002: Fix Windows compiler warnings/errors (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/xfermodeimagefilter.cpp
===================================================================
--- gm/xfermodeimagefilter.cpp (revision 12531)
+++ gm/xfermodeimagefilter.cpp (working copy)
@@ -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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698