[PATCH] fix pixbuf rendering

[Jeff Muizelaar <jrmuizel nit ca>]

The attached patch fixes rendering for pixbuf-document.c. It isn't as
fast as it could be, but at least it works properly.

-Jeff

2005-01-19  Jeff Muizelaar  <jrmuizel nit ca>

	* pixbuf/pixbuf-document.c: (pixbuf_document_get_page_size),
	(pixbuf_document_render), (pixbuf_document_init):

	fix pixbuf rendering

Index: pixbuf/pixbuf-document.c
===================================================================
RCS file: /cvs/gnome/evince/pixbuf/pixbuf-document.c,v
retrieving revision 1.7
diff -u -r1.7 pixbuf-document.c
--- pixbuf/pixbuf-document.c	13 Jan 2005 19:11:27 -0000	1.7
+++ pixbuf/pixbuf-document.c	19 Jan 2005 16:54:33 -0000
@@ -136,9 +136,9 @@
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
 
 	if (width)
-		*width = gdk_pixbuf_get_width (pixbuf_document->pixbuf);
+		*width = gdk_pixbuf_get_width (pixbuf_document->pixbuf) * pixbuf_document->scale;
 	if (height)
-		*height = gdk_pixbuf_get_height (pixbuf_document->pixbuf);
+		*height = gdk_pixbuf_get_height (pixbuf_document->pixbuf) * pixbuf_document->scale;
 }
 
 static void
@@ -149,37 +149,28 @@
 			int          clip_height)
 {
 	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
+	GdkPixbuf *tmp_pixbuf;
+	
+	tmp_pixbuf = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (pixbuf_document->pixbuf),
+				     gdk_pixbuf_get_has_alpha (pixbuf_document->pixbuf),
+				     gdk_pixbuf_get_bits_per_sample (pixbuf_document->pixbuf),
+				     clip_width, clip_height);
+	
+	gdk_pixbuf_fill (tmp_pixbuf, 0xffffffff);
+	gdk_pixbuf_scale (pixbuf_document->pixbuf, tmp_pixbuf, 0, 0,
+			  MIN(gdk_pixbuf_get_width(pixbuf_document->pixbuf)* pixbuf_document->scale-clip_x, clip_width),
+			  MIN(gdk_pixbuf_get_height(pixbuf_document->pixbuf)* pixbuf_document->scale-clip_y, clip_height),
+			  -clip_x, -clip_y,
+			  pixbuf_document->scale, pixbuf_document->scale,
+			  GDK_INTERP_BILINEAR);
+	
+	gdk_draw_pixbuf (pixbuf_document->target, NULL, tmp_pixbuf,
+			 0, 0,
+			 clip_x, clip_y,
+			 clip_width, clip_height, GDK_RGB_DITHER_NORMAL,
+			 0, 0);
 
-	if (pixbuf_document->scale == 1.0) {
- 		gdk_draw_pixbuf (pixbuf_document->target, NULL, pixbuf_document->pixbuf,
-				 clip_x, clip_y,
-				 clip_x, clip_y,
-				 clip_width, clip_height, GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-	}
-	else {
-		GdkPixbuf *tmp_pixbuf;
-
-		tmp_pixbuf = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (pixbuf_document->pixbuf),
-					     gdk_pixbuf_get_has_alpha (pixbuf_document->pixbuf),
-					     gdk_pixbuf_get_bits_per_sample (pixbuf_document->pixbuf),
-					     clip_width, clip_height);
-
-		gdk_pixbuf_scale (pixbuf_document->pixbuf, tmp_pixbuf, 0, 0, clip_width, clip_height,
-				  clip_x * pixbuf_document->scale,
-				  clip_y * pixbuf_document->scale,
-				  pixbuf_document->scale, pixbuf_document->scale,
-				  GDK_INTERP_BILINEAR);
-		
- 		gdk_draw_pixbuf (pixbuf_document->target, NULL, tmp_pixbuf,
-				 0, 0,
-				 clip_x + pixbuf_document->x_offset,
-				 clip_y + pixbuf_document->y_offset,
-				 clip_width, clip_height, GDK_RGB_DITHER_NORMAL,
-				 0, 0);
-
-		g_object_unref (tmp_pixbuf);
-	}
+	g_object_unref (tmp_pixbuf);
 }
 
 static void
@@ -306,6 +297,6 @@
 {
 	pixbuf_document->scale = 1.0;
 
-	pixbuf_document->x_offset = 10;
-	pixbuf_document->y_offset = 10;
+	pixbuf_document->x_offset = 0;
+	pixbuf_document->y_offset = 0;
 }