diff options
| author |  george <george@mozilla.com> | 2014-06-20 06:32:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-20 06:32:58 -0700 |
| commit | ae6a059c68b535e8d2bd814d8d43361e2f8626df (patch) | |
| tree | a3c67a05c0182507f3d2b9051973ae376d3bc0a0 /src | |
| parent | aed7007e9e3ee4cdf733bf2f53531fdcd0531b25 (diff) | |
Undef FloatToFixed and FixedToFloat as well in SkConvolver to avoid confusion with OS X's maths library
BUG=skia:
R=reed@google.com
Author: george@mozilla.com
Review URL: https://codereview.chromium.org/326623004
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkConvolver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/SkConvolver.h b/src/core/SkConvolver.h index 94a5e91598..8e53da2d42 100644 --- a/src/core/SkConvolver.h +++ b/src/core/SkConvolver.h @@ -13,6 +13,8 @@ #if defined(__APPLE__) #undef FloatToConvolutionFixed #undef ConvolutionFixedToFloat +#undef FloatToFixed +#undef FixedToFloat #endif // Represents a filter in one dimension. Each output pixel has one entry in this |