File 0070-fix-broken-fonts.patch of Package qt3

Overview Repositories Revisions Requests Users Attributes Meta

File 0070-fix-broken-fonts.patch of Package qt3 (Revision bf7ae8ff03ebaeaf3d16f89d8d68586b)

Currently displaying revision bf7ae8ff03ebaeaf3d16f89d8d68586b , Show latest

--- include/private/qfontengine_p.h	2006-03-08 17:47:45.000000000 +0100
+++ include/private/qfontengine_p.h	2006-05-31 12:59:58.000000000 +0200
@@ -491,7 +491,7 @@
     }
     void selectScript(unsigned int script, const Features *features = 0);
     
-    void shape(QShaperItem *item, const unsigned int *properties = 0);
+    bool shape(QShaperItem *item, const unsigned int *properties = 0);
     bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
 
     OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }

--- src/kernel/qfontengine_p.h	2006-03-08 17:47:45.000000000 +0100
+++ src/kernel/qfontengine_p.h	2006-05-31 12:59:58.000000000 +0200
@@ -491,7 +491,7 @@
     }
     void selectScript(unsigned int script, const Features *features = 0);
     
-    void shape(QShaperItem *item, const unsigned int *properties = 0);
+    bool shape(QShaperItem *item, const unsigned int *properties = 0);
     bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
 
     OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }

--- src/kernel/qfontengine_x11.cpp	2006-03-08 17:47:49.000000000 +0100
+++ src/kernel/qfontengine_x11.cpp	2006-05-31 12:59:58.000000000 +0200
@@ -2544,7 +2544,7 @@
 
 extern void qt_heuristicPosition(QShaperItem *item);
 
-void QOpenType::shape(QShaperItem *item, const unsigned int *properties)
+bool QOpenType::shape(QShaperItem *item, const unsigned int *properties)
 {
     length = item->num_glyphs;
 
@@ -2571,8 +2571,11 @@
 
     loadFlags = FT_LOAD_DEFAULT;
 
-    if (gsub)
-        TT_GSUB_Apply_String(gsub, otl_buffer);
+    if (gsub) {
+        uint error = TT_GSUB_Apply_String(gsub, otl_buffer);
+        if (error && error != TTO_Err_Not_Covered)
+            return false;
+    }
 
 #ifdef OT_DEBUG
 //     qDebug("log clusters before shaping:");
@@ -2584,6 +2587,8 @@
     qDebug("-----------------------------------------");
 //     dump_string(otl_buffer);
 #endif
+
+    return true;
 }
 
 bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)

--- src/kernel/qscriptengine.cpp	2006-03-08 17:47:45.000000000 +0100
+++ src/kernel/qscriptengine.cpp	2006-05-31 12:59:58.000000000 +0200
@@ -1504,8 +1504,10 @@
     {0, 0}
 };
 
-static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item)
+static bool arabicSyriacOpenTypeShape(QOpenType *openType, QShaperItem *item, bool *ot_ok)
 {
+    *ot_ok = true;
+
     openType->selectScript(item->script, item->script == QFont::Arabic ? arabic_features : syriac_features);
     int nglyphs = item->num_glyphs;
     if (item->font->stringToCMap(item->string->unicode()+item->from, item->length, item->glyphs, item->advances,
@@ -1562,7 +1564,10 @@
             apply[i] |= IsolProperty|MediProperty|FinaProperty;
     }
 
-    openType->shape(item, apply.data());
+    if (!openType->shape(item, apply.data())) {
+        *ot_ok = false;
+        return false;
+    }
     item->num_glyphs = nglyphs;
     return openType->positionAndAdd(item);
 }
@@ -1577,8 +1582,14 @@
 #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
     QOpenType *openType = item->font->openType();
 
-    if (openType && openType->supportsScript(QFont::Arabic))
-        return arabicSyriacOpenTypeShape(openType, item);
+    if (openType && openType->supportsScript(QFont::Arabic)) {
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
+    }
 #endif
 
     QVarLengthArray<ushort> shapedChars(item->length);

--- src/kernel/qscriptengine_x11.cpp	2006-03-08 17:47:47.000000000 +0100
+++ src/kernel/qscriptengine_x11.cpp	2006-05-31 12:59:58.000000000 +0200
@@ -45,7 +45,12 @@
 #ifndef QT_NO_XFTFREETYPE
     QOpenType *openType = item->font->openType();
     if (openType && openType->supportsScript(QFont::Syriac)) {
-        return arabicSyriacOpenTypeShape(openType, item);
+        bool ot_ok;
+        if (arabicSyriacOpenTypeShape(openType, item, &ot_ok))
+            return true;
+        if (ot_ok)
+            return false;
+        // fall through to the non OT code
     }
 #endif
     return basic_shape(item);

Places

File 0070-fix-broken-fonts.patch of Package qt3 (Revision bf7ae8ff03ebaeaf3d16f89d8d68586b)

Places