diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-09 19:31:09 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-09 19:31:09 +0400 |
| commit | b9958177903f7a8b6fdc389276fea0cd7c893392 (patch) | |
| tree | 945d69eb3672c9ae9c9d787db4e194b7cbaf11cd | |
| parent | fbe825675933edd8333b5640dd2e0de1a54d7d21 (diff) | |
Rasterizer.cpp: remove unneeded defines and use std:: explicitly
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5061 10f7b99b-c216-0410-bff0-8a66a9350fd8
| -rw-r--r-- | src/Subtitles/Rasterizer.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Subtitles/Rasterizer.cpp b/src/Subtitles/Rasterizer.cpp index 289f9f696..32d54e32a 100644 --- a/src/Subtitles/Rasterizer.cpp +++ b/src/Subtitles/Rasterizer.cpp @@ -33,14 +33,8 @@ #include "SeparableFilter.h"
#include "../DSUtil/vd.h" // For CPUID usage in Rasterizer::Draw
-#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
+#ifndef _MAX /* avoid collision with common (nonconforming) macros */
+#define _MAX (std::max)
#endif
// Statics constants for use by alpha_blend_sse2
@@ -577,8 +571,6 @@ bool Rasterizer::ScanConvert() return true;
}
-using namespace std;
-
void Rasterizer::_OverlapRegion(tSpanBuffer& dst, tSpanBuffer& src, int dx, int dy)
{
tSpanBuffer temp;
|