diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-05-29 20:10:01 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-05-29 20:10:01 -0700 |
| commit | 8fc83d8ffca75f86c144a7798ebf0661a1eb68ef (patch) | |
| tree | 741357c06acd966494684f8fdd4ec89e961d9887 /Source/Core/VideoCommon/TextureDecoder_x64.cpp | |
| parent | 30973459292d734fac12d1fefaf98edf37ad7976 (diff) | |
| parent | 49b0eef393f4d321928fb0b6093d58a7637cf1da (diff) | |
Merge pull request #334 from lioncash/use-std-minmax
Remove the min/max functions in CommonFuncs.
Diffstat (limited to 'Source/Core/VideoCommon/TextureDecoder_x64.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/TextureDecoder_x64.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index ae11374538..efe116d39a 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include <algorithm> #include <cmath> #include "Common/Common.h" @@ -2037,8 +2038,8 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in if ((!TexFmt_Overlay_Enable) || (retval == PC_TEX_FMT_NONE)) return retval; - int w = min(width, 40); - int h = min(height, 10); + int w = std::min(width, 40); + int h = std::min(height, 10); int xoff = (width - w) >> 1; int yoff = (height - h) >> 1; |