diff options
| author |  Hal Canary <halcanary@google.com> | 2017-04-11 12:12:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-11 18:57:20 +0000 |
| commit | fafe135349bd34961a12bfd8185733709cd0e45e (patch) | |
| tree | b40dbd0a0787901843aba62eec1f21a1fe3936e1 /src/pdf/SkPDFShader.cpp | |
| parent | 8a8e5fe290307952f9b8df1eb680eed52d83eca9 (diff) | |
SkSize can be aggregate-initialized
Previosly, SkSize had a base class, which prevented it.
Also removes unused SkISize::clampNegToZero() and
SkSize::clampNegToZero().
Change-Id: I7b93b42f6f6381c66e294bbedee99ad53c6c3436
Reviewed-on: https://skia-review.googlesource.com/13187
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/pdf/SkPDFShader.cpp')
| -rw-r--r-- | src/pdf/SkPDFShader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp index bc87c4a0fe..6a511855b9 100644 --- a/src/pdf/SkPDFShader.cpp +++ b/src/pdf/SkPDFShader.cpp @@ -1269,10 +1269,10 @@ SkPDFShader::State::State(SkShader* shader, const SkMatrix& canvasTransform, rasterScale *= SkScalarSqrt(kMaxBitmapArea / bitmapArea); } - SkISize size = SkISize::Make(SkScalarRoundToInt(rasterScale * bbox.width()), - SkScalarRoundToInt(rasterScale * bbox.height())); - SkSize scale = SkSize::Make(SkIntToScalar(size.width()) / shaderRect.width(), - SkIntToScalar(size.height()) / shaderRect.height()); + SkISize size = {SkScalarRoundToInt(rasterScale * bbox.width()), + SkScalarRoundToInt(rasterScale * bbox.height())}; + SkSize scale = {SkIntToScalar(size.width()) / shaderRect.width(), + SkIntToScalar(size.height()) / shaderRect.height()}; imageDst->allocN32Pixels(size.width(), size.height()); imageDst->eraseColor(SK_ColorTRANSPARENT); |