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
This commit is contained in:
Khaled Hosny
2016-10-30 17:59:23 +02:00
parent 425c92291b
commit 3c80eea38a

View File

@@ -489,6 +489,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
bool ok = hb_shape_plan_execute(pHbPlan, mpHbFont, pHbBuffer, maFeatures.data(), maFeatures.size()); bool ok = hb_shape_plan_execute(pHbPlan, mpHbFont, pHbBuffer, maFeatures.data(), maFeatures.size());
assert(ok); assert(ok);
(void) 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()); SAL_INFO("vcl.harfbuzz", hb_shape_plan_get_shaper(pHbPlan) << " shaper used for " << mrFontSelData.GetFamilyName());
int nRunGlyphCount = hb_buffer_get_length(pHbBuffer); int nRunGlyphCount = hb_buffer_get_length(pHbBuffer);