AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harfbuzz: fix build with NO_OPENTYPE macro defined

Browse Source 
Remove `DEFINES += QT_NO_OPENTYPE` since there are no QT_NO_OPENTYPE guards
and I'm not sure defining NO_OPENTYPE won't break some things.

Change-Id: I7b36d3f200408aee99db73c56baa9b4a21cb54f9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Konstantin Ritt 2012-08-26 00:24:54 +03:00 committed by Qt by Nokia
parent f61d02deea
commit 9f561f8a41
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h vendored
View File

@ -123,6 +123,7 @@ extern void HB_IndicAttributes(HB_Script script, const HB_UChar16 *string, hb_ui
extern void HB_ThaiAttributes(HB_Script script, const HB_UChar16 *string, hb_uint32 from, hb_uint32 len, HB_CharAttributes *attributes); extern void HB_ThaiAttributes(HB_Script script, const HB_UChar16 *string, hb_uint32 from, hb_uint32 len, HB_CharAttributes *attributes);
#ifndef NO_OPENTYPE
typedef struct { typedef struct {
hb_uint32 tag; hb_uint32 tag;
hb_uint32 property; hb_uint32 property;
@ -134,6 +135,7 @@ HB_Bool HB_SelectScript(HB_ShaperItem *item, const HB_OpenTypeFeature *features)
HB_Bool HB_OpenTypeShape(HB_ShaperItem *item, const hb_uint32 *properties); HB_Bool HB_OpenTypeShape(HB_ShaperItem *item, const hb_uint32 *properties);
HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool doLogClusters); HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool doLogClusters);
#endif // NO_OPENTYPE
void HB_HeuristicPosition(HB_ShaperItem *item); void HB_HeuristicPosition(HB_ShaperItem *item);
void HB_HeuristicSetGlyphAttributes(HB_ShaperItem *item); void HB_HeuristicSetGlyphAttributes(HB_ShaperItem *item);

2
src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp vendored
View File

@ -771,6 +771,7 @@ void HB_FreeFace(HB_Face face)
free(face); free(face);
} }
#ifndef NO_OPENTYPE
HB_Bool HB_SelectScript(HB_ShaperItem *shaper_item, const HB_OpenTypeFeature *features) HB_Bool HB_SelectScript(HB_ShaperItem *shaper_item, const HB_OpenTypeFeature *features)
{ {
HB_Script script = shaper_item->item.script; HB_Script script = shaper_item->item.script;
@ -1085,6 +1086,7 @@ HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool do
#endif #endif
return true; return true;
} }
#endif // NO_OPENTYPE
HB_Bool HB_ShapeItem(HB_ShaperItem *shaper_item) HB_Bool HB_ShapeItem(HB_ShaperItem *shaper_item)
{ {

4
src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c vendored
View File

@ -92,6 +92,7 @@ static const unsigned char tibetanForm[0x80] = {
#define tibetan_form(c) \ #define tibetan_form(c) \
(TibetanForm)tibetanForm[c - 0x0f40] (TibetanForm)tibetanForm[c - 0x0f40]
#ifndef NO_OPENTYPE
static const HB_OpenTypeFeature tibetan_features[] = { static const HB_OpenTypeFeature tibetan_features[] = {
{ HB_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty }, { HB_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
{ HB_MAKE_TAG('a', 'b', 'v', 's'), AboveSubstProperty }, { HB_MAKE_TAG('a', 'b', 'v', 's'), AboveSubstProperty },
@ -99,6 +100,7 @@ static const HB_OpenTypeFeature tibetan_features[] = {
{ HB_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty }, { HB_MAKE_TAG('c', 'a', 'l', 't'), CaltProperty },
{0, 0} {0, 0}
}; };
#endif
static HB_Bool tibetan_shape_syllable(HB_Bool openType, HB_ShaperItem *item, HB_Bool invalid) static HB_Bool tibetan_shape_syllable(HB_Bool openType, HB_ShaperItem *item, HB_Bool invalid)
{ {
@ -216,7 +218,7 @@ HB_Bool HB_TibetanShape(HB_ShaperItem *item)
assert(item->item.script == HB_Script_Tibetan); assert(item->item.script == HB_Script_Tibetan);
#ifndef QT_NO_OPENTYPE #ifndef NO_OPENTYPE
openType = HB_SelectScript(item, tibetan_features); openType = HB_SelectScript(item, tibetan_features);
#endif #endif

1
src/gui/text/text.pri
View File

@ -86,5 +86,4 @@ SOURCES += \
HEADERS += \ HEADERS += \
text/qplatformfontdatabase.h text/qplatformfontdatabase.h
DEFINES += QT_NO_OPENTYPE
INCLUDEPATH += ../3rdparty/harfbuzz/src INCLUDEPATH += ../3rdparty/harfbuzz/src