diff options
author | David 'Digit' Turner <digit@google.com> | 2010-03-03 14:24:57 -0800 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2010-03-03 15:33:53 -0800 |
commit | 295ffce55e0198e7a9f7d46b33f5c2b4147bf821 (patch) | |
tree | bda1a337e630483e46b2e4d4db803814437b765d /include/freetype/internal/ftcalc.h | |
parent | 6fb02c1f75ab969890012dd1f01939d3444ddbc1 (diff) | |
download | android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.gz android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.bz2 android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.zip |
Update to FreeType 2.3.12
Diffstat (limited to 'include/freetype/internal/ftcalc.h')
-rw-r--r-- | include/freetype/internal/ftcalc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h index 58def34..f8b4324 100644 --- a/include/freetype/internal/ftcalc.h +++ b/include/freetype/internal/ftcalc.h @@ -4,7 +4,7 @@ /* */ /* Arithmetic computations (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -165,6 +165,7 @@ FT_BEGIN_HEADER #define INT_TO_FIXED( x ) ( (FT_Long)(x) << 16 ) #define F2DOT14_TO_FIXED( x ) ( (FT_Long)(x) << 2 ) #define FLOAT_TO_FIXED( x ) ( (FT_Long)( x * 65536.0 ) ) +#define FIXED_TO_INT( x ) ( FT_RoundFix( x ) >> 16 ) #define ROUND_F26DOT6( x ) ( x >= 0 ? ( ( (x) + 32 ) & -64 ) \ : ( -( ( 32 - (x) ) & -64 ) ) ) |