fix warnings

Review URL: https://codereview.appspot.com/7073044

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

2 files changed, 21 insertions, 18 deletions

diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index a7598fe2d3..a1faf9480f 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -138,7 +138,7 @@ private:
 class BlurRectCompareGM : public skiagm::GM {
     SkString  fName;
     unsigned int fRectWidth, fRectHeight;
-    float fRadius;
+    SkScalar fRadius;
 public:
     BlurRectCompareGM(const char name[], unsigned int rectWidth, unsigned int rectHeight, float radius) :
         fName(name)
@@ -149,7 +149,7 @@ public:
 
   int width() const { return fRectWidth; }
   int height() const { return fRectHeight; }
-  int radius() const { return fRadius; }
+  SkScalar radius() const { return fRadius; }
 
 protected:
     virtual SkString onShortName() {
@@ -160,7 +160,7 @@ protected:
         return SkISize::Make(640, 480);
     }
 
-    virtual void makeMask( SkMask *m, SkRect r ) = 0;
+    virtual void makeMask( SkMask *m, const SkRect& ) = 0;
 
     virtual void onDraw(SkCanvas* canvas) {
       SkRect r;
@@ -184,12 +184,14 @@ private:
 
 class BlurRectFastGM: public BlurRectCompareGM {
 public:
-  BlurRectFastGM(const char name[], unsigned int rect_width, unsigned int rect_height, float blur_radius) :
-    BlurRectCompareGM( name, rect_width, rect_height, blur_radius ) {}
+    BlurRectFastGM(const char name[], unsigned int rect_width,
+                   unsigned int rect_height, float blur_radius) :
+        BlurRectCompareGM( name, rect_width, rect_height, blur_radius ) {}
 protected:
-  virtual void makeMask( SkMask *m, SkRect r ) {
-    SkBlurMask::BlurRect( m, r, radius(), SkBlurMask::kNormal_Style, SkBlurMask::kHigh_Quality );
-  }
+    virtual void makeMask( SkMask *m, const SkRect& r) SK_OVERRIDE {
+        SkBlurMask::BlurRect( m, r, radius(), SkBlurMask::kNormal_Style,
+                             SkBlurMask::kHigh_Quality );
+    }
 };
 
 class BlurRectSlowGM: public BlurRectCompareGM {
@@ -197,17 +199,18 @@ public:
   BlurRectSlowGM(const char name[], unsigned int rect_width, unsigned int rect_height, float blur_radius) :
     BlurRectCompareGM( name, rect_width, rect_height, blur_radius ) {}
 protected:
-  virtual void makeMask( SkMask *m, SkRect r ) {
-    SkMask src;
-    src.fFormat = SkMask::kA8_Format;
-    src.fRowBytes = r.width();
-    src.fBounds = SkIRect::MakeWH(r.width(), r.height());
-    src.fImage = SkMask::AllocImage( src.computeTotalImageSize() );
+    virtual void makeMask( SkMask *m, const SkRect& r) SK_OVERRIDE {
+        SkMask src;
+        r.roundOut(&src.fBounds);
+        src.fBounds.offset(-src.fBounds.fLeft, -src.fBounds.fTop);  // move to origin
+        src.fFormat = SkMask::kA8_Format;
+        src.fRowBytes = src.fBounds.width();
+        src.fImage = SkMask::AllocImage( src.computeTotalImageSize() );
 
-    memset( src.fImage, 0xff, src.computeTotalImageSize() );
+        memset( src.fImage, 0xff, src.computeTotalImageSize() );
 
-    SkBlurMask::BlurSeparable( m, src, radius()/2, SkBlurMask::kNormal_Style, SkBlurMask::kHigh_Quality );
-  }
+        SkBlurMask::BlurSeparable( m, src, radius()/2, SkBlurMask::kNormal_Style, SkBlurMask::kHigh_Quality );
+    }
 };
 
 
diff --git a/gm/dashing.cpp b/gm/dashing.cpp
index 70fb9b1fa2..914824d885 100644
--- a/gm/dashing.cpp
+++ b/gm/dashing.cpp
@@ -245,7 +245,7 @@ protected:
         // 1on/1off 1x1 squares with phase of 1 and non-integer length - rects fastpath
         canvas->save();
             canvas->translate(332, 0);
-            this->drawDashedLines(canvas, 99.5, SK_ScalarHalf, SK_Scalar1, 1, false);
+            this->drawDashedLines(canvas, 99.5f, SK_ScalarHalf, SK_Scalar1, 1, false);
         canvas->restore();
 
         // 1on/1off 3x3 squares with phase of 0 - points fast path