From 7b9fa8d7eb60950401065a81efffebd10d84309a Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 12 Feb 2017 20:31:18 +0000 Subject: fix plotter merge --- desktop/knockout.c | 4 ++-- frontends/beos/plotters.cpp | 8 ++++---- frontends/gtk/scaffolding.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/desktop/knockout.c b/desktop/knockout.c index 96e7b1a45..3647a3a7b 100644 --- a/desktop/knockout.c +++ b/desktop/knockout.c @@ -262,7 +262,7 @@ static nserror knockout_plot_flush(const struct redraw_context *ctx) { int i; struct knockout_box *box; - nserror res; /* operation result */ + nserror res = NSERROR_OK; /* operation result */ nserror ffres = NSERROR_OK; /* first failing result */ /* debugging information */ @@ -616,7 +616,7 @@ knockout_plot_polygon(const struct redraw_context *ctx, unsigned int n) { int *dest; - nserror res; + nserror res = NSERROR_OK; nserror ffres = NSERROR_OK; /* ensure we have sufficient room even when flushed */ diff --git a/frontends/beos/plotters.cpp b/frontends/beos/plotters.cpp index 6544d63bd..83a470d97 100644 --- a/frontends/beos/plotters.cpp +++ b/frontends/beos/plotters.cpp @@ -32,11 +32,11 @@ #include #include extern "C" { -#include "netsurf/plotters.h" #include "utils/log.h" #include "utils/utils.h" #include "utils/nsoption.h" #include "utils/nsurl.h" +#include "netsurf/plotters.h" } #include "beos/font.h" #include "beos/gui.h" @@ -400,7 +400,7 @@ nsbeos_plot_line(const struct redraw_context *ctx, static nserror nsbeos_plot_rectangle(const struct redraw_context *ctx, const plot_style_t *style, - const struct rect *rect) + const struct rect *nsrect) { if (style->fill_type != PLOT_OP_TYPE_NONE) { BView *view; @@ -413,7 +413,7 @@ nsbeos_plot_rectangle(const struct redraw_context *ctx, nsbeos_set_colour(style->fill_colour); - BRect rect(rect->x0, rect->y0, rect->x1 - 1, rect->y1 - 1); + BRect rect(nsrect->x0, nsrect->y0, nsrect->x1 - 1, nsrect->y1 - 1); view->FillRect(rect); //nsbeos_current_gc_unlock(); @@ -449,7 +449,7 @@ nsbeos_plot_rectangle(const struct redraw_context *ctx, float pensize = view->PenSize(); view->SetPenSize(style->stroke_width); - BRect rect(rect->x0, rect->y0, rect->x1, rect->y1); + BRect rect(nsrect->x0, nsrect->y0, nsrect->x1, nsrect->y1); view->StrokeRect(rect, pat); view->SetPenSize(pensize); diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c index 06b51decc..de666c941 100644 --- a/frontends/gtk/scaffolding.c +++ b/frontends/gtk/scaffolding.c @@ -1673,7 +1673,7 @@ nsgtk_history_draw_event(GtkWidget *widget, cairo_t *cr, gpointer data) clip.x1 = x2; clip.y1 = y2; - ctx.plot->clip(&clip); + ctx.plot->clip(&ctx, &clip); browser_window_history_redraw(bw, &ctx); -- cgit v1.2.3