diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-19 04:41:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-19 04:41:12 -0700 |
| commit | 3c920243f831de5892857f86618fd9c4f9655ba2 (patch) | |
| tree | 798ff75b06c4b51520a6f1ea3cd1666ebe4a7573 /include/codec/SkCodec.h | |
| parent | f682d9ad70d690a343bc15e26ef321d86770be41 (diff) | |
Revert of Add SkEncodedInfo to report properties of encoded image data (patchset #6 id:200001 of https://codereview.chromium.org/1820073002/ )
Reason for revert:
Lots of bots failing
Original issue's description:
> Add SkEncodedInfo to report properties of encoded image data
>
> All this does is build an SkEncodedInfo for each codec, and
> then convert it to an SkImageInfo.
>
> In future steps I intend to:
> (1) Use SkEncodedInfo in place of SrcConfig in SkSwizzler.
> (2) Support more conversions in SkSwizzler (non-native
> BGRA/RGBA, 16-bit components, float, fixed point)
> (3) Investigate optimizing conversions from encoded data
> to linear color spaces.
>
> BUG=skia:4133
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1820073002
>
> Committed: https://skia.googlesource.com/skia/+/f682d9ad70d690a343bc15e26ef321d86770be41
TBR=scroggo@google.com,reed@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4133
Review URL: https://codereview.chromium.org/1895383002
Diffstat (limited to 'include/codec/SkCodec.h')
| -rw-r--r-- | include/codec/SkCodec.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index 50875e46c4..629274d21c 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -11,7 +11,6 @@ #include "../private/SkTemplates.h" #include "SkColor.h" #include "SkEncodedFormat.h" -#include "SkEncodedInfo.h" #include "SkImageInfo.h" #include "SkSize.h" #include "SkStream.h" @@ -101,8 +100,6 @@ public: */ const SkImageInfo& getInfo() const { return fSrcInfo; } - const SkEncodedInfo& getEncodedInfo() const { return fEncodedInfo; } - /** * Returns the color space associated with the codec. * Does not affect ownership. @@ -514,9 +511,7 @@ protected: /** * Takes ownership of SkStream* */ - SkCodec(int width, - int height, - const SkEncodedInfo&, + SkCodec(const SkImageInfo&, SkStream*, sk_sp<SkColorSpace> = nullptr, Origin = kTopLeft_Origin); @@ -647,7 +642,6 @@ protected: virtual int onOutputScanline(int inputScanline) const; private: - const SkEncodedInfo fEncodedInfo; const SkImageInfo fSrcInfo; SkAutoTDelete<SkStream> fStream; bool fNeedsRewind; |