Merge branch 'fc-font-struct' into 'master'

Make PangoFcFont struct available again

See merge request GNOME/pango!133

1 files changed, 30 insertions, 0 deletions

diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h
index 0cd4f174..641f5947 100644
--- a/pango/pangofc-font.h
+++ b/pango/pangofc-font.h
@@ -49,6 +49,36 @@ G_BEGIN_DECLS
 typedef struct _PangoFcFont      PangoFcFont;
 typedef struct _PangoFcFontClass PangoFcFontClass;
 
+#ifndef PANGO_DISABLE_DEPRECATED
+
+/**
+ * PangoFcFont:
+ *
+ * #PangoFcFont is a base class for font implementations
+ * using the Fontconfig and FreeType libraries and is used in
+ * conjunction with #PangoFcFontMap. When deriving from this
+ * class, you need to implement all of its virtual functions
+ * other than shutdown() along with the get_glyph_extents()
+ * virtual function from #PangoFont.
+ **/
+struct _PangoFcFont
+{
+  PangoFont parent_instance;
+
+  FcPattern *font_pattern;          /* fully resolved pattern */
+  PangoFontMap *fontmap;            /* associated map */
+  gpointer priv;                    /* used internally */
+  PangoMatrix matrix;               /* used internally */
+  PangoFontDescription *description;
+
+  GSList *metrics_by_lang;
+
+  guint is_hinted : 1;
+  guint is_transformed : 1;
+};
+
+#endif /* PANGO_DISABLE_DEPRECATED */
+
 PANGO_AVAILABLE_IN_ALL
 GType      pango_fc_font_get_type (void) G_GNUC_CONST;