Changeset 846 for trunk/src/gui/text/qfontdatabase.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qfontdatabase.cpp (modified) (11 diffs)

trunk/src/gui/text/qfontdatabase.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -149 +149 @@
 struct QtFontSize
 {
-    unsigned short pixelSize;
-
 #ifdef Q_WS_X11
-    int count;
     QtFontEncoding *encodings;
     QtFontEncoding *encodingID(int id, uint xpoint = 0, uint xres = 0,
                                 uint yres = 0, uint avgwidth = 0, bool add = false);
+
 #endif // Q_WS_X11
 #ifdef Q_WS_PM
@@ -164 +162 @@
     int fileIndex;
 #endif // defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+
+
 };
 
@@ -294 +294 @@
         return 0;
 
-    if (!(count % 8)) {
+    if (!pixelSizes) {
+        // Most style have only one font size, we avoid waisting memory
+        QtFontSize *newPixelSizes = (QtFontSize *)malloc(sizeof(QtFontSize));
+        Q_CHECK_PTR(newPixelSizes);
+        pixelSizes = newPixelSizes;
+    } else if (!(count % 8) || count == 1) {
         QtFontSize *newPixelSizes = (QtFontSize *)
                      realloc(pixelSizes,
@@ -421 +426 @@
 #endif
 #ifdef Q_WS_X11
-    bool symbol_checked;
+    bool symbol_checked;
 #endif
 
@@ -635 +640 @@
     ~QFontDatabasePrivate() {
         free();
+
+
+
+
     }
     QtFontFamily *family(const QString &f, bool = false);
@@ -643 +652 @@
         families = 0;
         count = 0;
-#if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE)
-        if (symbianExtras) {
-            delete symbianExtras;
-            symbianExtras = 0;
-        }
-#endif
         // don't clear the memory fonts!
     }
@@ -664 +667 @@
 #elif defined(Q_WS_MAC)
         ATSFontContainerRef handle;
+
+
+
+
 #endif
         QStringList families;
@@ -691 +698 @@
     QStringList fallbackFamilies;
 #elif defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE)
-    const QSymbianFontDatabaseExtras *symbianExtras;
+    QSymbianFontDatabaseExtras *symbianExtras;
 #endif
 
@@ -2592 +2599 @@
     currently not supported.
 
+
+
     \sa addApplicationFontFromData(), applicationFontFamilies(), removeApplicationFont()
 */
@@ -2622 +2631 @@
     currently not supported.
 
+
+
     \sa addApplicationFont(), applicationFontFamilies(), removeApplicationFont()
 */