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

macOS: Use NSURL to resolve FreeType font names instead of CoreFoundation

Browse Source 
Change-Id: I4b397361c483fa07e4e95288f66d7f7ea2df8d9f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2017-03-30 18:48:39 +02:00
parent a7fe6ab891
commit 5b41b34958
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
View File

@ -363,30 +363,6 @@ void QCoreTextFontDatabase::releaseHandle(void *handle)
CFRelease(CTFontDescriptorRef(handle)); CFRelease(CTFontDescriptorRef(handle));
} }
#ifndef QT_NO_FREETYPE
static QByteArray filenameForCFUrl(CFURLRef url)
{
// The on-stack buffer prevents that a QByteArray allocated for the worst case (MAXPATHLEN)
// stays around for the lifetime of the font. Additionally, it helps to move the char
// signedness cast to an acceptable place.
uchar buffer[MAXPATHLEN];
QByteArray filename;
if (!CFURLGetFileSystemRepresentation(url, true, buffer, sizeof(buffer))) {
qWarning("QCoreTextFontDatabase::filenameForCFUrl: could not resolve file for URL %s",
url ? qPrintable(QString::fromCFString(CFURLGetString(url))) : "(null)");
} else {
QCFType<CFStringRef> scheme = CFURLCopyScheme(url);
if (QString::fromCFString(scheme) == QLatin1String("qrc"))
filename = ":";
filename += reinterpret_cast<char *>(buffer);
}
return filename;
}
#endif
extern CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef); extern CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef);
template <> template <>
@ -420,11 +396,16 @@ QFontEngine *QCoreTextFontDatabaseEngineFactory<QFontEngineFT>::fontEngine(const
{ {
CTFontDescriptorRef descriptor = static_cast<CTFontDescriptorRef>(usrPtr); CTFontDescriptorRef descriptor = static_cast<CTFontDescriptorRef>(usrPtr);
QCFType<CFURLRef> url(static_cast<CFURLRef>(CTFontDescriptorCopyAttribute(descriptor, kCTFontURLAttribute)));
QByteArray filename; QByteArray filename;
if (url) if (NSURL *url = [static_cast<NSURL *>(CTFontDescriptorCopyAttribute(descriptor, kCTFontURLAttribute)) autorelease]) {
filename = filenameForCFUrl(url); if ([url.scheme isEqual:@"qrc"])
filename = ":";
else if (!url.fileURL)
qWarning() << "QFontDatabase: Unknown scheme" << url.scheme << "in font descriptor URL";
filename += QString::fromNSString(url.path).toUtf8();
}
Q_ASSERT(!filename.isEmpty());
QFontEngine::FaceId faceId; QFontEngine::FaceId faceId;
faceId.filename = filename; faceId.filename = filename;