Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-04 08:50:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTGDI][FREETYPE] Simplify get_glyph_index_flagged (#6977)

Browse source 
Simplify code.
JIRA issue: CORE-9616
- Reduce one parameter of get_glyph_index_flagged function.
This commit is contained in:
Katayama Hirofumi MZ 2024-06-03 09:28:52 +09:00 committed by GitHub
parent 51f3cf0509
commit 890b9c0b93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
win32ss/gdi/ntgdi/freetype.c
View file

@ -3718,23 +3718,13 @@ get_glyph_index(FT_Face ft_face, UINT glyph)
} }
static inline FT_UInt FASTCALL static inline FT_UInt FASTCALL
get_glyph_index_flagged(FT_Face face, FT_ULong code, DWORD indexed_flag, DWORD flags) get_glyph_index_flagged(FT_Face face, FT_ULong code, BOOL fCodeAsIndex)
{ {
FT_UInt glyph_index; return (fCodeAsIndex ? code : get_glyph_index(face, code));
if (flags & indexed_flag)
{
glyph_index = code;
}
else
{
glyph_index = get_glyph_index(face, code);
}
return glyph_index;
} }
/* /*
* Based on WineEngGetGlyphOutline * Based on WineEngGetGlyphOutline
*
*/ */
ULONG ULONG
FASTCALL FASTCALL
@ -3820,7 +3810,7 @@ ftGdiGetGlyphOutline(
TEXTOBJ_UnlockText(TextObj); TEXTOBJ_UnlockText(TextObj);
glyph_index = get_glyph_index_flagged(ft_face, wch, GGO_GLYPH_INDEX, iFormat); glyph_index = get_glyph_index_flagged(ft_face, wch, (iFormat & GGO_GLYPH_INDEX));
iFormat &= ~GGO_GLYPH_INDEX; iFormat &= ~GGO_GLYPH_INDEX;
if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2) if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2)
@ -4325,7 +4315,7 @@ TextIntGetTextExtentPoint(PDC dc,
ch0 = Utf32FromSurrogatePair(ch0, ch1); ch0 = Utf32FromSurrogatePair(ch0, ch1);
} }
glyph_index = get_glyph_index_flagged(Cache.Hashed.Face, ch0, GTEF_INDICES, fl); glyph_index = get_glyph_index_flagged(Cache.Hashed.Face, ch0, (fl & GTEF_INDICES));
Cache.Hashed.GlyphIndex = glyph_index; Cache.Hashed.GlyphIndex = glyph_index;
realglyph = IntGetRealGlyph(&Cache); realglyph = IntGetRealGlyph(&Cache);
@ -5916,7 +5906,7 @@ IntGetTextDisposition(
ch0 = Utf32FromSurrogatePair(ch0, ch1); ch0 = Utf32FromSurrogatePair(ch0, ch1);
} }
glyph_index = get_glyph_index_flagged(face, ch0, ETO_GLYPH_INDEX, fuOptions); glyph_index = get_glyph_index_flagged(face, ch0, (fuOptions & ETO_GLYPH_INDEX));
Cache->Hashed.GlyphIndex = glyph_index; Cache->Hashed.GlyphIndex = glyph_index;
realglyph = IntGetRealGlyph(Cache); realglyph = IntGetRealGlyph(Cache);
@ -6325,7 +6315,7 @@ IntExtTextOutW(
ch0 = Utf32FromSurrogatePair(ch0, ch1); ch0 = Utf32FromSurrogatePair(ch0, ch1);
} }
glyph_index = get_glyph_index_flagged(face, ch0, ETO_GLYPH_INDEX, fuOptions); glyph_index = get_glyph_index_flagged(face, ch0, (fuOptions & ETO_GLYPH_INDEX));
Cache.Hashed.GlyphIndex = glyph_index; Cache.Hashed.GlyphIndex = glyph_index;
realglyph = IntGetRealGlyph(&Cache); realglyph = IntGetRealGlyph(&Cache);
@ -6880,11 +6870,11 @@ NtGdiGetCharABCWidthsW(
if (Safepwch) if (Safepwch)
{ {
glyph_index = get_glyph_index_flagged(face, Safepwch[i - FirstChar], GCABCW_INDICES, fl); glyph_index = get_glyph_index_flagged(face, Safepwch[i - FirstChar], (fl & GCABCW_INDICES));
} }
else else
{ {
glyph_index = get_glyph_index_flagged(face, i, GCABCW_INDICES, fl); glyph_index = get_glyph_index_flagged(face, i, (fl & GCABCW_INDICES));
} }
FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
@ -7067,11 +7057,11 @@ NtGdiGetCharWidthW(
{ {
if (Safepwc) if (Safepwc)
{ {
glyph_index = get_glyph_index_flagged(face, Safepwc[i - FirstChar], GCW_INDICES, fl); glyph_index = get_glyph_index_flagged(face, Safepwc[i - FirstChar], (fl & GCW_INDICES));
} }
else else
{ {
glyph_index = get_glyph_index_flagged(face, i, GCW_INDICES, fl); glyph_index = get_glyph_index_flagged(face, i, (fl & GCW_INDICES));
} }
FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (!fl) if (!fl)