aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/blurroundrect.cpp
diff options
context:
space:
mode:
authorGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-05 17:02:07 +0000
committerGravatar scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-05 17:02:07 +0000
commit770269d962ffeb2913ba7b495b5aa08e2e962272 (patch)
tree2bf7f37a48a25c4b3e179a4af13e6a45d02c69d4 /gm/blurroundrect.cpp
parent99e113beb2e0a728a1f3a67b50c8ecf10b218777 (diff)
More IntToScalars
Fix build. git-svn-id: http://skia.googlecode.com/svn/trunk@12137 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/blurroundrect.cpp')
-rw-r--r--gm/blurroundrect.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp
index 0e634709d3..5673de10c6 100644
--- a/gm/blurroundrect.cpp
+++ b/gm/blurroundrect.cpp
@@ -34,8 +34,8 @@ public:
: fName("blurroundrect")
, fWidth(width)
, fHeight(height)
- , fScaleX(scaleX)
- , fScaleY(scaleY) {
+ , fScaleX(SkIntToScalar(scaleX))
+ , fScaleY(SkIntToScalar(scaleY)) {
fName.appendf("-WH[%ix%i]-UL[%ix%i]-UR[%ix%i]-LR[%ix%i]-LL[%ix%i]-scale[%ix%i]",
width, height,
ulX, ulY,
@@ -48,7 +48,7 @@ public:
radii[1].set(SkIntToScalar(urX), SkIntToScalar(urY));
radii[2].set(SkIntToScalar(lrX), SkIntToScalar(lrY));
radii[3].set(SkIntToScalar(llX), SkIntToScalar(llY));
- SkRect r = SkRect::MakeWH(fWidth, fHeight);
+ SkRect r = SkRect::MakeWH(SkIntToScalar(fWidth), SkIntToScalar(fHeight));
fRRect.setRectRadii(r, radii);
}
@@ -168,7 +168,7 @@ protected:
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
// Handle the scaling.
this->INHERITED::onDraw(canvas);
- canvas->translate(10, 10);
+ canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
SkMaskFilter* filter = SkBlurMaskFilter::Create(fBlurRadius,
SkBlurMaskFilter::kNormal_BlurStyle);
SkPaint paint;