Fix warnings in birdfont-export

Changed files (6)

• modified libbirdfont/BirdFont.vala
• modified libbirdfont/BirdFontFile.vala
• modified libbirdfont/ExportTool.vala
• modified libbirdfont/Glyph.vala
• modified libbirdfont/KerningDisplay.vala
• modified libbirdfont/OpenFontFormat/CodePageBits.vala

Diff

diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex 2292c8c..2a3fb87 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -281,16 +281,15 @@ public static int run_export (string[] arg) { 	}  	if (!specific_formats || write_svg) {-		print (@"Writing $(BirdFont.current_font.get_name ()).svg to $output_directory\n");+		print (@"Writing $(BirdFont.current_font.get_full_name ()).svg to $output_directory\n"); 		ExportTool.export_svg_font_path (File.new_for_path (output_directory)); 	}  	if (!specific_formats || write_ttf) {-		print (@"Writing $(BirdFont.current_font.get_name ()).ttf to $output_directory\n");+		print (@"Writing $(BirdFont.current_font.get_full_name ()).ttf to $output_directory\n"); 		ExportTool.export_ttf_font_path (File.new_for_path (output_directory)); 	} 	-	Toolbox.redraw_tool_box (); 	return 0; } diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex 3c23e10..b2d8040 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -40,6 +40,11 @@ class BirdFontFile : GLib.Object { 		 		font.font_file = path; 		tr = new TextReader.filename (path);+		+		if (is_null (tr)) {+			warning (@"Failed to create TextReader for path: $path");+		}+		 		ok = load_xml (tr); 		 		// This causes a crash on windowsdiff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex 834cad3..776bb30 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -379,8 +379,6 @@ os.put_string ( 		bool done = true; 				 		try {-			current_font.save_backup ();- 			ttf_file = folder.get_child (current_font.get_full_name () + ".ttf"); 			eot_file = folder.get_child (current_font.get_full_name () + ".eot"); diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 1139578..44ef44e 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -117,9 +117,6 @@ public class Glyph : FontDisplay { 	}  	public GlyfData get_ttf_data () {-		print (name);-		print ("\n");-		 		if (ttf_data == null) { 			ttf_data =  new GlyfData (this); 		}diff --git a/libbirdfont/KerningDisplay.vala b/libbirdfont/KerningDisplay.valaindex 67badc9..ffad6d3 100644--- a/libbirdfont/KerningDisplay.vala+++ b/libbirdfont/KerningDisplay.vala@@ -807,7 +807,7 @@ public class KerningDisplay : FontDisplay { 		} 		 		c = t.char_count ();-		for (int i = 0; i < c; i++) {+		for (int i = 0; i <= c; i++) { 			add_character (t.get_char (i)); 		} 		diff --git a/libbirdfont/OpenFontFormat/CodePageBits.vala b/libbirdfont/OpenFontFormat/CodePageBits.valaindex 4d93120..c12eddc 100644--- a/libbirdfont/OpenFontFormat/CodePageBits.vala+++ b/libbirdfont/OpenFontFormat/CodePageBits.vala@@ -56,11 +56,7 @@ public class CodePageBits : GLib.Object { 		 		if (!g.is_unassigned ()) { 			bits = get_bits (g.get_unichar ());-			-			if (unlikely (bits.size == 0)) {-				warning (@"Unknown codepage for glyph $(g.get_name ()) ($(Font.to_hex (g.get_unichar ())))");-			}-			+						 			foreach (int bit in bits) { 				set_bit (bit, ref p0, ref p1); 			}