AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[QFontEngineFT] Move code around to improve readability (no-op)

Browse Source 
Move some variables initialization closer to the usage context.

Change-Id: I0f1de0ddc9f0fbe3ec4a56455ccc14f9e8d94e5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2015-03-07 06:01:13 +04:00
parent 037ad03182
commit 550fb85b65
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/gui/text/qfontengine_ft.cpp
View File

@ -808,13 +808,9 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
{ {
// Q_ASSERT(freetype->lock == 1); // Q_ASSERT(freetype->lock == 1);
if (format == Format_None) { if (format == Format_None)
if (defaultFormat != Format_None) { format = defaultFormat != Format_None ? defaultFormat : Format_Mono;
format = defaultFormat; Q_ASSERT(format != Format_None);
} else {
format = Format_Mono;
}
}
Glyph *g = set ? set->getGlyph(glyph, subPixelPosition) : 0; Glyph *g = set ? set->getGlyph(glyph, subPixelPosition) : 0;
if (g && g->format == format && (fetchMetricsOnly || g->data)) if (g && g->format == format && (fetchMetricsOnly || g->data))
@ -823,32 +819,28 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
if (!g && set && set->isGlyphMissing(glyph)) if (!g && set && set->isGlyphMissing(glyph))
return &emptyGlyph; return &emptyGlyph;
QFontEngineFT::GlyphInfo info;
Q_ASSERT(format != Format_None); FT_Face face = freetype->face;
FT_Matrix matrix = freetype->matrix;
FT_Vector v;
v.x = format == Format_Mono ? 0 : FT_Pos(subPixelPosition.value());
v.y = 0;
FT_Set_Transform(face, &matrix, &v);
bool hsubpixel = false; bool hsubpixel = false;
int vfactor = 1; int vfactor = 1;
int load_flags = loadFlags(set, format, 0, hsubpixel, vfactor); int load_flags = loadFlags(set, format, 0, hsubpixel, vfactor);
if (format != Format_Mono && !embeddedbitmap)
load_flags |= FT_LOAD_NO_BITMAP;
FT_Matrix matrix = freetype->matrix;
bool transform = matrix.xx != 0x10000 bool transform = matrix.xx != 0x10000
|| matrix.yy != 0x10000 || matrix.yy != 0x10000
|| matrix.xy != 0 || matrix.xy != 0
|| matrix.yx != 0; || matrix.yx != 0;
if (transform) if (transform || (format != Format_Mono && !embeddedbitmap))
load_flags |= FT_LOAD_NO_BITMAP; load_flags |= FT_LOAD_NO_BITMAP;
FT_Face face = freetype->face;
FT_Vector v;
v.x = format == Format_Mono ? 0 : FT_Pos(subPixelPosition.toReal() * 64);
v.y = 0;
FT_Set_Transform(face, &freetype->matrix, &v);
FT_Error err = FT_Load_Glyph(face, glyph, load_flags); FT_Error err = FT_Load_Glyph(face, glyph, load_flags);
if (err && (load_flags & FT_LOAD_NO_BITMAP)) { if (err && (load_flags & FT_LOAD_NO_BITMAP)) {
load_flags &= ~FT_LOAD_NO_BITMAP; load_flags &= ~FT_LOAD_NO_BITMAP;
@ -892,6 +884,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
FT_Matrix_Multiply(&m, &matrix); FT_Matrix_Multiply(&m, &matrix);
} }
GlyphInfo info;
info.xOff = TRUNC(ROUND(slot->advance.x)); info.xOff = TRUNC(ROUND(slot->advance.x));
info.yOff = 0; info.yOff = 0;