vcl/source/gdi/CommonSalLayout.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 3c80eea38add1b551261f86cc0f942c5f638d48c
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Sun Oct 30 17:59:23 2016 +0200
Avoid potential HarfBuzz asserts
We need to update the buffer content type ourselves since we are now
using the low lever shape plan API that does not do this.
Change-Id: I043d15731cf206b142c3153896e194a822a70ffb
diff --git a/vcl/source/gdi/CommonSalLayout.cxx
b/vcl/source/gdi/CommonSalLayout.cxx
index 24d32fd..239486e 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -489,6 +489,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
bool ok = hb_shape_plan_execute(pHbPlan, mpHbFont, pHbBuffer,
maFeatures.data(), maFeatures.size());
assert(ok);
(void) ok;
+ hb_buffer_set_content_type(pHbBuffer,
HB_BUFFER_CONTENT_TYPE_GLYPHS);
SAL_INFO("vcl.harfbuzz", hb_shape_plan_get_shaper(pHbPlan) << "
shaper used for " << mrFontSelData.GetFamilyName());
int nRunGlyphCount = hb_buffer_get_length(pHbBuffer);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
