[patch] Patch 2

qt-4.6.1-synthetic-bold.diff (text/plain), 2.39 KB, created by Hongjiu Zhang on 2010-02-24 07:09:44 UTC

diff -ur qt-everywhere-opensource-src-4.6.1.orig/src/gui/text/qfontengine_ft.cpp qt-everywhere-opensource-src-4.6.1/src/gui/text/qfontengine_ft.cpp
--- qt-everywhere-opensource-src-4.6.1.orig/src/gui/text/qfontengine_ft.cpp	2010-01-22 20:55:54.424164268 +0800
+++ qt-everywhere-opensource-src-4.6.1/src/gui/text/qfontengine_ft.cpp	2010-01-22 21:05:08.159154128 +0800
@@ -58,6 +58,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_OUTLINE_H
+#include FT_SYNTHESIS_H 
 #include FT_TRUETYPE_TABLES_H
 #include FT_TYPE1_TABLES_H
 #include FT_GLYPH_H
@@ -617,6 +618,7 @@
     cache_cost = 100;
     kerning_pairs_loaded = false;
     transform = false;
+    embolden = false;
     antialias = true;
     freetype = 0;
     default_load_flags = 0;
@@ -690,6 +692,9 @@
         freetype->matrix = matrix;
         if (fake_oblique)
             transform = true;
+        // fake bold                                                                                                                  
+        if ((fontDef.weight == QFont::Bold) && !(face->style_flags & FT_STYLE_FLAG_BOLD))                                             
+            embolden = true;
     } else {
         // copied from QFontEngineQPF
         // ad hoc algorithm
@@ -934,6 +939,7 @@
         return 0;
 
     FT_GlyphSlot slot = face->glyph;
+    if (embolden) FT_GlyphSlot_Embolden(slot);
     FT_Library library = qt_getFreetype();
 
     info.xOff = TRUNC(ROUND(slot->advance.x));
@@ -1209,6 +1215,8 @@
     int s = 0;
     if ((fontDef.style != QFont::StyleNormal) && !(freetype->face->style_flags & FT_STYLE_FLAG_ITALIC))
         s = SynthesizedItalic;
+    if ((fontDef.weight == QFont::Bold) && !(freetype->face->style_flags & FT_STYLE_FLAG_BOLD))
+        s |= SynthesizedBold;
     if (fontDef.stretch != 100 && FT_IS_SCALABLE(freetype->face))
         s |= SynthesizedStretch;
     return s;
diff -ur qt-everywhere-opensource-src-4.6.1.orig/src/gui/text/qfontengine_ft_p.h qt-everywhere-opensource-src-4.6.1/src/gui/text/qfontengine_ft_p.h
--- qt-everywhere-opensource-src-4.6.1.orig/src/gui/text/qfontengine_ft_p.h	2010-01-22 20:55:54.426161965 +0800
+++ qt-everywhere-opensource-src-4.6.1/src/gui/text/qfontengine_ft_p.h	2010-01-22 21:05:32.539162553 +0800
@@ -290,6 +290,7 @@
 
     bool antialias;
     bool transform;
+    bool embolden;
     SubpixelAntialiasingType subpixelType;
     int lcdFilterType;
     bool canUploadGlyphsToServer;