[Scummvm-git-logs] scummvm master -> 47a1a1b86c39cb58ea82a87717232493831f321d

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c7daae946d DIRECTOR: Fix font drawing in graphics tests
47a1a1b86c COMMON: Make punycode warnings more useable


Commit: c7daae946ddd8a4813c4f6a9abedf79db1552189
    https://github.com/scummvm/scummvm/commit/c7daae946ddd8a4813c4f6a9abedf79db1552189
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-01T18:29:41+02:00

Commit Message:
DIRECTOR: Fix font drawing in graphics tests

Changed paths:
    engines/director/tests.cpp


diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index 127597ccb2f..a8ea3f366f5 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -83,7 +83,7 @@ void Window::testFontScaling() {
 		Common::Rect bbox = font->getBoundingBox(text, x, y, w);
 		surface.frameRect(bbox, 15);
 
-		font->drawString(&surface, text, x, y, width, 0);
+		font->drawString(&surface, text, x, y, width, 0xFF);
 
 		x += width + 1;
 	}


Commit: 47a1a1b86c39cb58ea82a87717232493831f321d
    https://github.com/scummvm/scummvm/commit/47a1a1b86c39cb58ea82a87717232493831f321d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-01T18:29:41+02:00

Commit Message:
COMMON: Make punycode warnings more useable

Changed paths:
    common/punycode.cpp


diff --git a/common/punycode.cpp b/common/punycode.cpp
index 60f8caab326..2b6c5e6b82d 100644
--- a/common/punycode.cpp
+++ b/common/punycode.cpp
@@ -175,7 +175,7 @@ String punycode_encode(const U32String &src) {
 
 		if ((m - n) > (SMAX - delta) / (h + 1)) {
 			// OVERFLOW
-			warning("punycode_encode: overflow1");
+			warning("punycode_encode: overflow1 for string (%s)", src.encode().c_str());
 			return src;
 		}
 
@@ -186,7 +186,7 @@ String punycode_encode(const U32String &src) {
 			if (src[si] < n) {
 				if (++delta == 0) {
 					// OVERFLOW
-					warning("punycode_encode: overflow2");
+					warning("punycode_encode: overflow2 for string (%s)", src.encode().c_str());
 					return src;
 				}
 			} else if (src[si] == n) {
@@ -279,7 +279,7 @@ U32String punycode_decode(const String &src1) {
 			di = src.findLastOf('-');
 
 			if (di == String::npos) {
-				warning("punycode_decode: malformed string");
+				warning("punycode_decode: malformed string for string (%s)", src1.c_str());
 				return src1;
 			}
 		} else {
@@ -307,20 +307,20 @@ U32String punycode_decode(const String &src1) {
 
 		for (size_t w = 1, k = BASE; true; k += BASE) {
 			if (si >= (int)src.size()) {
-				warning("punycode_decode: incorrect digit");
+				warning("punycode_decode: incorrect digit for string (%s)", src1.c_str());
 				return src1;
 			}
 
 			size_t digit = decode_digit(src[si++]);
 
 			if (digit == SMAX) {
-				warning("punycode_decode: incorrect digit");
+				warning("punycode_decode: incorrect digit2 for string (%s)", src1.c_str());
 				return src1;
 			}
 
 			if (digit > (SMAX - i) / w) {
 				// OVERFLOW
-				warning("punycode_decode: overflow1");
+				warning("punycode_decode: overflow1 for string (%s)", src1.c_str());
 				return src1;
 			}
 
@@ -341,7 +341,7 @@ U32String punycode_decode(const String &src1) {
 
 			if (w > SMAX / (BASE - t)) {
 				// OVERFLOW
-				warning("punycode_decode: overflow2");
+				warning("punycode_decode: overflow2 for string (%s)", src1.c_str());
 				return src1;
 			}
 
@@ -352,7 +352,7 @@ U32String punycode_decode(const String &src1) {
 
 		if (i / (di + 1) > SMAX - n) {
 			// OVERFLOW
-				warning("punycode_decode: overflow3");
+				warning("punycode_decode: overflow3 for string (%s)", src1.c_str());
 			return src1;
 		}