Changeset 561 for trunk/src/gui/text/qfontengine_qpf.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qfontengine_qpf.cpp (modified) (22 diffs)

trunk/src/gui/text/qfontengine_qpf.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -52 +52 @@
 #include "private/qfontengine_ft_p.h"
 #endif
+#include "private/qcore_unix_p.h" // overrides QT_OPEN
 
 // for mmap
@@ -66 +67 @@
 #ifndef QT_NO_QWS_QPF2
 
+#include "qpfutil.cpp"
+
 QT_BEGIN_INCLUDE_NAMESPACE
-#include "qpfutil.cpp"
 
 #if defined(Q_WS_QWS)
@@ -253 +255 @@
         const QByteArray fileName = QFile::encodeName(dir.absoluteFilePath(dir[i]));
 
-        int fd = ::open(fileName.constData(), O_RDONLY);
+        int fd = QT_OPEN(fileName.constData(), O_RDONLY, 0);
         if (fd >= 0) {
             void *header = ::mmap(0, sizeof(QFontEngineQPF::Header), PROT_READ, MAP_SHARED, fd, 0);
@@ -266 +268 @@
                 ::munmap(header, sizeof(QFontEngineQPF::Header));
             }
-            ::close(fd);
+            QT_CLOSE(fd);
         }
     }
@@ -309 +311 @@
 
 #if defined(DEBUG_FONTENGINE)
-    qDebug() << "QFontEngineQPF::QFontEngineQPF( fd =" << fd << ", renderingFontEngine =" << renderingFontEngine << ")";
+    qDebug() << "QFontEngineQPF::QFontEngineQPF( fd =" << fd << ", renderingFontEngine =" << renderingFontEngine << ')';
 #endif
 
@@ -317 +319 @@
             return;
 
-        fileName = fontDef.family.toLower() + QLatin1String("_")
+        fileName = fontDef.family.toLower() + QLatin1Char('_')
                    + QString::number(fontDef.pixelSize)
-                   + QLatin1String("_") + QString::number(fontDef.weight)
+                   + QLatin1Char('_') + QString::number(fontDef.weight)
                    + (fontDef.style != QFont::StyleNormal ?
                       QLatin1String("_italic") : QLatin1String(""))
@@ -326 +328 @@
         fileName.prepend(qws_fontCacheDir());
 
