Commit ef98d143 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

usp10: Remove redundant information by making scriptData accessible and removing otTag.

parent 419d3d71
...@@ -298,16 +298,8 @@ static const scriptRange scriptRanges[] = { ...@@ -298,16 +298,8 @@ static const scriptRange scriptRanges[] = {
{ SCRIPT_UNDEFINED, 0, 0, 0} { SCRIPT_UNDEFINED, 0, 0, 0}
}; };
typedef struct _scriptData
{
SCRIPT_ANALYSIS a;
SCRIPT_PROPERTIES props;
OPENTYPE_TAG scriptTag;
WCHAR fallbackFont[LF_FACESIZE];
} scriptData;
/* the must be in order so that the index matches the Script value */ /* the must be in order so that the index matches the Script value */
static const scriptData scriptInformation[] = { const scriptData scriptInformation[] = {
{{SCRIPT_UNDEFINED, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {{SCRIPT_UNDEFINED, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}},
{LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0},
0x00000000, 0x00000000,
......
...@@ -155,6 +155,14 @@ typedef struct { ...@@ -155,6 +155,14 @@ typedef struct {
OPENTYPE_TAG userLang; OPENTYPE_TAG userLang;
} ScriptCache; } ScriptCache;
typedef struct _scriptData
{
SCRIPT_ANALYSIS a;
SCRIPT_PROPERTIES props;
OPENTYPE_TAG scriptTag;
WCHAR fallbackFont[LF_FACESIZE];
} scriptData;
typedef struct { typedef struct {
INT start; INT start;
INT base; INT base;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment