diff options
| -rw-r--r-- | pango/pangofc-private.h | 8 | ||||
| -rw-r--r-- | pango/pangofc-shape.c | 16 | ||||
| -rw-r--r-- | pango/pangohb-private.h | 41 | ||||
| -rw-r--r-- | pango/shape.c | 10 |
4 files changed, 54 insertions, 21 deletions
diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h index 554d9bb0..27b96df4 100644 --- a/pango/pangofc-private.h +++ b/pango/pangofc-private.h @@ -78,14 +78,6 @@ _PANGO_EXTERN PangoFontMetrics *pango_fc_font_create_base_metrics_for_context (PangoFcFont *font, PangoContext *context); -void _pango_fc_shape (PangoFont *font, - const char *item_text, - unsigned int item_length, - const PangoAnalysis *analysis, - PangoGlyphString *glyphs, - const char *paragraph_text, - unsigned int paragraph_length); - G_END_DECLS #endif /* __PANGOFC_PRIVATE_H__ */ diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c index 71b5740d..910ff4d7 100644 --- a/pango/pangofc-shape.c +++ b/pango/pangofc-shape.c @@ -26,7 +26,7 @@ #include <string.h> #include <math.h> -#include "pangofc-private.h" +#include "pangohb-private.h" #include "pango-impl-utils.h" #include <hb-glib.h> @@ -113,13 +113,13 @@ apply_extra_attributes (GSList *attrs, } void -_pango_fc_shape (PangoFont *font, - const char *item_text, - unsigned int item_length, - const PangoAnalysis *analysis, - PangoGlyphString *glyphs, - const char *paragraph_text, - unsigned int paragraph_length) +pango_hb_shape (PangoFont *font, + const char *item_text, + unsigned int item_length, + const PangoAnalysis *analysis, + PangoGlyphString *glyphs, + const char *paragraph_text, + unsigned int paragraph_length) { hb_font_t *hb_font; hb_buffer_t *hb_buffer; diff --git a/pango/pangohb-private.h b/pango/pangohb-private.h new file mode 100644 index 00000000..217bdb28 --- /dev/null +++ b/pango/pangohb-private.h @@ -0,0 +1,41 @@ +/* Pango + * pangohb-private.h: Private routines for using harfbuzz + * + * Copyright (C) 2019 Red Hat Software + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __PANGOHB_PRIVATE_H__ +#define __PANGOHB_PRIVATE_H__ + +#include <pango-font.h> +#include <pango-item.h> +#include <pango-glyph.h> + +G_BEGIN_DECLS + +void pango_hb_shape (PangoFont *font, + const char *item_text, + unsigned int item_length, + const PangoAnalysis *analysis, + PangoGlyphString *glyphs, + const char *paragraph_text, + unsigned int paragraph_length); + +G_END_DECLS + +#endif /* __PANGOHB_PRIVATE_H__ */ diff --git a/pango/shape.c b/pango/shape.c index 9117138c..14078e47 100644 --- a/pango/shape.c +++ b/pango/shape.c @@ -35,7 +35,7 @@ #include "pango-glyph.h" #include "pango-engine-private.h" -#include "pangofc-private.h" +#include "pangohb-private.h" #include <string.h> @@ -164,10 +164,10 @@ pango_shape_full (const gchar *item_text, if (analysis->font) { - _pango_fc_shape (analysis->font, - item_text, item_length, - analysis, glyphs, - paragraph_text, paragraph_length); + pango_hb_shape (analysis->font, + item_text, item_length, + analysis, glyphs, + paragraph_text, paragraph_length); if (G_UNLIKELY (glyphs->num_glyphs == 0)) { |