aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--bench/MathBench.cpp2
-rw-r--r--gyp/sfntly.gyp3
2 files changed, 4 insertions, 1 deletions
diff --git a/bench/MathBench.cpp b/bench/MathBench.cpp
index a5cc033c6f..fb35a8aafe 100644
--- a/bench/MathBench.cpp
+++ b/bench/MathBench.cpp
@@ -126,7 +126,7 @@ private:
static inline float SkFastInvSqrt(float x) {
float xhalf = 0.5f*x;
- int i = *SkTCast<int*>(&x);
+ uint32_t i = *SkTCast<uint32_t*>(&x);
i = 0x5f3759df - (i>>1);
x = *SkTCast<float*>(&i);
x = x*(1.5f-xhalf*x*x);
diff --git a/gyp/sfntly.gyp b/gyp/sfntly.gyp
index 4e3ca5f47a..07e2d2cb95 100644
--- a/gyp/sfntly.gyp
+++ b/gyp/sfntly.gyp
@@ -33,6 +33,9 @@
'dependencies' : [
'icu.gyp:icuuc',
],
+ # Disable any sanitizers we might be using.
+ 'ldflags!': [ '-fsanitize=<(skia_sanitizer)' ],
+ 'cflags!': [ '-fsanitize=<(skia_sanitizer)' ],
'conditions': [
[ 'skia_os == "win"',
{