diff options
| author | Oleg Oshmyan <chortos@inbox.lv> | 2020-07-05 22:05:06 +0300 |
|---|---|---|
| committer | Oleg Oshmyan <chortos@inbox.lv> | 2020-10-22 04:28:31 +0300 |
| commit | 4b371a2c8ec53986f424bded5c53184130146aa8 (patch) | |
| tree | 9fe15595ce3165a6266a9a621b656bec871a5b29 | |
| parent | f3e2c97e1818598afb0b1c7010003ffe4823ff21 (diff) | |
| download | libass-4b371a2c8ec53986f424bded5c53184130146aa8.tar.bz2 libass-4b371a2c8ec53986f424bded5c53184130146aa8.tar.xz | |
Return bool from ass_shaper_shape
| -rw-r--r-- | libass/ass_render.c | 2 | ||||
| -rw-r--r-- | libass/ass_shaper.c | 8 | ||||
| -rw-r--r-- | libass/ass_shaper.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c index 6a7f26e..bda4147 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -2613,7 +2613,7 @@ ass_render_event(ASS_Renderer *render_priv, ASS_Event *event, resolve_base_direction(render_priv->state.font_encoding)); ass_shaper_find_runs(render_priv->shaper, render_priv, text_info->glyphs, text_info->length); - if (ass_shaper_shape(render_priv->shaper, text_info) < 0) { + if (!ass_shaper_shape(render_priv->shaper, text_info)) { ass_msg(render_priv->library, MSGL_ERR, "Failed to shape text"); free_render_context(render_priv); return false; diff --git a/libass/ass_shaper.c b/libass/ass_shaper.c index 4a7c11e..0e28771 100644 --- a/libass/ass_shaper.c +++ b/libass/ass_shaper.c @@ -849,14 +849,14 @@ static void ass_shaper_skip_characters(TextInfo *text_info) * \param text_info event's text * \return success, when 0 */ -int ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info) +bool ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info) { int i, ret, last_break; FriBidiParType dir; GlyphInfo *glyphs = text_info->glyphs; if (!check_allocations(shaper, text_info->length)) - return -1; + return false; // Get bidi character types and embedding levels last_break = 0; @@ -883,7 +883,7 @@ int ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info) i - last_break + 1, &dir, shaper->emblevels + last_break); #endif if (ret == 0) - return -1; + return false; last_break = i + 1; } } @@ -898,7 +898,7 @@ int ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info) break; } - return 0; + return true; } /** diff --git a/libass/ass_shaper.h b/libass/ass_shaper.h index 9ff96e7..2c4166d 100644 --- a/libass/ass_shaper.h +++ b/libass/ass_shaper.h @@ -42,7 +42,7 @@ void ass_shaper_set_level(ASS_Shaper *shaper, ASS_ShapingLevel level); #ifdef USE_FRIBIDI_EX_API void ass_shaper_set_bidi_brackets(ASS_Shaper *shaper, bool match_brackets); #endif -int ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info); +bool ass_shaper_shape(ASS_Shaper *shaper, TextInfo *text_info); void ass_shaper_cleanup(ASS_Shaper *shaper, TextInfo *text_info); FriBidiStrIndex *ass_shaper_reorder(ASS_Shaper *shaper, TextInfo *text_info); FriBidiParType resolve_base_direction(int font_encoding); |