Index: src/core/SkColor.cpp |
diff --git a/src/core/SkColor.cpp b/src/core/SkColor.cpp |
index 985790dfe50bbca2464eeb3ad8ff040f3c37d909..134de7ad8f73ab079a8fbbeb95fc1cc04b7e3a99 100644 |
--- a/src/core/SkColor.cpp |
+++ b/src/core/SkColor.cpp |
@@ -9,8 +9,6 @@ |
#include "SkColorPriv.h" |
#include "SkFixed.h" |
-bool gTreatSkColorAsSRGB; |
- |
SkPMColor SkPreMultiplyARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) { |
return SkPremultiplyARGBInline(a, r, g, b); |
} |
@@ -158,11 +156,9 @@ SkColor4f SkColor4f::FromColor(SkColor c) { |
Sk4f value = SkNx_shuffle<2,1,0,3>(SkNx_cast<float>(Sk4b::Load(&c))); |
SkColor4f c4; |
(value * Sk4f(1.0f / 255)).store(&c4); |
- if (gTreatSkColorAsSRGB) { |
- c4.fR = srgb_to_linear(c4.fR); |
- c4.fG = srgb_to_linear(c4.fG); |
- c4.fB = srgb_to_linear(c4.fB); |
- } |
+ c4.fR = srgb_to_linear(c4.fR); |
+ c4.fG = srgb_to_linear(c4.fG); |
+ c4.fB = srgb_to_linear(c4.fB); |
return c4; |
} |