# HG changeset patch # User Matti Hamalainen # Date 1700411632 -7200 # Node ID c3c1d3c75f535e2728387df3eb2c7246c882ee2a # Parent bf43bf9d655674bd72f5403979138a3f5363bc62 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g diff -r bf43bf9d6556 -r c3c1d3c75f53 tools/64vw.c --- a/tools/64vw.c Sun Nov 19 04:02:18 2023 +0200 +++ b/tools/64vw.c Sun Nov 19 18:33:52 2023 +0200 @@ -220,7 +220,7 @@ dmGrowBufConstCreateFrom(&tmp, dataBuf, dataSize); if (optProbeOnly) - ret = dmC64ProbeBMP(&tmp, fmt) != DM_PROBE_SCORE_false ? DMERR_OK : DMERR_NOT_SUPPORTED; + ret = dmC64ProbeBMP(&tmp, fmt) != DM_PROBE_SCORE_FALSE ? DMERR_OK : DMERR_NOT_SUPPORTED; else ret = dmC64DecodeBMP(cimage, &tmp, -1, -1, fmt, forced); diff -r bf43bf9d6556 -r c3c1d3c75f53 tools/lib64fmts.c --- a/tools/lib64fmts.c Sun Nov 19 04:02:18 2023 +0200 +++ b/tools/lib64fmts.c Sun Nov 19 18:33:52 2023 +0200 @@ -19,7 +19,7 @@ dmCompareAddr16(buf, 0, fmt->addr)) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -45,7 +45,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -78,7 +78,7 @@ return DM_PROBE_SCORE_MAX; } - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -414,7 +414,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -498,7 +498,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -589,7 +589,7 @@ buf->data[0x0c44 - 0x0801 + 2] == 0x14) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -605,7 +605,7 @@ static int fmtProbeKoalaPainter(const DMGrowBuf *buf, const DMC64ImageFormat *fmt) { - int score = DM_PROBE_SCORE_false; + int score = DM_PROBE_SCORE_FALSE; if (buf->len >= 10002 && buf->len <= 10004) @@ -626,7 +626,7 @@ dmCompareAddr16(buf, 0, fmt->addr)) return DM_PROBE_SCORE_GOOD; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -645,7 +645,7 @@ return DM_PROBE_SCORE_MAX; } - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -655,7 +655,7 @@ dmCompareAddr16(buf, 0, 0x2000)) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -718,7 +718,7 @@ )) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -790,7 +790,7 @@ DM_MEMCMP_LEN(buf->data + 2, "DRAZLACE! 1.0") == 0) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -835,7 +835,7 @@ DM_MEMCMP_LEN(buf->data + 2, fmtBDP5_MagicID) == 0) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -922,7 +922,7 @@ memcmp(buf->data + fmtGunPaint_MagicOffs + 2, fmtGunPaint_MagicID, fmtGunPaint_MagicLen) == 0) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -946,13 +946,13 @@ size_t i, n; if (buf->len < 256 || !dmCompareAddr16(buf, 0, fmt->addr)) - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; // Interpaint Hi-Res gives a false positive // as do some GunPaint images .. if (buf->len == 9002 || fmtProbeGunPaint(buf, fmt) > DM_PROBE_SCORE_GOOD) - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; for (n = 0, i = 2; i < buf->len; i++) if (buf->data[i] == 0xC2) n++; @@ -964,7 +964,7 @@ if (n > 10) return DM_PROBE_SCORE_MAYBE; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1032,7 +1032,7 @@ dmCompareAddr16(buf, 0, fmt->addr)) return DM_PROBE_SCORE_GOOD; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1056,7 +1056,7 @@ dmCompareAddr16(buf, 2 + 3, 0x7f3f)) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1176,7 +1176,7 @@ DM_MEMCMP_SIZE(buf->data + 2, magicID) == 0) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1390,7 +1390,7 @@ dmCompareAddr16(buf, 0, fmt->addr)) return DM_PROBE_SCORE_MAYBE; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1427,7 +1427,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1444,7 +1444,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1461,7 +1461,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1500,7 +1500,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1524,7 +1524,7 @@ ) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1550,7 +1550,7 @@ } } - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1659,7 +1659,7 @@ return DM_PROBE_SCORE_MAX; } - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1856,7 +1856,7 @@ DM_MEMCMP_SIZE(buf->data + buf->len - sizeof(fmtCrestSHFLI_MagicID_Packed), fmtCrestSHFLI_MagicID_Packed) == 0) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -2115,7 +2115,7 @@ static int fmtProbeECIPacked(const DMGrowBuf *buf, const DMC64ImageFormat *fmt) { - int score = DM_PROBE_SCORE_false; + int score = DM_PROBE_SCORE_FALSE; if (buf->len > 128 && dmCompareAddr16(buf, 0, fmt->addr)) diff -r bf43bf9d6556 -r c3c1d3c75f53 tools/lib64gfx.c --- a/tools/lib64gfx.c Sun Nov 19 04:02:18 2023 +0200 +++ b/tools/lib64gfx.c Sun Nov 19 18:33:52 2023 +0200 @@ -1533,7 +1533,7 @@ return DMERR_OUT_OF_DATA; dmGrowBufConstCopyOffs(&tmp, buf, probeOffs); - if (dmC64ProbeBMP(&tmp, fmt) == DM_PROBE_SCORE_false) + if (dmC64ProbeBMP(&tmp, fmt) == DM_PROBE_SCORE_FALSE) return DMERR_NOT_SUPPORTED; } @@ -1673,12 +1673,12 @@ // is found, pointer to format description is set to *pfmt. int dmC64ProbeBMP(const DMGrowBuf *buf, const DMC64ImageFormat **pfmt) { - int scoreMax = DM_PROBE_SCORE_false, scoreIndex = -1; + int scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1; for (int i = 0; i < ndmC64ImageFormats; i++) { const DMC64ImageFormat *fmt = &dmC64ImageFormats[i]; - int score = DM_PROBE_SCORE_false; + int score = DM_PROBE_SCORE_FALSE; if (fmt->probe == NULL && fmt->size > 0 && fmt->addr > 0) { // Generic probe just checks matching size and load address @@ -1702,7 +1702,7 @@ return scoreMax; } else - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } diff -r bf43bf9d6556 -r c3c1d3c75f53 tools/libgfx.c --- a/tools/libgfx.c Sun Nov 19 04:02:18 2023 +0200 +++ b/tools/libgfx.c Sun Nov 19 18:33:52 2023 +0200 @@ -326,7 +326,7 @@ buf[0x300] == 0) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -395,7 +395,7 @@ if (len == 0x300) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1033,7 +1033,7 @@ (buf[1] == '5' || buf[1] == '6')) return DM_PROBE_SCORE_MAX; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1051,7 +1051,7 @@ return DM_PROBE_SCORE_GOOD; } - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -1436,7 +1436,7 @@ buf[65] >= 1 && buf[65] <= 4) return DM_PROBE_SCORE_GOOD; - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -2040,7 +2040,7 @@ return DM_PROBE_SCORE_GOOD; } - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -3055,7 +3055,7 @@ int dmImageProbeGeneric(const Uint8 *buf, const size_t len, const DMImageFormat **pfmt, int *index) { - int scoreMax = DM_PROBE_SCORE_false, scoreIndex = -1; + int scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1; for (int i = 0; i < ndmImageFormatList; i++) { @@ -3078,7 +3078,7 @@ return scoreMax; } else - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } @@ -3104,7 +3104,7 @@ int dmPaletteProbeGeneric(const Uint8 *buf, const size_t len, const DMPaletteFormat **pfmt, int *index) { - int scoreMax = DM_PROBE_SCORE_false, scoreIndex = -1; + int scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1; for (int i = 0; i < ndmPaletteFormatList; i++) { @@ -3127,5 +3127,5 @@ return scoreMax; } else - return DM_PROBE_SCORE_false; + return DM_PROBE_SCORE_FALSE; } diff -r bf43bf9d6556 -r c3c1d3c75f53 tools/libgfx.h --- a/tools/libgfx.h Sun Nov 19 04:02:18 2023 +0200 +++ b/tools/libgfx.h Sun Nov 19 18:33:52 2023 +0200 @@ -64,7 +64,7 @@ // Probe scores enum { - DM_PROBE_SCORE_false = 0, + DM_PROBE_SCORE_FALSE = 0, DM_PROBE_SCORE_MAYBE = 250, DM_PROBE_SCORE_AVG = 500, DM_PROBE_SCORE_GOOD = 750,