diff options
author | wm4 <wm4@nowhere> | 2015-09-07 16:06:24 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-09-07 16:06:24 +0200 |
commit | 92c3ae13183bc5143c935006695c7ee26b8148bc (patch) | |
tree | b830f4c83ec3f2843cbf7049ad924c72255d5037 | |
parent | 928f7a3c7e53daee99b3a27a50199192393e224f (diff) | |
download | libass-92c3ae13183bc5143c935006695c7ee26b8148bc.tar.bz2 libass-92c3ae13183bc5143c935006695c7ee26b8148bc.tar.xz |
ass_fontselect: uninline ass_map_font()
Also fixes the build on OSX under some circumstances (weird and
inconsistent rules for the inline keyword in C).
-rw-r--r-- | libass/ass_fontselect.c | 13 | ||||
-rw-r--r-- | libass/ass_fontselect.h | 14 |
2 files changed, 15 insertions, 12 deletions
diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index bf4376b..2a00c37 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -1045,3 +1045,16 @@ void ass_fontselect_free(ASS_FontSelector *priv) free(priv); } + +void ass_map_font(const ASS_FontMapping *map, int len, const char *name, + ASS_FontProviderMetaData *meta) +{ + for (int i = 0; i < len; i++) { + if (strcasecmp(map[i].from, name) == 0) { + meta->n_fullname = 1; + meta->fullnames = calloc(1, sizeof(char *)); + meta->fullnames[0] = strdup(map[i].to); + return; + } + } +} diff --git a/libass/ass_fontselect.h b/libass/ass_fontselect.h index 1e0959e..32b9905 100644 --- a/libass/ass_fontselect.h +++ b/libass/ass_fontselect.h @@ -195,18 +195,8 @@ struct ass_font_mapping { * \param name font name to map from * \param meta metadata struct, mapped fonts will be stored into this */ -inline void ass_map_font(const ASS_FontMapping *map, int len, const char *name, - ASS_FontProviderMetaData *meta) -{ - for (int i = 0; i < len; i++) { - if (strcasecmp(map[i].from, name) == 0) { - meta->n_fullname = 1; - meta->fullnames = calloc(1, sizeof(char *)); - meta->fullnames[0] = strdup(map[i].to); - return; - } - } -} +void ass_map_font(const ASS_FontMapping *map, int len, const char *name, + ASS_FontProviderMetaData *meta); ASS_FontSelector * ass_fontselect_init(ASS_Library *library, |