Fix warnings. Add const, constexpr, and noexcept. Initialize. Standard methods.

Replace 0 and NULL with nullptr for COM, DirectWrite and least ambiguous cases.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/XPM.cxx b/src/XPM.cxx
index 0d4a2a068..5df3ea7c9 100644
--- a/src/XPM.cxx
+++ b/src/XPM.cxx
@@ -58,9 +58,9 @@ unsigned int ValueOfHex(const char ch) noexcept {
 }
 
 ColourDesired ColourFromHex(const char *val) noexcept {
-	unsigned int r = ValueOfHex(val[0]) * 16 + ValueOfHex(val[1]);
-	unsigned int g = ValueOfHex(val[2]) * 16 + ValueOfHex(val[3]);
-	unsigned int b = ValueOfHex(val[4]) * 16 + ValueOfHex(val[5]);
+	const unsigned int r = ValueOfHex(val[0]) * 16 + ValueOfHex(val[1]);
+	const unsigned int g = ValueOfHex(val[2]) * 16 + ValueOfHex(val[3]);
+	const unsigned int b = ValueOfHex(val[4]) * 16 + ValueOfHex(val[5]);
 	return ColourDesired(r, g, b);
 }