diff options
| author |  jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-19 16:32:49 +0000 |
|---|---|---|
| committer | jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-19 16:32:49 +0000 |
| commit | 417446a1ce6563632df0e71c57a0516b4b5ef6f1 (patch) | |
| tree | 5790dd1653eff3694079fde48525d2e4062da92a /gm/stringart.cpp | |
| parent | 4ea2878f076cd41da803e6fcdcfb884b18a5b00c (diff) | |
Type warning fix for: Add string art GM and sample.
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/24258003
git-svn-id: http://skia.googlecode.com/svn/trunk@11384 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/stringart.cpp')
| -rw-r--r-- | gm/stringart.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/stringart.cpp b/gm/stringart.cpp index 1dc86efef7..006dfe7524 100644 --- a/gm/stringart.cpp +++ b/gm/stringart.cpp @@ -11,8 +11,8 @@ // Reproduces https://code.google.com/p/chromium/issues/detail?id=279014 -static const int kWidth = 640; -static const int kHeight = 480; +static const SkScalar kWidth = SkIntToScalar(640); +static const SkScalar kHeight = SkIntToScalar(480); static const SkScalar kAngle = 0.305f; // Renders a string art shape. @@ -33,7 +33,7 @@ protected: virtual void onDraw(SkCanvas* canvas) { SkScalar angle = kAngle*SK_ScalarPI + SkScalarHalf(SK_ScalarPI); - SkScalar size = SkMin32(kWidth, kHeight); + SkScalar size = SkMinScalar(kWidth, kHeight); SkPoint center = SkPoint::Make(SkScalarHalf(kWidth), SkScalarHalf(kHeight)); SkScalar length = 5; SkScalar step = angle; |