diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-11 00:01:39 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-11 00:01:39 +0000 |
| commit | 31a40ef58b8eda59fd12b5e172683d8882acdc60 (patch) | |
| tree | 569ae1a1334d4522810c0c57138af6d33dc560af /gm/xfermodeimagefilter.cpp | |
| parent | 8bad7375d7e0ebe28af4d905665f34227843bd16 (diff) | |
Win7/8 compiler warnings/errors fix for r9980
git-svn-id: http://skia.googlecode.com/svn/trunk@9991 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/xfermodeimagefilter.cpp')
| -rw-r--r-- | gm/xfermodeimagefilter.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index e602c7079d..ca7b677f48 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -167,8 +167,10 @@ protected: (mode, offsetBackground, offsetForeground))); paint.setImageFilter(filter); canvas->save(); - canvas->clipRect(SkRect::MakeXYWH(x, y, - SkIntToScalar(fBitmap.width() + 4), SkIntToScalar(fBitmap.height() + 4))); + canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), + SkIntToScalar(y), + SkIntToScalar(fBitmap.width() + 4), + SkIntToScalar(fBitmap.height() + 4))); canvas->drawPaint(paint); canvas->restore(); x += fBitmap.width() + MARGIN; @@ -181,8 +183,10 @@ protected: filter.reset(SkNEW_ARGS(SkXfermodeImageFilter, (mode, offsetBackground, offsetForeground))); paint.setImageFilter(filter); canvas->save(); - canvas->clipRect(SkRect::MakeXYWH(x, y, - SkIntToScalar(fBitmap.width() + 4), SkIntToScalar(fBitmap.height() + 4))); + canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), + SkIntToScalar(y), + SkIntToScalar(fBitmap.width() + 4), + SkIntToScalar(fBitmap.height() + 4))); canvas->drawPaint(paint); canvas->restore(); } |