summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-05-02 06:13:58 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2013-05-02 06:13:58 +0200
commit69a120ccc6a8afdb239912f9b4fbbc123e69d4ca (patch)
tree10284746d12896e83475aea225baf51dc1eb9b6d /vcl
parentwe need to exclude scatter chart for data label export for now (diff)
downloadcore-69a120ccc6a8afdb239912f9b4fbbc123e69d4ca.tar.gz
core-69a120ccc6a8afdb239912f9b4fbbc123e69d4ca.zip
Revert "[harfbuzz] Fix shaping across text runs"
This reverts commit ca0b580e2a21999d75bcd39ae5b6f81e9e42897b.
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/glyphs/gcach_layout.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index a849d9d29a69..d562d3bf7abd 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -422,10 +422,8 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) fUnitsPerEM) >> 16);
hb_font_set_ppem(pHbFont, aFtFace->size->metrics.x_ppem, aFtFace->size->metrics.y_ppem);
- int nTextLen = rArgs.mnEndCharPos - rArgs.mnMinCharPos;
-
// allocate temporary arrays, note: round to even
- int nGlyphCapacity = (3 * nTextLen | 15) + 1;
+ int nGlyphCapacity = (3 * (rArgs.mnEndCharPos - rArgs.mnMinCharPos) | 15) + 1;
rLayout.Reserve(nGlyphCapacity);
@@ -467,7 +465,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
hb_buffer_set_direction(pHbBuffer, bRightToLeft ? HB_DIRECTION_RTL: HB_DIRECTION_LTR);
hb_buffer_set_script(pHbBuffer, hb_icu_script_to_script(eScriptCode));
hb_buffer_set_language(pHbBuffer, hb_language_from_string(sLanguage.getStr(), -1));
- hb_buffer_add_utf16(pHbBuffer, rArgs.mpStr, nTextLen, nMinRunPos, nRunLen);
+ hb_buffer_add_utf16(pHbBuffer, rArgs.mpStr, nRunLen, nMinRunPos, nRunLen);
hb_shape(pHbFont, pHbBuffer, NULL, 0);
int nRunGlyphCount = hb_buffer_get_length(pHbBuffer);
@@ -484,14 +482,12 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
if (nCharPos >= 0)
{
rArgs.NeedFallback(nCharPos, bRightToLeft);
-#if 0
// XXX: do we need this? HarfBuzz can take context into
// account when shaping
if ((nCharPos > 0) && needPreviousCode(rArgs.mpStr[nCharPos-1]))
rArgs.NeedFallback(nCharPos-1, bRightToLeft);
else if ((nCharPos + 1 < nEndRunPos) && needNextCode(rArgs.mpStr[nCharPos+1]))
rArgs.NeedFallback(nCharPos+1, bRightToLeft);
-#endif
}
if (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags)