diff options
| author |  Mike Reed <reed@google.com> | 2017-10-16 18:56:57 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-16 18:57:02 +0000 |
| commit | 82269abfec798621c8dbbc6bd48996c0b2686f41 (patch) | |
| tree | 4cbc683affe8e898a8973e8edd76187d3d32ba0e /include/codec | |
| parent | 354ec36bad4f504286916e72b1e1a4eefde2efc2 (diff) | |
Revert "Revert "apply codec origin in generator""
This reverts commit 363dd988a55c2ed3fa92e2368c1c889101425734.
Reason for revert: pdfium fix landed
Original change's description:
> Revert "apply codec origin in generator"
>
> This reverts commit fa15877f487333bec876e7315cf584c0d598d098.
>
> Reason for revert: Appears to break PDFium.
>
> Original change's description:
> > apply codec origin in generator
> >
> > Bug: skia:
> > Change-Id: I383dacb49b1e3c88467ccdbf3288764bb1bbf01a
> > Reviewed-on: https://skia-review.googlesource.com/58600
> > Reviewed-by: Leon Scroggins <scroggo@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
>
> TBR=scroggo@google.com,reed@google.com
>
> Change-Id: Id97137d6ec39ca638c941928bae6510814b1c499
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/60041
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
TBR=benjaminwagner@google.com,scroggo@google.com,reed@google.com
Change-Id: I1b54a6e6e6cbda07f346ffbbc4977f9db705abcd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/60320
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/codec')
| -rw-r--r-- | include/codec/SkCodec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index e2596890f3..6e9c8280b9 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -15,6 +15,7 @@ #include "SkEncodedImageFormat.h" #include "SkEncodedInfo.h" #include "SkImageInfo.h" +#include "SkPixmap.h" #include "SkSize.h" #include "SkStream.h" #include "SkTypes.h" @@ -355,6 +356,10 @@ public: return this->getPixels(info, pixels, rowBytes, nullptr); } + Result getPixels(const SkPixmap& pm, const Options* opts = nullptr) { + return this->getPixels(pm.info(), pm.writable_addr(), pm.rowBytes(), opts); + } + /** * If decoding to YUV is supported, this returns true. Otherwise, this * returns false and does not modify any of the parameters. |