Attachment #213874 for bug #297773

View | Details | Raw Unified | Return to bug 297773
Collapse All | Expand All

Lines 56-63 HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item) Link Here

(-)a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c (-3 / +1 lines)
56		56
57	assert(shaper_item->item.script == HB_Script_Hebrew);	57	assert(shaper_item->item.script == HB_Script_Hebrew);
58		58
59	HB_HeuristicSetGlyphAttributes(shaper_item);
60
61	#ifndef NO_OPENTYPE	59	#ifndef NO_OPENTYPE
62	if (HB_SelectScript(shaper_item, hebrew_features)) {	60	if (HB_SelectScript(shaper_item, hebrew_features)) {
63		61
Lines 65-71 HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item) Link Here
65	if (!HB_ConvertStringToGlyphIndices(shaper_item))	63	if (!HB_ConvertStringToGlyphIndices(shaper_item))
66	return FALSE;	64	return FALSE;
67		65
68		66	HB_HeuristicSetGlyphAttributes(shaper_item);
69	HB_OpenTypeShape(shaper_item, /properties/0);	67	HB_OpenTypeShape(shaper_item, /properties/0);
70	return HB_OpenTypePosition(shaper_item, availableGlyphs, /doLogClusters/TRUE);	68	return HB_OpenTypePosition(shaper_item, availableGlyphs, /doLogClusters/TRUE);
71	}	69	}




    HB_Stream gdefStream;

    gdefStream = getTableStream(font, tableFunc, TTAG_GDEF);
    error = HB_Err_Not_Covered;
    if (!gdefStream || (error = HB_Load_GDEF_Table(gdefStream, &face->gdef))) {
        //DEBUG("error loading gdef table: %d", error);
        face->gdef = 0;


    //DEBUG() << "trying to load gsub table";
    stream = getTableStream(font, tableFunc, TTAG_GSUB);
    error = HB_Err_Not_Covered;
    if (!stream || (error = HB_Load_GSUB_Table(stream, &face->gsub, face->gdef, gdefStream))) {
        face->gsub = 0;
        if (error != HB_Err_Not_Covered) {

    _hb_close_stream(stream);

    stream = getTableStream(font, tableFunc, TTAG_GPOS);
    error = HB_Err_Not_Covered;
    if (!stream || (error = HB_Load_GPOS_Table(stream, &face->gpos, face->gdef, gdefStream))) {
        face->gpos = 0;
        DEBUG("error loading gpos table: %d", error);
- 

Return to bug 297773

Lines 980-985 HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc) Link Here

(-)a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp (-1 / +3 lines)
980	HB_Stream gdefStream;	980	HB_Stream gdefStream;
981		981
982	gdefStream = getTableStream(font, tableFunc, TTAG_GDEF);	982	gdefStream = getTableStream(font, tableFunc, TTAG_GDEF);
		983	error = HB_Err_Not_Covered;
983	if (!gdefStream \|\| (error = HB_Load_GDEF_Table(gdefStream, &face->gdef))) {	984	if (!gdefStream \|\| (error = HB_Load_GDEF_Table(gdefStream, &face->gdef))) {
984	//DEBUG("error loading gdef table: %d", error);	985	//DEBUG("error loading gdef table: %d", error);
985	face->gdef = 0;	986	face->gdef = 0;
Lines 987-992 HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc) Link Here
987		988
988	//DEBUG() << "trying to load gsub table";	989	//DEBUG() << "trying to load gsub table";
989	stream = getTableStream(font, tableFunc, TTAG_GSUB);	990	stream = getTableStream(font, tableFunc, TTAG_GSUB);
		991	error = HB_Err_Not_Covered;
990	if (!stream \|\| (error = HB_Load_GSUB_Table(stream, &face->gsub, face->gdef, gdefStream))) {	992	if (!stream \|\| (error = HB_Load_GSUB_Table(stream, &face->gsub, face->gdef, gdefStream))) {
991	face->gsub = 0;	993	face->gsub = 0;
992	if (error != HB_Err_Not_Covered) {	994	if (error != HB_Err_Not_Covered) {
Lines 998-1003 HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc) Link Here
998	_hb_close_stream(stream);	1000	_hb_close_stream(stream);
999		1001
1000	stream = getTableStream(font, tableFunc, TTAG_GPOS);	1002	stream = getTableStream(font, tableFunc, TTAG_GPOS);
		1003	error = HB_Err_Not_Covered;
1001	if (!stream \|\| (error = HB_Load_GPOS_Table(stream, &face->gpos, face->gdef, gdefStream))) {	1004	if (!stream \|\| (error = HB_Load_GPOS_Table(stream, &face->gpos, face->gdef, gdefStream))) {
1002	face->gpos = 0;	1005	face->gpos = 0;
1003	DEBUG("error loading gpos table: %d", error);	1006	DEBUG("error loading gpos table: %d", error);
1004	-