whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allocate QGlyphLayout data, when possible 

...and operate directly on a passed array pointers,
without having to copy the input and output data.

Calling QFontEngine:: stringToCMap()/recalcAdvances() with
partially-constructed QGlyphLayout is completely safe
iff `glyphs` and `advances_?` members were initialized.

Also get rid of QGlyphLayoutInstance that was used just in a single place
and never was really needed.

Change-Id: I48fab246fd69fc869f948220a553c3574d93c772
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
bb10
Konstantin Ritt 2013-08-10 23:17:36 +03:00 committed by The Qt Project
parent cb7921a433
commit fe3c34c259
2 changed files with 37 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/gui/text/qfontengine.cpp
View File

@ -71,11 +71,16 @@ static inline bool qtransform_equals_no_translate(const QTransform &a, const QTr
// Harfbuzz helper functions
Q_STATIC_ASSERT(sizeof(HB_Glyph) == sizeof(glyph_t));
Q_STATIC_ASSERT(sizeof(HB_Fixed) == sizeof(QFixed));
static HB_Bool hb_stringToGlyphs(HB_Font font, const HB_UChar16 *string, hb_uint32 length, HB_Glyph *glyphs, hb_uint32 *numGlyphs, HB_Bool rightToLeft)
{
QFontEngine *fe = (QFontEngine *)font->userData;
QVarLengthGlyphLayoutArray qglyphs(*numGlyphs);
QGlyphLayout qglyphs;
qglyphs.numGlyphs = *numGlyphs;
qglyphs.glyphs = glyphs;
QFontEngine::ShaperFlags shaperFlags(QFontEngine::GlyphIndicesOnly);
if (rightToLeft)
@ -84,28 +89,23 @@ static HB_Bool hb_stringToGlyphs(HB_Font font, const HB_UChar16 *string, hb_uint
int nGlyphs = *numGlyphs;
bool result = fe->stringToCMap(reinterpret_cast<const QChar *>(string), length, &qglyphs, &nGlyphs, shaperFlags);
*numGlyphs = nGlyphs;
if (!result)
return false;
for (hb_uint32 i = 0; i < *numGlyphs; ++i)
glyphs[i] = qglyphs.glyphs[i];
return true;
return result;
}
static void hb_getAdvances(HB_Font font, const HB_Glyph *glyphs, hb_uint32 numGlyphs, HB_Fixed *advances, int flags)
{
QFontEngine *fe = (QFontEngine *)font->userData;
QVarLengthGlyphLayoutArray qglyphs(numGlyphs);
QVarLengthArray<QFixed> advances_y(numGlyphs);
for (hb_uint32 i = 0; i < numGlyphs; ++i)
qglyphs.glyphs[i] = glyphs[i];
QGlyphLayout qglyphs;
qglyphs.numGlyphs = numGlyphs;
qglyphs.glyphs = const_cast<glyph_t *>(glyphs);
qglyphs.advances_x = reinterpret_cast<QFixed *>(advances);
qglyphs.advances_y = advances_y.data(); // not used
fe->recalcAdvances(&qglyphs, (flags & HB_ShaperFlag_UseDesignMetrics) ? QFontEngine::DesignMetrics : QFontEngine::ShaperFlags(0));
for (hb_uint32 i = 0; i < numGlyphs; ++i)
advances[i] = qglyphs.advances_x[i].value();
}
static HB_Bool hb_canRender(HB_Font font, const HB_UChar16 *string, hb_uint32 length)
@ -1439,9 +1439,11 @@ bool QFontEngineMulti::stringToCMap(const QChar *str, int len,
bool surrogate = (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate());
uint ucs4 = surrogate ? QChar::surrogateToUcs4(str[i], str[i+1]) : str[i].unicode();
if (glyphs->glyphs[glyph_pos] == 0 && str[i].category() != QChar::Separator_Line) {
QGlyphLayoutInstance tmp;
if (!(flags & GlyphIndicesOnly))
tmp = glyphs->instance(glyph_pos);
QFixedPoint tmpAdvance;
if (!(flags & GlyphIndicesOnly)) {
tmpAdvance.x = glyphs->advances_x[glyph_pos];
tmpAdvance.y = glyphs->advances_y[glyph_pos];
}
for (int x=1; x < engines.size(); ++x) {
if (engines.at(x) == 0 && !shouldLoadFontEngineForCharacter(x, ucs4))
continue;
@ -1455,10 +1457,8 @@ bool QFontEngineMulti::stringToCMap(const QChar *str, int len,
if (engine->type() == Box)
continue;
if (!(flags & GlyphIndicesOnly)) {
if (!(flags & GlyphIndicesOnly))
glyphs->advances_x[glyph_pos] = glyphs->advances_y[glyph_pos] = 0;
glyphs->offsets[glyph_pos] = QFixedPoint();
}
int num = 2;
QGlyphLayout offs = glyphs->mid(glyph_pos, num);
engine->stringToCMap(str + i, surrogate ? 2 : 1, &offs, &num, flags);
@ -1471,8 +1471,10 @@ bool QFontEngineMulti::stringToCMap(const QChar *str, int len,
}
// ensure we use metrics from the 1st font when we use the fallback image.
if (!(flags & GlyphIndicesOnly) && !glyphs->glyphs[glyph_pos])
glyphs->setInstance(glyph_pos, tmp);
if (!(flags & GlyphIndicesOnly) && glyphs->glyphs[glyph_pos] == 0) {
glyphs->advances_x[glyph_pos] = tmpAdvance.x;
glyphs->advances_y[glyph_pos] = tmpAdvance.y;
}
}
if (surrogate)
@ -1774,22 +1776,27 @@ bool QFontEngineMulti::canRender(const QChar *string, int len)
if (engine(0)->canRender(string, len))
return true;
QVarLengthGlyphLayoutArray glyphs(len);
int nglyphs = len;
if (!stringToCMap(string, len, &glyphs, &nglyphs, GlyphIndicesOnly)) {
QVarLengthArray<glyph_t> glyphs(nglyphs);
QGlyphLayout g;
g.numGlyphs = nglyphs;
g.glyphs = glyphs.data();
if (!stringToCMap(string, len, &g, &nglyphs, GlyphIndicesOnly)) {
glyphs.resize(nglyphs);
stringToCMap(string, len, &glyphs, &nglyphs, GlyphIndicesOnly);
g.numGlyphs = nglyphs;
g.glyphs = glyphs.data();
if (!stringToCMap(string, len, &g, &nglyphs, GlyphIndicesOnly))
Q_ASSERT_X(false, Q_FUNC_INFO, "stringToCMap shouldn't fail twice");
}
bool allExist = true;
for (int i = 0; i < nglyphs; i++) {
if (!glyphs.glyphs[i]) {
allExist = false;
break;
}
if (g.glyphs[i] == 0)
return false;
}
return allExist;
return true;
}
/* Implement alphaMapForGlyph() which is called by Lighthouse/Windows code.

31
src/gui/text/qtextengine_p.h
View File

@ -188,15 +188,6 @@ struct QGlyphJustification
};
Q_DECLARE_TYPEINFO(QGlyphJustification, Q_PRIMITIVE_TYPE);
struct QGlyphLayoutInstance
{
QFixedPoint offset;
QFixedPoint advance;
glyph_t glyph;
QGlyphJustification justification;
QGlyphAttributes attributes;
};
struct QGlyphLayout
{
// init to 0 not needed, done when shaping
@ -251,28 +242,6 @@ struct QGlyphLayout
inline QFixed effectiveAdvance(int item) const
{ return (advances_x[item] + QFixed::fromFixed(justifications[item].space_18d6)) * !attributes[item].dontPrint; }
inline QGlyphLayoutInstance instance(int position) const {
QGlyphLayoutInstance g;
g.offset.x = offsets[position].x;
g.offset.y = offsets[position].y;
g.glyph = glyphs[position];
g.advance.x = advances_x[position];
g.advance.y = advances_y[position];
g.justification = justifications[position];
g.attributes = attributes[position];
return g;
}
inline void setInstance(int position, const QGlyphLayoutInstance &g) {
offsets[position].x = g.offset.x;
offsets[position].y = g.offset.y;
glyphs[position] = g.glyph;
advances_x[position] = g.advance.x;
advances_y[position] = g.advance.y;
justifications[position] = g.justification;
attributes[position] = g.attributes;
}
inline void clear(int first = 0, int last = -1) {
if (last == -1)
last = numGlyphs;