12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 |
- --- freetype-2.3.11/src/bdf/bdflib.c 2012-03-28 10:40:25.000000000 +0200
- +++ freetype-2.3.11/src/bdf/bdflib.c 2012-03-28 10:44:30.000000000 +0200
- @@ -1736,12 +1736,7 @@
- if ( ft_memcmp( line, "SWIDTH", 6 ) == 0 )
- {
- if ( !( p->flags & _BDF_ENCODING ) )
- - {
- - /* Missing ENCODING field. */
- - FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "ENCODING" ));
- - error = BDF_Err_Missing_Encoding_Field;
- - goto Exit;
- - }
- + goto Missing_Encoding;
-
- error = _bdf_list_split( &p->list, (char *)" +", line, linelen );
- if ( error )
- @@ -1756,6 +1751,9 @@
- /* Expect the DWIDTH (scalable width) field next. */
- if ( ft_memcmp( line, "DWIDTH", 6 ) == 0 )
- {
- + if ( !( p->flags & _BDF_ENCODING ) )
- + goto Missing_Encoding;
- +
- error = _bdf_list_split( &p->list, (char *)" +", line, linelen );
- if ( error )
- goto Exit;
- @@ -1781,6 +1779,9 @@
- /* Expect the BBX field next. */
- if ( ft_memcmp( line, "BBX", 3 ) == 0 )
- {
- + if ( !( p->flags & _BDF_ENCODING ) )
- + goto Missing_Encoding;
- +
- error = _bdf_list_split( &p->list, (char *)" +", line, linelen );
- if ( error )
- goto Exit;
- @@ -1880,6 +1881,12 @@
- }
-
- error = BDF_Err_Invalid_File_Format;
- + goto Exit;
- +
- + Missing_Encoding:
- + /* Missing ENCODING field. */
- + FT_ERROR(( "_bdf_parse_glyphs: " ERRMSG1, lineno, "ENCODING" ));
- + error = BDF_Err_Missing_Encoding_Field;
-
- Exit:
- return error;
|