From 27534ce56c6d908d1db2c1a168512addedef6c96 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 19 Jul 2019 11:56:23 +0200 Subject: Remove unused remnants of shape engine --- pango/pango-context.c | 1 - pango/pango-engine-private.h | 48 ---------------- pango/pango-engine.c | 134 ------------------------------------------- pango/shape.c | 1 - 4 files changed, 184 deletions(-) delete mode 100644 pango/pango-engine-private.h (limited to 'pango') diff --git a/pango/pango-context.c b/pango/pango-context.c index 1f31c268..6ba64ce1 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -41,7 +41,6 @@ #include "pango-font-private.h" #include "pango-fontset-private.h" #include "pango-fontmap-private.h" -#include "pango-engine-private.h" #include "pango-script-private.h" #include "pango-emoji-private.h" diff --git a/pango/pango-engine-private.h b/pango/pango-engine-private.h deleted file mode 100644 index cd0b6103..00000000 --- a/pango/pango-engine-private.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Pango - * pango-engine-private.h: Private routines related to engines for - * script and language specific processing - * - * Copyright (C) 2003 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 __PANGO_ENGINE_PRIVATE_H__ -#define __PANGO_ENGINE_PRIVATE_H__ - -#include - -G_BEGIN_DECLS - -void _pango_engine_shape_shape (PangoEngineShape *engine, - PangoFont *font, - const char *item_text, - unsigned int item_length, - const char *paragraph_text, - unsigned int paragraph_len, - const PangoAnalysis *analysis, - PangoGlyphString *glyphs); -PangoCoverageLevel _pango_engine_shape_covers (PangoEngineShape *engine, - PangoFont *font, - PangoLanguage *language, - gunichar wc); - -PangoEngineShape *_pango_get_fallback_shaper (void) /* XXX got to go when we switch to harfbuzz-only. */; - -G_END_DECLS - -#endif /* __PANGO_ENGINE_PRIVATE_H__ */ - diff --git a/pango/pango-engine.c b/pango/pango-engine.c index 0cd57407..34d09641 100644 --- a/pango/pango-engine.c +++ b/pango/pango-engine.c @@ -60,7 +60,6 @@ #include "config.h" #include "pango-engine.h" -#include "pango-engine-private.h" #include "pango-impl-utils.h" @@ -119,136 +118,3 @@ pango_engine_shape_class_init (PangoEngineShapeClass *class) { class->covers = pango_engine_shape_real_covers; } - -void -_pango_engine_shape_shape (PangoEngineShape *engine, - PangoFont *font, - const char *item_text, - unsigned int item_length, - const char *paragraph_text, - unsigned int paragraph_len, - const PangoAnalysis *analysis, - PangoGlyphString *glyphs) -{ - glyphs->num_glyphs = 0; - - PANGO_ENGINE_SHAPE_GET_CLASS (engine)->script_shape (engine, - font, - item_text, - item_length, - analysis, - glyphs, - paragraph_text, - paragraph_len); -} - -PangoCoverageLevel -_pango_engine_shape_covers (PangoEngineShape *engine, - PangoFont *font, - PangoLanguage *language, - gunichar wc) -{ - if (G_UNLIKELY (!engine || !font)) - return PANGO_COVERAGE_NONE; - - return PANGO_ENGINE_SHAPE_GET_CLASS (engine)->covers (engine, - font, - language, - wc); -} - -/* No extra fields needed */ -typedef PangoEngineShape PangoFallbackEngine; -typedef PangoEngineShapeClass PangoFallbackEngineClass; - -static void -fallback_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, - PangoFont *font G_GNUC_UNUSED, - const char *text, - unsigned int length, - const PangoAnalysis *analysis, - PangoGlyphString *glyphs, - const char *paragraph_text G_GNUC_UNUSED, - unsigned int paragraph_length G_GNUC_UNUSED) -{ - int n_chars; - const char *p; - int cluster = 0; - int i; - - n_chars = text ? pango_utf8_strlen (text, length) : 0; - - pango_glyph_string_set_size (glyphs, n_chars); - - p = text; - for (i = 0; i < n_chars; i++) - { - gunichar wc; - PangoGlyph glyph; - PangoRectangle logical_rect; - - wc = g_utf8_get_char (p); - - if (g_unichar_type (wc) != G_UNICODE_NON_SPACING_MARK) - cluster = p - text; - - if (pango_is_zero_width (wc)) - glyph = PANGO_GLYPH_EMPTY; - else - glyph = PANGO_GET_UNKNOWN_GLYPH (wc); - - pango_font_get_glyph_extents (analysis->font, glyph, NULL, &logical_rect); - - glyphs->glyphs[i].glyph = glyph; - - glyphs->glyphs[i].geometry.x_offset = 0; - glyphs->glyphs[i].geometry.y_offset = 0; - glyphs->glyphs[i].geometry.width = logical_rect.width; - - glyphs->log_clusters[i] = cluster; - - p = g_utf8_next_char (p); - } - - if (analysis->level & 1) - pango_glyph_string_reverse_range (glyphs, 0, glyphs->num_glyphs); -} - -static PangoCoverageLevel -fallback_engine_covers (PangoEngineShape *engine G_GNUC_UNUSED, - PangoFont *font G_GNUC_UNUSED, - PangoLanguage *lang G_GNUC_UNUSED, - gunichar wc G_GNUC_UNUSED) -{ - return PANGO_COVERAGE_NONE; -} - - -static GType pango_fallback_engine_get_type (void); - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS -G_DEFINE_TYPE (PangoFallbackEngine, pango_fallback_engine, PANGO_TYPE_ENGINE_SHAPE); -G_GNUC_END_IGNORE_DEPRECATIONS - -static void -pango_fallback_engine_init (PangoFallbackEngine *self) -{ -} - -static void -pango_fallback_engine_class_init (PangoFallbackEngineClass *class) -{ - class->covers = fallback_engine_covers; - class->script_shape = fallback_engine_shape; -} - -PangoEngineShape * -_pango_get_fallback_shaper (void) -{ - static PangoEngineShape *fallback_shaper = NULL; /* MT-safe */ - if (g_once_init_enter (&fallback_shaper)) - g_once_init_leave(&fallback_shaper, g_object_new (pango_fallback_engine_get_type (), NULL)); - - return fallback_shaper; -} - diff --git a/pango/shape.c b/pango/shape.c index 14078e47..cb969e67 100644 --- a/pango/shape.c +++ b/pango/shape.c @@ -33,7 +33,6 @@ #include "pango-impl-utils.h" #include "pango-glyph.h" -#include "pango-engine-private.h" #include "pangohb-private.h" -- cgit v1.2.1