diff options
| author |  reed <reed@google.com> | 2016-03-22 08:10:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 08:10:17 -0700 |
| commit | 4c9776b046dd5e9e46e2d1ce35154855c8fcb381 (patch) | |
| tree | 3cdcc394a99b0483921eb86a8f5cc118f20d6433 /src/utils | |
| parent | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (diff) | |
Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
Fixed legacy withColorFilter to call new(er) make method
This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
TBR=
Review URL: https://codereview.chromium.org/1825073002
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkLua.cpp | 2 | ||||
| -rw-r--r-- | src/utils/SkRGBAToYUV.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp index 56e2b41a45..d0b6a4b1ac 100644 --- a/src/utils/SkLua.cpp +++ b/src/utils/SkLua.cpp @@ -1114,7 +1114,7 @@ static int lpaint_getColorFilter(lua_State* L) { static int lpaint_setColorFilter(lua_State* L) { SkPaint* paint = get_obj<SkPaint>(L, 1); - paint->setColorFilter(get_ref<SkColorFilter>(L, 2)); + paint->setColorFilter(sk_ref_sp(get_ref<SkColorFilter>(L, 2))); return 0; } diff --git a/src/utils/SkRGBAToYUV.cpp b/src/utils/SkRGBAToYUV.cpp index b7f78bac14..eebbda4869 100644 --- a/src/utils/SkRGBAToYUV.cpp +++ b/src/utils/SkRGBAToYUV.cpp @@ -49,7 +49,7 @@ bool SkRGBAToYUV(const SkImage* image, const SkISize sizes[3], void* const plane int rowStartIdx = 5 * i; const SkScalar* row = kYUVColorSpaceInvMatrices[colorSpace] + rowStartIdx; paint.setColorFilter( - SkColorMatrixFilterRowMajor255::CreateSingleChannelOutput(row))->unref(); + SkColorMatrixFilterRowMajor255::MakeSingleChannelOutput(row)); surface->getCanvas()->drawImageRect(image, SkIRect::MakeWH(image->width(), image->height()), SkRect::MakeIWH(surface->width(), surface->height()), &paint); |