diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-10 17:42:21 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-10 17:42:21 +0000 |
| commit | 75589257c6ac7fc55a66502b74b8bc09c0212fea (patch) | |
| tree | 24d452385ad37eba7f91a17aec9b5a7851007229 /gm/colormatrix.cpp | |
| parent | 56dd630c41d662bcf2a3f08100f2c6accda05ba9 (diff) | |
Fix miscellaneous compiler warnings from Visual Studio 2010.
Changes serialization path for MorphologyImageFilter, handling of Windows
HRESULTS; otherwise just tweaks tests.
git-svn-id: http://skia.googlecode.com/svn/trunk@3642 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/colormatrix.cpp')
| -rw-r--r-- | gm/colormatrix.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp index 3cc9c028dc..cc5cfbc22a 100644 --- a/gm/colormatrix.cpp +++ b/gm/colormatrix.cpp @@ -61,7 +61,8 @@ protected: for (int x = 0; x < width; ++x) { SkPaint paint; paint.setColor(SkColorSetARGB(255, x * 255 / width, y * 255 / height, 0)); - canvas.drawRect(SkRect::MakeXYWH(x, y, 1, 1), paint); + canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(x), + SkIntToScalar(y), SK_Scalar1, SK_Scalar1), paint); } } return bm; |