diff options
| author |  Mike Reed <reed@google.com> | 2017-07-11 16:00:24 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-11 16:00:32 +0000 |
| commit | 64778d9f275d8ce3df8f4ab39ff334b7ef5b70d3 (patch) | |
| tree | d1f3cb8149c09154f736494b229496ac6795b176 /src/pdf/SkPDFBitmap.cpp | |
| parent | dc799550e2d9965aa5b7cda496465b2a76b310a5 (diff) | |
Revert "Change image encode api to return sk_sp"
This reverts commit dc799550e2d9965aa5b7cda496465b2a76b310a5.
Reason for revert: need to fix sites in Document_none
Original change's description:
> Change image encode api to return sk_sp
>
> Bug: skia:
> Change-Id: I238289bc630be27795cb1384955dd6e887597c05
> Reviewed-on: https://skia-review.googlesource.com/22208
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
TBR=scroggo@google.com,fmalita@chromium.org,reed@google.com
Change-Id: Id7f67027e5f1405a60fdbde29863cdf8daef0cb7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/22280
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 68d5272277..fa09be33e6 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->refEncodedData(); + sk_sp<SkData> data(image->refEncoded()); 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 = pixelSerializer->encodeToData(pmap); + data.reset(pixelSerializer->encode(pmap)); if (data && SkIsJFIF(data.get(), &info)) { bool yuv = info.fType == SkJFIFInfo::kYCbCr; if (info.fSize == image->dimensions()) { // Sanity check. |