Index: include/core/SkPostConfig.h |
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h |
index e44c709b74a9bd1fb6d6efa40966bcea0ecfdc52..fa65ee6d47015fa7750f29c58ee47e30f160f467 100644 |
--- a/include/core/SkPostConfig.h |
+++ b/include/core/SkPostConfig.h |
@@ -318,12 +318,8 @@ |
////////////////////////////////////////////////////////////////////// |
-#if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB) |
-# error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB" |
-#elif defined(SK_GAMMA_SRGB) |
-# define SK_GAMMA_EXPONENT (0.0f) |
-#elif !defined(SK_GAMMA_EXPONENT) |
-# define SK_GAMMA_EXPONENT (2.2f) |
+#if !defined(SK_GAMMA_EXPONENT) |
+ #define SK_GAMMA_EXPONENT (0.0f) // SRGB |
bungeman-skia
2016/08/01 15:17:22
nit: the hash is indented, while the rest of the f
|
#endif |
////////////////////////////////////////////////////////////////////// |