AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Windows compiler warnings/errors

Browse Source 
https://codereview.chromium.org/108563002/



git-svn-id: http://skia.googlecode.com/svn/trunk@12533 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-12-06 17:08:50 +00:00
parent 5f8ef4f510
commit 86b82767bd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gm/xfermodeimagefilter.cpp
View File

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