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

Fix indentation and move some variables around

Browse Source 
Change-Id: Ice1987242d288b0b18e77c647153e6d133135896
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Konstantin Ritt 2015-02-15 02:30:41 +04:00
parent 0eec8c86b6
commit 071b286756
1 changed files with 57 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
View File

@ -1661,13 +1661,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
int dpi, int dpi,
const QSharedPointer<QWindowsFontEngineData> &data) const QSharedPointer<QWindowsFontEngineData> &data)
{ {
LOGFONT lf;
memset(&lf, 0, sizeof(LOGFONT));
bool preferClearTypeAA = false;
HFONT hfont = 0;
#if !defined(QT_NO_DIRECTWRITE) #if !defined(QT_NO_DIRECTWRITE)
bool useDirectWrite = (request.hintingPreference == QFont::PreferNoHinting) bool useDirectWrite = (request.hintingPreference == QFont::PreferNoHinting)
|| (request.hintingPreference == QFont::PreferVerticalHinting); || (request.hintingPreference == QFont::PreferVerticalHinting);
@ -1676,10 +1669,10 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
bool useDirectWrite = false; bool useDirectWrite = false;
#endif #endif
{ LOGFONT lf = fontDefToLOGFONT(request);
lf = fontDefToLOGFONT(request); const bool preferClearTypeAA = lf.lfQuality == CLEARTYPE_QUALITY;
preferClearTypeAA = lf.lfQuality == CLEARTYPE_QUALITY;
HFONT hfont = 0;
hfont = CreateFontIndirect(&lf); hfont = CreateFontIndirect(&lf);
if (!hfont) if (!hfont)
qErrnoWarning("%s: CreateFontIndirect failed", __FUNCTION__); qErrnoWarning("%s: CreateFontIndirect failed", __FUNCTION__);
@ -1699,21 +1692,20 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
if (hfont && (!ttf || request.stretch != 100)) { if (hfont && (!ttf || request.stretch != 100)) {
DeleteObject(hfont); DeleteObject(hfont);
if (!res) if (!res)
qErrnoWarning("QFontEngine::loadEngine: GetTextMetrics failed"); qErrnoWarning("%s: GetTextMetrics failed", __FUNCTION__);
lf.lfWidth = avWidth * request.stretch/100; lf.lfWidth = avWidth * request.stretch/100;
hfont = CreateFontIndirect(&lf); hfont = CreateFontIndirect(&lf);
if (!hfont) if (!hfont)
qErrnoWarning("%s: CreateFontIndirect with stretch failed", __FUNCTION__); qErrnoWarning("%s: CreateFontIndirect with stretch failed", __FUNCTION__);
} }
if (hfont == 0) if (!hfont)
hfont = QWindowsFontDatabase::systemFont(); hfont = QWindowsFontDatabase::systemFont();
} }
#if !defined(QT_NO_DIRECTWRITE) #if !defined(QT_NO_DIRECTWRITE)
else { else {
// Default to false for DirectWrite (and re-enable once/if everything // Default to false for DirectWrite (and re-enable once/if everything turns out okay)
// turns out okay)
useDirectWrite = false; useDirectWrite = false;
if (initDirectWrite(data.data())) { if (initDirectWrite(data.data())) {
const QString fam = QString::fromWCharArray(lf.lfFaceName); const QString fam = QString::fromWCharArray(lf.lfFaceName);
@ -1724,9 +1716,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
lf.lfFaceName[nameSubstituteLength] = 0; lf.lfFaceName[nameSubstituteLength] = 0;
} }
HRESULT hr = data->directWriteGdiInterop->CreateFontFromLOGFONT( HRESULT hr = data->directWriteGdiInterop->CreateFontFromLOGFONT(&lf, &directWriteFont);
&lf,
&directWriteFont);
if (FAILED(hr)) { if (FAILED(hr)) {
qErrnoWarning("%s: CreateFontFromLOGFONT failed", __FUNCTION__); qErrnoWarning("%s: CreateFontFromLOGFONT failed", __FUNCTION__);
} else { } else {
@ -1736,7 +1726,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
} }
} }
#endif #endif
}
QFontEngine *fe = 0; QFontEngine *fe = 0;
if (!useDirectWrite) { if (!useDirectWrite) {
@ -1760,10 +1749,10 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
} else { } else {
qErrnoWarning("%s: CreateFontFace failed", __FUNCTION__); qErrnoWarning("%s: CreateFontFace failed", __FUNCTION__);
} }
directWriteFont->Release();
} }
if (directWriteFont != 0)
directWriteFont->Release();
#endif #endif
return fe; return fe;