mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-08 02:24:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix plotter merge

Browse Source
This commit is contained in:
Vincent Sanders 2017-02-12 20:31:18 +00:00
parent 1666944c7e
commit 7b9fa8d7eb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/knockout.c
View File

@ -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 */

8
frontends/beos/plotters.cpp
View File

@ -32,11 +32,11 @@
#include <View.h>
#include <Shape.h>
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);

2
frontends/gtk/scaffolding.c
View File

@ -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);