ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Glyph class tables are just generic class tables.

This commit is contained in:
Huw Davies 2012-12-20 12:55:32 +00:00 committed by Alexandre Julliard
parent eb272cbd31
commit 79cbcf9612
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/usp10/opentype.c
View File

@ -93,19 +93,19 @@ typedef struct {
WORD StartGlyph; WORD StartGlyph;
WORD GlyphCount; WORD GlyphCount;
WORD ClassValueArray[1]; WORD ClassValueArray[1];
} GDEF_ClassDefFormat1; } OT_ClassDefFormat1;
typedef struct { typedef struct {
WORD Start; WORD Start;
WORD End; WORD End;
WORD Class; WORD Class;
} GDEF_ClassRangeRecord; } OT_ClassRangeRecord;
typedef struct { typedef struct {
WORD ClassFormat; WORD ClassFormat;
WORD ClassRangeCount; WORD ClassRangeCount;
GDEF_ClassRangeRecord ClassRangeRecord[1]; OT_ClassRangeRecord ClassRangeRecord[1];
} GDEF_ClassDefFormat2; } OT_ClassDefFormat2;
/* These are all structures needed for the GSUB table */ /* These are all structures needed for the GSUB table */
@ -525,20 +525,13 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR
* GDEF * GDEF
**********/ **********/
static WORD GDEF_get_glyph_class(const GDEF_Header *header, WORD glyph) static WORD OT_get_glyph_class(const void *table, WORD glyph)
{ {
int offset;
WORD class = 0; WORD class = 0;
const GDEF_ClassDefFormat1 *cf1; const OT_ClassDefFormat1 *cf1 = table;
if (!header) if (!table) return 0;
return 0;
offset = GET_BE_WORD(header->GlyphClassDef);
if (!offset)
return 0;
cf1 = (GDEF_ClassDefFormat1*)(((BYTE*)header)+offset);
if (GET_BE_WORD(cf1->ClassFormat) == 1) if (GET_BE_WORD(cf1->ClassFormat) == 1)
{ {
if (glyph >= GET_BE_WORD(cf1->StartGlyph)) if (glyph >= GET_BE_WORD(cf1->StartGlyph))
@ -550,7 +543,7 @@ static WORD GDEF_get_glyph_class(const GDEF_Header *header, WORD glyph)
} }
else if (GET_BE_WORD(cf1->ClassFormat) == 2) else if (GET_BE_WORD(cf1->ClassFormat) == 2)
{ {
const GDEF_ClassDefFormat2 *cf2 = (GDEF_ClassDefFormat2*)cf1; const OT_ClassDefFormat2 *cf2 = table;
int i, top; int i, top;
top = GET_BE_WORD(cf2->ClassRangeCount); top = GET_BE_WORD(cf2->ClassRangeCount);
for (i = 0; i < top; i++) for (i = 0; i < top; i++)
@ -585,10 +578,19 @@ static VOID *load_gdef_table(HDC hdc)
void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp)
{ {
int i; int i;
void *glyph_class_table = NULL;
if (!psc->GDEF_Table) if (!psc->GDEF_Table)
psc->GDEF_Table = load_gdef_table(hdc); psc->GDEF_Table = load_gdef_table(hdc);
if (psc->GDEF_Table)
{
const GDEF_Header *header = psc->GDEF_Table;
WORD offset = GET_BE_WORD( header->GlyphClassDef );
if (offset)
glyph_class_table = (BYTE *)psc->GDEF_Table + offset;
}
for (i = 0; i < cGlyphs; i++) for (i = 0; i < cGlyphs; i++)
{ {
WORD class; WORD class;
@ -602,7 +604,7 @@ void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGly
char_count++; char_count++;
} }
class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); class = OT_get_glyph_class( glyph_class_table, pwGlyphs[i] );
switch (class) switch (class)
{ {