commit 94acc70312d8fe6605dea99f27f62b180bf22284
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 06 18:43:21 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Sep 06 18:43:21 2012 +0000
tree 1aee4ca3784d75c3ae2eb1a626d1cb5d6479022e
parent 22023bea1b7c5eff958214a3fd6f7fc4ffeec76c

Fixed Windows compiler complaints (esp. in debugger)

https://codereview.appspot.com/6497090/



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

gm/image.cpp

diff --git a/gm/image.cpp b/gm/image.cpp
index 090106d..444cc4d 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -37,7 +37,8 @@
 }
 
 static void drawContents(SkSurface* surface, SkColor fillC) {
-    SkSize size = SkSize::Make(surface->width(), surface->height());
+    SkSize size = SkSize::Make(SkIntToScalar(surface->width()), 
+                               SkIntToScalar(surface->height()));
     SkCanvas* canvas = surface->getCanvas();
 
     SkScalar stroke = size.fWidth / 10;