diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-02 19:50:26 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-02 19:50:26 +0000 |
| commit | 92b6a94ac103ea3f37a8f9f02072ef884cc17a7c (patch) | |
| tree | 0f115580f3cabe733629a8d7c956b145834acecb /include/core/SkScalar.h | |
| parent | 50ff9bd4d72c77c7c5ec2393f28ddbd8050129db (diff) | |
Make GrGLTextureDomainEffect use GrGLEffectMatrix.
Also, don't send redundant domain.
Review URL: https://codereview.appspot.com/6820082
git-svn-id: http://skia.googlecode.com/svn/trunk@6276 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkScalar.h')
| -rw-r--r-- | include/core/SkScalar.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index 82ac6e33cf..ea97a79865 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -29,8 +29,6 @@ as a 16.16 fixed point integer. */ typedef float SkScalar; - extern const uint32_t gIEEENotANumber; - extern const uint32_t gIEEEInfinity; /** SK_Scalar1 is defined to be 1.0 represented as an SkScalar */ @@ -40,7 +38,7 @@ #define SK_ScalarHalf (0.5f) /** SK_ScalarInfinity is defined to be infinity as an SkScalar */ - #define SK_ScalarInfinity (*SkTCast<const float*>(&gIEEEInfinity)) + #define SK_ScalarInfinity SK_FloatInfinity /** SK_ScalarMax is defined to be the largest value representable as an SkScalar */ #define SK_ScalarMax (3.402823466e+38f) @@ -49,7 +47,7 @@ #define SK_ScalarMin (-SK_ScalarMax) /** SK_ScalarNaN is defined to be 'Not a Number' as an SkScalar */ - #define SK_ScalarNaN (*SkTCast<const float*>(&gIEEENotANumber)) + #define SK_ScalarNaN SK_FloatNaN /** SkScalarIsNaN(n) returns true if argument is not a number */ static inline bool SkScalarIsNaN(float x) { return x != x; } |