summaryrefslogtreecommitdiffstats
path: root/src/tools/regrep.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/regrep.cpp')
-rw-r--r--src/tools/regrep.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/tools/regrep.cpp b/src/tools/regrep.cpp
index bfe05ea52db..b421d94190e 100644
--- a/src/tools/regrep.cpp
+++ b/src/tools/regrep.cpp
@@ -61,8 +61,8 @@ struct summary_file
summary_file * next;
char name[20];
char source[100];
- UINT8 status[MAX_COMPARES];
- UINT8 matchbitmap[MAX_COMPARES];
+ uint8_t status[MAX_COMPARES];
+ uint8_t matchbitmap[MAX_COMPARES];
std::string text[MAX_COMPARES];
};
@@ -174,12 +174,12 @@ static inline char *trim_string(char *string)
int length;
/* trim leading spaces */
- while (*string != 0 && isspace((UINT8)*string))
+ while (*string != 0 && isspace((uint8_t)*string))
string++;
/* trim trailing spaces */
length = strlen(string);
- while (length > 0 && isspace((UINT8)string[length - 1]))
+ while (length > 0 && isspace((uint8_t)string[length - 1]))
string[--length] = 0;
return string;
@@ -218,7 +218,7 @@ static inline int get_unique_index(const summary_file *curfile, int index)
int main(int argc, char *argv[])
{
- UINT32 bufsize;
+ uint32_t bufsize;
void *buffer;
int listnum;
int result;
@@ -393,7 +393,7 @@ static int read_summary_log(const char *filename, int index)
{
/* find the end of the line and normalize it with a CR */
for (curptr = linestart; *curptr != 0 && *curptr != '\n' && *curptr != '\r'; curptr++)
- if (!isspace((UINT8)*curptr))
+ if (!isspace((uint8_t)*curptr))
foundchars = 1;
*curptr++ = '\n';
*curptr = 0;
@@ -414,7 +414,7 @@ static int read_summary_log(const char *filename, int index)
char *end;
/* find the end */
- for (end = start; !isspace((UINT8)*end); end++) ;
+ for (end = start; !isspace((uint8_t)*end); end++) ;
*end = 0;
strcpy(lists[index].version, start);
fprintf(stderr, "Parsing results from version %s\n", lists[index].version);
@@ -774,8 +774,8 @@ static int compare_screenshots(summary_file *curfile)
/* compare scanline by scanline */
for (int y = 0; y < this_bitmap.height() && !bitmaps_differ; y++)
{
- UINT32 *base = &base_bitmap.pix32(y);
- UINT32 *curr = &this_bitmap.pix32(y);
+ uint32_t *base = &base_bitmap.pix32(y);
+ uint32_t *curr = &this_bitmap.pix32(y);
/* scan the scanline */
int x;
@@ -901,11 +901,11 @@ static int generate_png_diff(const summary_file *curfile, std::string &destdir,
/* 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(starty + y, 0);
- UINT32 *dst2 = &finalbitmap.pix32(starty + y, bitmap1.width() + BITMAP_SPACE);
- UINT32 *dstdiff = &finalbitmap.pix32(starty + 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(starty + y, 0);
+ uint32_t *dst2 = &finalbitmap.pix32(starty + y, bitmap1.width() + BITMAP_SPACE);
+ uint32_t *dstdiff = &finalbitmap.pix32(starty + y, bitmap1.width() + BITMAP_SPACE + maxwidth + BITMAP_SPACE);
/* now iterate over columns */
for (x = 0; x < maxwidth; x++)