aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/gradients/SkGradientShaderPriv.h
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2015-12-09 12:02:30 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-12-09 12:02:30 -0800
commit3127c99986dc932343aae5ccc575237d99c3aaec (patch)
tree68b3bf28a8f38c10838afa7a2b28478ad07ff17f /src/effects/gradients/SkGradientShaderPriv.h
parente36ec871768eb4f5372540c1167ff7ec592f2bec (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/SkGradientShaderPriv.h')
-rw-r--r--src/effects/gradients/SkGradientShaderPriv.h2
1 files changed, 1 insertions, 1 deletions
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;
}