diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-06-29 16:46:17 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-07-05 15:32:34 +0200 |
| commit | ea7403b4c172338dfe7f371302f82859921e60af (patch) | |
| tree | 4a3fbf8ea35cb53fcbf395f096cf61ffda7b40be /source/fitz/text.c | |
| parent | 4a99615a609eec2b84bb2341d74fac46a5998137 (diff) | |
| download | mupdf-ea7403b4c172338dfe7f371302f82859921e60af.tar.xz | |
Pass matrices by value: device and document interface.
Diffstat (limited to 'source/fitz/text.c')
| -rw-r--r-- | source/fitz/text.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/fitz/text.c b/source/fitz/text.c index 7fb46ae5..ef57db4b 100644 --- a/source/fitz/text.c +++ b/source/fitz/text.c @@ -107,8 +107,8 @@ fz_show_glyph(fz_context *ctx, fz_text *text, fz_font *font, fz_matrix trm, int span->len++; } -void -fz_show_string(fz_context *ctx, fz_text *text, fz_font *user_font, fz_matrix *trm, const char *s, int wmode, int bidi_level, fz_bidi_direction markup_dir, fz_text_language language) +fz_matrix +fz_show_string(fz_context *ctx, fz_text *text, fz_font *user_font, fz_matrix trm, const char *s, int wmode, int bidi_level, fz_bidi_direction markup_dir, fz_text_language language) { fz_font *font; int gid, ucs; @@ -118,13 +118,15 @@ fz_show_string(fz_context *ctx, fz_text *text, fz_font *user_font, fz_matrix *tr { s += fz_chartorune(&ucs, s); gid = fz_encode_character_with_fallback(ctx, user_font, ucs, 0, language, &font); - fz_show_glyph(ctx, text, font, *trm, gid, ucs, wmode, bidi_level, markup_dir, language); + fz_show_glyph(ctx, text, font, trm, gid, ucs, wmode, bidi_level, markup_dir, language); adv = fz_advance_glyph(ctx, font, gid, wmode); if (wmode == 0) - *trm = fz_pre_translate(*trm, adv, 0); + trm = fz_pre_translate(trm, adv, 0); else - *trm = fz_pre_translate(*trm, 0, -adv); + trm = fz_pre_translate(trm, 0, -adv); } + + return trm; } fz_rect |