Commit 3c1a7f3
Build on Windows
Changed files (5)
modifiedlibbirdfont/Glyph.valamodifiedlibbirdfont/GlyphRange.valamodifiedlibbirdfont/KerningClasses.valamodifiedlibbirdfont/KerningPair.valamodifiedlibbirdfont/Path.vala
Diff
@@ -541,11 +541,17 @@ public class Glyph : FontDisplay { public void sort_help_lines () { vertical_help_lines.sort ((a, b) => {- return (int) (a.get_pos () - b.get_pos ());+ Line first, next;+ first = (Line) a;+ next = (Line) b;+ return (int) (first.get_pos () - next.get_pos ()); }); horizontal_help_lines.sort ((a, b) => {- return (int) (a.get_pos () - b.get_pos ());+ Line first, next;+ first = (Line) a;+ next = (Line) b;+ return (int) (first.get_pos () - next.get_pos ()); }); } @@ -55,8 +55,15 @@ public class GlyphRange { // TODO: complete localized alphabetical sort åäö is not the right order for example. public void sort () { ranges.sort ((a, b) => {- bool r = a.start > b.start;- return_val_if_fail (a.start != b.start, 0);+ UniRange first, next;+ bool r;+ + first = (UniRange) a;+ next = (UniRange) b;+ + r = first.start > next.start;+ return_val_if_fail (first.start != next.start, 0);+ return (r) ? 1 : -1; }); }@@ -359,7 +359,10 @@ public class KerningClasses : GLib.Object { } left_glyphs.sort ((a, b) => {- return strcmp (a.get_name (), b.get_name ());+ Glyph first, next;+ first = (Glyph) a;+ next = (Glyph) b;+ return strcmp (first.get_name (), next.get_name ()); }); // add the right hand glyph and the kerning value@@ -39,7 +39,10 @@ public class KerningPair : GLib.Object { public void sort () { kerning.sort ((a, b) => {- return strcmp (((!)a.glyph).get_unichar_string (), ((!)b.glyph).get_unichar_string ());+ Kerning first, next;+ first = (Kerning) a;+ next = (Kerning) b;+ return strcmp (((!)first.glyph).get_unichar_string (), ((!)next.glyph).get_unichar_string ()); }); } }@@ -745,7 +745,10 @@ public class Path { } ycoordinates.sort ((a, b) => {- return (a.y < b.y) ? 1 : -1;+ EditPoint first, next;+ first = (EditPoint) a;+ next = (EditPoint) b;+ return (first.y < next.y) ? 1 : -1; }); for (int i = 0; i < ycoordinates.size - 1; i++) {