merged clipping parameter changes.

svn path=/trunk/netsurf/; revision=11810

2 files changed, 7 insertions, 9 deletions

diff --git a/atari/plot.c b/atari/plot.c
index 2d45f1f63..60570fae2 100755
--- a/atari/plot.c
+++ b/atari/plot.c
@@ -112,18 +112,17 @@ static bool plot_polygon(const int *p, unsigned int n,
 

 bool plot_clip(const struct rect *clip)

 {

-	plotter->clip( plotter, clip->x0, clip->y0, clip->x1, clip->y1 );

+	plotter->clip( plotter, clip );

 	return ( true );

 }

 

-bool plot_get_clip(struct s_clipping * out){

-	out->x0 = plotter->clipping.x0;

-	out->y0 = plotter->clipping.y0;

-	out->x1 = plotter->clipping.x1;

-	out->y1 = plotter->clipping.y1;

+

+bool plot_get_clip(struct rect * out){

+	plotter_get_clip( plotter , out );

 	return( true );

 }

 

+

 static bool plot_text(int x, int y, const char *text, size_t length, const plot_font_style_t *fstyle )

 {

 	plotter->text( plotter, x, y, text, length, fstyle );

@@ -151,7 +150,7 @@ static bool plot_bitmap(int x, int y, int width, int height,
 	bool repeat_x = (flags & BITMAPF_REPEAT_X);

 	bool repeat_y = (flags & BITMAPF_REPEAT_Y);

 	int bmpw,bmph;

-	struct s_clipping clip;

+	struct rect clip;

 	

 	if( option_suppress_images != 0 ) {

 		return( true );

diff --git a/atari/plot.h b/atari/plot.h
index a11b6d576..9b7dc5f1f 100755
--- a/atari/plot.h
+++ b/atari/plot.h
@@ -26,8 +26,7 @@ struct rect;
 

 int atari_plotter_init( char*, char * );

 int atari_plotter_finalise( void );

-

-bool plot_get_clip(struct s_clipping * out);

+bool plot_get_clip(struct rect * out);

 bool plot_clip(const struct rect *clip);

 bool plot_rectangle( int x0, int y0, int x1, int y1,const plot_style_t *style );