Changeset 846 for trunk/src/gui/text/qfontengine_ft.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/qfontengine_ft.cpp (modified) (26 diffs)

trunk/src/gui/text/qfontengine_ft.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])
@@ -52 +52 @@
 #include "qthreadstorage.h"
 #include <qmath.h>
-#include <private/qpdf_p.h>
 #include <private/qharfbuzz_p.h>
 
@@ -59 +58 @@
 #include FT_FREETYPE_H
 #include FT_OUTLINE_H
+
 #include FT_TRUETYPE_TABLES_H
 #include FT_TYPE1_TABLES_H
@@ -92 +92 @@
 #define X_SIZE(face,i) ((face)->available_sizes[i].width << 6)
 #define Y_SIZE(face,i) ((face)->available_sizes[i].height << 6)
+
+
+
+
+
+
+
 #endif
 
@@ -618 +625 @@
     kerning_pairs_loaded = false;
     transform = false;
+
     antialias = true;
     freetype = 0;
-    default_load_flags = 0;
+    default_load_flags = ;
     default_hint_style = HintNone;
     subpixelType = Subpixel_None;
@@ -680 +688 @@
     FT_Face face = lockFace();
 
-    //underline metrics
     if (FT_IS_SCALABLE(face)) {
-        line_thickness =  QFixed::fromFixed(FT_MulFix(face->underline_thickness, face->size->metrics.y_scale));
-        underline_position = QFixed::fromFixed(-FT_MulFix(face->underline_position, face->size->metrics.y_scale));
         bool fake_oblique = (fontDef.style != QFont::StyleNormal) && !(face->style_flags & FT_STYLE_FLAG_ITALIC);
         if (fake_oblique)
@@ -691 +696 @@
         if (fake_oblique)
             transform = true;
+
+
+
+
+
+
     } else {
         // copied from QFontEngineQPF
@@ -747 +758 @@
 QFontEngineFT::Glyph *QFontEngineFT::loadGlyphMetrics(QGlyphSet *set, uint glyph) const
 {
-    Glyph *g = set->glyph_data.value(glyph);
+    Glyph *g = set->g(glyph);
     if (g)
         return g;
@@ -790 +801 @@
 
     FT_GlyphSlot slot = face->glyph;
+
     int left  = slot->metrics.horiBearingX;
     int right = slot->metrics.horiBearingX + slot->metrics.width;
@@ -859 +871 @@
     }
 
-    Glyph *g = set->glyph_data.value(glyph);
+    Glyph *g = set->g(glyph);
     if (g && g->format == format) {
         if (uploadToServer && !g->uploadedToServer) {
-            set->glyph_data[glyph] = 0;
+            set->;
             delete g;
             g = 0;
@@ -935 +947 @@
 
     FT_GlyphSlot slot = face->glyph;
+
     FT_Library library = qt_getFreetype();
 
@@ -1159 +1172 @@
     }
 
-    set->glyph_data[glyph] = g;
+    set->;
 
     return g;
@@ -1183 +1196 @@
     Properties p = freetype->properties();
     if (p.postscriptName.isEmpty()) {
-        p.postscriptName = fontDef.family.toUtf8();
-#ifndef QT_NO_PRINTER
-        p.postscriptName = QPdf::stripSpecialCharacters(p.postscriptName);
-#endif
+        p.postscriptName = QFontEngine::convertToPostscriptFontFamilyName(fontDef.family.toUtf8());
     }
 
@@ -1210 +1220 @@
     if ((fontDef.style != QFont::StyleNormal) && !(freetype->face->style_flags & FT_STYLE_FLAG_ITALIC))
         s = SynthesizedItalic;
+
+
     if (fontDef.stretch != 100 && FT_IS_SCALABLE(freetype->face))
         s |= SynthesizedStretch;
@@ -1369 +1381 @@
     if (!gs) {
         // don't try to load huge fonts
-        bool draw_as_outline = fontDef.pixelSize * qSqrt(matrix.det()) >= 64;
+        bool draw_as_outline = fontDef.pixelSize * qSqrt()) >= 64;
         if (draw_as_outline)
             return 0;
@@ -1382 +1394 @@
         gs = &transformedGlyphSets[0];
 
-        qDeleteAll(gs->glyph_data);
-        gs->glyph_data.clear();
+        gs->clear();
 
         gs->id = allocateServerGlyphSet();
@@ -1399 +1410 @@
 
     for (int i = 0; i < num_glyphs; ++i) {
-        Glyph *glyph = gs->glyph_data.value(glyphs[i]);
+        Glyph *glyph = gs->g(glyphs[i]);
         if (glyph == 0 || glyph->format != format) {
             if (!face) {
@@ -1551 +1562 @@
         for ( int i = 0; i < len; ++i ) {
             unsigned int uc = getChar(str, i, len);
-            if (mirrored)
-                uc = QChar::mirroredChar(uc);
             glyphs->glyphs[glyph_pos] = uc < QFreetypeFace::cmapCacheSize ? freetype->cmapCache[uc] : 0;
             if ( !glyphs->glyphs[glyph_pos] ) {
@@ -1636 +1645 @@
     if (flags & QTextEngine::DesignMetrics) {
         for (int i = 0; i < glyphs->numGlyphs; i++) {
-            Glyph *g = defaultGlyphSet.glyph_data.value(glyphs->glyphs[i]);
+            Glyph *g = defaultGlyphSet.g(glyphs->glyphs[i]);
             if (g) {
                 glyphs->advances_x[i] = QFixed::fromFixed(g->linearAdvance);
@@ -1649 +1658 @@
     } else {
         for (int i = 0; i < glyphs->numGlyphs; i++) {
-            Glyph *g = defaultGlyphSet.glyph_data.value(glyphs->glyphs[i]);
+            Glyph *g = defaultGlyphSet.g(glyphs->glyphs[i]);
             if (g) {
                 glyphs->advances_x[i] = QFixed(g->advance);
@@ -1678 +1687 @@
     QFixed xmax = 0;
     for (int i = 0; i < glyphs.numGlyphs; i++) {
-        Glyph *g = defaultGlyphSet.glyph_data.value(glyphs.glyphs[i]);
+        Glyph *g = defaultGlyphSet.g(glyphs.glyphs[i]);
         if (!g) {
             if (!face)
@@ -1720 +1729 @@
     FT_Face face = 0;
     glyph_metrics_t overall;
-    Glyph *g = defaultGlyphSet.glyph_data.value(glyph);
+    Glyph *g = defaultGlyphSet.g(glyph);
     if (!g) {
         face = lockFace();
@@ -1784 +1793 @@
             }
             glyphSet = &transformedGlyphSets[0];
-            qDeleteAll(glyphSet->glyph_data);
-            glyphSet->glyph_data.clear();
+            glyphSet->clear();
             glyphSet->id = allocateServerGlyphSet();
             glyphSet->transformationMatrix = m;
@@ -1793 +1801 @@
         glyphSet = &defaultGlyphSet;
     }
-    Glyph * g = glyphSet->glyph_data.value(glyph);
+    Glyph * g = glyphSet->g(glyph);
     if (!g) {
         face = lockFace();
@@ -1882 +1890 @@
 void QFontEngineFT::removeGlyphFromCache(glyph_t glyph)
 {
-    delete defaultGlyphSet.glyph_data.take(glyph);
+    dee(glyph);
 }
 
@@ -1938 +1946 @@
     transformationMatrix.xy = 0;
     transformationMatrix.yx = 0;
+
+
 }
 
 QFontEngineFT::QGlyphSet::~QGlyphSet()
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     qDeleteAll(glyph_data);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }