diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-18 20:06:14 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-18 20:06:14 +0000 |
| commit | 218aad0fc1d9823b2b8ea4c91da534982f6ddb0c (patch) | |
| tree | 8ccf747553a6114ec47b78981ec1ccc9ca7d2dda | |
| parent | 3d1240ae397d1637be6887815221bc17112ad4ce (diff) | |
| parent | e8181138ab5b4403bee552e768d53a0674d881dd (diff) | |
| download | pango-218aad0fc1d9823b2b8ea4c91da534982f6ddb0c.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/pango!243
| -rw-r--r-- | pango/pangofc-fontmap.h | 8 | ||||
| -rw-r--r-- | pango/pangoft2.h | 4 | ||||
| -rw-r--r-- | pango/pangoxft.h | 4 | ||||
| -rw-r--r-- | utils/viewer-pangoft2.c | 2 | ||||
| -rw-r--r-- | utils/viewer-pangoxft.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h index c20bde60..6fdf32d2 100644 --- a/pango/pangofc-fontmap.h +++ b/pango/pangofc-fontmap.h @@ -128,9 +128,9 @@ typedef void (*PangoFcSubstituteFunc) (FcPattern *pattern, * the font. This function can be used to do things like set * hinting and antialiasing options. * - * Since: 1.46 + * Since: 1.48 */ -PANGO_AVAILABLE_IN_1_46 +PANGO_AVAILABLE_IN_1_48 void pango_fc_font_map_set_default_substitute (PangoFcFontMap *fontmap, PangoFcSubstituteFunc func, gpointer data, @@ -146,9 +146,9 @@ void pango_fc_font_map_set_default_substitute (PangoFcFontMap *fontmap, * That is, if your substitution function will return different * results for the same input pattern, you must call this function. * - * Since: 1.46 + * Since: 1.48 */ -PANGO_AVAILABLE_IN_1_46 +PANGO_AVAILABLE_IN_1_48 void pango_fc_font_map_substitute_changed (PangoFcFontMap *fontmap); /** diff --git a/pango/pangoft2.h b/pango/pangoft2.h index cda3b51e..892aa039 100644 --- a/pango/pangoft2.h +++ b/pango/pangoft2.h @@ -116,12 +116,12 @@ void pango_ft2_font_map_set_resolution (PangoFT2FontMap double dpi_x, double dpi_y); #ifndef PANGO_DISABLE_DEPRECATED -PANGO_AVAILABLE_IN_1_2 +PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_set_default_substitute) void pango_ft2_font_map_set_default_substitute (PangoFT2FontMap *fontmap, PangoFT2SubstituteFunc func, gpointer data, GDestroyNotify notify); -PANGO_AVAILABLE_IN_1_2 +PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_substitute_changed) void pango_ft2_font_map_substitute_changed (PangoFT2FontMap *fontmap); PANGO_DEPRECATED_IN_1_22_FOR(pango_font_map_create_context) PangoContext *pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap); diff --git a/pango/pangoxft.h b/pango/pangoxft.h index 708629cc..eb17f97c 100644 --- a/pango/pangoxft.h +++ b/pango/pangoxft.h @@ -102,13 +102,13 @@ void pango_xft_shutdown_display (Display *display, int screen); #ifndef PANGO_DISABLE_DEPRECATED -PANGO_AVAILABLE_IN_1_2 +PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_set_default_substitute) void pango_xft_set_default_substitute (Display *display, int screen, PangoXftSubstituteFunc func, gpointer data, GDestroyNotify notify); -PANGO_AVAILABLE_IN_1_2 +PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_substitute_changed) void pango_xft_substitute_changed (Display *display, int screen); #endif diff --git a/utils/viewer-pangoft2.c b/utils/viewer-pangoft2.c index 87973c80..3a698b8e 100644 --- a/utils/viewer-pangoft2.c +++ b/utils/viewer-pangoft2.c @@ -51,7 +51,7 @@ pangoft2_view_create (const PangoViewer *klass G_GNUC_UNUSED) fontmap = pango_ft2_font_map_new (); pango_ft2_font_map_set_resolution (PANGO_FT2_FONT_MAP (fontmap), opt_dpi, opt_dpi); - pango_ft2_font_map_set_default_substitute (PANGO_FT2_FONT_MAP (fontmap), substitute_func, NULL, NULL); + pango_fc_font_map_set_default_substitute (PANGO_FC_FONT_MAP (fontmap), substitute_func, NULL, NULL); return fontmap; } diff --git a/utils/viewer-pangoxft.c b/utils/viewer-pangoxft.c index 948cd90e..95a4545e 100644 --- a/utils/viewer-pangoxft.c +++ b/utils/viewer-pangoxft.c @@ -51,8 +51,8 @@ pangoxft_view_create (const PangoViewer *klass) XftInit (NULL); - pango_xft_set_default_substitute (instance->display, instance->screen, - default_substitute, NULL, NULL); + pango_fc_font_map_set_default_substitute (PANGO_FC_FONT_MAP (pango_xft_get_font_map (instance->display, instance->screen)), + default_substitute, NULL, NULL); return instance; } |