[pango/pangofc-api] Keep deprecated pango_fc apis in pango-fc-font.h



commit 51de6323c8def137688ca7568af287c2bcd8e786
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Aug 1 07:50:05 2019 -0400

    Keep deprecated pango_fc apis in pango-fc-font.h
    
    Turns out these are in use.
    
    Closes: https://gitlab.gnome.org/GNOME/pango/issues/394

 pango/pangofc-font-private.h | 15 ---------------
 pango/pangofc-font.h         | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/pango/pangofc-font-private.h b/pango/pangofc-font-private.h
index 91f89207..0f538bb7 100644
--- a/pango/pangofc-font-private.h
+++ b/pango/pangofc-font-private.h
@@ -22,7 +22,6 @@
 #ifndef __PANGO_FC_FONT_PRIVATE_H__
 #define __PANGO_FC_FONT_PRIVATE_H__
 
-#include <pango/pango-glyph.h>
 #include <pango/pangofc-font.h>
 #include <pango/pango-font-private.h>
 
@@ -128,19 +127,5 @@ struct _PangoFcFontClass
 };
 
 
-PANGO_DEPRECATED_IN_1_44
-gboolean   pango_fc_font_has_char          (PangoFcFont      *font,
-                                           gunichar          wc);
-PANGO_AVAILABLE_IN_1_4
-guint      pango_fc_font_get_glyph         (PangoFcFont      *font,
-                                           gunichar          wc);
-PANGO_DEPRECATED_FOR(PANGO_GET_UNKNOWN_GLYPH)
-PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont      *font,
-                                           gunichar          wc);
-PANGO_DEPRECATED_IN_1_32
-void       pango_fc_font_kern_glyphs       (PangoFcFont      *font,
-                                           PangoGlyphString *glyphs);
-
-
 G_END_DECLS
 #endif /* __PANGO_FC_FONT_PRIVATE_H__ */
diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h
index fc6ee529..a7c5f87d 100644
--- a/pango/pangofc-font.h
+++ b/pango/pangofc-font.h
@@ -22,7 +22,9 @@
 #ifndef __PANGO_FC_FONT_H__
 #define __PANGO_FC_FONT_H__
 
+#include <pango/pango-glyph.h>
 #include <pango/pango-font.h>
+#include <pango/pango-glyph.h>
 
 /* Freetype has undefined macros in its header */
 #ifdef PANGO_COMPILATION
@@ -48,6 +50,19 @@ typedef struct _PangoFcFontClass PangoFcFontClass;
 PANGO_AVAILABLE_IN_ALL
 GType      pango_fc_font_get_type (void) G_GNUC_CONST;
 
+PANGO_DEPRECATED_IN_1_44
+gboolean   pango_fc_font_has_char          (PangoFcFont      *font,
+                                            gunichar          wc);
+PANGO_AVAILABLE_IN_1_4
+guint      pango_fc_font_get_glyph         (PangoFcFont      *font,
+                                            gunichar          wc);
+PANGO_DEPRECATED_FOR(PANGO_GET_UNKNOWN_GLYPH)
+PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont      *font,
+                                            gunichar          wc);
+PANGO_DEPRECATED_IN_1_32
+void       pango_fc_font_kern_glyphs       (PangoFcFont      *font,
+                                            PangoGlyphString *glyphs);
+
 PANGO_DEPRECATED_IN_1_44_FOR(pango_font_get_hb_font)
 gpointer   pango_fc_font_lock_face         (PangoFcFont      *font);
 PANGO_DEPRECATED_IN_1_44_FOR(pango_font_get_hb_font)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]