diff options
Diffstat (limited to 'pango')
-rw-r--r-- | pango/meson.build | 2 | ||||
-rw-r--r-- | pango/pangofc-private.h | 10 | ||||
-rw-r--r-- | pango/pangohb-private.h | 43 | ||||
-rw-r--r-- | pango/pangohb-shape.c (renamed from pango/pangofc-shape.c) | 16 | ||||
-rw-r--r-- | pango/shape.c | 10 |
5 files changed, 57 insertions, 24 deletions
diff --git a/pango/meson.build b/pango/meson.build index faf38780..e5cfa2f5 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -26,6 +26,7 @@ pango_sources = [ 'pango-utils.c', 'reorder-items.c', 'shape.c', + 'pangohb-shape.c', ] pango_headers = [ @@ -70,7 +71,6 @@ if fontconfig_dep.found() 'pangofc-font.c', 'pangofc-fontmap.c', 'pangofc-decoder.c', - 'pangofc-shape.c', ] pango_requires += [ fontconfig_pc, diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h index df59fb69..27b96df4 100644 --- a/pango/pangofc-private.h +++ b/pango/pangofc-private.h @@ -78,16 +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 char *paragraph_text, - unsigned int paragraph_length, - const PangoAnalysis *analysis, - PangoShapeFlags flags, - PangoGlyphString *glyphs); - G_END_DECLS #endif /* __PANGOFC_PRIVATE_H__ */ diff --git a/pango/pangohb-private.h b/pango/pangohb-private.h new file mode 100644 index 00000000..029b014c --- /dev/null +++ b/pango/pangohb-private.h @@ -0,0 +1,43 @@ +/* Pango + * pangohb-private.h: Private apis related to 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 char *paragraph_text, + unsigned int paragraph_length, + const PangoAnalysis *analysis, + PangoShapeFlags flags, + PangoGlyphString *glyphs); + +G_END_DECLS + +#endif /* __PANGOHB_PRIVATE_H__ */ diff --git a/pango/pangofc-shape.c b/pango/pangohb-shape.c index 63cd3466..2bd68a43 100644 --- a/pango/pangofc-shape.c +++ b/pango/pangohb-shape.c @@ -315,14 +315,14 @@ pango_font_get_hb_font_for_flags (PangoFont *font, } void -_pango_fc_shape (PangoFont *font, - const char *item_text, - unsigned int item_length, - const char *paragraph_text, - unsigned int paragraph_length, - const PangoAnalysis *analysis, - PangoShapeFlags flags, - PangoGlyphString *glyphs) +pango_hb_shape (PangoFont *font, + const char *item_text, + unsigned int item_length, + const char *paragraph_text, + unsigned int paragraph_length, + const PangoAnalysis *analysis, + PangoShapeFlags flags, + PangoGlyphString *glyphs) { PangoHbShapeContext context; hb_font_t *hb_font; diff --git a/pango/shape.c b/pango/shape.c index 3815cb9e..ccd4222e 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> @@ -194,10 +194,10 @@ pango_shape_with_options (const gchar *item_text, if (analysis->font) { - _pango_fc_shape (analysis->font, - item_text, item_length, - paragraph_text, paragraph_length, - analysis, flags, glyphs); + pango_hb_shape (analysis->font, + item_text, item_length, + paragraph_text, paragraph_length, + analysis, flags, glyphs); if (G_UNLIKELY (glyphs->num_glyphs == 0)) { |