commit b859fe653003862ca8603a60d561a053f752cc77
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 27 17:03:25 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue May 27 17:03:25 2014 +0000
tree cc28dd1867779d2a72f3e2c825979c2cd17b9cb4
parent dd56a243ffc2d2bcb2452a8297cf943cbf0c0051

Fixing windows warnings

BUG=skia:
R=bsalomon@google.com, epoger@google.com

Author: sugoi@chromium.org

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

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

samplecode/SampleFilterFuzz.cpp

diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index 11a5ec1..0cba43c 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -100,10 +100,10 @@
 }
 
 static SkRegion make_region() {
-    SkIRect iRegion = SkIRect::MakeXYWH(SkIntToScalar(R(static_cast<float>(kBitmapSize))),
-                                        SkIntToScalar(R(static_cast<float>(kBitmapSize))),
-                                        SkIntToScalar(R(static_cast<float>(kBitmapSize))),
-                                        SkIntToScalar(R(static_cast<float>(kBitmapSize))));
+    SkIRect iRegion = SkIRect::MakeXYWH(R(static_cast<float>(kBitmapSize)),
+                                        R(static_cast<float>(kBitmapSize)),
+                                        R(static_cast<float>(kBitmapSize)),
+                                        R(static_cast<float>(kBitmapSize)));
     return SkRegion(iRegion);
 }
 
@@ -293,7 +293,8 @@
         for (int i = 0; i < arraySize; ++i) {
             kernel.push_back() = make_scalar();
         }
-        SkIPoint kernelOffset = SkIPoint::Make(R(size.width()), R(size.height()));
+        SkIPoint kernelOffset = SkIPoint::Make(R(SkIntToScalar(size.width())),
+                                               R(SkIntToScalar(size.height())));
         filter = SkMatrixConvolutionImageFilter::Create(size,
                                                         kernel.begin(),
                                                         make_scalar(),