summaryrefslogtreecommitdiff
path: root/pango/pangoft2.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-04-14 23:48:34 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-04-14 23:48:34 +0000
commit402f2625c2c779df20470ed0f758999db494e4dc (patch)
tree6667e384ed0c39a22a6e3f731c062311fa7b3e9a /pango/pangoft2.h
parentf6fdd34661bd9fe23452b5eb98ece8488a12ce8f (diff)
downloadpango-402f2625c2c779df20470ed0f758999db494e4dc.tar.gz
Switch over the way that module entry points work, taking advantage of the
Mon Apr 14 06:02:34 2003 Owen Taylor <otaylor@redhat.com> * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}: * modules/*/*-{xft,x,win32.c} pango/pango-engine.h modules/*/Makefile.am: Switch over the way that module entry points work, taking advantage of the new automake capability for per-target CFLAGS for shared sources. * pango/pangofc-font.[ch] pango/pangoxft-font.c pango/pangoft2.c: Add a base class for PangoXft and PangoFT2 font classes so code can be shared between FT2 and Xft backends. * configure.in modules/*/Makefile.am modules/{arabic,basic,hangul,hebrew,indic,thai}: Move *-xft.c to *-fc.c and share between Xft and FT2 backends; adds FT2 backend capabilities for hangul/indic/thai. * pango/pangoxft.h pango/pangoft2.h: Deprecate APIs that moved into PangoFcFont * modules/basic/basic-fc.c (set_glyph): Add kerning handling from FT2 backend.
Diffstat (limited to 'pango/pangoft2.h')
-rw-r--r--pango/pangoft2.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index 10dc143c..2bb7db8d 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -23,11 +23,10 @@
#ifndef __PANGOFT2_H__
#define __PANGOFT2_H__
-#include <freetype/freetype.h>
-
#include <fontconfig/fontconfig.h>
#include <pango/pango-layout.h>
+#include <pango/pangofc-font.h>
G_BEGIN_DECLS
@@ -79,6 +78,7 @@ PangoContext *pango_ft2_font_map_create_context (PangoFT2FontMap
/* API for rendering modules
*/
+#ifndef PANGO_DISABLE_DEPRECATED
PangoGlyph pango_ft2_get_unknown_glyph (PangoFont *font);
int pango_ft2_font_get_kerning (PangoFont *font,
PangoGlyph left,
@@ -86,6 +86,7 @@ int pango_ft2_font_get_kerning (PangoFont *font,
FT_Face pango_ft2_font_get_face (PangoFont *font);
PangoCoverage *pango_ft2_font_get_coverage (PangoFont *font,
PangoLanguage *language);
+#endif /* PANGO_DISABLE_DEPRECATED */
G_END_DECLS