Apply all Qt3.3.8d patches

NOTE: This will *likely* break compilation of TQt4
Please wait a few days for fixes to be committed as needed!

1 files changed, 5 insertions, 12 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp b/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp
index 0b45ec9..8d76e0b 100644
--- a/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp
+++ b/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp
@@ -2694,23 +2694,16 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters)
             // ###### fix the case where we have y advances. How do we handle this in Uniscribe?????
             if (positions[i].new_advance) {
                 item->advances[i] = item->flags & TQTextEngine::RightToLeft
-                                    ? -tqRound((positions[i].x_advance >> 6)*scale)
+                                    ? -tqRound((positions[i].x_advance >> 6)*scale) 
                                     :  tqRound((positions[i].x_advance >> 6)*scale);
             } else {
                 item->advances[i] += item->flags & TQTextEngine::RightToLeft
-                                     ? -tqRound((positions[i].x_advance >> 6)*scale)
+                                     ? -tqRound((positions[i].x_advance >> 6)*scale) 
                                      :  tqRound((positions[i].x_advance >> 6)*scale);
             }
-            int back = 0;
-	  item->offsets[i].x = tqRound((positions[i].x_pos >> 6)*scale);
-	  item->offsets[i].y = tqRound((positions[i].y_pos >> 6)*scale);
-            while (positions[i-back].back) {
-                back += positions[i - back].back;
-                item->offsets[i].x += tqRound((positions[i - back].x_pos >> 6)*scale);
-	      item->offsets[i].y += tqRound((positions[i - back].y_pos >> 6)*scale);
-            }
-	  item->offsets[i].y = -item->offsets[i].y;
-            back = positions[i].back;
+	    item->offsets[i].x = tqRound((positions[i].x_pos >> 6)*scale);
+	    item->offsets[i].y = -tqRound((positions[i].y_pos >> 6)*scale);
+            int back = positions[i].back;
             if (item->flags & TQTextEngine::RightToLeft) {
                 while (back--) {
                     item->offsets[i].x -= item->advances[i-back];