Merge branch 'master' of github.com:johanmattssonm/birdfont

Changed files (4)

• modified libbirdfont/BackgroundTools.vala
• modified libbirdfont/ExportTool.vala
• modified libbirdfont/Path.vala
• modified libbirdfont/SvgParser.vala

Diff

diff --git a/libbirdfont/BackgroundTools.vala b/libbirdfont/BackgroundTools.valaindex 5a68d58..5bf630c 100644--- a/libbirdfont/BackgroundTools.vala+++ b/libbirdfont/BackgroundTools.vala@@ -184,6 +184,14 @@ public class BackgroundTools : ToolCollection  { 			} 		}); 		+		fc.add_extension ("png");+		fc.add_extension ("jpeg");+		fc.add_extension ("jpg");+		fc.add_extension ("gif");+		fc.add_extension ("tiff");+		fc.add_extension ("bmp");+		fc.add_extension ("svg");+		 		MainWindow.file_chooser (t_("Open"), fc, FileChooser.LOAD); 	} 	diff --git a/libbirdfont/ExportTool.vala b/libbirdfont/ExportTool.valaindex 5fc4e73..9aaa4d7 100644--- a/libbirdfont/ExportTool.vala+++ b/libbirdfont/ExportTool.vala@@ -190,6 +190,7 @@ public class ExportTool : GLib.Object { 			} 		}); 		+		fc.add_extension ("svg"); 		MainWindow.file_chooser (t_("Save"), fc, FileChooser.SAVE); 	} 	diff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex eed5b7e..a26ed77 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -1538,7 +1538,7 @@ public class Path : GLib.Object { 			return true; 		} 		-		warning (@"Mixed point types in segment $(start.x),$(start.y) to $(stop.x),$(stop.y) right: $(right), left: $(left) (start: $(start.type), stop: $(stop.type))");+		// warning (@"Mixed point types in segment $(start.x),$(start.y) to $(stop.x),$(stop.y) right: $(right), left: $(left) (start: $(start.type), stop: $(stop.type))"); 		return all_of_quadratic_curve (start.x, start.y, start.get_right_handle ().x, start.get_right_handle ().x, stop.x, stop.y, iter, steps); 	} @@ -1561,7 +1561,7 @@ public class Path : GLib.Object { 			x = bezier_path (step, start.x, start.get_right_handle ().x, stop.get_left_handle ().x, stop.x); 			y = bezier_path (step, start.y, start.get_right_handle ().y, stop.get_left_handle ().y, stop.y);	 		} else {-			warning (@"Mixed point types in segment $(start.x),$(start.y) to $(stop.x),$(stop.y) right: $(right), left: $(left) (start: $(start.type), stop: $(stop.type))");+			// warning (@"Mixed point types in segment $(start.x),$(start.y) to $(stop.x),$(stop.y) right: $(right), left: $(left) (start: $(start.type), stop: $(stop.type))"); 			x = bezier_path (step, start.x, start.get_right_handle ().x, stop.get_left_handle ().x, stop.x); 			y = bezier_path (step, start.y, start.get_right_handle ().y, stop.get_left_handle ().y, stop.y);	 		}@@ -1790,7 +1790,7 @@ public class Path : GLib.Object { 			bezier_vector (step, start.x, start.get_right_handle ().x, stop.get_left_handle ().x, stop.x, out x1, out x2); 			bezier_vector (step, start.y, start.get_right_handle ().y, stop.get_left_handle ().y, stop.y, out y1, out y2);	 		} else {-			warning (@"Mixed point types in segment $(start.x),$(start.y) to $(stop.x),$(stop.y) right: $(right), left: $(left) (start: $(start.type), stop: $(stop.type))");+			// warning (@"Mixed point types in segment $(start.x),$(start.y) to $(stop.x),$(stop.y) right: $(right), left: $(left) (start: $(start.type), stop: $(stop.type))"); 			bezier_vector (step, start.x, start.get_right_handle ().x, stop.get_left_handle ().x, stop.x, out x1, out x2); 			bezier_vector (step, start.y, start.get_right_handle ().y, stop.get_left_handle ().y, stop.y, out y1, out y2);	 		}diff --git a/libbirdfont/SvgParser.vala b/libbirdfont/SvgParser.valaindex c0913bc..f24184a 100644--- a/libbirdfont/SvgParser.vala+++ b/libbirdfont/SvgParser.vala@@ -47,6 +47,7 @@ public class SvgParser { 			import_svg (path); 		}); 		+		fc.add_extension ("svg"); 		MainWindow.file_chooser (t_("Import"), fc, FileChooser.LOAD); 	}