diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-06 18:43:21 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-06 18:43:21 +0000 |
| commit | 94acc70312d8fe6605dea99f27f62b180bf22284 (patch) | |
| tree | 1aee4ca3784d75c3ae2eb1a626d1cb5d6479022e /gm | |
| parent | 22023bea1b7c5eff958214a3fd6f7fc4ffeec76c (diff) | |
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
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/blend.cpp | 2 | ||||
| -rw-r--r-- | gm/image.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gm/blend.cpp b/gm/blend.cpp index f1f47b3444..3ba92a7981 100644 --- a/gm/blend.cpp +++ b/gm/blend.cpp @@ -49,7 +49,7 @@ protected: for (int y = 0; y < 80; y += 16) { for (int x = 0; x < 80; x += 16) { canvas.save(); - canvas.translate(x, y); + canvas.translate(SkIntToScalar(x), SkIntToScalar(y)); canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint); canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint); canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint); diff --git a/gm/image.cpp b/gm/image.cpp index 090106dc37..444cc4d8a5 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -37,7 +37,8 @@ static void drawJpeg(SkCanvas* canvas, const SkISize& size) { } 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; |