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/SkBmpStandardCodec.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/SkBmpStandardCodec.cpp')
| -rw-r--r-- | src/codec/SkBmpStandardCodec.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp index a509c75b6d..80a989ae4d 100644 --- a/src/codec/SkBmpStandardCodec.cpp +++ b/src/codec/SkBmpStandardCodec.cpp @@ -14,12 +14,12 @@ * Creates an instance of the decoder * Called only by NewFromStream */ -SkBmpStandardCodec::SkBmpStandardCodec(int width, int height, const SkEncodedInfo& info, - SkStream* stream, uint16_t bitsPerPixel, uint32_t numColors, +SkBmpStandardCodec::SkBmpStandardCodec(const SkImageInfo& info, SkStream* stream, + uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor, uint32_t offset, SkCodec::SkScanlineOrder rowOrder, bool isOpaque, bool inIco) - : INHERITED(width, height, info, stream, bitsPerPixel, rowOrder) + : INHERITED(info, stream, bitsPerPixel, rowOrder) , fColorTable(nullptr) , fNumColors(numColors) , fBytesPerColor(bytesPerColor) |