Calling QString::fromUcs4() for the single UCS-4 -encoded character is quite suboptimal
since the BOM detections and the resulting QString aren't really used;
all we need is to split the UCS-4 code point into the UCS-2 surrogate pair.
Change-Id: Ia5b68312909bf551cf2493d9e2752a7d7d837fb9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
virtual const char *name() const = 0;
virtual bool canRender(const QChar *string, int len) = 0;
+ inline bool canRender(uint ucs4) {
+ QChar utf16[2];
+ int utf16len = 1;
+ if (QChar::requiresSurrogates(ucs4)) {
+ utf16[0] = QChar::highSurrogate(ucs4);
+ utf16[1] = QChar::lowSurrogate(ucs4);
+ ++utf16len;
+ } else {
+ utf16[0] = QChar(ucs4);
+ }
+ return canRender(utf16, utf16len);
+ }
virtual Type type() const = 0;
Q_ASSERT(engine != 0);
if (engine->type() == QFontEngine::Box)
return false;
- QString utf16 = QString::fromUcs4(&ucs4, 1);
- return engine->canRender(utf16.data(), utf16.length());
+ return engine->canRender(ucs4);
}
/*!
Q_ASSERT(engine != 0);
if (engine->type() == QFontEngine::Box)
return false;
- QString utf16 = QString::fromUcs4(&ucs4, 1);
- return engine->canRender(utf16.data(), utf16.length());
+ return engine->canRender(ucs4);
}
/*!
}
/*!
+ \overload
+
Returns true if the font has a glyph that corresponds to the UCS-4 encoded character \a ucs4.
\sa supportedWritingSystems()
*/
-bool QRawFont::supportsCharacter(quint32 ucs4) const
+bool QRawFont::supportsCharacter(uint ucs4) const
{
- if (!d->isValid())
- return false;
-
- QString str = QString::fromUcs4(&ucs4, 1);
- return d->fontEngine->canRender(str.constData(), str.size());
+ return d->isValid() && d->fontEngine->canRender(ucs4);
}
// qfontdatabase.cpp
qreal pixelSize,
QFont::HintingPreference hintingPreference);
- bool supportsCharacter(quint32 ucs4) const;
+ bool supportsCharacter(uint ucs4) const;
bool supportsCharacter(QChar character) const;
QList<QFontDatabase::WritingSystem> supportedWritingSystems() const;