From 1ab2e4baefaeca28b667415f7609649c2f826a17 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 18 Mar 2020 05:36:49 +0300 Subject: Harfbuzz: get rid of Qt-specific patch in CoreText shaper code this code isn't used as of 21c242f9fd27523d0016b821d0a962231c4bafa6 and thus we do not need to keep the patch around Change-Id: Ic3b836c6a68f40b8e450542a39db968ef3b09101 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/3rdparty/harfbuzz-ng/src/hb-coretext.cc | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/3rdparty/harfbuzz-ng/src') diff --git a/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc b/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc index f4e3ef0a22..8885cfe730 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc +++ b/src/3rdparty/harfbuzz-ng/src/hb-coretext.cc @@ -36,18 +36,6 @@ #include "hb-aat-layout.hh" #include -typedef bool (*qt_get_font_table_func_t) (void *user_data, unsigned int tag, unsigned char *buffer, unsigned int *length); - -struct FontEngineFaceData { - void *user_data; - qt_get_font_table_func_t get_font_table; -}; - -struct CoreTextFontEngineData { - CTFontRef ctFont; - CGFontRef cgFont; -}; - /** * SECTION:hb-coretext @@ -119,7 +107,6 @@ get_last_resort_font_desc () return font_desc; } -#if 0 static void release_data (void *info, const void *data, size_t size) { @@ -128,7 +115,6 @@ release_data (void *info, const void *data, size_t size) hb_blob_destroy ((hb_blob_t *) info); } -#endif static CGFontRef create_cg_font (hb_face_t *face) @@ -140,7 +126,6 @@ create_cg_font (hb_face_t *face) } else { -#if 0 hb_blob_t *blob = hb_face_reference_blob (face); unsigned int blob_length; const char *blob_data = hb_blob_get_data (blob, &blob_length); @@ -155,11 +140,6 @@ create_cg_font (hb_face_t *face) DEBUG_MSG (CORETEXT, face, "Face CGFontCreateWithDataProvider() failed"); CGDataProviderRelease (provider); } -#else - FontEngineFaceData *fontEngineFaceData = (FontEngineFaceData *) face->user_data; - CoreTextFontEngineData *coreTextFontEngineData = (CoreTextFontEngineData *) fontEngineFaceData->user_data; - cg_font = CGFontRetain (coreTextFontEngineData->cgFont); -#endif } return cg_font; } -- cgit v1.2.3