dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Remove min/max functions in favour of STL variants (#8502)

Browse Source
This commit is contained in:
Charles Pigott
2021-01-08 10:16:18 +00:00
committed by GitHub
parent c1fddb9a6a
commit 9b800a96ed
181 changed files with 900 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screenshot.cpp
View File

@@ -182,7 +182,7 @@ static bool MakeBMPImage(const char *name, ScreenshotCallback *callb, void *user
/* Start at the bottom, since bitmaps are stored bottom up */
do {
uint n = min(h, maxlines);
uint n = std::min(h, maxlines);
h -= n;
/* Render the pixels */
@@ -375,7 +375,7 @@ static bool MakePNGImage(const char *name, ScreenshotCallback *callb, void *user
y = 0;
do {
/* determine # lines to write */
n = min(h - y, maxlines);
n = std::min(h - y, maxlines);
/* render the pixels into the buffer */
callb(userdata, buff, y, w, n);
@@ -482,7 +482,7 @@ static bool MakePCXImage(const char *name, ScreenshotCallback *callb, void *user
y = 0;
do {
/* determine # lines to write */
uint n = min(h - y, maxlines);
uint n = std::min(h - y, maxlines);
uint i;
/* render the pixels into the buffer */
@@ -640,7 +640,7 @@ static void LargeWorldCallback(void *userdata, void *buf, uint y, uint pitch, ui
/* Render viewport in blocks of 1600 pixels width */
left = 0;
while (vp->width - left != 0) {
wx = min(vp->width - left, 1600);
wx = std::min(vp->width - left, 1600);
left += wx;
ViewportDoDraw(vp,