58 lines
1.9 KiB
Text
58 lines
1.9 KiB
Text
|
Index: mupdf_mod/font.c
|
||
|
|
--- mupdf_mod/font.c.orig
|
||
|
|
+++ mupdf_mod/font.c
|
||
|
|
@@ -200,8 +200,8 @@ struct fz_font_context_s
|
||
|
|
int ctx_refs;
|
||
|
|
FT_Library ftlib;
|
||
|
|
int ftlib_refs;
|
||
|
|
- fz_load_system_font_func load_font;
|
||
|
|
- fz_load_system_cjk_font_func load_cjk_font;
|
||
|
|
+ fz_load_system_font_fn load_font;
|
||
|
|
+ fz_load_system_cjk_font_fn load_cjk_font;
|
||
|
|
|
||
|
|
/* Cached fallback fonts */
|
||
|
|
struct { fz_font *serif, *sans; } fallback[256];
|
||
|
|
@@ -258,7 +258,7 @@ void fz_drop_font_context(fz_context *ctx)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-void fz_install_load_system_font_funcs(fz_context *ctx, fz_load_system_font_func f, fz_load_system_cjk_font_func f_cjk)
|
||
|
|
+void fz_install_load_system_font_funcs(fz_context *ctx, fz_load_system_font_fn f, fz_load_system_cjk_font_fn f_cjk, fz_load_system_fallback_font_fn f_fallback)
|
||
|
|
{
|
||
|
|
ctx->font->load_font = f;
|
||
|
|
ctx->font->load_cjk_font = f_cjk;
|
||
|
|
@@ -1354,27 +1354,27 @@ fz_render_t3_glyph_direct(fz_context *ctx, fz_device *
|
||
|
|
void
|
||
|
|
fz_print_font(fz_context *ctx, fz_output *out, fz_font *font)
|
||
|
|
{
|
||
|
|
- fz_printf(ctx, out, "font '%s' {\n", font->name);
|
||
|
|
+ fz_write_printf(ctx, out, "font '%s' {\n", font->name);
|
||
|
|
|
||
|
|
if (font->ft_face)
|
||
|
|
{
|
||
|
|
- fz_printf(ctx, out, "\tfreetype face %p\n", font->ft_face);
|
||
|
|
+ fz_write_printf(ctx, out, "\tfreetype face %p\n", font->ft_face);
|
||
|
|
if (font->flags.ft_substitute)
|
||
|
|
- fz_printf(ctx, out, "\tsubstitute font\n");
|
||
|
|
+ fz_write_printf(ctx, out, "\tsubstitute font\n");
|
||
|
|
}
|
||
|
|
|
||
|
|
if (font->t3procs)
|
||
|
|
{
|
||
|
|
- fz_printf(ctx, out, "\ttype3 matrix [%g %g %g %g]\n",
|
||
|
|
+ fz_write_printf(ctx, out, "\ttype3 matrix [%g %g %g %g]\n",
|
||
|
|
font->t3matrix.a, font->t3matrix.b,
|
||
|
|
font->t3matrix.c, font->t3matrix.d);
|
||
|
|
|
||
|
|
- fz_printf(ctx, out, "\ttype3 bbox [%g %g %g %g]\n",
|
||
|
|
+ fz_write_printf(ctx, out, "\ttype3 bbox [%g %g %g %g]\n",
|
||
|
|
font->bbox.x0, font->bbox.y0,
|
||
|
|
font->bbox.x1, font->bbox.y1);
|
||
|
|
}
|
||
|
|
|
||
|
|
- fz_printf(ctx, out, "}\n");
|
||
|
|
+ fz_write_printf(ctx, out, "}\n");
|
||
|
|
}
|
||
|
|
|
||
|
|
fz_rect *
|