Index: src/psaux/afmparse.c |
diff --git a/src/psaux/afmparse.c b/src/psaux/afmparse.c |
index 5f3f9e615887a23f2861a410d9fecb03e98988c5..6a40e110dc69915a1daf4033af23d7527c7ee541 100644 |
--- a/src/psaux/afmparse.c |
+++ b/src/psaux/afmparse.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* AFM parser (body). */ |
/* */ |
-/* Copyright 2006-2010, 2012 by */ |
+/* Copyright 2006-2010, 2012, 2013 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -17,6 +17,7 @@ |
#include <ft2build.h> |
#include FT_FREETYPE_H |
+#include FT_INTERNAL_DEBUG_H |
#include FT_INTERNAL_POSTSCRIPT_AUX_H |
#include "afmparse.h" |
@@ -119,7 +120,6 @@ |
afm_stream_read_one( AFM_Stream stream ) |
{ |
char* str; |
- int ch; |
afm_stream_skip_spaces( stream ); |
@@ -130,7 +130,9 @@ |
while ( 1 ) |
{ |
- ch = AFM_GETC(); |
+ int ch = AFM_GETC(); |
+ |
+ |
if ( AFM_IS_SPACE( ch ) ) |
break; |
else if ( AFM_IS_NEWLINE( ch ) ) |
@@ -159,7 +161,6 @@ |
afm_stream_read_string( AFM_Stream stream ) |
{ |
char* str; |
- int ch; |
afm_stream_skip_spaces( stream ); |
@@ -171,7 +172,9 @@ |
/* scan to eol */ |
while ( 1 ) |
{ |
- ch = AFM_GETC(); |
+ int ch = AFM_GETC(); |
+ |
+ |
if ( AFM_IS_NEWLINE( ch ) ) |
{ |
stream->status = AFM_STREAM_STATUS_EOL; |
@@ -545,7 +548,7 @@ |
parser->FontInfo = NULL; |
parser->get_index = NULL; |
- return PSaux_Err_Ok; |
+ return FT_Err_Ok; |
} |
@@ -572,10 +575,10 @@ |
{ |
*aint = val.u.i; |
- return PSaux_Err_Ok; |
+ return FT_Err_Ok; |
} |
else |
- return PSaux_Err_Syntax_Error; |
+ return FT_THROW( Syntax_Error ); |
} |
@@ -637,7 +640,7 @@ |
case AFM_TOKEN_ENDKERNDATA: |
case AFM_TOKEN_ENDFONTMETRICS: |
fi->NumTrackKern = n + 1; |
- return PSaux_Err_Ok; |
+ return FT_Err_Ok; |
case AFM_TOKEN_UNKNOWN: |
break; |
@@ -648,7 +651,7 @@ |
} |
Fail: |
- return PSaux_Err_Syntax_Error; |
+ return FT_THROW( Syntax_Error ); |
} |
@@ -753,7 +756,7 @@ |
ft_qsort( fi->KernPairs, fi->NumKernPair, |
sizeof ( AFM_KernPairRec ), |
afm_compare_kern_pairs ); |
- return PSaux_Err_Ok; |
+ return FT_Err_Ok; |
case AFM_TOKEN_UNKNOWN: |
break; |
@@ -764,7 +767,7 @@ |
} |
Fail: |
- return PSaux_Err_Syntax_Error; |
+ return FT_THROW( Syntax_Error ); |
} |
@@ -795,7 +798,7 @@ |
case AFM_TOKEN_ENDKERNDATA: |
case AFM_TOKEN_ENDFONTMETRICS: |
- return PSaux_Err_Ok; |
+ return FT_Err_Ok; |
case AFM_TOKEN_UNKNOWN: |
break; |
@@ -806,7 +809,7 @@ |
} |
Fail: |
- return PSaux_Err_Syntax_Error; |
+ return FT_THROW( Syntax_Error ); |
} |
@@ -832,11 +835,11 @@ |
if ( token == end_section || token == AFM_TOKEN_ENDFONTMETRICS ) |
- return PSaux_Err_Ok; |
+ return FT_Err_Ok; |
} |
Fail: |
- return PSaux_Err_Syntax_Error; |
+ return FT_THROW( Syntax_Error ); |
} |
@@ -845,19 +848,19 @@ |
{ |
FT_Memory memory = parser->memory; |
AFM_FontInfo fi = parser->FontInfo; |
- FT_Error error = PSaux_Err_Syntax_Error; |
+ FT_Error error = FT_ERR( Syntax_Error ); |
char* key; |
FT_Offset len; |
FT_Int metrics_sets = 0; |
if ( !fi ) |
- return PSaux_Err_Invalid_Argument; |
+ return FT_THROW( Invalid_Argument ); |
key = afm_parser_next_key( parser, 1, &len ); |
if ( !key || len != 16 || |
ft_strncmp( key, "StartFontMetrics", 16 ) != 0 ) |
- return PSaux_Err_Unknown_File_Format; |
+ return FT_THROW( Unknown_File_Format ); |
while ( ( key = afm_parser_next_key( parser, 1, &len ) ) != 0 ) |
{ |
@@ -872,7 +875,7 @@ |
if ( metrics_sets != 0 && metrics_sets != 2 ) |
{ |
- error = PSaux_Err_Unimplemented_Feature; |
+ error = FT_THROW( Unimplemented_Feature ); |
goto Fail; |
} |
@@ -938,7 +941,7 @@ |
/* fall through since we only support kern data */ |
case AFM_TOKEN_ENDFONTMETRICS: |
- return PSaux_Err_Ok; |
+ return FT_Err_Ok; |
default: |
break; |