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 Wed, 28 Oct 2015 18:42:31 +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>
Wed, 28 Oct 2015 18:42:31 +0000 (19:42 +0100)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Wed, 28 Oct 2015 18:42:31 +0000 (19:42 +0100)
commit 66d501bbd9bd3af80306078629c639e69c9f0350
tree 1d53723c045eee3273e487e680a101a8ce1b83d5
parent 48d539368149cf19b1c5d8a312d18260279016f5
parent 7a8213a869bb357b59c6d6d50bf0c7d0750c8a10
Merge branch 'master' of github.com:johanmattssonm/birdfont

birdfont-test/TestRunner.vala
libbirdfont/BackgroundImage.vala
--- a/birdfont-test/TestRunner.vala +++ b/birdfont-test/TestRunner.vala @@ -53,34 +53,20 @@ for (uint i = 0; i < 3000; i++) { for (uint j = 0; j < 300; j++) { GLib.Object o = new GLib.Object (); + o.ref (); + o.unref (); } } test_object.print (); - - Test test_ref = new Test.time ("GObject ref"); - - for (uint i = 0; i < 3000; i++) { - for (uint k = 0; k < 300; k++) { - GLib.Object o = new GLib.Object (); - - for (int j = 0; j < 7; j++) { - o.ref (); - } - - for (int j = 0; j < 7; j++) { - o.unref (); - } - } - } - - test_ref.print (); Test test_edit_point = new Test.time ("EditPoint creation"); for (uint i = 0; i < 3000; i++) { for (uint j = 0; j < 300; j++) { EditPoint ep = new EditPoint (); + ep.ref (); + ep.unref (); } } @@ -91,6 +77,8 @@ for (uint i = 0; i < 3000; i++) { for (uint j = 0; j < 300; j++) { Path p = new Path (); + p.ref (); + p.unref (); } }
--- a/libbirdfont/BackgroundImage.vala +++ b/libbirdfont/BackgroundImage.vala @@ -327,7 +327,11 @@ return; } - folder.make_directory (); + try { + folder.make_directory (); + } catch (GLib.Error e) { + warning (e.message); + } converted = MainWindow.native_window.convert_to_png (path.dup (), ((!) png_image.get_path ()).dup ());