diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2016-03-22 13:24:23 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2016-03-23 15:58:47 +0100 |
commit | b2c3d9e7ca40e001d3ee18975427224b726dc4d1 (patch) | |
tree | d113ff85ce07dbd81ae45f8f18b303e8787d26cf /source/pdf/pdf-font.c | |
parent | 81109bf17aada37f678b6adbdb9fa8eca1cd3163 (diff) | |
download | mupdf-b2c3d9e7ca40e001d3ee18975427224b726dc4d1.tar.xz |
Compile embedded fonts in separate C files.
Also change unsigned char into const char for embedded data.
Diffstat (limited to 'source/pdf/pdf-font.c')
-rw-r--r-- | source/pdf/pdf-font.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c index 9cc928a1..c3513cbb 100644 --- a/source/pdf/pdf-font.c +++ b/source/pdf/pdf-font.c @@ -47,8 +47,8 @@ static const char *base_font_names[][10] = { "ZapfDingbats", NULL } }; -unsigned char * -pdf_lookup_substitute_font(fz_context *ctx, int mono, int serif, int bold, int italic, unsigned int *len) +const char * +pdf_lookup_substitute_font(fz_context *ctx, int mono, int serif, int bold, int italic, int *len) { if (mono) { if (bold) { @@ -121,10 +121,10 @@ static const char *clean_font_name(const char *fontname) static int is_builtin_font(fz_context *ctx, fz_font *font) { - unsigned int size; + int size; if (!font->buffer) return 0; - return fz_lookup_base14_font(ctx, clean_font_name(font->name), &size) == font->buffer->data; + return fz_lookup_base14_font(ctx, clean_font_name(font->name), &size) == (char*)font->buffer->data; } /* @@ -234,8 +234,8 @@ pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, fontdesc->font = fz_load_system_font(ctx, fontname, 0, 0, !has_descriptor); if (!fontdesc->font) { - unsigned char *data; - unsigned int len; + const char *data; + int len; data = fz_lookup_base14_font(ctx, clean_name, &len); if (!data) @@ -259,8 +259,8 @@ pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontnam fontdesc->font = fz_load_system_font(ctx, fontname, bold, italic, 0); if (!fontdesc->font) { - unsigned char *data; - unsigned int len; + const char *data; + int len; data = pdf_lookup_substitute_font(ctx, mono, serif, bold, italic, &len); if (!data) @@ -286,8 +286,8 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fon fontdesc->font = fz_load_system_cjk_font(ctx, fontname, ros, serif); if (!fontdesc->font) { - unsigned char *data; - unsigned int len; + const char *data; + int len; int index; data = fz_lookup_cjk_font(ctx, ros, serif, fontdesc->wmode, &len, &index); |