piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 13:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the min/max functions in CommonFuncs.

Browse Source 
The algorithm header has the same functions.
This commit is contained in:
Lioncash
2014-05-02 22:47:04 -04:00
parent 3097345929
commit 49b0eef393
29 changed files with 104 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/VideoCommon/TextureDecoder_Generic.cpp
View File

@ -1,20 +1,8 @@
// Copyright (C) 2003 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
// Copyright 2014 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <algorithm>
#include <cmath>
#include "Common/Common.h"
@ -1055,8 +1043,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;