[pango/shape-engine-remnants] Remove unused remnants of shape engine



commit 27534ce56c6d908d1db2c1a168512addedef6c96
Author: Khaled Hosny <khaledhosny eglug org>
Date:   Fri Jul 19 11:56:23 2019 +0200

    Remove unused remnants of shape engine

 docs/meson.build             |   1 -
 pango/pango-context.c        |   1 -
 pango/pango-engine-private.h |  48 ----------------
 pango/pango-engine.c         | 134 -------------------------------------------
 pango/shape.c                |   1 -
 5 files changed, 185 deletions(-)
---
diff --git a/docs/meson.build b/docs/meson.build
index edf04dbe..6f148221 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -15,7 +15,6 @@ private_headers = [
   'pango-coverage-private.h',
   'pango-color-table.h',
   'pango-emoji-private.h',
-  'pango-engine-private.h',
   'pango-font-private.h',
   'pango-fontmap-private.h',
   'pango-fontset-private.h',
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.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"
 


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