diff -uprw /home/otaylor/cvs/gnome2/pango-head/pango/opentype/ftxgpos.c ./opentype-munge/ftxgpos.c --- /home/otaylor/cvs/gnome2/pango-head/pango/opentype/ftxgpos.c 2003-07-25 12:59:44.000000000 -0400 +++ ./opentype-munge/ftxgpos.c 2003-07-25 12:55:55.000000000 -0400 @@ -62,12 +63,15 @@ /* the client application must replace this with something more meaningful if multiple master fonts are to be supported. */ - static FT_Error default_mmfunc( FT_Face face, FT_UShort metric_id, FT_Pos* metric_value, void* data ) { + (void)face; + (void)metric_id; + (void)metric_value; + (void)data; return TTO_Err_No_MM_Interpreter; } @@ -5298,7 +5305,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -5324,7 +5331,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -5487,7 +5494,7 @@ if ( error && error != TTO_Err_Not_Covered ) goto End1; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -5518,7 +5518,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -5646,7 +5653,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else return TTO_Err_Not_Covered; @@ -5671,7 +5678,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else return TTO_Err_Not_Covered; diff -uprw /home/otaylor/cvs/gnome2/pango-head/pango/opentype/ftxgsub.c ./opentype-munge/ftxgsub.c --- /home/otaylor/cvs/gnome2/pango-head/pango/opentype/ftxgsub.c 2003-07-25 12:59:44.000000000 -0400 +++ ./opentype-munge/ftxgsub.c 2003-07-25 12:55:55.000000000 -0400 @@ -3475,7 +3437,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -3501,7 +3463,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -3664,7 +3626,7 @@ if ( error && error != TTO_Err_Not_Covered ) goto End1; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -3700,7 +3662,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else break; @@ -3822,7 +3784,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else return TTO_Err_Not_Covered; @@ -3847,7 +3809,7 @@ if ( error && error != TTO_Err_Not_Covered ) return error; - if ( curr_pos + j < in->length ) + if ( curr_pos + j < (int)in->length ) j++; else return TTO_Err_Not_Covered;