| Index: src/codec/SkJpegCodec.cpp
|
| diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
|
| index e920de1956f4db76f75b66b5a087058d0ec25a03..1e381ad263b00f2266f76a12121d1a483aeb415d 100644
|
| --- a/src/codec/SkJpegCodec.cpp
|
| +++ b/src/codec/SkJpegCodec.cpp
|
| @@ -212,16 +212,16 @@ bool SkJpegCodec::ReadHeader(SkStream* stream, SkCodec** codecOut,
|
|
|
| if (codecOut) {
|
| // Recommend the color type to decode to
|
| - const SkColorType colorType = decoderMgr->getColorType();
|
| + const SkEncodedInfo::Color color = decoderMgr->getEncodedColor();
|
|
|
| // Create image info object and the codec
|
| - const SkImageInfo& imageInfo = SkImageInfo::Make(decoderMgr->dinfo()->image_width,
|
| - decoderMgr->dinfo()->image_height, colorType, kOpaque_SkAlphaType);
|
| + SkEncodedInfo info = SkEncodedInfo::Make(decoderMgr->dinfo()->image_width,
|
| + decoderMgr->dinfo()->image_height, color, SkEncodedInfo::kOpaque_Alpha, 8);
|
|
|
| Origin orientation = get_exif_orientation(decoderMgr->dinfo());
|
| sk_sp<SkColorSpace> colorSpace = get_icc_profile(decoderMgr->dinfo());
|
|
|
| - *codecOut = new SkJpegCodec(imageInfo, stream, decoderMgr.release(), colorSpace,
|
| + *codecOut = new SkJpegCodec(info, stream, decoderMgr.release(), colorSpace,
|
| orientation);
|
| } else {
|
| SkASSERT(nullptr != decoderMgrOut);
|
| @@ -242,9 +242,9 @@ SkCodec* SkJpegCodec::NewFromStream(SkStream* stream) {
|
| return nullptr;
|
| }
|
|
|
| -SkJpegCodec::SkJpegCodec(const SkImageInfo& srcInfo, SkStream* stream,
|
| +SkJpegCodec::SkJpegCodec(const SkEncodedInfo& info, SkStream* stream,
|
| JpegDecoderMgr* decoderMgr, sk_sp<SkColorSpace> colorSpace, Origin origin)
|
| - : INHERITED(srcInfo, stream, colorSpace, origin)
|
| + : INHERITED(info, stream, colorSpace, origin)
|
| , fDecoderMgr(decoderMgr)
|
| , fReadyState(decoderMgr->dinfo()->global_state)
|
| , fSwizzlerSubset(SkIRect::MakeEmpty())
|
|
|