diff options
| author |  herb <herb@google.com> | 2015-12-18 08:50:08 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-18 08:50:08 -0800 |
| commit | 1e810b3cc290b5b5d95c7789661271256288977c (patch) | |
| tree | 0b8931b4bf33449e5c32006d58cd33b8d3cf034f /src/core/SkBlitter_ARGB32.cpp | |
| parent | 31d46df1b0adf230c58b59c918d2d2ba64adf1ad (diff) | |
Revert of Fix UB function problems for shaders and mask. (patchset #3 id:40001 of https://codereview.chromium.org/1530743002/ )
Reason for revert:
Breaks man gold tests.
Original issue's description:
> Fix UB function problems for shaders and mask.
>
> BUG=skia:4634
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1530743002
>
> Committed: https://skia.googlesource.com/skia/+/dafd044e4aea529f88d899247678d4549f776388
TBR=mtklein@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4634
Review URL: https://codereview.chromium.org/1534243002
Diffstat (limited to 'src/core/SkBlitter_ARGB32.cpp')
| -rw-r--r-- | src/core/SkBlitter_ARGB32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp index a00ed86d8e..e44ad02da5 100644 --- a/src/core/SkBlitter_ARGB32.cpp +++ b/src/core/SkBlitter_ARGB32.cpp @@ -570,7 +570,7 @@ void SkARGB32_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) SkXfermode* xfer = fXfermode; do { shaderContext->shadeSpan(x, y, span, width); - xfer->xfer32(reinterpret_cast<SkPMColor*>(dstRow), span, width, maskRow); + xfer->xfer32((SkPMColor*)dstRow, span, width, maskRow); dstRow += dstRB; maskRow += maskRB; y += 1; @@ -578,7 +578,7 @@ void SkARGB32_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) } else { do { shaderContext->shadeSpan(x, y, span, width); - proc(reinterpret_cast<SkPMColor*>(dstRow), maskRow, span, width); + proc(dstRow, maskRow, span, width); dstRow += dstRB; maskRow += maskRB; y += 1; |