commit bc386ce0f7a39a85f9662bf20f410d2de6efda3b
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 19:30:58 2013 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 19:30:58 2013 +0000
tree 616dbad7c20a6a95df504c4e0c6692793017a40e
parent 01bdf3c568f9df2df4a787197caeba736b23fe73

Fix Win warning-as-error.

TBR=edisonn
BUG=

Review URL: https://codereview.chromium.org/27391002

git-svn-id: http://skia.googlecode.com/svn/trunk@11783 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/displacement.cpp

diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index 5878431..350b8e3 100644
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -65,7 +65,7 @@
 
     void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
         canvas->save();
-        canvas->translate(x, y);
+        canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
         canvas->clipRect(SkRect::MakeWH(SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height())));
         canvas->drawBitmap(fBitmap, 0, 0, &paint);
         canvas->restore();