diff options
Diffstat (limited to 'include/codec/SkCodec.h')
| -rw-r--r-- | include/codec/SkCodec.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index d3035a7a71..6a6a597f1f 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -9,11 +9,11 @@ #define SkCodec_DEFINED #include "../private/SkTemplates.h" +#include "../private/SkEncodedInfo.h" #include "SkCodecAnimation.h" #include "SkColor.h" #include "SkColorSpaceXform.h" #include "SkEncodedImageFormat.h" -#include "SkEncodedInfo.h" #include "SkEncodedOrigin.h" #include "SkImageInfo.h" #include "SkPixmap.h" @@ -169,8 +169,6 @@ public: */ const SkImageInfo& getInfo() const { return fSrcInfo; } - const SkEncodedInfo& getEncodedInfo() const { return fEncodedInfo; } - /** * Returns the image orientation stored in the EXIF data. * If there is no EXIF data, or if we cannot read the EXIF data, returns kTopLeft. @@ -612,7 +610,7 @@ public: * This is conservative; it will still return non-opaque if e.g. a * color index-based frame has a color with alpha but does not use it. */ - SkEncodedInfo::Alpha fAlpha; + SkAlphaType fAlphaType; /** * How this frame should be modified before decoding the next one. @@ -662,6 +660,8 @@ public: } protected: + const SkEncodedInfo& getEncodedInfo() const { return fEncodedInfo; } + using XformFormat = SkColorSpaceXform::ColorFormat; SkCodec(int width, @@ -847,7 +847,7 @@ private: * * Will be called for the appropriate frame, prior to initializing the colorXform. */ - virtual bool conversionSupported(const SkImageInfo& dst, SkEncodedInfo::Color srcColor, + virtual bool conversionSupported(const SkImageInfo& dst, SkColorType srcColor, bool srcIsOpaque, const SkColorSpace* srcCS) const; /** * Return whether these dimensions are supported as a scale. |