- Fix MSVC build. Sent and applied upstream.

svn path=/trunk/; revision=55263
This commit is contained in:
Thomas Faber 2012-01-27 21:20:03 +00:00
parent e70779e693
commit d07efed2e7

View file

@ -357,9 +357,6 @@ static const char* required_khmer_features[] =
NULL NULL
}; };
static OPENTYPE_FEATURE_RECORD no_features[] =
{ };
static OPENTYPE_FEATURE_RECORD ethiopic_features[] = static OPENTYPE_FEATURE_RECORD ethiopic_features[] =
{ {
{ MS_MAKE_TAG('c','c','m','p'), 1}, { MS_MAKE_TAG('c','c','m','p'), 1},
@ -441,31 +438,31 @@ static const ScriptShapeData ShapingData[] =
{{ standard_features, 2}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, NULL, 0, NULL, NULL},
{{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer}, {{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer},
{{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer}, {{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ ethiopic_features, 4}, NULL, 0, NULL, NULL}, {{ ethiopic_features, 4}, NULL, 0, NULL, NULL},
{{ ethiopic_features, 4}, NULL, 0, NULL, NULL}, {{ ethiopic_features, 4}, NULL, 0, NULL, NULL},
{{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL}, {{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL},
{{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL}, {{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ no_features, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, NULL, 0, NULL, NULL},
{{ hebrew_features, 1}, NULL, 0, NULL, NULL}, {{ hebrew_features, 1}, NULL, 0, NULL, NULL},
{{ latin_features, 2}, NULL, 0, NULL, NULL}, {{ latin_features, 2}, NULL, 0, NULL, NULL},
{{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai},