[pango/shape-engine-remnants: 1/2] Remove now unused platform shaping code



commit e62e0953e5a4153e194ca18fe5607c70d6011455
Author: Khaled Hosny <khaledhosny eglug org>
Date:   Fri Jul 19 11:52:13 2019 +0200

    Remove now unused platform shaping code

 pango/meson.build             |   5 -
 pango/pangocoretext-private.h |   9 -
 pango/pangocoretext-shape.c   | 554 ------------------------------
 pango/pangowin32-private.h    |  10 -
 pango/pangowin32-shape.c      | 775 ------------------------------------------
 5 files changed, 1353 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index cfbf8a9a..1327ca39 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -340,14 +340,10 @@ if host_system == 'windows'
     'pangowin32.c',
     'pangowin32-fontcache.c',
     'pangowin32-fontmap.c',
-    'pangowin32-shape.c',
   ]
 
-  # usp10 needs to be before gdi32
-  # see https://bugzilla.gnome.org/show_bug.cgi?id=795045#c0
   pangowin32_deps = pango_deps + [
     libpango_dep,
-    cc.find_library('usp10'),
     cc.find_library('gdi32'),
   ]
 
@@ -441,7 +437,6 @@ if cairo_dep.found()
     pangocairo_sources += [
       'pangocoretext.c',
       'pangocoretext-fontmap.c',
-      'pangocoretext-shape.c',
       'pangocairo-coretextfont.c',
       'pangocairo-coretextfontmap.c',
     ]
diff --git a/pango/pangocoretext-private.h b/pango/pangocoretext-private.h
index a652f520..57d26937 100644
--- a/pango/pangocoretext-private.h
+++ b/pango/pangocoretext-private.h
@@ -155,15 +155,6 @@ PangoGravity          pango_core_text_font_key_get_gravity          (const Pango
 _PANGO_EXTERN
 CTFontDescriptorRef   pango_core_text_font_key_get_ctfontdescriptor (const PangoCoreTextFontKey *key);
 
-void
-_pango_core_text_shape (PangoFont           *font,
-                       const char          *text,
-                       gint                 length,
-                       const PangoAnalysis *analysis,
-                       PangoGlyphString    *glyphs,
-                       const char          *paragraph_text G_GNUC_UNUSED,
-                       unsigned int         paragraph_length G_GNUC_UNUSED);
-
 G_END_DECLS
 
 #endif /* __PANGOCORETEXT_PRIVATE_H__ */
diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h
index fd102413..65f9de05 100644
--- a/pango/pangowin32-private.h
+++ b/pango/pangowin32-private.h
@@ -284,16 +284,6 @@ gboolean   _pango_win32_get_name_record        (HDC                 hdc,
 _PANGO_EXTERN
 HFONT          _pango_win32_font_get_hfont         (PangoFont          *font);
 
-_PANGO_EXTERN
-void
-_pango_win32_shape (PangoFont          *font,
-                   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);
-
 extern HDC _pango_win32_hdc;
 extern OSVERSIONINFO _pango_win32_os_version_info;
 extern gboolean _pango_win32_debug;


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