diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-01-26 13:58:24 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-26 19:52:20 +0000 |
| commit | 333848272c4d023199e44ff38f2e6fc6876388e8 (patch) | |
| tree | 399fd71be826ba4c0a276909fe0e539dd765f435 /src/core/SkColorSpace_A2B.h | |
| parent | 8f11d4dcafef4447fa68ea0ab28a72589241e9fd (diff) | |
remove SkColorSpace_Base
The type SkColorSpace_Base doesn't need to exist. Its one type() query
can be answered instead by toXYZD50().
Now all that's left in the file is SkGammas, so rename it to SkGammas.h.
Change-Id: Id60ddbfb342accfd5674ae89b37a24a6583ef7b8
Reviewed-on: https://skia-review.googlesource.com/99702
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/core/SkColorSpace_A2B.h')
| -rw-r--r-- | src/core/SkColorSpace_A2B.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/SkColorSpace_A2B.h b/src/core/SkColorSpace_A2B.h index 9bdd8ef10a..48e8a700e6 100644 --- a/src/core/SkColorSpace_A2B.h +++ b/src/core/SkColorSpace_A2B.h @@ -8,8 +8,9 @@ #ifndef SkColorSpace_A2B_DEFINED #define SkColorSpace_A2B_DEFINED -#include "SkColorSpace_Base.h" - +#include "SkColorLookUpTable.h" +#include "SkColorSpace.h" +#include "SkGammas.h" #include <vector> // An alternative SkColorSpace that represents all the color space data that @@ -25,7 +26,7 @@ // you to combine these 3 primitives (TRC, CLUT, matrix) in any order/quantity. // MPET tags are currently unsupported by the MakeICC parser, could be supported // here by the nature of the design. -class SkColorSpace_A2B : public SkColorSpace_Base { +class SkColorSpace_A2B : public SkColorSpace { public: const SkMatrix44* onToXYZD50() const override { // the matrix specified in A2B0 profiles is not necessarily @@ -68,8 +69,6 @@ public: return SkColorSpace::MakeSRGB(); } - Type type() const override { return Type::kA2B; } - class Element { public: Element(SkGammaNamed gammaNamed, int channelCount) @@ -176,9 +175,7 @@ private: std::vector<Element> fElements; PCS fPCS; - friend class SkColorSpace_Base; friend class ColorSpaceXformTest; - typedef SkColorSpace_Base INHERITED; }; #endif |