diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-27 21:09:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-27 21:09:47 (GMT) |
| commit | 68f87b31ae4b49a69686e4ecedeea1b9839debfd (patch) | |
| tree | 844ce22e01d074cbe96f084d99246f21a4cd9738 | |
| parent | fadd87f448d3dd4133d1a6ec022ee6db42eb9723 (diff) | |
| parent | 1b928f5e41888150c4d85ff4df8a9fcab9b06d90 (diff) | |
| download | Qt-68f87b31ae4b49a69686e4ecedeea1b9839debfd.zip Qt-68f87b31ae4b49a69686e4ecedeea1b9839debfd.tar.gz Qt-68f87b31ae4b49a69686e4ecedeea1b9839debfd.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp index 3410782..7f4bb0c 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp @@ -1293,7 +1293,7 @@ HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool do // (int)(positions[i].x_pos >> 6), (int)(positions[i].y_pos >> 6), // positions[i].back, positions[i].new_advance); - HB_Fixed adjustment = (item->item.bidiLevel % 2) ? -positions[i].x_advance : positions[i].x_advance; + HB_Fixed adjustment = positions[i].x_advance; if (!(face->current_flags & HB_ShaperFlag_UseDesignMetrics)) adjustment = HB_FIXED_ROUND(adjustment); |