diff options
author | 2016-07-31 11:50:20 +0200 | |
---|---|---|
committer | 2016-07-31 14:41:02 +0200 | |
commit | 9667c6a8cce1829a7321dde67bd0287c73234386 (patch) | |
tree | f3665957d557cb18728a40e75f7d9f2341aaff1d /src/emu/video | |
parent | 69ac4affc86caac51ff9720083ed128dabdb932f (diff) |
std::min and std:max instead of MIN and MAX, also some more macros converted to inline functions (nw)
Diffstat (limited to 'src/emu/video')
-rw-r--r-- | src/emu/video/resnet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/video/resnet.cpp b/src/emu/video/resnet.cpp index a4df1c0bdc4..0ae03e2ed14 100644 --- a/src/emu/video/resnet.cpp +++ b/src/emu/video/resnet.cpp @@ -670,7 +670,7 @@ int compute_res_net(int inputs, int channel, const res_net_info &di) rTotal = 1.0 / rTotal; v *= rTotal; - v = MAX(minout, v - cut); + v = std::max(minout, v - cut); switch (di.options & RES_NET_MONITOR_MASK) { @@ -679,8 +679,8 @@ int compute_res_net(int inputs, int channel, const res_net_info &di) break; case RES_NET_MONITOR_SANYO_EZV20: v = vcc - v; - v = MAX(0, v-0.7); - v = MIN(v, vcc - 2 * 0.7); + v = std::max(double(0), v-0.7); + v = std::min(v, vcc - 2 * 0.7); v = v / (vcc-1.4); v = v * vcc; break; |