diff options
| author |  caryclark <caryclark@google.com> | 2015-12-09 12:02:30 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-09 12:02:30 -0800 |
| commit | 3127c99986dc932343aae5ccc575237d99c3aaec (patch) | |
| tree | 68b3bf28a8f38c10838afa7a2b28478ad07ff17f /src/effects/gradients/SkClampRange.h | |
| parent | e36ec871768eb4f5372540c1167ff7ec592f2bec (diff) | |
ubsan shift fixes
Use an inline function that does a normal shift. When built for the sanitizer, add casts so that the shift is unsigned.
Also make a few fixes to do unsigned shifts or avoid the shift altogether; and add an argument spec to some macros.
R=reed@google.com,mtklein@google.com
BUG=skia:4633
Review URL: https://codereview.chromium.org/1503423003
Diffstat (limited to 'src/effects/gradients/SkClampRange.h')
| -rw-r--r-- | src/effects/gradients/SkClampRange.h | 4 |
1 files changed, 2 insertions, 2 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 |