diff options
author | John Tytgat <joty@netsurf-browser.org> | 2008-07-30 19:17:27 +0000 |
---|---|---|
committer | John Tytgat <joty@netsurf-browser.org> | 2008-07-30 19:17:27 +0000 |
commit | 5685170036d59c6db307b014476146513713ad5f (patch) | |
tree | d7e2823da84212d070341cd74394d73bf3f43fae /pdf | |
parent | d43f5777e28b04cceef6389792a52e801f057059 (diff) | |
download | netsurf-5685170036d59c6db307b014476146513713ad5f.tar.gz netsurf-5685170036d59c6db307b014476146513713ad5f.tar.bz2 |
Make the knockout plotter calling behaviour optional by added a new entry
'option_knockout' to 'struct plotter_table' which basically is a request
from that plotter backend for the content redraw routine to get called in
such a way that overlapping render areas are avoided as much as possible.
It is up to the content redraw code to actually implement this
option if it is reasonably profitable. This was and is currently done
explicitly by the html content redraw code. On top of that the riscos
plotter code was installing the knockout plotter itself for all content
types except plaintext and SVG and this is no longer being done in this
patch.
In more detail:
- desktop/plotters.h: added struct plotter_table::option_knockout
- render/html_redraw.c(html_redraw): if the plotter backend wants the
knockout calling behaviour, install the knockout plotter which will then
call the real backend. Also check on the return values of clg and clip
plotter calls.
- Plotter backend changes:
-> no longer plotting in knockout mode:
- gtk/gtk_print.c: Also removed a 2nd instance of
"struct plotter_table plot".
- riscos/save_draw.c
- riscos/print.c: Also the path plotter function pointer wasn't
filled in and this is now fixed.
- pdf/pdf_plotters.c: Removed the flush function as this is
optional and we only had a dummy implementation there.
-> remaining to request knockout mode if it makes sense based on the
content type:
- gtk/gtk_plotters.c
- riscos/plotters.c
- desktop/knockout.c
- riscos/window.c: Removed what's believed an obsolete test on the
content type which determined to additionally install the
knockout plotter in front of the real plotter code.
svn path=/trunk/netsurf/; revision=4823
Diffstat (limited to 'pdf')
-rw-r--r-- | pdf/pdf_plotters.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pdf/pdf_plotters.c b/pdf/pdf_plotters.c index ac4e9b69c..6451ca704 100644 --- a/pdf/pdf_plotters.c +++ b/pdf/pdf_plotters.c @@ -64,7 +64,6 @@ static bool pdf_plot_bitmap(int x, int y, int width, int height, static bool pdf_plot_bitmap_tile(int x, int y, int width, int height, struct bitmap *bitmap, colour bg, bool repeat_x, bool repeat_y, struct content *content); -static bool pdf_plot_flush(void); static bool pdf_plot_path(float *p, unsigned int n, colour fill, float width, colour c, float *transform); @@ -113,8 +112,9 @@ static const struct plotter_table pdf_plotters = { pdf_plot_bitmap_tile, NULL, NULL, - pdf_plot_flush, - pdf_plot_path + NULL, + pdf_plot_path, + false }; struct printer pdf_printer= { @@ -515,19 +515,12 @@ HPDF_Image pdf_extract_image(struct bitmap *bitmap, struct content *content) return image; } - -bool pdf_plot_flush(void) -{ - return true; -} - - -static inline float transform_x(float *transform,float x,float y) +static inline float transform_x(float *transform, float x, float y) { return ((transform[0] * x) + (transform[2] * (-y) ) + transform[4]) * 2; } -static inline float transform_y(float *transform,float x,float y) +static inline float transform_y(float *transform, float x, float y) { return page_height - (((transform[1] * x) + (transform[3] * (-y)) - transform[5]) * 2); |