diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
| commit | 9db9c1f2215e32047c7329ab769d54dd3c1ddeb7 (patch) | |
| tree | 98acb9a60cf237138f939b5dadb0d9ae7722ddeb /src/3rdparty/freetype/src/psaux/afmparse.c | |
| parent | e9d32707afeddfdd2906af7bed60c375b1035dd6 (diff) | |
| parent | 3c8f4512df30dee4a867a498fff6d2b27b881e4b (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/freetype/src/psaux/afmparse.c')
| -rw-r--r-- | src/3rdparty/freetype/src/psaux/afmparse.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/3rdparty/freetype/src/psaux/afmparse.c b/src/3rdparty/freetype/src/psaux/afmparse.c index 0528fe6ff..63a786e88 100644 --- a/src/3rdparty/freetype/src/psaux/afmparse.c +++ b/src/3rdparty/freetype/src/psaux/afmparse.c @@ -4,7 +4,7 @@ /* */ /* AFM parser (body). */ /* */ -/* Copyright 2006, 2007 by */ +/* Copyright 2006, 2007, 2008 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -672,7 +672,12 @@ FT_ULong index2 = KERN_INDEX( kp2->index1, kp2->index2 ); - return (int)( index1 - index2 ); + if ( index1 > index2 ) + return 1; + else if ( index1 < index2 ) + return -1; + else + return 0; } |