Compiler complaints + some minor cleanup

http://codereview.appspot.com/6295070/



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

1 files changed, 4 insertions, 2 deletions

diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp
index a0fde55cd0..f41e79c24c 100644
--- a/bench/MorphologyBench.cpp
+++ b/bench/MorphologyBench.cpp
@@ -69,10 +69,12 @@ protected:
                 SkMorphologyImageFilter* mf = NULL;
                 switch (fStyle) {
                 case kDilate_MT:
-                    mf = new SkDilateImageFilter(fRadius, fRadius);
+                    mf = new SkDilateImageFilter(SkScalarFloorToInt(fRadius), 
+                                                 SkScalarFloorToInt(fRadius));
                     break;
                 case kErode_MT:
-                    mf = new SkErodeImageFilter(fRadius, fRadius);
+                    mf = new SkErodeImageFilter(SkScalarFloorToInt(fRadius), 
+                                                SkScalarFloorToInt(fRadius));
                     break;
                 }
                 paint.setImageFilter(mf)->unref();