From 1165edf662baa3286ff76df54f2db6819340d0a3 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Wed, 1 Jul 2009 13:53:06 +0000
Subject: remove redundant clg call

svn path=/trunk/netsurf/; revision=8240
---
 riscos/plotters.c  | 20 --------------------
 riscos/print.c     |  9 +++------
 riscos/save_draw.c | 11 -----------
 riscos/window.c    |  2 +-
 4 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'riscos')

diff --git a/riscos/plotters.c b/riscos/plotters.c
index 63a44bf26..8ff46ad0a 100644
--- a/riscos/plotters.c
+++ b/riscos/plotters.c
@@ -34,7 +34,6 @@
 #include "utils/log.h"
 
 
-static bool ro_plot_clg(colour c);
 static bool ro_plot_rectangle(int x0, int y0, int width, int height,
 		int line_width, colour c, bool dotted, bool dashed);
 static bool ro_plot_line(int x0, int y0, int x1, int y1, int width,
@@ -60,7 +59,6 @@ static bool ro_plot_bitmap(int x, int y, int width, int height,
 struct plotter_table plot;
 
 const struct plotter_table ro_plotters = {
-	.clg = ro_plot_clg,
 	.rectangle = ro_plot_rectangle,
 	.line = ro_plot_line,
 	.polygon = ro_plot_polygon,
@@ -82,24 +80,6 @@ float ro_plot_scale = 1.0;
 bool ro_plot_patterned_lines = true;
 
 
-bool ro_plot_clg(colour c)
-{
-	os_error *error;
-	error = xcolourtrans_set_gcol(c << 8,
-			colourtrans_SET_BG_GCOL | colourtrans_USE_ECFS_GCOL,
-			os_ACTION_OVERWRITE, 0, 0);
-	if (error) {
-		LOG(("xcolourtrans_set_gcol: 0x%x: %s",
-				error->errnum, error->errmess));
-		return false;
-	}
-	error = xos_clg();
-	if (error) {
-		LOG(("xos_clg: 0x%x: %s", error->errnum, error->errmess));
-		return false;
-	}
-	return true;
-}
 
 
 bool ro_plot_rectangle(int x0, int y0, int width, int height,
diff --git a/riscos/print.c b/riscos/print.c
index a663b3d1c..8742f40b6 100644
--- a/riscos/print.c
+++ b/riscos/print.c
@@ -97,7 +97,6 @@ static void print_send_printsave(struct content *c);
 static bool print_send_printtypeknown(wimp_message *m);
 static bool print_document(struct gui_window *g, const char *filename);
 static const char *print_declare_fonts(struct content *content);
-static bool print_fonts_plot_clg(colour c);
 static bool print_fonts_plot_rectangle(int x0, int y0, int width, int height,
 		int line_width, colour c, bool dotted, bool dashed);
 static bool print_fonts_plot_line(int x0, int y0, int x1, int y1, int width,
@@ -126,7 +125,6 @@ static void print_fonts_callback(void *context,
 /** Plotter for print_declare_fonts(). All the functions do nothing except for
  * print_fonts_plot_text, which records the fonts used. */
 static const struct plotter_table print_fonts_plotters = {
-	.clg = print_fonts_plot_clg,
 	.rectangle = print_fonts_plot_rectangle,
 	.line = print_fonts_plot_line,
 	.polygon = print_fonts_plot_polygon,
@@ -809,24 +807,23 @@ end:
 }
 
 
-bool print_fonts_plot_clg(colour c)
-{
-	return true;
-}
 bool print_fonts_plot_rectangle(int x0, int y0, int width, int height,
 		int line_width, colour c, bool dotted, bool dashed)
 {
 	return true;
 }
+
 bool print_fonts_plot_line(int x0, int y0, int x1, int y1, int width,
 		colour c, bool dotted, bool dashed)
 {
 	return true;
 }
+
 bool print_fonts_plot_polygon(const int *p, unsigned int n, colour fill)
 {
 	return true;
 }
+
 bool print_fonts_plot_fill(int x0, int y0, int x1, int y1, colour c)
 {
 	return true;
diff --git a/riscos/save_draw.c b/riscos/save_draw.c
index 7c76210c2..320f7bfb9 100644
--- a/riscos/save_draw.c
+++ b/riscos/save_draw.c
@@ -37,8 +37,6 @@
 #include "utils/log.h"
 #include "utils/utils.h"
 
-
-static bool ro_save_draw_clg(colour c);
 static bool ro_save_draw_rectangle(int x0, int y0, int width, int height,
 		int line_width, colour c, bool dotted, bool dashed);
 static bool ro_save_draw_line(int x0, int y0, int x1, int y1, int width,
@@ -63,7 +61,6 @@ static bool ro_save_draw_error(pencil_code code);
 
 
 static const struct plotter_table ro_save_draw_plotters = {
-	.clg = ro_save_draw_clg,
 	.rectangle = ro_save_draw_rectangle,
 	.line = ro_save_draw_line,
 	.polygon = ro_save_draw_polygon,
@@ -146,14 +143,6 @@ bool save_as_draw(struct content *c, const char *path)
 	return true;
 }
 
-
-bool ro_save_draw_clg(colour c)
-{
-	return ro_save_draw_fill(0, 0, ro_save_draw_width, ro_save_draw_height,
-			c);
-}
-
-
 bool ro_save_draw_rectangle(int x0, int y0, int width, int height,
 		int line_width, colour c, bool dotted, bool dashed)
 {
diff --git a/riscos/window.c b/riscos/window.c
index 8e0a8b8d6..09b191ed1 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -1483,7 +1483,7 @@ void ro_gui_window_redraw(wimp_draw *redraw)
 		plot.clip(clip_x0, clip_y0, clip_x1, clip_y1);
 
 		if (c->type != CONTENT_HTML)
-			plot.clg(0x00ffffff);
+                    plot.fill(clip_x0, clip_y0, clip_x1, clip_y1, 0x00ffffff);
 
 		/* Redraw the clip rectangle area of the content */
 		content_redraw(c, 0, 0,
-- 
cgit v1.2.3