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 /src/codec/SkWbmpCodec.cpp | |
| 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 'src/codec/SkWbmpCodec.cpp')
| -rw-r--r-- | src/codec/SkWbmpCodec.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/codec/SkWbmpCodec.cpp b/src/codec/SkWbmpCodec.cpp index 9a842ac91f..90ee322b1f 100644 --- a/src/codec/SkWbmpCodec.cpp +++ b/src/codec/SkWbmpCodec.cpp @@ -104,8 +104,8 @@ bool SkWbmpCodec::readRow(uint8_t* row) { return this->stream()->read(row, fSrcRowBytes) == fSrcRowBytes; } -SkWbmpCodec::SkWbmpCodec(int width, int height, const SkEncodedInfo& info, SkStream* stream) - : INHERITED(width, height, info, stream) +SkWbmpCodec::SkWbmpCodec(const SkImageInfo& info, SkStream* stream) + : INHERITED(info, stream) , fSrcRowBytes(get_src_row_bytes(this->getInfo().width())) , fSwizzler(nullptr) , fColorTable(nullptr) @@ -166,9 +166,9 @@ SkCodec* SkWbmpCodec::NewFromStream(SkStream* stream) { if (!read_header(stream, &size)) { return nullptr; } - SkEncodedInfo info = SkEncodedInfo::Make(SkEncodedInfo::kGray_Color, - SkEncodedInfo::kOpaque_Alpha, 1); - return new SkWbmpCodec(size.width(), size.height(), info, streamDeleter.release()); + SkImageInfo info = SkImageInfo::Make(size.width(), size.height(), + kGray_8_SkColorType, kOpaque_SkAlphaType); + return new SkWbmpCodec(info, streamDeleter.release()); } int SkWbmpCodec::onGetScanlines(void* dst, int count, size_t dstRowBytes) { |