complile with clang

Changed files (10)

• modified libbirdfont/BackgroundSelection.vala
• modified libbirdfont/Glyph.vala
• modified libbirdfont/GlyphBackgroundImage.vala
• modified libbirdfont/GlyphRange.vala
• modified libbirdfont/GlyphTable.vala
• modified libbirdfont/MoveTool.vala
• modified libbirdfont/OpenFontFormatWriter.vala
• modified libbirdfont/Path.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/TabBar.vala

Diff

diff --git a/libbirdfont/BackgroundSelection.vala b/libbirdfont/BackgroundSelection.valaindex d9dccca..5dce0cb 100644--- a/libbirdfont/BackgroundSelection.vala+++ b/libbirdfont/BackgroundSelection.vala@@ -33,7 +33,10 @@ class BackgroundSelection : FontDisplay { 		glyph = MainWindow.get_current_glyph (); 		 		i = Icons.get_icon ("add_background_image.png");-		return_if_fail (i != null);+		if (i == null) {+			warning ("Could not find icon.");	+		}+		 		add_icon = (!) i; 	} diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 8aebc8b..3bdf379 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -171,7 +171,7 @@ public class Glyph : FontDisplay { 	} 	 	public Path? get_active_path () {-		return_if_fail (!is_null(active_paths));+		return_val_if_fail (!is_null(active_paths), null); 		 		if (!is_null(active_paths.last ())) { 			return null;@@ -641,7 +641,7 @@ public class Glyph : FontDisplay { 	public EditPoint add_new_edit_point (int x, int y) { 		insert_edit_point (x, y); 		-		return_if_fail (active_paths.length () > 0);+		return_val_if_fail (active_paths.length () > 0, new EditPoint ()); 		 		last_added_edit_point = active_paths.last ().data.get_last_point (); 		return (!) last_added_edit_point;@@ -729,13 +729,13 @@ public class Glyph : FontDisplay {  	public static double path_coordinate_x (double x) { 		Glyph g = MainWindow.get_current_glyph ();-		return_if_fail (g.view_zoom != 0);+		return_val_if_fail (g.view_zoom != 0, 0); 		return x * ivz () - xc () + g.view_offset_x; 	}  	public static int reverse_path_coordinate_x (double x) { 		Glyph g = MainWindow.get_current_glyph ();-		return_if_fail (g.view_zoom != 0);+		return_val_if_fail (g.view_zoom != 0, 0); 		return (int) Math.rint ((x - g.view_offset_x + xc ()) * g.view_zoom); 	} @@ -863,12 +863,12 @@ public class Glyph : FontDisplay {  		// FIXME: what about removeing this feature 		if (new_point_on_path != null) {-			return_if_fail (active_paths.length () > 0);+			return_val_if_fail (active_paths.length () > 0, new EditPoint ());  			Path p = new Path (); 			EditPoint e = (!) new_point_on_path; -			return_if_fail (e.prev != null);+			return_val_if_fail (e.prev != null, new EditPoint ()); 			 			p.add_point (e); 			e.type = PointType.CUBIC;@@ -1018,7 +1018,7 @@ public class Glyph : FontDisplay { 	public Path? get_last_path ()  		ensures (result != null) 	{-		return_if_fail (path_list.length () > 0);+		return_val_if_fail (path_list.length () > 0, null); 		return path_list.last ().data; 	} 	diff --git a/libbirdfont/GlyphBackgroundImage.vala b/libbirdfont/GlyphBackgroundImage.valaindex a893d46..a181fbc 100644--- a/libbirdfont/GlyphBackgroundImage.vala+++ b/libbirdfont/GlyphBackgroundImage.vala@@ -564,13 +564,13 @@ public class GlyphBackgroundImage { 		len = 4 * w * h; 		 		pix_buff_t = img.get_data ();-		return_if_fail (pix_buff_t != null);+		return_val_if_fail (pix_buff_t != null, null); 		pix_buff = pix_buff_t; 		 		contrast_img = new uchar[len];  		pix_buff_t = contrast_img;-		return_if_fail (pix_buff_t != null);+		return_val_if_fail (pix_buff_t != null, null); 		 		contrast += 70; 		contrast /= 71;diff --git a/libbirdfont/GlyphRange.vala b/libbirdfont/GlyphRange.valaindex a4cc2c7..9ddb740 100644--- a/libbirdfont/GlyphRange.vala+++ b/libbirdfont/GlyphRange.vala@@ -183,7 +183,7 @@ public class GlyphRange { 		ranges.sort ((a, b) => { 			bool r = a.start > b.start; 			-			return_if_fail (a.start != b.start);+			return_val_if_fail (a.start != b.start, 0); 			 			return (r) ? 1 : -1; 		});diff --git a/libbirdfont/GlyphTable.vala b/libbirdfont/GlyphTable.valaindex 8c1668d..eb970e5 100644--- a/libbirdfont/GlyphTable.vala+++ b/libbirdfont/GlyphTable.vala@@ -175,7 +175,7 @@ class GlyphTable : GLib.Object { 		int i1 = 0; 		int i2 = 0; 		-		return_if_fail (bt != null);+		return_val_if_fail (bt != null, 0); 		 		int ca = an.char_count (); 		int cb = bn.char_count ();diff --git a/libbirdfont/MoveTool.vala b/libbirdfont/MoveTool.valaindex 55d19af..dbe472d 100644--- a/libbirdfont/MoveTool.vala+++ b/libbirdfont/MoveTool.vala@@ -181,7 +181,7 @@ class MoveTool : Tool { 		double h; 		Path rp; 		-		return_if_fail (!is_null (resized_path));+		return_val_if_fail (!is_null (resized_path), 0); 		rp = (!) resized_path; 		h = rp.xmax - rp.xmin; diff --git a/libbirdfont/OpenFontFormatWriter.vala b/libbirdfont/OpenFontFormatWriter.valaindex afb650b..d47bc85 100644--- a/libbirdfont/OpenFontFormatWriter.vala+++ b/libbirdfont/OpenFontFormatWriter.vala@@ -638,7 +638,7 @@ class LocaTable : Table { 	}
 	
 	public uint32 get_offset (uint32 i) {
-		return_if_fail (glyph_offsets != null);
+		return_val_if_fail (glyph_offsets != null, 0);
 		
 		if (size == 0) {
 			warning ("No glyphs in loca table");
@@ -653,7 +653,7 @@ class LocaTable : Table { 	
 	/** Returns true if glyph at index i is empty and have no body to parse. */
 	public bool is_empty (uint32 i) {
-		return_if_fail (glyph_offsets != null);
+		return_val_if_fail (glyph_offsets != null, true);
 
 		if (size == 0) {
 			warning ("No glyphs in loca table");
diff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex 0f80c3b..ea6a953 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -432,7 +432,7 @@ public class Path { 	} 	 	private double clockwise_sum () {-		return_if_fail (points.length () >= 3);+		return_val_if_fail (points.length () >= 3, 0); 		 		double sum = 0; 		EditPoint prev = points.last ().data;diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex 68c3c71..c764dba 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -883,8 +883,8 @@ public class PenTool : Tool { 		double min_right, min_left; 		double min; 		-		return_if_fail (e.next != null);-		return_if_fail (e.prev != null);+		return_val_if_fail (e.next != null, new EditPoint ());+		return_val_if_fail (e.prev != null, new EditPoint ()); 			 		// angle might be greater than 2 PI or less than 0 		min_right = double.MAX;diff --git a/libbirdfont/TabBar.vala b/libbirdfont/TabBar.valaindex 29eb155..436f771 100644--- a/libbirdfont/TabBar.vala+++ b/libbirdfont/TabBar.vala@@ -68,7 +68,9 @@ public class TabBar : GLib.Object { 		next_tab = (!) Icons.get_icon ("next_tab.png"); 		to_previous_tab = (!) Icons.get_icon ("previous_tab.png"); 		-		return_if_fail (!is_null (next_tab));+		if (is_null (next_tab)) {+			warning ("Next tab is null");+		} 	} 	 	public void motion (double x, double y) {