From faa9cf974946285c604f1a4dfe5f11d3761f607c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 Jul 2022 10:35:05 +0200 Subject: [PATCH] QFontSubset: remove unused glyphName() overload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amends b7f3253f906594ec1971fbea3a5760dcf8f01cdd(!). Change-Id: I39dd2efee241afc2a57d0eb614d3a396fef95b9e Reviewed-by: Tor Arne Vestbø (cherry picked from commit 215f0e4ea631e6abe6653c80fb375d806b78c158) Reviewed-by: Qt Cherry-pick Bot --- src/gui/text/qfontsubset.cpp | 18 ------------------ src/gui/text/qfontsubset_p.h | 1 - 2 files changed, 19 deletions(-) diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp index f28cc72258e..44d117db26f 100644 --- a/src/gui/text/qfontsubset.cpp +++ b/src/gui/text/qfontsubset.cpp @@ -78,24 +78,6 @@ QByteArray QFontSubset::glyphName(unsigned short unicode, bool symbol) return buffer; } -QByteArray QFontSubset::glyphName(unsigned int glyph, const QList &reverseMap) const -{ - uint glyphIndex = glyph_indices[glyph]; - - if (glyphIndex == 0) - return "/.notdef"; - - QByteArray ba; - QPdf::ByteStream s(&ba); - if (reverseMap[glyphIndex] && reverseMap[glyphIndex] < 0x10000) { - s << '/' << glyphName(reverseMap[glyphIndex], false); - } else { - s << "/gl" << (int)glyphIndex; - } - return ba; -} - - QByteArray QFontSubset::widthArray() const { Q_ASSERT(!widths.isEmpty()); diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h index 1cd24aa73d9..01108dcc7f3 100644 --- a/src/gui/text/qfontsubset_p.h +++ b/src/gui/text/qfontsubset_p.h @@ -41,7 +41,6 @@ public: QByteArray widthArray() const; QByteArray createToUnicodeMap() const; QList getReverseMap() const; - QByteArray glyphName(unsigned int glyph, const QList &reverseMap) const; static QByteArray glyphName(unsigned short unicode, bool symbol);