diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-15 12:05:48 -0800 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-15 12:05:48 -0800 |
commit | ea815d93086e3d6d743c1d22fb7e83fb4d41c32a (patch) | |
tree | 0fb281d1f2c9b5983c59359c272e6eb8cf4826b5 /src/autofit/afcjk.c | |
parent | dc280eeb0aa3d55aaf6584c86623bf999ebd1736 (diff) | |
parent | 0c250419df978255ad31e91dd82174b1ceb54542 (diff) | |
download | android_external_freetype-ea815d93086e3d6d743c1d22fb7e83fb4d41c32a.tar.gz android_external_freetype-ea815d93086e3d6d743c1d22fb7e83fb4d41c32a.tar.bz2 android_external_freetype-ea815d93086e3d6d743c1d22fb7e83fb4d41c32a.zip |
merge from eclair
Diffstat (limited to 'src/autofit/afcjk.c')
-rw-r--r-- | src/autofit/afcjk.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c index fabe921..de3ce11 100644 --- a/src/autofit/afcjk.c +++ b/src/autofit/afcjk.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter hinting routines for CJK script (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, */ @@ -1253,10 +1253,15 @@ else if ( after >= edge_limit ) af_cjk_align_serif_edge( hints, before, edge ); else - edge->pos = before->pos + - FT_MulDiv( edge->fpos - before->fpos, - after->pos - before->pos, - after->fpos - before->fpos ); + { + if ( after->fpos == before->fpos ) + edge->pos = before->pos; + else + edge->pos = before->pos + + FT_MulDiv( edge->fpos - before->fpos, + after->pos - before->pos, + after->fpos - before->fpos ); + } } } } |