summaryrefslogtreecommitdiffstats
path: root/libass/ass_fontselect.c
diff options
context:
space:
mode:
authorOleg Oshmyan <chortos@inbox.lv>2015-12-01 17:18:43 +0200
committerOleg Oshmyan <chortos@inbox.lv>2015-12-01 17:18:43 +0200
commit54a59dca6ef8bc3de126cea68a39a90baa46c9cd (patch)
tree07749fac36f0300198169ab8befa05e00091cf77 /libass/ass_fontselect.c
parent99fd1f372567330445806457b834aeb0882ea3be (diff)
downloadlibass-54a59dca6ef8bc3de126cea68a39a90baa46c9cd.tar.bz2
libass-54a59dca6ef8bc3de126cea68a39a90baa46c9cd.tar.xz
fontselect: fix bool return values
Return true on success and false on failure. get_font_info was actually inconsistent, returning false both on success and on failure due to the face not being scalable.
Diffstat (limited to 'libass/ass_fontselect.c')
-rw-r--r--libass/ass_fontselect.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c
index 7f73529..9fd873b 100644
--- a/libass/ass_fontselect.c
+++ b/libass/ass_fontselect.c
@@ -345,11 +345,11 @@ ass_font_provider_add_font(ASS_FontProvider *provider,
info->provider = provider;
selector->n_font++;
- return false;
+ return true;
error:
ass_font_provider_free_fontinfo(info);
- return true;
+ return false;
}
/**
@@ -822,7 +822,7 @@ get_font_info(FT_Library lib, FT_Face face, ASS_FontProviderMetaData *info)
info->n_fullname = num_fullname;
}
- return false;
+ return true;
error:
for (i = 0; i < num_family; i++)
@@ -834,7 +834,7 @@ error:
free(info->families);
free(info->fullnames);
- return true;
+ return false;
}
/**
@@ -893,7 +893,7 @@ static void process_fontdata(ASS_FontProvider *priv, ASS_Library *library,
charmap_magic(library, face);
memset(&info, 0, sizeof(ASS_FontProviderMetaData));
- if (get_font_info(ftlibrary, face, &info)) {
+ if (!get_font_info(ftlibrary, face, &info)) {
ass_msg(library, MSGL_WARN,
"Error getting metadata for embedded font '%s'", name);
FT_Done_Face(face);
@@ -912,7 +912,7 @@ static void process_fontdata(ASS_FontProvider *priv, ASS_Library *library,
ft->face = face;
ft->idx = idx;
- if (ass_font_provider_add_font(priv, &info, NULL, face_index, ft)) {
+ if (!ass_font_provider_add_font(priv, &info, NULL, face_index, ft)) {
ass_msg(library, MSGL_WARN, "Failed to add embedded font '%s'",
name);
}