diff options
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/gradients/SkClampRange.h | 4 | ||||
| -rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/gradients/SkClampRange.h b/src/effects/gradients/SkClampRange.h index 945f9a7ff1..d3d2d08c86 100644 --- a/src/effects/gradients/SkClampRange.h +++ b/src/effects/gradients/SkClampRange.h @@ -12,8 +12,8 @@ #include "SkScalar.h" #define SkGradFixed SkFixed3232 -#define SkScalarToGradFixed SkScalarToFixed3232 -#define SkFixedToGradFixed SkFixedToFixed3232 +#define SkScalarToGradFixed(x) SkScalarToFixed3232(x) +#define SkFixedToGradFixed(x) SkFixedToFixed3232(x) #define SkGradFixedToFixed(x) (SkFixed)((x) >> 16) #define kFracMax_SkGradFixed 0xFFFFFFFFLL diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 203f791ceb..f8a968d1a2 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -58,7 +58,7 @@ static inline SkFixed repeat_tileproc(SkFixed x) { #endif static inline SkFixed mirror_tileproc(SkFixed x) { - int s = x << 15 >> 31; + int s = SkLeftShift(x, 15) >> 31; return (x ^ s) & 0xFFFF; } |