diff options
Diffstat (limited to 'source/html')
-rw-r--r-- | source/html/epub-doc.c | 4 | ||||
-rw-r--r-- | source/html/html-doc.c | 4 | ||||
-rw-r--r-- | source/html/html-layout.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c index 5325c316..85c84624 100644 --- a/source/html/epub-doc.c +++ b/source/html/epub-doc.c @@ -149,7 +149,7 @@ epub_bound_page(fz_context *ctx, fz_page *page_) } static void -epub_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie) +epub_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, fz_matrix ctm, fz_cookie *cookie) { epub_page *page = (epub_page*)page_; epub_document *doc = page->doc; @@ -162,7 +162,7 @@ epub_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix * int cn = count_chapter_pages(ch); if (n < count + cn) { - fz_draw_html(ctx, dev, *ctm, ch->html, n-count); + fz_draw_html(ctx, dev, ctm, ch->html, n-count); break; } count += cn; diff --git a/source/html/html-doc.c b/source/html/html-doc.c index 45fbd8f9..21c9c653 100644 --- a/source/html/html-doc.c +++ b/source/html/html-doc.c @@ -88,11 +88,11 @@ htdoc_bound_page(fz_context *ctx, fz_page *page_) } static void -htdoc_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie) +htdoc_run_page(fz_context *ctx, fz_page *page_, fz_device *dev, fz_matrix ctm, fz_cookie *cookie) { html_page *page = (html_page*)page_; html_document *doc = page->doc; - fz_draw_html(ctx, dev, *ctm, doc->html, page->number); + fz_draw_html(ctx, dev, ctm, doc->html, page->number); } static fz_link * diff --git a/source/html/html-layout.c b/source/html/html-layout.c index 5f67c4e7..56ad3a45 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -1652,7 +1652,7 @@ static void draw_flow_box(fz_context *ctx, fz_html_box *box, float page_top, flo { if (text) { - fz_fill_text(ctx, dev, text, &ctm, fz_device_rgb(ctx), prev_color, 1, NULL); + fz_fill_text(ctx, dev, text, ctm, fz_device_rgb(ctx), prev_color, 1, NULL); fz_drop_text(ctx, text); text = NULL; } @@ -1739,7 +1739,7 @@ static void draw_flow_box(fz_context *ctx, fz_html_box *box, float page_top, flo { if (text) { - fz_fill_text(ctx, dev, text, &ctm, fz_device_rgb(ctx), color, 1, NULL); + fz_fill_text(ctx, dev, text, ctm, fz_device_rgb(ctx), color, 1, NULL); fz_drop_text(ctx, text); text = NULL; } @@ -1747,14 +1747,14 @@ static void draw_flow_box(fz_context *ctx, fz_html_box *box, float page_top, flo { fz_matrix itm = fz_pre_translate(ctm, node->x, node->y - page_top); itm = fz_pre_scale(itm, node->w, node->h); - fz_fill_image(ctx, dev, node->content.image, &itm, 1, NULL); + fz_fill_image(ctx, dev, node->content.image, itm, 1, NULL); } } } if (text) { - fz_fill_text(ctx, dev, text, &ctm, fz_device_rgb(ctx), color, 1, NULL); + fz_fill_text(ctx, dev, text, ctm, fz_device_rgb(ctx), color, 1, NULL); fz_drop_text(ctx, text); text = NULL; } @@ -1778,7 +1778,7 @@ static void draw_rect(fz_context *ctx, fz_device *dev, fz_matrix ctm, float page rgb[1] = color.g / 255.0f; rgb[2] = color.b / 255.0f; - fz_fill_path(ctx, dev, path, 0, &ctm, fz_device_rgb(ctx), rgb, color.a / 255.0f, NULL); + fz_fill_path(ctx, dev, path, 0, ctm, fz_device_rgb(ctx), rgb, color.a / 255.0f, NULL); fz_drop_path(ctx, path); } @@ -1936,7 +1936,7 @@ static void draw_list_mark(fz_context *ctx, fz_html_box *box, float page_top, fl color[1] = box->style.color.g / 255.0f; color[2] = box->style.color.b / 255.0f; - fz_fill_text(ctx, dev, text, &ctm, fz_device_rgb(ctx), color, 1, NULL); + fz_fill_text(ctx, dev, text, ctm, fz_device_rgb(ctx), color, 1, NULL); } fz_always(ctx) fz_drop_text(ctx, text); |