From f224c97d4566ca7338cfcd621ce3bd8548372791 Mon Sep 17 00:00:00 2001 From: Oleg Oshmyan Date: Mon, 19 Oct 2015 14:35:24 +0300 Subject: fontselect: fix ass_font_provider_add_font signature and doxygen index is signed, and psname only overrides it iff index < 0. --- libass/ass_fontselect.c | 6 +++--- libass/ass_fontselect.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index 521b4d0..72d6d0b 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -236,15 +236,15 @@ static void ass_font_provider_free_fontinfo(ASS_FontInfo *info) * \param provider the font provider * \param meta basic metadata of the font * \param path path to the font file, or NULL - * \param index face index inside the file - * \param psname PostScript name of the face (overrides index if present) + * \param index face index inside the file (-1 to look up by PostScript name) + * \param psname PostScript name of the face * \param data private data for the font * \return success */ int ass_font_provider_add_font(ASS_FontProvider *provider, ASS_FontProviderMetaData *meta, const char *path, - unsigned int index, const char *psname, void *data) + int index, const char *psname, void *data) { int i; int weight, slant, width; diff --git a/libass/ass_fontselect.h b/libass/ass_fontselect.h index 32b9905..93bd746 100644 --- a/libass/ass_fontselect.h +++ b/libass/ass_fontselect.h @@ -230,7 +230,8 @@ ass_create_font_provider(ASS_Renderer *priv, ASS_FontProviderFuncs *funcs, * \param meta font metadata. See struct definition for more information. * \param path absolute path to font, or NULL for memory-based fonts * \param index index inside a font collection file - * \param psname PostScript name of the face (overrides index if present) + * (-1 to look up by PostScript name) + * \param psname PostScript name of the face * \param data private data for font callbacks * \return success * @@ -238,7 +239,7 @@ ass_create_font_provider(ASS_Renderer *priv, ASS_FontProviderFuncs *funcs, int ass_font_provider_add_font(ASS_FontProvider *provider, ASS_FontProviderMetaData *meta, const char *path, - unsigned int index, const char *psname, void *data); + int index, const char *psname, void *data); /** * \brief Free font provider and associated fonts. -- cgit v1.2.3