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/core/SkBitmapProcState_matrixProcs.cpp | |
| 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/core/SkBitmapProcState_matrixProcs.cpp')
| -rw-r--r-- | src/core/SkBitmapProcState_matrixProcs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp index ee61ee8556..1c4b7b6bcf 100644 --- a/src/core/SkBitmapProcState_matrixProcs.cpp +++ b/src/core/SkBitmapProcState_matrixProcs.cpp @@ -178,7 +178,7 @@ static inline U16CPU fixed_repeat(SkFixed x) { #endif static inline U16CPU fixed_mirror(SkFixed x) { - SkFixed s = x << 15 >> 31; + SkFixed s = SkLeftShift(x, 15) >> 31; // s is FFFFFFFF if we're on an odd interval, or 0 if an even interval return (x ^ s) & 0xFFFF; } |