summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2017-03-10 16:53:08 +0200
committerAndras Timar <andras.timar@collabora.com>2017-03-17 11:58:40 +0100
commit08b7e84a01d836e513a85f542217b9c67eddda7d (patch)
treec2ea9afd01912ae97471fe909730715a56ddcdde /vcl
parenta135e567b8d9735e7a1d7d506730aafc0c43b7f1 (diff)
tdf#106466: Use graphite2 shaper first
We want to always prefer Graphite shaping when supported by the font, which is also what HarfBuzz does by default. Change-Id: I6670fc03b8e6b3d7e07e1b8e0062880524da1655 Reviewed-on: https://gerrit.libreoffice.org/35046 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> (cherry picked from commit 3cee50476e422e3ed84169cdcbe6bd9883fc9316) Reviewed-on: https://gerrit.libreoffice.org/35058 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 68b546b17afa0082862f2a20b8f089ae9124a16a)
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/CommonSalLayout.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 21be0c99bf01..a6ca683c15f5 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -579,7 +579,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
// preference. The coretext_aat shaper is available only on macOS,
// but there is no harm in always including it, HarfBuzz will
// ignore unavailable shapers.
- const char* pHbShapers[] = { "coretext_aat", "graphite2", "ot", "fallback", nullptr };
+ const char* pHbShapers[] = { "graphite2", "coretext_aat", "ot", "fallback", nullptr };
hb_segment_properties_t aHbProps;
hb_buffer_get_segment_properties(pHbBuffer, &aHbProps);
hb_shape_plan_t* pHbPlan = hb_shape_plan_create_cached(pHbFace, &aHbProps, maFeatures.data(), maFeatures.size(), pHbShapers);