Fixing windows warnings

samplecode/SampleFilterFuzz.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkAlphaThresholdFilter.h"
 #include "SkBicubicImageFilter.h"
 #include "SkBitmapDevice.h"
@@ skipping 82 matching lines @@
 static SkScalar make_scalar(bool positiveOnly = false) {
     return make_number(positiveOnly);
 }
 
 static SkRect make_rect() {
     return SkRect::MakeWH(SkIntToScalar(R(static_cast<float>(kBitmapSize))),
                           SkIntToScalar(R(static_cast<float>(kBitmapSize))));
 }
 
 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);
 }
 
 static SkMatrix make_matrix() {
     SkMatrix m;
     for (int i = 0; i < 9; ++i) {
         m[i] = make_scalar();
     }
     return m;
 }
@@ skipping 169 matching lines @@
     case MATRIX_CONVOLUTION:
     {
         SkImageFilter::CropRect cropR(SkRect::MakeWH(SkIntToScalar(kBitmapSize),
                                                      SkIntToScalar(kBitmapSize)));
         SkISize size = SkISize::Make(R(10)+1, R(10)+1);
         int arraySize = size.width() * size.height();
         SkTArray<SkScalar> kernel(arraySize);
         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(),
                                                         make_scalar(),
                                                         kernelOffset,
                                                         (SkMatrixConvolutionImageFilter::TileMode)R(3),
                                                         R(2) == 1,
                                                         make_image_filter(),
                                                         &cropR);
     }
@@ skipping 174 matching lines @@
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ImageFilterFuzzView; }
 static SkViewRegister reg(MyFactory);