Fixed warnings as error

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 "SkBicubicImageFilter.h"
 #include "SkBitmapSource.h"
@@ skipping 210 matching lines @@
                  make_point(), make_scalar(), make_scalar(), make_color(),
                  make_scalar(), make_scalar(), make_image_filter()) :
                  SkLightingImageFilter::CreateSpotLitSpecular(SkPoint3(0, 0, 0),
                  make_point(), make_scalar(), make_scalar(), make_color(),
                  make_scalar(), make_scalar(), SkIntToScalar(R(10)), make_image_filter());
         break;
     case NOISE:
     {
         SkAutoTUnref<SkShader> shader((R(2) == 1) ?
             SkPerlinNoiseShader::CreateFractalNoise(
-                make_scalar(true), make_scalar(true), SkIntToScalar(R(10)), make_scalar()) :
+                make_scalar(true), make_scalar(true), R(10.0f), make_scalar()) :
             SkPerlinNoiseShader::CreateTubulence(
-                make_scalar(true), make_scalar(true), SkIntToScalar(R(10)), make_scalar()));
+                make_scalar(true), make_scalar(true), R(10.0f), make_scalar()));
         filter = SkRectShaderImageFilter::Create(shader, SkRect::MakeWH(kBitmapSize, kBitmapSize));
     }
         break;
     case DROP_SHADOW:
         filter = new SkDropShadowImageFilter(make_scalar(), make_scalar(),
                      make_scalar(true), make_color(), make_image_filter());
         break;
     case MORPHOLOGY:
         if (R(2) == 1)
-            filter = new SkDilateImageFilter(SkIntToScalar(R(kBitmapSize)),
-                SkIntToScalar(R(kBitmapSize)), make_image_filter());
+            filter = new SkDilateImageFilter(R(static_cast<float>(kBitmapSize)),
+                R(static_cast<float>(kBitmapSize)), make_image_filter());
         else
-            filter = new SkErodeImageFilter(SkIntToScalar(R(kBitmapSize)),
-                SkIntToScalar(R(kBitmapSize)), make_image_filter());
+            filter = new SkErodeImageFilter(R(static_cast<float>(kBitmapSize)),
+                R(static_cast<float>(kBitmapSize)), make_image_filter());
         break;
     case BITMAP:
         filter = new SkBitmapSource(make_bitmap());
         break;
     case DISPLACE:
         filter = new SkDisplacementMapEffect(make_channel_selector_type(),
                      make_channel_selector_type(), make_scalar(),
                      make_image_filter(false), make_image_filter());
         break;
     default:
         break;
     }
     return (filter || canBeNull) ? filter : make_image_filter(canBeNull);
 }
 
-void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
+static void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
     canvas->save();
     canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
         SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)));
     canvas->drawBitmap(make_bitmap(), SkIntToScalar(x), SkIntToScalar(y), &paint);
     canvas->restore();
 }
 
 static void do_fuzz(SkCanvas* canvas) {
     SkPaint paint;
     paint.setImageFilter(make_image_filter());
@@ skipping 28 matching lines @@
     }
 
 private:
     typedef SkView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ImageFilterFuzzView; }
 static SkViewRegister reg(MyFactory);