summaryrefslogtreecommitdiffstats
path: root/src/tools/pngcmp.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-22 13:13:17 +0200
commitddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch)
treea70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/tools/pngcmp.cpp
parent333bff8de64dfaeb98134000412796b4fdef970b (diff)
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/tools/pngcmp.cpp')
-rw-r--r--src/tools/pngcmp.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/pngcmp.cpp b/src/tools/pngcmp.cpp
index 5ee6d703cda..af104e928b3 100644
--- a/src/tools/pngcmp.cpp
+++ b/src/tools/pngcmp.cpp
@@ -119,8 +119,8 @@ static int generate_png_diff(const std::string& imgfile1, const std::string& img
/* compare scanline by scanline */
for (y = 0; y < bitmap2.height() && !bitmaps_differ; y++)
{
- UINT32 *base = &bitmap1.pix32(y);
- UINT32 *curr = &bitmap2.pix32(y);
+ uint32_t *base = &bitmap1.pix32(y);
+ uint32_t *curr = &bitmap2.pix32(y);
/* scan the scanline */
for (x = 0; x < bitmap2.width(); x++)
@@ -150,11 +150,11 @@ static int generate_png_diff(const std::string& imgfile1, const std::string& img
/* iterate over rows in these bitmaps */
for (y = 0; y < curheight; y++)
{
- UINT32 *src1 = (y < bitmap1.height()) ? &bitmap1.pix32(y) : nullptr;
- UINT32 *src2 = (y < bitmap2.height()) ? &bitmap2.pix32(y) : nullptr;
- UINT32 *dst1 = &finalbitmap.pix32(y);
- UINT32 *dst2 = &finalbitmap.pix32(y, bitmap1.width() + BITMAP_SPACE);
- UINT32 *dstdiff = &finalbitmap.pix32(y, bitmap1.width() + BITMAP_SPACE + maxwidth + BITMAP_SPACE);
+ uint32_t *src1 = (y < bitmap1.height()) ? &bitmap1.pix32(y) : nullptr;
+ uint32_t *src2 = (y < bitmap2.height()) ? &bitmap2.pix32(y) : nullptr;
+ uint32_t *dst1 = &finalbitmap.pix32(y);
+ uint32_t *dst2 = &finalbitmap.pix32(y, bitmap1.width() + BITMAP_SPACE);
+ uint32_t *dstdiff = &finalbitmap.pix32(y, bitmap1.width() + BITMAP_SPACE + maxwidth + BITMAP_SPACE);
/* now iterate over columns */
for (x = 0; x < maxwidth; x++)