Index: src/core/SkColorSpace_Base.h |
diff --git a/src/core/SkColorSpace_Base.h b/src/core/SkColorSpace_Base.h |
index 07fa3832530d3357a45350043a5a3b2d41b41d52..15946d090b43ccd00e0c4358cec6457b272af1c2 100644 |
--- a/src/core/SkColorSpace_Base.h |
+++ b/src/core/SkColorSpace_Base.h |
@@ -181,16 +181,16 @@ struct SkColorLookUpTable : public SkRefCnt { |
class SkColorSpace_Base : public SkColorSpace { |
public: |
- |
static sk_sp<SkColorSpace> NewRGB(const float gammas[3], const SkMatrix44& toXYZD50); |
+ enum class Type : uint8_t { |
msarett
2016/10/05 19:05:53
Can we make this protected?
raftias
2016/10/06 14:43:04
Done.
|
+ kXYZTRC, |
+ kA2B0 |
+ }; |
+ |
+ Type type() const { return fType; } |
msarett
2016/10/05 19:05:52
Can we make this a protected virtual? Then only f
raftias
2016/10/06 14:43:04
Done.
|
- SkGammaNamed gammaNamed() const { return fGammaNamed; } |
- const SkGammas* gammas() const { return fGammas.get(); } |
- |
- const SkColorLookUpTable* colorLUT() const { return fColorLUT.get(); } |
- |
- const SkMatrix44& toXYZD50() const { return fToXYZD50; } |
- const SkMatrix44& fromXYZD50() const; |
+protected: |
+ SkColorSpace_Base(sk_sp<SkData> profileData, Type type); |
private: |
@@ -205,19 +205,9 @@ private: |
static sk_sp<SkColorSpace> NewRGB(SkGammaNamed gammaNamed, const SkMatrix44& toXYZD50); |
- SkColorSpace_Base(SkGammaNamed gammaNamed, const SkMatrix44& toXYZ); |
- |
- SkColorSpace_Base(sk_sp<SkColorLookUpTable> colorLUT, SkGammaNamed gammaNamed, |
- sk_sp<SkGammas> gammas, const SkMatrix44& toXYZ, sk_sp<SkData> profileData); |
- |
- sk_sp<SkColorLookUpTable> fColorLUT; |
- const SkGammaNamed fGammaNamed; |
- sk_sp<SkGammas> fGammas; |
- sk_sp<SkData> fProfileData; |
- const SkMatrix44 fToXYZD50; |
- mutable SkMatrix44 fFromXYZD50; |
- mutable SkOnce fFromXYZOnce; |
+ sk_sp<SkData> fProfileData; |
+ Type fType; |
friend class SkColorSpace; |
friend class ColorSpaceXformTest; |