commit 28f43dbee2ed72289c9cad107c4d652c20593b4d
author scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 05 16:19:32 2013 +0000
committer scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 05 16:19:32 2013 +0000
tree fb6570037c7d5b4b671da6551caa0a957abec6a4
parent 7b0565907272bfe6682b09a36f7a8fef85e0f73d

Fix build.

Fix some warnings.

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

gm/blurroundrect.cpp

diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp
index c416d7a..3176f36 100644
--- a/gm/blurroundrect.cpp
+++ b/gm/blurroundrect.cpp
@@ -103,8 +103,8 @@
 
 protected:
     virtual SkISize getUnscaledSize() const SK_OVERRIDE {
-        return SkISize::Make(this->getRRect().rect().width(),
-                             this->getRRect().rect().height());
+        return SkISize::Make(SkScalarCeilToInt(this->getRRect().rect().width()),
+                             SkScalarCeilToInt(this->getRRect().rect().height()));
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
@@ -122,10 +122,10 @@
                     SkBlurMaskFilter::kNormal_BlurStyle,
                     SkBlurMaskFilter::kHighQuality_BlurFlag);
             paint->setMaskFilter(maskFilter)->unref();
-            SkColorFilter* colorFilter = SkColorFilter::CreateModeFilter(4279308561,
+            SkColorFilter* colorFilter = SkColorFilter::CreateModeFilter((SkColor) 4279308561,
                     SkXfermode::kSrcIn_Mode);
             paint->setColorFilter(colorFilter)->unref();
-            paint->setColor(4278190080);
+            paint->setColor((SkColor) 4278190080);
         }
         {
             SkLayerDrawLooper::LayerInfo info;
@@ -135,7 +135,7 @@
         canvas->drawRect(this->getRRect().rect(), paint);
 
         paint.setLooper(looper)->unref();
-        paint.setColor(4293848814);
+        paint.setColor((SkColor) 4293848814);
         paint.setAntiAlias(true);
 
         canvas->drawRRect(this->getRRect(), paint);
@@ -161,8 +161,8 @@
 
 protected:
     virtual SkISize getUnscaledSize() const SK_OVERRIDE {
-        return SkISize::Make(this->getRRect().rect().width() + 20,
-                             this->getRRect().rect().height() + 20);
+        return SkISize::Make(SkScalarCeilToInt(this->getRRect().rect().width() + 20),
+                             SkScalarCeilToInt(this->getRRect().rect().height() + 20));
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {