summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/vbiparse.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-07-31 11:50:20 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-07-31 14:41:02 +0200
commit9667c6a8cce1829a7321dde67bd0287c73234386 (patch)
treef3665957d557cb18728a40e75f7d9f2341aaff1d /src/lib/util/vbiparse.cpp
parent69ac4affc86caac51ff9720083ed128dabdb932f (diff)
std::min and std:max instead of MIN and MAX, also some more macros converted to inline functions (nw)
Diffstat (limited to 'src/lib/util/vbiparse.cpp')
-rw-r--r--src/lib/util/vbiparse.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/vbiparse.cpp b/src/lib/util/vbiparse.cpp
index ff523ee4265..854b5fbd384 100644
--- a/src/lib/util/vbiparse.cpp
+++ b/src/lib/util/vbiparse.cpp
@@ -11,7 +11,7 @@
#include "osdcore.h"
#include "vbiparse.h"
#include <math.h>
-
+#include <algorithm>
/***************************************************************************
@@ -58,8 +58,8 @@ int vbi_parse_manchester_code(const UINT16 *source, int sourcewidth, int sources
for (x = 0; x < sourcewidth; x++)
{
UINT8 rawsrc = source[x] >> sourceshift;
- min = MIN(min, rawsrc);
- max = MAX(max, rawsrc);
+ min = std::min(min, rawsrc);
+ max = std::max(max, rawsrc);
}
/* bail if the line is all black or all white */