diff options
| author |  reed <reed@google.com> | 2016-03-11 04:33:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-11 04:33:52 -0800 |
| commit | 7fb4f8bd031eda87e1da9bc0f749968c0e872e6f (patch) | |
| tree | 51ce5e58b62e0e3b57065e12517670d77c17837e /src/c | |
| parent | db6bd3239fd5e35797a9aa36eb0044ecbe5557c4 (diff) | |
Revert "Revert of add Make variations to return SkImage by sk_sp (patchset #5 id:80001 of https://codereview.chromium.org/1778393002/ )"
Fix was to call get() instead of release() when passing the sp to a bare-ptr method.
This reverts commit e683c56115a210b5993df9294260bb147b408bfa.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789443002
TBR=
Review URL: https://codereview.chromium.org/1789443002
Diffstat (limited to 'src/c')
| -rw-r--r-- | src/c/sk_surface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/c/sk_surface.cpp b/src/c/sk_surface.cpp index f7fa30f28a..6bd62a9aa9 100644 --- a/src/c/sk_surface.cpp +++ b/src/c/sk_surface.cpp @@ -224,12 +224,12 @@ sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t* cinfo, const void* pi if (!from_c_info(*cinfo, &info)) { return NULL; } - return (sk_image_t*)SkImage::NewRasterCopy(info, pixels, rowBytes); + return (sk_image_t*)SkImage::MakeRasterCopy(SkPixmap(info, pixels, rowBytes)).release(); } sk_image_t* sk_image_new_from_encoded(const sk_data_t* cdata, const sk_irect_t* subset) { - return ToImage(SkImage::NewFromEncoded(AsData(cdata), - reinterpret_cast<const SkIRect*>(subset))); + return ToImage(SkImage::MakeFromEncoded(sk_ref_sp(AsData(cdata)), + reinterpret_cast<const SkIRect*>(subset)).release()); } sk_data_t* sk_image_encode(const sk_image_t* cimage) { |