diff options
author | jvanverth <jvanverth@google.com> | 2016-05-06 09:33:55 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-06 09:33:55 -0700 |
commit | 73e81abd5e87a6630a2e2725abf13e11af4c8792 (patch) | |
tree | 209811c185912ee2a6fd15bb0218f995020d7738 /src/core/SkMaskCache.cpp | |
parent | 31b8417b3c703463aca4e6962b091cec1b6b9fd6 (diff) |
Fix for Ubuntu compile warning
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955913002
Review-Url: https://codereview.chromium.org/1955913002
Diffstat (limited to 'src/core/SkMaskCache.cpp')
-rw-r--r-- | src/core/SkMaskCache.cpp | 13 |
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)); |