diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-09 22:32:52 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-09 22:32:52 +0000 |
| commit | ee9aa304579b3d5314519372728187879456d49d (patch) | |
| tree | 9eb7c5bf46e14fbf24df3754a9e988249330a1ac /include | |
| parent | 757cdc4e7399da991b2881f367249424124da895 (diff) | |
Fixes from Sk/Gr rect unification.
git-svn-id: http://skia.googlecode.com/svn/trunk@1288 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkFixed.h | 2 | ||||
| -rw-r--r-- | include/core/SkRect.h | 4 | ||||
| -rw-r--r-- | include/core/SkScalar.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h index 1deb72c5f0..c58c6de10b 100644 --- a/include/core/SkFixed.h +++ b/include/core/SkFixed.h @@ -30,7 +30,7 @@ typedef int32_t SkFixed; #define SK_Fixed1 (1 << 16) #define SK_FixedHalf (1 << 15) #define SK_FixedMax (0x7FFFFFFF) -#define SK_FixedMin (0x1) +#define SK_FixedMin (-SK_FixedMax) #define SK_FixedNaN ((int) 0x80000000) #define SK_FixedPI (0x3243F) #define SK_FixedSqrt2 (92682) diff --git a/include/core/SkRect.h b/include/core/SkRect.h index 49acf631d2..eb8815c0f8 100644 --- a/include/core/SkRect.h +++ b/include/core/SkRect.h @@ -498,8 +498,8 @@ struct SK_API SkRect { void growToInclude(SkScalar x, SkScalar y) { fLeft = SkMinScalar(x, fLeft); - fRight = SkMaxScalar(y, fRight); - fTop = SkMinScalar(x, fTop); + fRight = SkMaxScalar(x, fRight); + fTop = SkMinScalar(y, fTop); fBottom = SkMaxScalar(y, fBottom); } diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index e568d7ec4b..ebe621be4f 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -53,7 +53,7 @@ #define SK_ScalarMax (3.402823466e+38f) /** SK_ScalarMin is defined to be the smallest value representable as an SkScalar */ - #define SK_ScalarMin (1.175494351e-38f) + #define SK_ScalarMin (-SK_ScalarMax) /** SK_ScalarNaN is defined to be 'Not a Number' as an SkScalar */ #define SK_ScalarNaN (*(const float*)(const void*)&gIEEENotANumber) |