diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-08 20:31:53 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-08 20:31:53 +0000 |
| commit | 50c79d886bf435d3a9cad056885370e2c3f526ad (patch) | |
| tree | 628f039081e19dc3d447cb8d33d0e94122732c3c /include | |
| parent | 15655b241bfe1d77032e88115f119684722c10e0 (diff) | |
Enable warnings-as-errors on Windows.
Review URL: https://codereview.appspot.com/7066054
git-svn-id: http://skia.googlecode.com/svn/trunk@7094 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkFloatingPoint.h | 3 | ||||
| -rw-r--r-- | include/core/SkScalar.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/core/SkFloatingPoint.h b/include/core/SkFloatingPoint.h index d388cdb47b..96270b09e2 100644 --- a/include/core/SkFloatingPoint.h +++ b/include/core/SkFloatingPoint.h @@ -89,8 +89,9 @@ static inline float sk_float_copysign(float x, float y) { extern const uint32_t gIEEENotANumber; extern const uint32_t gIEEEInfinity; +extern const uint32_t gIEEENegativeInfinity; #define SK_FloatNaN (*reinterpret_cast<const float*>(&gIEEENotANumber)) #define SK_FloatInfinity (*reinterpret_cast<const float*>(&gIEEEInfinity)) - +#define SK_FloatNegativeInfinity (*reinterpret_cast<const float*>(&gIEEENegativeInfinity)) #endif diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index ea97a79865..b775472139 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -39,6 +39,9 @@ /** SK_ScalarInfinity is defined to be infinity as an SkScalar */ #define SK_ScalarInfinity SK_FloatInfinity + /** SK_ScalarNegativeInfinity is defined to be negative infinity as an SkScalar + */ + #define SK_ScalarNegativeInfinity SK_FloatNegativeInfinity /** SK_ScalarMax is defined to be the largest value representable as an SkScalar */ #define SK_ScalarMax (3.402823466e+38f) @@ -220,7 +223,8 @@ #define SK_Scalar1 SK_Fixed1 #define SK_ScalarHalf SK_FixedHalf - #define SK_ScalarInfinity SK_FixedMax + #define SK_ScalarInfinity SK_FixedMax + #define SK_ScalarNegativeInfinity SK_FixedMin #define SK_ScalarMax SK_FixedMax #define SK_ScalarMin SK_FixedMin #define SK_ScalarNaN SK_FixedNaN |