aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/pdf
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2017-12-14 15:33:23 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-15 01:23:57 +0000
commita088365e2faca3f28469c0fc568169e095b5b1a0 (patch)
treefcad288bcdd54f3a59349aed7fbc5c326ae3cb31 /src/pdf
parentf6e6be2da12add94770db4ecaa9d365f3bcad453 (diff)
SkBitmap::pixmap
Change-Id: I6d062b9ae1d242970be140d5a1885639c8c45f77 Reviewed-on: https://skia-review.googlesource.com/85320 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/pdf')
-rw-r--r--src/pdf/SkPDFBitmap.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index f97eeff484..b9b73a9e28 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -430,9 +430,8 @@ sk_sp<SkPDFObject> SkPDFCreateBitmapObject(sk_sp<SkImage> image,
#ifdef SK_SUPPORT_LEGACY_PDF_PIXELSERIALIZER
if (pixelSerializer) {
SkBitmap bm;
- SkPixmap pmap;
- if (SkPDFUtils::ToBitmap(image.get(), &bm) && bm.peekPixels(&pmap)) {
- data = pixelSerializer->encodeToData(pmap);
+ if (SkPDFUtils::ToBitmap(image.get(), &bm)) {
+ data = pixelSerializer->encodeToData(bm.pixmap());
if (data && SkIsJFIF(data.get(), &info)) {
bool yuv = info.fType == SkJFIFInfo::kYCbCr;
if (info.fSize == image->dimensions()) { // Sanity check.