summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--pango/pangocairo-fc.h12
-rw-r--r--pango/pangocairo-fcfont.c2
4 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b0ab554e..64add5d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 3 19:00:17 2005 Manish Singh <yosh@gimp.org>
+
+ * pango/pangocairo-fc.h: spell _pango_cairo_fc_get_render_key
+ correctly.
+
+ * pango/pangocairo-fcfont.c: #include cairo-ft.h
+
Thu Feb 3 18:23:27 2005 Manish Singh <yosh@gimp.org>
* configure.in: use CAIRO_LIBS for all libcairo checks, and disable
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b0ab554e..64add5d2 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Thu Feb 3 19:00:17 2005 Manish Singh <yosh@gimp.org>
+
+ * pango/pangocairo-fc.h: spell _pango_cairo_fc_get_render_key
+ correctly.
+
+ * pango/pangocairo-fcfont.c: #include cairo-ft.h
+
Thu Feb 3 18:23:27 2005 Manish Singh <yosh@gimp.org>
* configure.in: use CAIRO_LIBS for all libcairo checks, and disable
diff --git a/pango/pangocairo-fc.h b/pango/pangocairo-fc.h
index 8d978cb1..6335058d 100644
--- a/pango/pangocairo-fc.h
+++ b/pango/pangocairo-fc.h
@@ -49,12 +49,12 @@ PangoFcFont *_pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
PangoContext *context,
FcPattern *pattern);
-gboolean _pango_cairo_get_render_key (PangoCairoFcFontMap *cffontmap,
- PangoContext *context,
- const PangoFontDescription *desc,
- int *xsize,
- int *ysize,
- guint *flags);
+gboolean _pango_cairo_fc_get_render_key (PangoCairoFcFontMap *cffontmap,
+ PangoContext *context,
+ const PangoFontDescription *desc,
+ int *xsize,
+ int *ysize,
+ guint *flags);
G_END_DECLS
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 8334a385..ea335472 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -24,6 +24,8 @@
#include <math.h>
#include <stdlib.h>
+#include <cairo-ft.h>
+
#include "pango-fontmap.h"
#include "pangocairo-private.h"
#include "pangocairo-fc.h"