Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[autofit] Minor fix.

Browse Source 
* src/autofit/afcjk.c (af_cjk_metrics_init_widths),
src/autofit/aflatin.c (af_latin_metrics_init_widths): Fix handling
of alternative standard characters.
This also fixes a compilation warning in non-debug mode.
2.6.5
Werner Lemberg 11 years ago
parent ee3778d3d7
commit a8772918a3
3 changed files with 31 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      ChangeLog
  2. 23
      src/autofit/afcjk.c
  3. 23
      src/autofit/aflatin.c

9
ChangeLog
Unescape View File

@ -1,3 +1,12 @@
2014-02-04 Werner Lemberg <wl@gnu.org>
[autofit] Minor fix.
* src/autofit/afcjk.c (af_cjk_metrics_init_widths),
src/autofit/aflatin.c (af_latin_metrics_init_widths): Fix handling
of alternative standard characters.
This also fixes a compilation warning in non-debug mode.
2014-02-03 Werner Lemberg <wl@gnu.org>
[cff] Fix Savannah bug #41363.

23
src/autofit/afcjk.c
Unescape View File

@ -104,40 +104,39 @@
FT_UInt32 standard_char;
standard_char = script_class->standard_char1;
af_get_char_index( &metrics->root,
script_class->standard_char1,
standard_char,
&glyph_index,
&y_offset );
if ( glyph_index == 0 )
if ( !glyph_index )
{
if ( script_class->standard_char2 )
{
standard_char = script_class->standard_char2;
af_get_char_index( &metrics->root,
script_class->standard_char2,
standard_char,
&glyph_index,
&y_offset );
if ( glyph_index == 0 )
if ( !glyph_index )
{
if ( script_class->standard_char3 )
{
standard_char = script_class->standard_char3;
af_get_char_index( &metrics->root,
script_class->standard_char3,
standard_char,
&glyph_index,
&y_offset );
if ( glyph_index == 0 )
if ( !glyph_index )
goto Exit;
else
standard_char = script_class->standard_char3;
}
else
goto Exit;
}
else
standard_char = script_class->standard_char2;
}
else
goto Exit;
}
else
standard_char = script_class->standard_char1;
FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
standard_char, glyph_index ));

23
src/autofit/aflatin.c
Unescape View File

@ -98,40 +98,39 @@
* numerals.
*/
standard_char = script_class->standard_char1;
af_get_char_index( &metrics->root,
script_class->standard_char1,
standard_char,
&glyph_index,
&y_offset );
if ( glyph_index == 0 )
if ( !glyph_index )
{
if ( script_class->standard_char2 )
{
standard_char = script_class->standard_char2;
af_get_char_index( &metrics->root,
script_class->standard_char2,
standard_char,
&glyph_index,
&y_offset );
if ( glyph_index == 0 )
if ( !glyph_index )
{
if ( script_class->standard_char3 )
{
standard_char = script_class->standard_char3;
af_get_char_index( &metrics->root,
script_class->standard_char3,
standard_char,
&glyph_index,
&y_offset );
if ( glyph_index == 0 )
if ( !glyph_index )
goto Exit;
else
standard_char = script_class->standard_char3;
}
else
goto Exit;
}
else
standard_char = script_class->standard_char2;
}
else
goto Exit;
}
else
standard_char = script_class->standard_char1;
FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
standard_char, glyph_index ));

Write Preview
Loading…
Cancel
Save