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/pngcmp.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/pngcmp.cpp')
-rw-r--r-- | src/tools/pngcmp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/pngcmp.cpp b/src/tools/pngcmp.cpp index e34bcf401e4..5ee6d703cda 100644 --- a/src/tools/pngcmp.cpp +++ b/src/tools/pngcmp.cpp @@ -135,18 +135,18 @@ static int generate_png_diff(const std::string& imgfile1, const std::string& img height = width = 0; { /* determine the maximal width */ - maxwidth = MAX(bitmap1.width(), bitmap2.width()); + maxwidth = std::max(bitmap1.width(), bitmap2.width()); width = bitmap1.width() + BITMAP_SPACE + maxwidth + BITMAP_SPACE + maxwidth; /* add to the height */ - height += MAX(bitmap1.height(), bitmap2.height()); + height += std::max(bitmap1.height(), bitmap2.height()); } /* allocate the final bitmap */ finalbitmap.allocate(width, height); /* now copy and compare each set of bitmaps */ - int curheight = MAX(bitmap1.height(), bitmap2.height()); + int curheight = std::max(bitmap1.height(), bitmap2.height()); /* iterate over rows in these bitmaps */ for (y = 0; y < curheight; y++) { |