summaryrefslogtreecommitdiff
path: root/poppler
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2005-05-16 19:06:00 +0000
committerKristian Høgsberg <krh@redhat.com>2005-05-16 19:06:00 +0000
commit8753ae8ba20fcceaef3ef1dda89129f0456fccf6 (patch)
tree394003ee43b01f450567127426c14c8feafb9d64 /poppler
parent2e17106ef4711097104a561d5be49980f8b2f5ab (diff)
2005-05-16 Kristian Høgsberg <krh@redhat.com>
* poppler/CairoOutputDevX.cc: Track changes to cairo Xlib surface constructors. * poppler/CairoFontEngine.cc (cairo_font_face_destroy): Make this static.
Diffstat (limited to 'poppler')
-rw-r--r--poppler/CairoFontEngine.cc2
-rw-r--r--poppler/CairoOutputDevX.cc5
2 files changed, 4 insertions, 3 deletions
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index c869cb2c..54703d1d 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -60,7 +60,7 @@ static CairoOutFontSubst cairoOutSubstFonts[16] = {
// CairoFont
//------------------------------------------------------------------------
-void cairo_font_face_destroy (void *data)
+static void cairo_font_face_destroy (void *data)
{
CairoFont *font = (CairoFont *) data;
diff --git a/poppler/CairoOutputDevX.cc b/poppler/CairoOutputDevX.cc
index d97800cb..122ba3ae 100644
--- a/poppler/CairoOutputDevX.cc
+++ b/poppler/CairoOutputDevX.cc
@@ -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 @@ CairoOutputDevX::createCairo(GfxState *state) {
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);