walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move variables to narrower scope and indent

This commit is contained in:
Behdad Esfahbod 2017-08-04 16:39:29 +01:00
parent 894e5675c8
commit d7f5332410
1 changed files with 60 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fcfreetype.c
View File

@ -2111,11 +2111,8 @@ FcFreeTypeCheckGlyph (FT_Face face,
FcCharSet * FcCharSet *
FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks FC_UNUSED, int *spacing) FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks FC_UNUSED, int *spacing)
{ {
FcChar32 page, off, ucs4;
FcCharSet *fcs; FcCharSet *fcs;
FcCharLeaf *leaf;
int o; int o;
FT_UInt glyph;
FT_Pos advance, advance_one = 0, advance_two = 0; FT_Pos advance, advance_one = 0, advance_two = 0;
FcBool has_advance = FcFalse, fixed_advance = FcTrue, dual_advance = FcFalse; FcBool has_advance = FcFalse, fixed_advance = FcTrue, dual_advance = FcFalse;
@ -2147,10 +2144,13 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks FC_UNUSED, int *spac
#endif #endif
for (o = 0; o < NUM_DECODE; o++) for (o = 0; o < NUM_DECODE; o++)
{ {
FcChar32 page, off, ucs4;
FcCharLeaf *leaf;
FT_UInt glyph;
if (FT_Select_Charmap (face, fcFontEncodings[o]) != 0) if (FT_Select_Charmap (face, fcFontEncodings[o]) != 0)
continue; continue;
{
page = ~0; page = ~0;
leaf = NULL; leaf = NULL;
ucs4 = FT_Get_First_Char (face, &glyph); ucs4 = FT_Get_First_Char (face, &glyph);
@ -2220,8 +2220,6 @@ FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks FC_UNUSED, int *spac
} }
} }
#endif #endif
}
break; break;
} }
if (fixed_advance) if (fixed_advance)