diff options
| author |  vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-30 21:29:47 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-30 21:29:47 +0000 |
| commit | f5747daed9e3392b0a8875a7dbedfcd652b6781a (patch) | |
| tree | f227d2818b5520e4abaa441b6dc1e723cb5488b2 /gm/xfermodes.cpp | |
| parent | fd3c8c243ab190604e134910a1d6c1326d21e374 (diff) | |
Fix int/SkScalar mismatch in gm.
Review URL: https://codereview.chromium.org/45953005
git-svn-id: http://skia.googlecode.com/svn/trunk@12036 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/xfermodes.cpp')
| -rw-r--r-- | gm/xfermodes.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index 76db8b7d4e..02cdd61927 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -82,7 +82,8 @@ class XfermodesGM : public GM { p.setXfermode(mode); switch (srcType) { case kQuarterClearInLayer_SrcType: { - SkRect bounds = SkRect::MakeXYWH(x, y, W, H); + SkRect bounds = SkRect::MakeXYWH(x, y, SkIntToScalar(W), + SkIntToScalar(H)); canvas->saveLayer(&bounds, &p); restoreNeeded = true; p.setXfermodeMode(SkXfermode::kSrcOver_Mode); @@ -92,10 +93,11 @@ class XfermodesGM : public GM { SkScalar halfW = SkIntToScalar(W) / 2; SkScalar halfH = SkIntToScalar(H) / 2; p.setColor(0xFF66AAFF); - SkRect r = SkRect::MakeXYWH(x + halfW, y, halfW, H); + SkRect r = SkRect::MakeXYWH(x + halfW, y, halfW, + SkIntToScalar(H)); canvas->drawRect(r, p); p.setColor(0xFFAA66FF); - r = SkRect::MakeXYWH(x, y + halfH, W, halfH); + r = SkRect::MakeXYWH(x, y + halfH, SkIntToScalar(W), halfH); canvas->drawRect(r, p); break; } |