Fixes from Sk/Gr rect unification.

git-svn-id: http://skia.googlecode.com/svn/trunk@1288 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2011-05-09 22:32:52 +00:00
parent 757cdc4e73
commit ee9aa30457
3 changed files with 4 additions and 4 deletions

View File

@ -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)

View File

@ -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);
}

View File

@ -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)