diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-02-24 13:35:11 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-02-24 13:41:56 +0100 |
| commit | 07b0e5e758d77e6b9b3049e13cb386128be1592c (patch) | |
| tree | c68e3d6d66ffc919ba751a83958d73b924e5849a /source/html | |
| parent | a76adb3dce6360d08aa5eeb7a23da50c3af81c10 (diff) | |
| download | mupdf-07b0e5e758d77e6b9b3049e13cb386128be1592c.tar.xz | |
Add fz_show_string function and move wmode argument to end.
Diffstat (limited to 'source/html')
| -rw-r--r-- | source/html/html-layout.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/html/html-layout.c b/source/html/html-layout.c index c738ff21..2749587f 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -1274,7 +1274,7 @@ static void draw_flow_box(fz_context *ctx, fz_html *box, float page_top, float p continue; trm.e = *(float *)&p->x_offset; trm.f = *(float *)&p->y_offset; - fz_show_glyph(ctx, text, walker.font, 0, &trm, g->codepoint, c); + fz_show_glyph(ctx, text, walker.font, &trm, g->codepoint, c, 0); break; } if (gp == walker.glyph_count) @@ -1283,7 +1283,7 @@ static void draw_flow_box(fz_context *ctx, fz_html *box, float page_top, float p * because we've been shaped away into another. We can't afford * to just drop the codepoint as this will upset text extraction. */ - fz_show_glyph(ctx, text, walker.font, 0, &trm, -1, c); + fz_show_glyph(ctx, text, walker.font, &trm, -1, c, 0); } else { @@ -1297,7 +1297,7 @@ static void draw_flow_box(fz_context *ctx, fz_html *box, float page_top, float p continue; trm.e = *(float *)&p->x_offset; trm.f = *(float *)&p->y_offset; - fz_show_glyph(ctx, text, walker.font, 0, &trm, g->codepoint, -1); + fz_show_glyph(ctx, text, walker.font, &trm, g->codepoint, -1, 0); } } idx += l; @@ -1476,7 +1476,7 @@ static void draw_list_mark(fz_context *ctx, fz_html *box, float page_top, float { s += fz_chartorune(&c, s); g = fz_encode_character_with_fallback(ctx, box->style.font, c, UCDN_SCRIPT_LATIN, &font); - w += fz_advance_glyph(ctx, font, g) * box->em; + w += fz_advance_glyph(ctx, font, g, 0) * box->em; } s = buf; @@ -1486,8 +1486,8 @@ static void draw_list_mark(fz_context *ctx, fz_html *box, float page_top, float { s += fz_chartorune(&c, s); g = fz_encode_character_with_fallback(ctx, box->style.font, c, UCDN_SCRIPT_LATIN, &font); - fz_show_glyph(ctx, text, font, 0, &trm, g, c); - trm.e += fz_advance_glyph(ctx, font, g) * box->em; + fz_show_glyph(ctx, text, font, &trm, g, c, 0); + trm.e += fz_advance_glyph(ctx, font, g, 0) * box->em; } color[0] = box->style.color.r / 255.0f; |