[poppler] poppler/poppler: CairoFontEngine.cc, 1.9, 1.10 CairoOutputDevX.cc, 1.2, 1.3

[Kristian Hogsberg]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv25325/poppler

Modified Files:
	CairoFontEngine.cc CairoOutputDevX.cc 
Log Message:
2005-05-16  Kristian Høgsberg  <krh at redhat.com>

        * poppler/CairoOutputDevX.cc: Track changes to cairo Xlib surface
        constructors.

        * poppler/CairoFontEngine.cc (cairo_font_face_destroy): Make this
        static.



Index: CairoFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoFontEngine.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CairoFontEngine.cc	2 May 2005 05:39:11 -0000	1.9
+++ CairoFontEngine.cc	16 May 2005 19:06:00 -0000	1.10
@@ -60,7 +60,7 @@
 // CairoFont
 //------------------------------------------------------------------------
 
-void cairo_font_face_destroy (void *data)
+static void cairo_font_face_destroy (void *data)
 {
   CairoFont *font = (CairoFont *) data;
 

Index: CairoOutputDevX.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoOutputDevX.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CairoOutputDevX.cc	12 May 2005 21:26:25 -0000	1.2
+++ CairoOutputDevX.cc	16 May 2005 19:06:00 -0000	1.3
@@ -17,6 +17,7 @@
 #include <math.h>
 #include <cairo.h>
 #include <cairo/cairo-xlib.h>
+#include <X11/Xutil.h>
 
 #include "goo/gfile.h"
 #include "GlobalParams.h"
@@ -108,8 +109,8 @@
   gc = XCreateGC(display, pixmap, GCForeground, &gcv);
   XFillRectangle(display, pixmap, gc, 0, 0, w, h);
 
-  surface = cairo_xlib_surface_create_for_pixmap_with_visual(display, pixmap,
-						             DefaultVisual(display, DefaultScreen(display)));
+  surface = cairo_xlib_surface_create_with_visual(display, pixmap,
+						  DefaultVisual(display, DefaultScreen(display)));
   cairo = cairo_create (surface);
   cairo_surface_destroy (surface);