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

Changed files (2)

• modified birdfont-test/TestRunner.vala
• modified libbirdfont/BackgroundImage.vala

Diff

diff --git a/birdfont-test/TestRunner.vala b/birdfont-test/TestRunner.valaindex b5c69b5..f5b95f5 100644--- a/birdfont-test/TestRunner.vala+++ b/birdfont-test/TestRunner.vala@@ -53,34 +53,20 @@ public class TestRunner : NativeWindow, GLib.Object  { 		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 @@ public class TestRunner : NativeWindow, GLib.Object  { 		for (uint i = 0; i < 3000; i++) { 			for (uint j = 0; j < 300; j++) { 				Path p = new Path ();+				p.ref ();+				p.unref (); 			} 		} 		diff --git a/libbirdfont/BackgroundImage.vala b/libbirdfont/BackgroundImage.valaindex 8a2652f..01771ea 100644--- a/libbirdfont/BackgroundImage.vala+++ b/libbirdfont/BackgroundImage.vala@@ -327,7 +327,11 @@ public class BackgroundImage { 			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 ());