The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

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

These changes was commited to the Birdfont repository Thu, 05 Nov 2015 20:58:28 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Thu, 05 Nov 2015 20:58:28 +0000 (21:58 +0100)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Thu, 05 Nov 2015 20:58:28 +0000 (21:58 +0100)
commit bfd6c97b8acade25ce63ec1d70e160128919605e
tree 3892e19c4b9d7c409e461afa7dec85d8d47d8bce
parent ea8f1e774c761660cda8ec4b60f57d70aec4525e
parent 22d1cb3843e270e3e36f6cc606e4b7b8787741d3
Merge branch 'master' of github.com:johanmattssonm/birdfont

libbirdfont/BackgroundTools.vala
libbirdfont/ExportTool.vala
libbirdfont/Path.vala
libbirdfont/SvgParser.vala
--- a/libbirdfont/BackgroundTools.vala +++ b/libbirdfont/BackgroundTools.vala @@ -183,6 +183,14 @@ add_image_file ((!) fn); } }); + + 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); }
--- a/libbirdfont/ExportTool.vala +++ b/libbirdfont/ExportTool.vala @@ -190,6 +190,7 @@ } }); + fc.add_extension ("svg"); MainWindow.file_chooser (t_("Save"), fc, FileChooser.SAVE); }
--- a/libbirdfont/Path.vala +++ b/libbirdfont/Path.vala @@ -1538,7 +1538,7 @@ 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 @@ 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 @@ 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); }
--- a/libbirdfont/SvgParser.vala +++ b/libbirdfont/SvgParser.vala @@ -47,6 +47,7 @@ import_svg (path); }); + fc.add_extension ("svg"); MainWindow.file_chooser (t_("Import"), fc, FileChooser.LOAD); }