The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Merge svgbird vapi files

These changes was commited to the Birdfont repository Thu, 07 Jul 2016 14:59:11 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Thu, 07 Jul 2016 14:59:11 +0000]

Updated Files

dodo.py
install.py
libsvgbird/SvgFile.vala
diff --git a/dodo.py b/dodo.py
--- a/dodo.py +++ b/dodo.py @@ -32,6 +32,8 @@ 'man', 'libbirdfont', 'libbirdgems', + 'libsvgbird', + 'svgbird_vapi', 'birdfont', 'birdfont-autotrace', 'birdfont-export', @@ -77,7 +79,6 @@ --enable-experimental \ birdfont/*.vala \ --vapidir=./ \ - --pkg svgbirdpoint \ --pkg """ + config.GEE + """ \ --pkg gio-2.0 \ --pkg cairo \ @@ -142,7 +143,6 @@ """ + config.VALACFLAGS.get("birdfont-export", "") + """ \ birdfont-export/*.vala \ --vapidir=./ \ - --pkg svgbirdpoint \ --pkg """ + config.GEE + """ \ --pkg gio-2.0 \ --pkg cairo \ @@ -199,7 +199,6 @@ """ + config.VALACFLAGS.get("birdfont-import", "") + """ \ birdfont-import/*.vala \ --vapidir=./ \ - --pkg svgbirdpoint \ --pkg """ + config.GEE + """ \ --pkg gio-2.0 \ --pkg cairo \ @@ -255,7 +254,6 @@ """ + config.VALACFLAGS.get("birdfont-autotrace", "") + """ \ birdfont-autotrace/*.vala \ --vapidir=./ \ - --pkg svgbirdpoint \ --pkg """ + config.GEE + """ \ --pkg gio-2.0 \ --pkg cairo \ @@ -318,7 +316,6 @@ libbirdfont/OpenFontFormat/*.vala \ libbirdfont/TextRendering/*.vala \ --pkg posix \ - --pkg svgbirdpoint \ --pkg """ + config.GEE + """ \ --pkg gio-2.0 \ --pkg cairo \ @@ -448,7 +445,13 @@ def task_libsvgbird(): yield make_libsvgbird('libsvgbird.so.' + LIBSVGBIRD_SO_VERSION, []) - + + def task_svgbird_vapi(): + yield { + 'name': 'merge svgbird vapi', + 'file_dep': ['build/libsvgbird/Object.c'], + 'actions': ['cat svgbirdpoint.vapi >> svgbird.vapi'], + } def make_libbirdgems(target_binary, deps): valac_command = config.VALAC + """\ -C \ @@ -538,7 +541,6 @@ --enable-experimental \ birdfont-test/*.vala \ --vapidir=./ \ - --pkg svgbirdpoint \ --pkg """ + config.GEE + """ \ --pkg gio-2.0 \ --pkg cairo \
--- a/install.py +++ b/install.py @@ -225,7 +225,8 @@ #install development files if options.development: install ('build/libsvgbird/svgbird.h', '/include', 644) + install ('build/libsvgbird/point_value.h', '/include', 644) install ('svgbird.vapi', '/share/vala/vapi', 644) install ('svgbird.deps', '/share/vala/vapi', 644) install ('build/svgbird.pc', libdir + '/pkgconfig', 644)
--- a/libsvgbird/SvgFile.vala +++ b/libsvgbird/SvgFile.vala @@ -887,9 +887,7 @@ illustrator_points.y = p.point_data.get_double (p.point_data.size - 6); } - int start = p.point_data.get_point_type (0) == POINT_CUBIC ? 8 : 0; - - start = 0; + int start = 0; for (int i = start; i < p.point_data.size; i += 1) { illustrator_points.point_data.add (p.point_data.get_double (i));