diff options
author | bungeman <bungeman@google.com> | 2015-08-26 05:15:46 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-26 05:15:46 -0700 |
commit | 60e0fee6d4acff638ccc9670c4055aced529a7a0 (patch) | |
tree | 8f73b02cd0bfbb7d6d64982ed4ebd8776d4a5a28 /src/pathops/SkOpSpan.cpp | |
parent | 8d624bd44ef9e6d4ab7b768c4cbaa41cba830eda (diff) |
Remove include of stdlib.h from SkTypes.h.
Unfortunately, immintrin.h (which is also included by SkTypes)
includes xmmintrin.h which includes mm_malloc.h which includes
stdlib.h for malloc even though, from the implementation, it is
difficult to see why.
Fortunately, arm_neon.h does not seem to be involved in such
shenanigans, so building for Android will keep things sane.
TBR=reed@google.com
Doesn't change Skia API, just moves an include.
Review URL: https://codereview.chromium.org/1313203003
Diffstat (limited to 'src/pathops/SkOpSpan.cpp')
-rwxr-xr-x | src/pathops/SkOpSpan.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pathops/SkOpSpan.cpp b/src/pathops/SkOpSpan.cpp index 5c89c736fb..df3ef3c9b3 100755 --- a/src/pathops/SkOpSpan.cpp +++ b/src/pathops/SkOpSpan.cpp @@ -369,7 +369,7 @@ void SkOpSpan::setOppSum(int oppSum) { this->globalState()->setWindingFailed(); return; } - SkASSERT(!DEBUG_LIMIT_WIND_SUM || abs(oppSum) <= DEBUG_LIMIT_WIND_SUM); + SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(oppSum) <= DEBUG_LIMIT_WIND_SUM); fOppSum = oppSum; } @@ -379,6 +379,6 @@ void SkOpSpan::setWindSum(int windSum) { this->globalState()->setWindingFailed(); return; } - SkASSERT(!DEBUG_LIMIT_WIND_SUM || abs(windSum) <= DEBUG_LIMIT_WIND_SUM); + SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(windSum) <= DEBUG_LIMIT_WIND_SUM); fWindSum = windSum; } |