diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-04-05 20:36:42 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-04-06 00:06:45 +0200 |
| commit | eaaf33f161e3d010c61ae9bdb3ae5f9cd202bb88 (patch) | |
| tree | 1806c1182c3f18537f7a7576a9950473ec02d830 /source | |
| parent | 7adb22c9cdcb41c47629b6734cac5cea1a4713af (diff) | |
| download | mupdf-eaaf33f161e3d010c61ae9bdb3ae5f9cd202bb88.tar.xz | |
epub: Change order of arguments to fz_draw_html.
Diffstat (limited to 'source')
| -rw-r--r-- | source/html/epub-doc.c | 2 | ||||
| -rw-r--r-- | source/html/html-doc.c | 2 | ||||
| -rw-r--r-- | source/html/html-layout.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c index 2f09fe50..a3451175 100644 --- a/source/html/epub-doc.c +++ b/source/html/epub-doc.c @@ -143,7 +143,7 @@ epub_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix * if (n < count + cn) { fz_pre_translate(&local_ctm, ch->page_margin[L], ch->page_margin[T]); - fz_draw_html(ctx, ch->box, (n-count) * ch->page_h, (n-count+1) * ch->page_h, dev, &local_ctm); + fz_draw_html(ctx, dev, &local_ctm, ch->box, (n-count) * ch->page_h, (n-count+1) * ch->page_h); break; } count += cn; diff --git a/source/html/html-doc.c b/source/html/html-doc.c index 23f1195b..f5bb42b8 100644 --- a/source/html/html-doc.c +++ b/source/html/html-doc.c @@ -87,7 +87,7 @@ htdoc_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix fz_pre_translate(&local_ctm, doc->page_margin[L], doc->page_margin[T]); - fz_draw_html(ctx, doc->box, n * doc->page_h, (n+1) * doc->page_h, dev, &local_ctm); + fz_draw_html(ctx, dev, &local_ctm, doc->box, n * doc->page_h, (n+1) * doc->page_h); } static fz_page * diff --git a/source/html/html-layout.c b/source/html/html-layout.c index 0e8ac27e..091ce052 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -1617,9 +1617,9 @@ static void draw_block_box(fz_context *ctx, fz_html *box, float page_top, float } void -fz_draw_html(fz_context *ctx, fz_html *box, float page_top, float page_bot, fz_device *dev, const fz_matrix *inctm) +fz_draw_html(fz_context *ctx, fz_device *dev, const fz_matrix *ctm, fz_html *box, float page_top, float page_bot) { - fz_matrix ctm = *inctm; + fz_matrix local_ctm = *ctm; hb_buffer_t *hb_buf = NULL; int unlocked = 0; @@ -1633,8 +1633,8 @@ fz_draw_html(fz_context *ctx, fz_html *box, float page_top, float page_bot, fz_d hb_buf = hb_buffer_create(); hb_unlock(ctx); unlocked = 1; - fz_pre_translate(&ctm, 0, -page_top); - draw_block_box(ctx, box, page_top, page_bot, dev, &ctm, hb_buf); + fz_pre_translate(&local_ctm, 0, -page_top); + draw_block_box(ctx, box, page_top, page_bot, dev, &local_ctm, hb_buf); } fz_always(ctx) { |