diff options
| author | rcombs <rcombs@rcombs.me> | 2020-05-27 13:57:55 -0500 |
|---|---|---|
| committer | Oleg Oshmyan <chortos@inbox.lv> | 2020-10-22 04:35:56 +0300 |
| commit | 3e4c70206e6de15d9531edc718a11ad81e973754 (patch) | |
| tree | e9cc69f5141b735538925135ec3a77a3f630dd1d /libass | |
| parent | d277c8b52a2626c209df7317f4174f1078b0548d (diff) | |
| download | libass-3e4c70206e6de15d9531edc718a11ad81e973754.tar.bz2 libass-3e4c70206e6de15d9531edc718a11ad81e973754.tar.xz | |
ass_shaper: remove dependency on hb-ft
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_shaper.c | 43 |
1 files changed, 40 insertions, 3 deletions
diff --git a/libass/ass_shaper.c b/libass/ass_shaper.c index a85181e..3718e45 100644 --- a/libass/ass_shaper.c +++ b/libass/ass_shaper.c @@ -27,7 +27,9 @@ #include <limits.h> #include <stdbool.h> -#include <hb-ft.h> +#include <ft2build.h> +#include FT_FREETYPE_H +#include FT_TRUETYPE_TABLES_H enum { VERT = 0, VKNA, @@ -249,6 +251,31 @@ size_t ass_glyph_metrics_construct(void *key, void *value, void *priv) return 1; } +static hb_blob_t* +get_reference_table(hb_face_t *hbface, hb_tag_t tag, void *font_data) +{ + FT_Face face = font_data; + FT_ULong len = 0; + + if (FT_Load_Sfnt_Table(face, tag, 0, NULL, &len) != FT_Err_Ok) + return NULL; + + char *buf = malloc(len); + if (!buf) + return NULL; + + if (FT_Load_Sfnt_Table(face, tag, 0, (FT_Byte*)buf, &len) != FT_Err_Ok) { + free(buf); + return NULL; + } + + hb_blob_t *blob = hb_blob_create(buf, len, HB_MEMORY_MODE_WRITABLE, buf, free); + if (!blob) + free(buf); + + return blob; +} + static hb_bool_t get_glyph_nominal(hb_font_t *font, void *font_data, hb_codepoint_t unicode, hb_codepoint_t *glyph, void *user_data) @@ -409,11 +436,21 @@ static hb_font_t *get_hb_font(ASS_Shaper *shaper, GlyphInfo *info) hb_fonts = font->shaper_priv->fonts; if (!hb_fonts[info->face_index]) { FT_Face face = font->faces[info->face_index]; - hb_font_t *hb_font = hb_fonts[info->face_index] = - hb_ft_font_create(face, NULL); + hb_face_t *hb_face = hb_face_create_for_tables(get_reference_table, face, NULL); + if (!hb_face) + return NULL; + hb_face_set_index(hb_face, face->face_index); + hb_face_set_upem(hb_face, face->units_per_EM); + + hb_font_t *hb_font = hb_fonts[info->face_index] = hb_font_create(hb_face); + hb_face_destroy(hb_face); if (!hb_font) return NULL; + hb_font_set_scale(hb_font, + (int)(((uint64_t)face->size->metrics.x_scale * face->units_per_EM + (1<<15)) >> 16), + (int)(((uint64_t)face->size->metrics.y_scale * face->units_per_EM + (1<<15)) >> 16)); + // set up cached metrics access struct ass_shaper_metrics_data *metrics = font->shaper_priv->metrics_data[info->face_index] = |