diff options
| author | Casimir666 <casimir666@users.sourceforge.net> | 2008-03-15 20:43:31 +0300 |
|---|---|---|
| committer | Casimir666 <casimir666@users.sourceforge.net> | 2008-03-15 20:43:31 +0300 |
| commit | b90e603f9cfaea94ff23247c01ff03ba53d1f85d (patch) | |
| tree | c63178162562a7897fbca7b12a3d959efe07b86b /src/subtitles/Rasterizer.cpp | |
| parent | 183e0c03e45537b92d66b163ef310233fecedce9 (diff) | |
CHANGED : modifications for Visual Studio 2008 (old projects renamed to xxx _vs2005.vcproj / sln)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@466 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/subtitles/Rasterizer.cpp')
| -rw-r--r-- | src/subtitles/Rasterizer.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/subtitles/Rasterizer.cpp b/src/subtitles/Rasterizer.cpp index 04201470d..386c5b274 100644 --- a/src/subtitles/Rasterizer.cpp +++ b/src/subtitles/Rasterizer.cpp @@ -26,6 +26,16 @@ #include <algorithm>
#include "Rasterizer.h"
+ #ifndef _MAX /* avoid collision with common (nonconforming) macros */
+ #define _MAX (max)
+ #define _MIN (min)
+ #define _IMPL_MAX max
+ #define _IMPL_MIN min
+ #else
+ #define _IMPL_MAX _MAX
+ #define _IMPL_MIN _MIN
+ #endif
+
Rasterizer::Rasterizer() : mpPathTypes(NULL), mpPathPoints(NULL), mPathPoints(0), mpOverlayBuffer(NULL)
{
mOverlayWidth = mOverlayHeight = 0;
|