summaryrefslogtreecommitdiff
path: root/include/mupdf/fitz
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2018-04-19 14:57:56 +0200
committerTor Andersson <tor.andersson@artifex.com>2018-04-25 12:26:33 +0200
commit73ce99685536764bf17dc097f5cba7208cd8f9c1 (patch)
tree4840bd0debf0160f1a0b48b2087162a5ad0a86c8 /include/mupdf/fitz
parentc17e8a57934a863dc24476300d89e9483b9773e9 (diff)
downloadmupdf-73ce99685536764bf17dc097f5cba7208cd8f9c1.tar.xz
Don't use WMode as part of CJK font lookup.
Return TTC subfont index from fz_lookup_noto_font.
Diffstat (limited to 'include/mupdf/fitz')
-rw-r--r--include/mupdf/fitz/font.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mupdf/fitz/font.h b/include/mupdf/fitz/font.h
index 654e8146..43e61a01 100644
--- a/include/mupdf/fitz/font.h
+++ b/include/mupdf/fitz/font.h
@@ -297,7 +297,7 @@ const unsigned char *fz_lookup_icc(fz_context *ctx, const char *name, size_t *le
Returns a pointer to the font file data, or NULL if not present.
*/
-const unsigned char *fz_lookup_cjk_font(fz_context *ctx, int registry, int serif, int wmode, int *len, int *index);
+const unsigned char *fz_lookup_cjk_font(fz_context *ctx, int registry, int serif, int *len, int *index);
/*
fz_lookup_noto_font: Search the builtin noto fonts for a match.
@@ -315,7 +315,7 @@ const unsigned char *fz_lookup_cjk_font(fz_context *ctx, int registry, int serif
Returns a pointer to the font file data, or NULL if not present.
*/
-const unsigned char *fz_lookup_noto_font(fz_context *ctx, int script, int lang, int serif, int *len);
+const unsigned char *fz_lookup_noto_font(fz_context *ctx, int script, int lang, int serif, int *len, int *subfont);
/*
fz_lookup_noto_symbol_font: Search the builtin noto fonts
@@ -443,7 +443,7 @@ fz_font *fz_new_font_from_file(fz_context *ctx, const char *name, const char *pa
/* Create a new font from one of the built-in fonts. */
fz_font *fz_new_base14_font(fz_context *ctx, const char *name);
-fz_font *fz_new_cjk_font(fz_context *ctx, int registry, int serif, int wmode);
+fz_font *fz_new_cjk_font(fz_context *ctx, int registry, int serif);
fz_font *fz_new_builtin_font(fz_context *ctx, const char *name, int is_bold, int is_italic);
/*