1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFontEngineQPA: Get rid of unused externalCMap

Browse Source 
It seems to be a leftover after dropping the QPF1 font engine.

Change-Id: If8d3e1447fab9d042a85195d7bdb4d9811c37c6e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2014-03-05 09:30:58 +02:00 committed by The Qt Project
parent 94d0f7c3d3
commit cfb4581fee
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/text/qfontengine_qpa.cpp
View File

@ -242,7 +242,7 @@ QFontEngineQPA::QFontEngineQPA(const QFontDef &def, const QByteArray &data)
{ {
fontDef = def; fontDef = def;
cache_cost = 100; cache_cost = 100;
externalCMap = 0; cmap = 0;
cmapOffset = 0; cmapOffset = 0;
cmapSize = 0; cmapSize = 0;
glyphMapOffset = 0; glyphMapOffset = 0;
@ -293,15 +293,8 @@ QFontEngineQPA::QFontEngineQPA(const QFontDef &def, const QByteArray &data)
// get the real cmap // get the real cmap
if (cmapOffset) { if (cmapOffset) {
int tableSize = cmapSize; cmap = QFontEngine::getCMap(fontData + cmapOffset, cmapSize, &symbol, &cmapSize);
const uchar *cmapPtr = getCMap(fontData + cmapOffset, tableSize, &symbol, &cmapSize); cmapOffset = cmap ? cmap - fontData : 0;
if (cmapPtr)
cmapOffset = cmapPtr - fontData;
else
cmapOffset = 0;
} else if (externalCMap) {
int tableSize = cmapSize;
externalCMap = getCMap(externalCMap, tableSize, &symbol, &cmapSize);
} }
// verify all the positions in the glyphMap // verify all the positions in the glyphMap
@ -323,7 +316,7 @@ QFontEngineQPA::QFontEngineQPA(const QFontDef &def, const QByteArray &data)
#if defined(DEBUG_FONTENGINE) #if defined(DEBUG_FONTENGINE)
if (!isValid()) if (!isValid())
qDebug() << "fontData" << fontData << "dataSize" << dataSize qDebug() << "fontData" << fontData << "dataSize" << dataSize
<< "externalCMap" << externalCMap << "cmapOffset" << cmapOffset << "cmap" << cmap << "cmapOffset" << cmapOffset
<< "glyphMapOffset" << glyphMapOffset << "glyphDataOffset" << glyphDataOffset << "glyphMapOffset" << glyphMapOffset << "glyphDataOffset" << glyphDataOffset
<< "fd" << fd << "glyphDataSize" << glyphDataSize; << "fd" << fd << "glyphDataSize" << glyphDataSize;
#endif #endif
@ -347,8 +340,6 @@ bool QFontEngineQPA::getSfntTableData(uint tag, uchar *buffer, uint *length) con
glyph_t QFontEngineQPA::glyphIndex(uint ucs4) const glyph_t QFontEngineQPA::glyphIndex(uint ucs4) const
{ {
const uchar *cmap = externalCMap ? externalCMap : (fontData + cmapOffset);
glyph_t glyph = getTrueTypeGlyphIndex(cmap, ucs4); glyph_t glyph = getTrueTypeGlyphIndex(cmap, ucs4);
if (glyph == 0 && symbol && ucs4 < 0x100) if (glyph == 0 && symbol && ucs4 < 0x100)
glyph = getTrueTypeGlyphIndex(cmap, ucs4 + 0xf000); glyph = getTrueTypeGlyphIndex(cmap, ucs4 + 0xf000);
@ -370,8 +361,6 @@ bool QFontEngineQPA::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
QSet<QChar> seenGlyphs; QSet<QChar> seenGlyphs;
#endif #endif
const uchar *cmap = externalCMap ? externalCMap : (fontData + cmapOffset);
int glyph_pos = 0; int glyph_pos = 0;
if (symbol) { if (symbol) {
for (int i = 0; i < len; ++i) { for (int i = 0; i < len; ++i) {
@ -517,7 +506,7 @@ QFixed QFontEngineQPA::lineThickness() const
bool QFontEngineQPA::isValid() const bool QFontEngineQPA::isValid() const
{ {
return fontData && dataSize && (cmapOffset || externalCMap) return fontData && dataSize && cmapOffset
&& glyphMapOffset && glyphDataOffset && glyphDataSize > 0; && glyphMapOffset && glyphDataOffset && glyphDataSize > 0;
} }

2
src/gui/text/qfontengine_qpa_p.h
View File

@ -195,7 +195,7 @@ private:
const uchar *fontData; const uchar *fontData;
int dataSize; int dataSize;
const uchar *externalCMap; const uchar *cmap;
quint32 cmapOffset; quint32 cmapOffset;
int cmapSize; int cmapSize;
quint32 glyphMapOffset; quint32 glyphMapOffset;