diff options
| author | awalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 19:34:30 +0000 |
|---|---|---|
| committer | awalker@google.com <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 19:34:30 +0000 |
| commit | 247e24728016f366f80bda88a3d4b8d7efd2dafe (patch) | |
| tree | 55c4cd91a050f9abe230e62184bc85c793af8df1 /base/gfx/convolver.h | |
| parent | 8448f1ae7fc731b8c02f66bb36bb4849096d61a6 (diff) | |
| download | chromium_src-247e24728016f366f80bda88a3d4b8d7efd2dafe.zip chromium_src-247e24728016f366f80bda88a3d4b8d7efd2dafe.tar.gz chromium_src-247e24728016f366f80bda88a3d4b8d7efd2dafe.tar.bz2 | |
Merges in updated versions of Mac graphics platform classes, adds generic typedefs for use by higher level classes that just need to hold a reference (though does not yet refactor those classes).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx/convolver.h')
| -rw-r--r-- | base/gfx/convolver.h | 5 |
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 |