[Scummvm-git-logs] scummvm master -> 37f2751006140b094220279e06adf9ef566af93f

[digitall]

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:
0d6e4d647a COMMON: Minor Formatting Fix in String Header
37f2751006 AD: Fix Signed vs. Unsigned GCC Compiler Warning


Commit: 0d6e4d647a2b14f7a0192be040bc5e18303ee089
    https://github.com/scummvm/scummvm/commit/0d6e4d647a2b14f7a0192be040bc5e18303ee089
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-12T19:50:49Z

Commit Message:
COMMON: Minor Formatting Fix in String Header

Changed paths:
    common/str.h


diff --git a/common/str.h b/common/str.h
index 654d82a051..ff8a0b3dae 100644
--- a/common/str.h
+++ b/common/str.h
@@ -248,7 +248,7 @@ public:
 protected:
 	void encodeUTF8(const U32String &src);
 	void encodeWindows932(const U32String &src);
-    	void encodeWindows949(const U32String &src);
+	void encodeWindows949(const U32String &src);
 	void encodeWindows950(const U32String &src, bool translit = true);
 	void encodeOneByte(const U32String &src, CodePage page, bool translit = true);
 	void encodeInternal(const U32String &src, CodePage page);


Commit: 37f2751006140b094220279e06adf9ef566af93f
    https://github.com/scummvm/scummvm/commit/37f2751006140b094220279e06adf9ef566af93f
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-12T19:51:39Z

Commit Message:
AD: Fix Signed vs. Unsigned GCC Compiler Warning

Changed paths:
    engines/advancedDetector.cpp


diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index abfecf7aec..a2f27573c3 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -87,7 +87,7 @@ static Common::String sanitizeName(const char *name, int maxLen) {
 			// Skipping short words and "the"
 			if ((word.size() > 2 && !word.equals("the")) || (!word.empty() && Common::isDigit(word[0]))) {
 				// Adding first word, or when word fits
-				if (res.empty() || word.size() < maxLen)
+				if (res.empty() || (int)word.size() < maxLen)
 					res += word;
 
 				maxLen -= word.size();