Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7b9fa8d7eb60950401065a81efffebd10d84309a
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7b9fa8d7eb60950401065a81efffebd10d84309a
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7b9fa8d7eb60950401065a81efffebd10d84309a
The branch, master has been updated
via 7b9fa8d7eb60950401065a81efffebd10d84309a (commit)
from 1666944c7e5c7a300ad0658b9654464ff2c11495 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7b9fa8d7eb60950401065a81efffebd10d84309a
commit 7b9fa8d7eb60950401065a81efffebd10d84309a
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix plotter merge
diff --git a/desktop/knockout.c b/desktop/knockout.c
index 96e7b1a..3647a3a 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 6544d63..83a470d 100644
--- a/frontends/beos/plotters.cpp
+++ b/frontends/beos/plotters.cpp
@@ -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);
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 06b51de..de666c9 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);
-----------------------------------------------------------------------
Summary of changes:
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 96e7b1a..3647a3a 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 6544d63..83a470d 100644
--- a/frontends/beos/plotters.cpp
+++ b/frontends/beos/plotters.cpp
@@ -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);
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 06b51de..de666c9 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);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
