| Index: src/codec/SkRawCodec.cpp
|
| diff --git a/src/codec/SkRawCodec.cpp b/src/codec/SkRawCodec.cpp
|
| index 762e82364cd3a6dd27e7c6534f69f0d40d6c8eb4..c1a44eb32e5f110e39feaeb5c90484c13eadd2d3 100644
|
| --- a/src/codec/SkRawCodec.cpp
|
| +++ b/src/codec/SkRawCodec.cpp
|
| @@ -515,8 +515,8 @@ public:
|
| }
|
| }
|
|
|
| - const SkImageInfo& getImageInfo() const {
|
| - return fImageInfo;
|
| + const SkEncodedInfo& getEncodedInfo() const {
|
| + return fEncodedInfo;
|
| }
|
|
|
| bool isScalable() const {
|
| @@ -546,7 +546,8 @@ private:
|
| }
|
|
|
| void init(const int width, const int height, const dng_point& cfaPatternSize) {
|
| - fImageInfo = SkImageInfo::Make(width, height, kN32_SkColorType, kOpaque_SkAlphaType);
|
| + fEncodedInfo = SkEncodedInfo::Make(width, height, SkEncodedInfo::kRGB_Color,
|
| + SkEncodedInfo::kOpaque_Alpha, 8);
|
|
|
| // The DNG SDK scales only during demosaicing, so scaling is only possible when
|
| // a mosaic info is available.
|
| @@ -616,7 +617,7 @@ private:
|
| SkAutoTDelete<dng_negative> fNegative;
|
| SkAutoTDelete<dng_stream> fDngStream;
|
|
|
| - SkImageInfo fImageInfo;
|
| + SkEncodedInfo fEncodedInfo;
|
| bool fIsScalable;
|
| bool fIsXtransImage;
|
| };
|
| @@ -760,5 +761,5 @@ bool SkRawCodec::onDimensionsSupported(const SkISize& dim) {
|
| SkRawCodec::~SkRawCodec() {}
|
|
|
| SkRawCodec::SkRawCodec(SkDngImage* dngImage)
|
| - : INHERITED(dngImage->getImageInfo(), nullptr)
|
| + : INHERITED(dngImage->getEncodedInfo(), nullptr)
|
| , fDngImage(dngImage) {}
|
|
|