-        const QByteArray encodedName = QFile::encodeName(fileName);
-        if (::access(encodedName, F_OK) == 0) {
+        encodedFileName = QFile::encodeName(fileName);
+        if (::access(encodedFileName, F_OK) == 0) {
 #if defined(DEBUG_FONTENGINE)
             qDebug() << "found existing qpf:" << fileName;
 #endif
-            if (::access(encodedName, W_OK | R_OK) == 0)
-                fd = ::open(encodedName, O_RDWR);
-            else if (::access(encodedName, R_OK) == 0)
-                fd = ::open(encodedName, O_RDONLY);
+            if (::access(encodedFileName, W_OK | R_OK) == 0) {
+                fd = QT_OPEN(encodedFileName, O_RDWR);
+            }
+            // read-write access failed - try read-only access
+            if (fd == -1 && ::access(encodedFileName, R_OK) == 0) {
+                fd = QT_OPEN(encodedFileName, O_RDONLY);
+                if (fd == -1) {
+#if defined(DEBUG_FONTENGINE)
+                    qErrnoWarning("QFontEngineQPF: unable to open %s", encodedName.constData());
+#endif
+                    return;
+                }
+            }
+            if (fd == -1) {
+#if defined(DEBUG_FONTENGINE)
+                qWarning("QFontEngineQPF: insufficient access rights to %s", encodedName.constData());
+#endif
+                return;
+            }
         } else {
 #if defined(DEBUG_FONTENGINE)
@@ -340 +357 @@
 #endif
             if (::access(QFile::encodeName(qws_fontCacheDir()), W_OK) == 0) {
-                fd = ::open(encodedName, O_RDWR | O_EXCL | O_CREAT, 0644);
+                fd = QT_OPEN(encodedFileName, O_RDWR | O_EXCL | O_CREAT, 0644);
+                if (fd == -1) {
+#if defined(DEBUG_FONTENGINE)
+                    qErrnoWarning(errno, "QFontEngineQPF: open() failed for %s", encodedName.constData());
+#endif
+                    return;
+                }
 
                 QBuffer buffer;
@@ -348 +371 @@
                 buffer.close();
                 const QByteArray &data = buffer.data();
-                ::write(fd, data.constData(), data.size());
+                if (QT_WRITE(fd, data.constData(), data.size()) == -1) {
+#if defined(DEBUG_FONTENGINE)
+                    qErrnoWarning(errno, "QFontEngineQPF: write() failed for %s", encodedName.constData());
+#endif
+                    return;
+                }
+            } else {
+#if defined(DEBUG_FONTENGINE)
+                qErrnoWarning(errno, "QFontEngineQPF: access() failed for %s", qPrintable(qws_fontCacheDir()));
+#endif
+                return;
             }
         }
@@ -356 +389 @@
     if (QT_FSTAT(fd, &st)) {
 #if defined(DEBUG_FONTENGINE)
-        qDebug() << "stat failed!";
+        qErrnoWarning(errno, "QFontEngineQPF: fstat failed!");
 #endif
         return;
@@ -475 +508 @@
 #if defined(Q_WS_QWS)
     if (isValid() && renderingFontEngine)
-        qt_fbdpy->sendFontCommand(QWSFontCommand::StartedUsingFont, QFile::encodeName(fileName));
+        qt_fbdpy->sendFontCommand(QWSFontCommand::StartedUsingFont, encodedFileName);
 #endif
 }
@@ -482 +515 @@
 {
 #if defined(Q_WS_QWS)
-    if (isValid() && renderingFontEngine)
-        qt_fbdpy->sendFontCommand(QWSFontCommand::StoppedUsingFont, QFile::encodeName(fileName));
+    if (isValid() && renderingFontEngine) {
+        QT_TRY {
+            qt_fbdpy->sendFontCommand(QWSFontCommand::StoppedUsingFont, encodedFileName);
+        } QT_CATCH(...) {
+            qDebug("QFontEngineQPF::~QFontEngineQPF: Out of memory");
+            // ignore.
+        }
+    }
 #endif
     delete renderingFontEngine;
-    if (fontData)
-        munmap((void *)fontData, dataSize);
+    if (fontData) {
+        if (munmap((void *)fontData, dataSize) == -1) {
+#if defined(DEBUG_FONTENGINE)
+            qErrnoWarning(errno, "~QFontEngineQPF: Unable to munmap");
+#endif
+        }
+    }
     if (fd != -1)
         ::close(fd);
@@ -551 +595 @@
             QChar c(uc);
             if (!findGlyph(glyphs[glyph_pos].glyph) && !seenGlyphs.contains(c))
-                qDebug() << "glyph for character" << c << "/" << hex << uc << "is" << dec << glyphs[glyph_pos].glyph;
+                qDebug() << "glyph for character" << c << '/' << hex << uc << "is" << dec << glyphs[glyph_pos].glyph;
 
             seenGlyphs.insert(c);
@@ -585 +629 @@
     const Glyph *glyph = findGlyph(g);
     if (!glyph)
-        QImage();
+        return QImage();
 
     const uchar *bits = ((const uchar *) glyph) + sizeof(Glyph);
@@ -591 +635 @@
     QImage image(glyph->width, glyph->height, QImage::Format_Indexed8);
     for (int j=0; j<256; ++j)
-        image.setColor(j, 0xff000000 | j | (j<<8) | (j<<16));
+        image.setColor(j, qRgba(0, 0, 0, j));
 
     for (int i=0; i<glyph->height; ++i) {
@@ -776 +820 @@
 
     // ### not perfect
-    const int ysize = fontDef.pixelSize << 6;
+    const int ysize = qRound(fontDef.pixelSize * qreal(64));
     const int xsize = ysize;
 
@@ -894 +938 @@
     g.advance = qRound(metrics.xoff);
 
-    ::write(fd, &g, sizeof(g));
-    ::write(fd, img.bits(), img.numBytes());
+    QT_WRITE(fd, &g, sizeof(g));
+    QT_WRITE(fd, img.bits(), img.byteCount());
 
     glyphPos = oldSize - glyphDataOffset;
@@ -905 +949 @@
     gmap[glyph] = qToBigEndian(glyphPos);
 
-    glyphDataSize = glyphPos + sizeof(g) + img.numBytes();
+    glyphDataSize = glyphPos + sizeof(g) + img.byteCount();
     quint32 *blockSizePtr = (quint32 *)(fontData + glyphDataOffset - 4);
     *blockSizePtr = qToBigEndian(glyphDataSize);
@@ -1129 +1173 @@
 #endif // QT_NO_QWS_QPF2
 
+/*
+    Creates a new multi qws engine.
+
+    This function takes ownership of the QFontEngine, increasing it's refcount.
+*/
 QFontEngineMultiQWS::QFontEngineMultiQWS(QFontEngine *fe, int _script, const QStringList &fallbacks)
     : QFontEngineMulti(fallbacks.size() + 1),