diff options
| author | 2016-07-31 11:50:20 +0200 | |
|---|---|---|
| committer | 2016-07-31 14:41:02 +0200 | |
| commit | 9667c6a8cce1829a7321dde67bd0287c73234386 (patch) | |
| tree | f3665957d557cb18728a40e75f7d9f2341aaff1d /src/tools/regrep.cpp | |
| 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/tools/regrep.cpp')
| -rw-r--r-- | src/tools/regrep.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/regrep.cpp b/src/tools/regrep.cpp index 0c6d11093c6..bfe05ea52db 100644 --- a/src/tools/regrep.cpp +++ b/src/tools/regrep.cpp @@ -876,12 +876,12 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir, int curwidth; /* determine the maximal width */ - maxwidth = MAX(maxwidth, bitmaps[bmnum].width()); + maxwidth = std::max(maxwidth, bitmaps[bmnum].width()); curwidth = bitmaps[0].width() + BITMAP_SPACE + maxwidth + BITMAP_SPACE + maxwidth; - width = MAX(width, curwidth); + width = std::max(width, curwidth); /* add to the height */ - height += MAX(bitmaps[0].height(), bitmaps[bmnum].height()); + height += std::max(bitmaps[0].height(), bitmaps[bmnum].height()); if (bmnum != 1) height += BITMAP_SPACE; } @@ -895,7 +895,7 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir, { bitmap_argb32 &bitmap1 = bitmaps[0]; bitmap_argb32 &bitmap2 = bitmaps[bmnum]; - int curheight = MAX(bitmap1.height(), bitmap2.height()); + int curheight = std::max(bitmap1.height(), bitmap2.height()); int x, y; /* iterate over rows in these bitmaps */ @@ -921,7 +921,7 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir, } /* update the starting Y position */ - starty += BITMAP_SPACE + MAX(bitmap1.height(), bitmap2.height()); + starty += BITMAP_SPACE + std::max(bitmap1.height(), bitmap2.height()); } /* write the final PNG */ |
