diff options
Diffstat (limited to 'src/main.cc')
| -rw-r--r-- | src/main.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main.cc b/src/main.cc index f9708cc..d221e9d 100644 --- a/src/main.cc +++ b/src/main.cc @@ -24,7 +24,6 @@ * Red Hat Author(s): Behdad Esfahbod */ -#include "hb-mutex-private.hh" #include "hb-open-file-private.hh" #include "hb-ot-layout-gdef-table.hh" #include "hb-ot-layout-gsubgpos-private.hh" @@ -38,6 +37,9 @@ using namespace OT; +#ifndef HB_NO_VISIBILITY +const void * const OT::_hb_NullPool[HB_NULL_POOL_SIZE / sizeof (void *)] = {}; +#endif int main (int argc, char **argv) @@ -47,11 +49,11 @@ main (int argc, char **argv) exit (1); } - const char *font_data = NULL; + const char *font_data = nullptr; int len = 0; #ifdef HAVE_GLIB - GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL); + GMappedFile *mf = g_mapped_file_new (argv[1], false, nullptr); font_data = g_mapped_file_get_contents (mf); len = g_mapped_file_get_length (mf); #else @@ -105,8 +107,8 @@ main (int argc, char **argv) switch (table.tag) { - case GSUBGPOS::GSUBTag: - case GSUBGPOS::GPOSTag: + case HB_OT_TAG_GSUB: + case HB_OT_TAG_GPOS: { const GSUBGPOS &g = *CastP<GSUBGPOS> (font_data + table.offset); |