summaryrefslogtreecommitdiffstats
path: root/base/gfx/convolver.h
diff options
context:
space:
mode:
Diffstat (limited to 'base/gfx/convolver.h')
-rw-r--r--base/gfx/convolver.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/base/gfx/convolver.h b/base/gfx/convolver.h
index 8a2310e..2cb91af 100644
--- a/base/gfx/convolver.h
+++ b/base/gfx/convolver.h
@@ -34,6 +34,11 @@
#include "base/basictypes.h"
+// avoid confusion with Mac OS X's math library (Carbon)
+#if defined(OS_MACOSX)
+#undef FloatToFixed
+#endif
+
namespace gfx {
// Represents a filter in one dimension. Each output pixel has one entry in this