aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkMaskCache.cpp
diff options
context:
space:
mode:
authorGravatar jvanverth <jvanverth@google.com>2016-05-06 09:33:55 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-06 09:33:55 -0700
commit73e81abd5e87a6630a2e2725abf13e11af4c8792 (patch)
tree209811c185912ee2a6fd15bb0218f995020d7738 /src/core/SkMaskCache.cpp
parent31b8417b3c703463aca4e6962b091cec1b6b9fd6 (diff)
Fix for Ubuntu compile warning
Diffstat (limited to 'src/core/SkMaskCache.cpp')
-rw-r--r--src/core/SkMaskCache.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/SkMaskCache.cpp b/src/core/SkMaskCache.cpp
index da7b538d3e..eb7c8f0941 100644
--- a/src/core/SkMaskCache.cpp
+++ b/src/core/SkMaskCache.cpp
@@ -110,16 +110,15 @@ public:
SkASSERT(1 == count || 2 == count);
SkIRect ir;
rects[0].roundOut(&ir);
- fSizes[0] = SkSize::Make(0, 0);
- fSizes[1] = SkSize::Make(0, 0);
- fSizes[2] = SkSize::Make(0, 0);
- fSizes[3] = SkSize::Make(rects[0].x() - ir.x(), rects[0].y() - ir.y());
- for (int i = 0; i < count; i++) {
- fSizes[i] = SkSize::Make(rects[i].width(), rects[i].height());
- }
+ fSizes[0] = SkSize::Make(rects[0].width(), rects[0].height());
if (2 == count) {
+ fSizes[1] = SkSize::Make(rects[1].width(), rects[1].height());
fSizes[2] = SkSize::Make(rects[0].x() - rects[1].x(), rects[0].y() - rects[1].y());
+ } else {
+ fSizes[1] = SkSize::Make(0, 0);
+ fSizes[2] = SkSize::Make(0, 0);
}
+ fSizes[3] = SkSize::Make(rects[0].x() - ir.x(), rects[0].y() - ir.y());
this->init(&gRectsBlurKeyNamespaceLabel, 0,
sizeof(fSigma) + sizeof(fStyle) + sizeof(fQuality) + sizeof(fSizes));