diff options
| author |  Mike Reed <reed@google.com> | 2017-07-11 16:03:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-12 15:44:35 +0000 |
| commit | 6409f84fc3ae5e3b2df9eb0a900957fce404ad5c (patch) | |
| tree | 41575591d345bf205d84d6d9e52a0e76c231be7d /src/pdf/SkPDFBitmap.cpp | |
| parent | ebb38256c65f2d799dd64f0274256a0c1deffed1 (diff) | |
Revert "Revert "Change image encode api to return sk_sp""
This reverts commit 64778d9f275d8ce3df8f4ab39ff334b7ef5b70d3.
Bug: skia:
Change-Id: I779515ff1e16a40c33890a4bac7a8a07171aadfe
Reviewed-on: https://skia-review.googlesource.com/22261
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/pdf/SkPDFBitmap.cpp')
| -rw-r--r-- | src/pdf/SkPDFBitmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp index fa09be33e6..68d5272277 100644 --- a/src/pdf/SkPDFBitmap.cpp +++ b/src/pdf/SkPDFBitmap.cpp @@ -479,7 +479,7 @@ void PDFJpegBitmap::emitObject(SkWStream* stream, sk_sp<SkPDFObject> SkPDFCreateBitmapObject(sk_sp<SkImage> image, SkPixelSerializer* pixelSerializer) { SkASSERT(image); - sk_sp<SkData> data(image->refEncoded()); + sk_sp<SkData> data = image->refEncodedData(); SkJFIFInfo info; if (data && SkIsJFIF(data.get(), &info) && (!pixelSerializer || @@ -502,7 +502,7 @@ sk_sp<SkPDFObject> SkPDFCreateBitmapObject(sk_sp<SkImage> image, SkPixmap pmap; SkColorSpace* legacyColorSpace = nullptr; if (as_IB(image.get())->getROPixels(&bm, legacyColorSpace) && bm.peekPixels(&pmap)) { - data.reset(pixelSerializer->encode(pmap)); + data = pixelSerializer->encodeToData(pmap); if (data && SkIsJFIF(data.get(), &info)) { bool yuv = info.fType == SkJFIFInfo::kYCbCr; if (info.fSize == image->dimensions()) { // Sanity check. |