diff options
author | Алексей Подтележников <apodtele@gmail.com> | 2010-11-28 08:23:40 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2010-11-28 08:23:40 +0100 |
commit | 7c4ac3cb0c3defe453009503d2a85026227bad55 (patch) | |
tree | 1d8f59baa7c36be3eeed320c31fbc6515831e8af | |
parent | 9073e7ceb628ed8404896bd1901e4262d77a170f (diff) | |
download | freetype2-7c4ac3cb0c3defe453009503d2a85026227bad55.tar.gz |
[ftsmooth]: Minor code simplification.
* src/smooth/ftgrays (gray_render_cubic): Do only one comparison
instead of two.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/smooth/ftgrays.c | 8 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2010-11-28 Alexei Podtelezhnikov <apodtele@gmail.com> + + [ftsmooth]: Minor code simplification. + + * src/smooth/ftgrays (gray_render_cubic): Do only one comparison + instead of two. + 2010-11-26 Johnson Y. Yan <yinsen_yan@foxitsoftware.com> [truetype] Better multi-threading support. diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 8f93392fb..a85e16086 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -1057,7 +1057,13 @@ typedef ptrdiff_t FT_PtrDist; dx_ = FT_ABS( dx ); dy_ = FT_ABS( dy ); - L = ( 236 * FT_MAX( dx_, dy_ ) + 97 * FT_MIN( dx_, dy_ ) ) >> 8; + + /* This is the same as */ + /* */ + /* L = ( 236 * FT_MAX( dx_, dy_ ) */ + /* + 97 * FT_MIN( dx_, dy_ ) ) >> 8; */ + L = ( dx_ > dy_ ? 236 * dx_ + 97 * dy_ + : 97 * dx_ + 236 * dy_ ) >> 8; /* Avoid possible arithmetic overflow below by splitting. */ if ( L > 32767 ) |