dec to hex conversion for ranges above 0xFF

Changed files (2)

• modified src/Font.vala
• modified src/TestSupplement.vala

Diff

diff --git a/src/Font.vala b/src/Font.valaindex fc6d62e..916e18a 100644--- a/src/Font.vala+++ b/src/Font.vala@@ -1145,22 +1145,22 @@ class Font : GLib.Object { 		StringBuilder s = new StringBuilder (); 		 		uint8 a = (uint8)(ch & 0x00000F);-		uint8 b = (uint8)(ch & 0x0000F0) >> 4 * 1;-		uint8 c = (uint8)(ch & 0x000F00) >> 4 * 2;-		uint8 d = (uint8)(ch & 0x00F000) >> 4 * 3;-		uint8 e = (uint8)(ch & 0x0F0000) >> 4 * 4;-		uint8 f = (uint8)(ch & 0xF00000) >> 4 * 5;+		uint8 b = (uint8)((ch & 0x0000F0) >> 4 * 1);+		uint8 c = (uint8)((ch & 0x000F00) >> 4 * 2);+		uint8 d = (uint8)((ch & 0x00F000) >> 4 * 3);+		uint8 e = (uint8)((ch & 0x0F0000) >> 4 * 4);+		uint8 f = (uint8)((ch & 0xF00000) >> 4 * 5); 		-		if (e != 0) {+		if (e != 0 || f != 0) { 			s.append (oct_to_hex (f)); 			s.append (oct_to_hex (e)); 		} 		-		if (c != 0) {+		if (c != 0 || d != 0) { 			s.append (oct_to_hex (d)); 			s.append (oct_to_hex (c)); 		}-		+				 		s.append (oct_to_hex (b)); 		s.append (oct_to_hex (a)); 		@@ -1197,11 +1197,16 @@ class Font : GLib.Object { 			case 14: return "e"; 			case 15: return "f"; 		}++		return_val_if_fail (0 <= o <= 9, "-".dup ()); 		 		return o.to_string (); 	}  	private static uint8 hex_to_oct (unichar o) {+		StringBuilder s = new StringBuilder ();+		s.append_unichar (o);+	 		switch (o) { 			case 'a': return 10; 			case 'b': return 11;diff --git a/src/TestSupplement.vala b/src/TestSupplement.valaindex bff63df..1518e29 100644--- a/src/TestSupplement.vala+++ b/src/TestSupplement.vala@@ -146,6 +146,7 @@ class TestCases { 		test_hex_conv ('H', "U+48", 72);
 		test_hex_conv ('1', "U+31", 49);
 		test_hex_conv ('å', "U+e5", 229);
+		test_hex_conv ('◊', "U+25ca", 9674);
 	}
 
 	private static void test_hex_conv (unichar h, string sr, int r) {