OSDN Git Service

remove redundant condition check in QFreetypeFace constructor
authorIvailo Monev <xakepa10@gmail.com>
Fri, 21 Jan 2022 14:18:25 +0000 (14:18 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Fri, 21 Jan 2022 14:18:25 +0000 (14:18 +0000)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/text/qfontengine_ft.cpp

index fbf264d..1064bfd 100644 (file)
@@ -65,14 +65,12 @@ QFreetypeFace::QFreetypeFace(const QFontEngine::FaceId &face_id)
         return;
     }
 
-    if (!face_id.filename.isEmpty()) {
-        QFile file(QString::fromUtf8(face_id.filename));
-        if (!(file.fileEngine()->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag)) {
-            if (!file.open(QIODevice::ReadOnly)) {
-                return;
-            }
-            fontData = file.readAll();
+    QFile file(QString::fromUtf8(face_id.filename));
+    if (!(file.fileEngine()->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag)) {
+        if (!file.open(QIODevice::ReadOnly)) {
+            return;
         }
+        fontData = file.readAll();
     }
     if (!fontData.isEmpty()) {
         if (FT_New_Memory_Face(library, (const FT_Byte *)fontData.constData(), fontData.size(), face_id.index, &face)) {