From 8332bf6b2a42fd03b864e46f60eeaa76b51da496 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 23 May 2018 13:48:17 +0100 Subject: Plotters: Remove width param from path plotter. We now use the stroke_width in the plot_style. --- frontends/riscos/plotters.c | 6 +++--- frontends/riscos/print.c | 1 - frontends/riscos/save_draw.c | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'frontends/riscos') diff --git a/frontends/riscos/plotters.c b/frontends/riscos/plotters.c index 286ddab1b..2b306827d 100644 --- a/frontends/riscos/plotters.c +++ b/frontends/riscos/plotters.c @@ -483,7 +483,6 @@ ro_plot_polygon(const struct redraw_context *ctx, * \param pstyle Style controlling the path plot. * \param p elements of path * \param n nunber of elements on path - * \param width The width of the path * \param transform A transform to apply to the path. * \return NSERROR_OK on success else error code. */ @@ -492,7 +491,6 @@ ro_plot_path(const struct redraw_context *ctx, const plot_style_t *pstyle, const float *p, unsigned int n, - float width, const float transform[6]) { static const draw_line_style line_style = { @@ -591,7 +589,9 @@ ro_plot_path(const struct redraw_context *ctx, } error = xdraw_stroke((draw_path *) path, 0, &trfm, 0, - width * 2 * 256, &line_style, 0); + plot_style_fixed_to_int( + pstyle->stroke_width) * 2 * 256, + &line_style, 0); if (error) { NSLOG(netsurf, INFO, "xdraw_stroke: 0x%x: %s", error->errnum, error->errmess); diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c index d965baff4..b390c693d 100644 --- a/frontends/riscos/print.c +++ b/frontends/riscos/print.c @@ -831,7 +831,6 @@ print_fonts_plot_path(const struct redraw_context *ctx, const plot_style_t *pstyle, const float *p, unsigned int n, - float width, const float transform[6]) { return NSERROR_OK; diff --git a/frontends/riscos/save_draw.c b/frontends/riscos/save_draw.c index 41764d927..28880e530 100644 --- a/frontends/riscos/save_draw.c +++ b/frontends/riscos/save_draw.c @@ -312,7 +312,6 @@ ro_save_draw_polygon(const struct redraw_context *ctx, * \param pstyle Style controlling the path plot. * \param p elements of path * \param n nunber of elements on path - * \param width The width of the path * \param transform A transform to apply to the path. * \return NSERROR_OK on success else error code. */ @@ -321,7 +320,6 @@ ro_save_draw_path(const struct redraw_context *ctx, const plot_style_t *pstyle, const float *p, unsigned int n, - float width, const float transform[6]) { pencil_code code; @@ -409,7 +407,8 @@ ro_save_draw_path(const struct redraw_context *ctx, pstyle->stroke_colour == NS_TRANSPARENT ? pencil_TRANSPARENT : pstyle->stroke_colour << 8, - width, pencil_JOIN_MITRED, + plot_style_fixed_to_int(style->stroke_width), + pencil_JOIN_MITRED, pencil_CAP_BUTT, pencil_CAP_BUTT, 0, -- cgit v1.2.3