Patch to get the pixbuf backend to compile, maybe even works properly

[David Malcolm <dmalcolm redhat com>]

CVS evince wouldn't compile for me; the shell/Makefile.am want to links
against the pixbuf subdirectory.

The attached patch fixed the pixbuf backend for me; though I haven't
looked into the details of the new API, so I may doing something subtly
wrong.

Dave

? get-pixbuf-working.patch
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evince/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- Makefile.am	31 Mar 2005 15:34:34 -0000	1.13
+++ Makefile.am	1 Apr 2005 19:17:58 -0000
@@ -1,4 +1,4 @@
-SUBDIRS = lib cut-n-paste data backend po pdf ps shell thumbnailer
+SUBDIRS = lib cut-n-paste data backend po pdf ps pixbuf shell thumbnailer
 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
Index: pixbuf/pixbuf-document.c
===================================================================
RCS file: /cvs/gnome/evince/pixbuf/pixbuf-document.c,v
retrieving revision 1.13
diff -u -p -r1.13 pixbuf-document.c
--- pixbuf/pixbuf-document.c	7 Mar 2005 13:51:12 -0000	1.13
+++ pixbuf/pixbuf-document.c	1 Apr 2005 19:17:58 -0000
@@ -107,15 +107,6 @@ pixbuf_document_get_page (EvDocument  *d
 }
 
 static void
-pixbuf_document_set_target (EvDocument  *document,
-			    GdkDrawable *target)
-{
-	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-
-	pixbuf_document->target = target;
-}
-
-static void
 pixbuf_document_set_scale (EvDocument  *document,
 			   double       scale)
 {
@@ -125,17 +116,6 @@ pixbuf_document_set_scale (EvDocument  *
 }
 
 static void
-pixbuf_document_set_page_offset (EvDocument  *document,
-			      int          x,
-			      int          y)
-{
-	PixbufDocument *pixbuf_document = PIXBUF_DOCUMENT (document);
-
-	pixbuf_document->x_offset = x;
-	pixbuf_document->y_offset = y;
-}
-
-static void
 pixbuf_document_get_page_size (EvDocument   *document,
 			       int           page,
 			       int          *width,
@@ -149,36 +129,12 @@ pixbuf_document_get_page_size (EvDocumen
 		*height = gdk_pixbuf_get_height (pixbuf_document->pixbuf) * pixbuf_document->scale;
 }
 
-static void
-pixbuf_document_render (EvDocument  *document,
-			int          clip_x,
-			int          clip_y,
-			int          clip_width,
-			int          clip_height)
+static GdkPixbuf*
+pixbuf_document_render_pixbuf (EvDocument  *document)
 {
 	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);
 
-	g_object_unref (tmp_pixbuf);
+	return gdk_pixbuf_copy (pixbuf_document->pixbuf);
 }
 
 static void
@@ -259,10 +215,8 @@ pixbuf_document_document_iface_init (EvD
 	iface->set_page = pixbuf_document_set_page;
 	iface->get_page = pixbuf_document_get_page;
 	iface->set_scale = pixbuf_document_set_scale;
-	iface->set_target = pixbuf_document_set_target;
-	iface->set_page_offset = pixbuf_document_set_page_offset;
 	iface->get_page_size = pixbuf_document_get_page_size;
-	iface->render = pixbuf_document_render;
+	iface->render_pixbuf = pixbuf_document_render_pixbuf;
 }
 
 static GdkPixbuf *