diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
| commit | 4e370208d0f941a4cceb6f9fefa78444c2bf3498 (patch) | |
| tree | 543c693b5dee03c965b0c9ef79869a8536024432 /freetype/src/pshinter | |
| parent | 1eaf4b3f1d746b054298358d81233364bb1b7ba2 (diff) | |
| parent | 2177eb8fad173f2b0fe04f188c4d6dadaa8f4441 (diff) | |
| download | vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.gz vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.bz2 vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/src/pshinter')
| -rw-r--r-- | freetype/src/pshinter/pshalgo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/freetype/src/pshinter/pshalgo.c b/freetype/src/pshinter/pshalgo.c index 22c8cca22..15ecc2b90 100644 --- a/freetype/src/pshinter/pshalgo.c +++ b/freetype/src/pshinter/pshalgo.c @@ -1862,12 +1862,10 @@ point->cur_u = hint->cur_pos + hint->cur_len + FT_MulFix( delta - hint->org_len, scale ); - else if ( hint->org_len > 0 ) + else /* hint->org_len > 0 */ point->cur_u = hint->cur_pos + FT_MulDiv( delta, hint->cur_len, hint->org_len ); - else - point->cur_u = hint->cur_pos; } psh_point_set_fitted( point ); } |