diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2016-10-02 13:23:30 -0400 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-10-07 16:56:46 +0100 |
| commit | f5263de25f42552fce13944b23238676503d0e9d (patch) | |
| tree | 134493fbf676873854a37a8e9a7351f13a8c4713 /source/html | |
| parent | 21b695f447ad3fa852e11a4f20b0576ab75b527f (diff) | |
| download | mupdf-f5263de25f42552fce13944b23238676503d0e9d.tar.xz | |
Add ctx to fz_font functions.
Diffstat (limited to 'source/html')
| -rw-r--r-- | source/html/html-layout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/html/html-layout.c b/source/html/html-layout.c index 0d0e5aed..df119b1a 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -885,7 +885,7 @@ static int walk_string(string_walker *walker) hb_lock(ctx); fz_try(ctx) { - face = fz_font_ft_face(walker->font); + face = fz_font_ft_face(ctx, walker->font); walker->scale = face->units_per_EM; fterr = FT_Set_Char_Size(face, walker->scale, walker->scale, 72, 72); if (fterr) @@ -905,7 +905,7 @@ static int walk_string(string_walker *walker) if (!quickshape) { - fz_shaper_data_t *hb = fz_font_shaper_data(walker->font); + fz_shaper_data_t *hb = fz_font_shaper_data(ctx, walker->font); if (hb->shaper_handle == NULL) { Memento_startLeaking(); /* HarfBuzz leaks harmlessly */ @@ -1990,7 +1990,7 @@ void fz_print_css_style(fz_context *ctx, fz_css_style *style, int boxtype, int n) { indent(n); printf("font_size %g%c\n", style->font_size.value, style->font_size.unit); - indent(n); printf("font %s\n", style->font ? fz_font_name(style->font) : "NULL"); + indent(n); printf("font %s\n", style->font ? fz_font_name(ctx, style->font) : "NULL"); indent(n); printf("width = %g%c;\n", style->width.value, style->width.unit); indent(n); printf("height = %g%c;\n", style->height.value, style->height.unit); if (boxtype == BOX_BLOCK) |