diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-05 16:19:32 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-05 16:19:32 +0000 |
| commit | 28f43dbee2ed72289c9cad107c4d652c20593b4d (patch) | |
| tree | fb6570037c7d5b4b671da6551caa0a957abec6a4 /gm/blurroundrect.cpp | |
| parent | 7b0565907272bfe6682b09a36f7a8fef85e0f73d (diff) | |
Fix build.
Fix some warnings.
git-svn-id: http://skia.googlecode.com/svn/trunk@12134 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/blurroundrect.cpp')
| -rw-r--r-- | gm/blurroundrect.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index c416d7a9f4..3176f361d2 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -103,8 +103,8 @@ public: 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 @@ protected: 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 @@ protected: 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 @@ public: 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 { |