The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Merge ../birdfont-2.x

These changes was commited to the Birdfont repository Sun, 09 Oct 2016 07:27:10 +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>
Sun, 09 Oct 2016 07:27:10 +0000 (09:27 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Sun, 09 Oct 2016 07:27:10 +0000 (09:27 +0200)
commit 8d4e40f664ec34fa8f4d05d13e7b56698c68d240
tree bc3ce0d00f9b04cf9a03ccb227289ecbbab1d4c0
parent d735886e0c3a3df5ef1a9790383d66d257adff76
parent 27eb78ca1aa732deb0f61ac86f85a3df2b258295
Merge ../birdfont-2.x

libbirdfont/CharDatabase.vala
libbirdfont/CharDatabaseParser.vala
libbirdfont/OpenFontFormat/CodePageBits.vala
--- a/libbirdfont/CharDatabase.vala +++ b/libbirdfont/CharDatabase.vala @@ -33,7 +33,7 @@ public static void open_database () { File f = get_database_file (); - int rc = Database.open ((!) f.get_path (), out database); + int rc = Database.open_v2 ((!) f.get_path (), out database, OPEN_READONLY); db = (!) database;
--- a/libbirdfont/CharDatabaseParser.vala +++ b/libbirdfont/CharDatabaseParser.vala @@ -46,7 +46,7 @@ f.delete (); } - open_database (); + open_database (OPEN_READWRITE); create_tables (); parse_all_entries (); } catch (GLib.Error e) { @@ -54,9 +54,9 @@ } } - public void open_database () { + public void open_database (int access_mode) { File f = get_database_file (); - int rc = Database.open ((!) f.get_path (), out database); + int rc = Database.open_v2 ((!) f.get_path (), out database, access_mode); db = (!) database;
--- a/libbirdfont/OpenFontFormat/CodePageBits.vala +++ b/libbirdfont/OpenFontFormat/CodePageBits.vala @@ -28,7 +28,7 @@ public CodePageBits () { if (database == null) { - open_database (get_database_file ()); + open_database (get_database_file (), OPEN_READONLY); } } @@ -192,7 +192,7 @@ f.delete (); } - open_database (f); + open_database (f, OPEN_READWRITE); create_tables (); default_range = new PageBit (-1, "null-"); @@ -242,8 +242,8 @@ } } - void open_database (File db_file) { - int rc = Database.open ((!) db_file.get_path (), out database); + void open_database (File db_file, int access) { + int rc = Database.open_v2 ((!) db_file.get_path (), out database, access); db = (!) database; @@ -333,4 +333,4 @@ } } - +