aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkColor.h
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-01-22 00:04:30 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-22 00:04:30 -0800
commit2a2bdc698460c38ac9e24ba4abdeefec67bcba37 (patch)
treefd2660e993c369874be1966a95ebc673194aabb4 /include/core/SkColor.h
parent7765000709dc64eb23be7df47d1f995d1f787115 (diff)
Revert of experiment: float color components (patchset #6 id:100001 of https://codereview.chromium.org/1617813002/ )
Reason for revert: broke some colormatrix tests Original issue's description: > experiment: float color components > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1617813002 > > Committed: https://skia.googlesource.com/skia/+/353c148d8e8c9031daca34c6f9d6bcc6f08706c7 TBR=fmalita@chromium.org,mtklein@google.com,herb@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1623453002
Diffstat (limited to 'include/core/SkColor.h')
-rw-r--r--include/core/SkColor.h40
1 files changed, 0 insertions, 40 deletions
diff --git a/include/core/SkColor.h b/include/core/SkColor.h
index 77946387e5..1ba1331c1a 100644
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
@@ -160,44 +160,4 @@ SK_API SkPMColor SkPreMultiplyColor(SkColor c);
*/
typedef SkPMColor (*SkXfermodeProc)(SkPMColor src, SkPMColor dst);
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*
- * The float values are 0...1 premultiplied
- */
-struct SK_ATTRIBUTE(aligned(16)) SkPM4f {
- float fVec[4];
-
- float a() const { return fVec[SK_A32_SHIFT/8]; }
-};
-
-/*
- * The float values are 0...1 unpremultiplied
- */
-struct SkColor4f {
- float fA;
- float fR;
- float fG;
- float fB;
-
- bool operator==(const SkColor4f& other) const {
- return fA == other.fA && fR == other.fR && fG == other.fG && fB == other.fB;
- }
- bool operator!=(const SkColor4f& other) const {
- return !(*this == other);
- }
-
- const float* vec() const { return &fA; }
- float* vec() { return &fA; }
-
- static SkColor4f Pin(float a, float r, float g, float b);
- static SkColor4f FromColor(SkColor);
-
- SkColor4f pin() const {
- return Pin(fA, fR, fG, fB);
- }
-
- SkPM4f premul() const;
-};
-
#endif