rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

formatting

This commit is contained in:
Werner Lemberg 2001-06-16 07:48:30 +00:00
parent 686901a1a5
commit 3058af3300
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,12 +1,20 @@
2001-06-14 David Turner <david@freetype.org>
* src/base/ftcalc.c, include/internal/ftcalc.h, src/truetype/ttinterp.c,
include/config/ftoption.h: modified the TrueType interpreter to let it
use the new trigonometric functions provided in "fttrigon.h". This
gets rid of some old 64-bit computation routines, as well as many
warnings when compiling the library with the "long long" 64-bit
integer type.
Modified the TrueType interpreter to let it use the new
trigonometric functions provided in "fttrigon.h". This gets rid of
some old 64-bit computation routines, as well as many warnings when
compiling the library with the "long long" 64-bit integer type.
* include/freetype/config/ftoption.h: Undefine
FT_CONFIG_OPTION_OLD_CALCS.
* include/freetype/internal/ftcalc.h: Rearrange use of
FT_CONFIG_OPTION_OLD_CALCS.
* src/base/ftcalc.c: Add declaration of FT_Int64 if
FT_CONFIG_OPTION_OLD_CALCS isn't defined.
* src/truetype/ttinterp.c: Use FT_TRIGONOMETRY_H.
(Norm): Add a special version if FT_CONFIG_OPTION_OLD_CALCS isn't
defined.
(Current_Ratio, Normalize): Simplify code.
2001-06-11 Mike Owens <MOwens@amtdatasouth.com>

22
include/freetype/internal/ftcalc.h
View File

@ -31,15 +31,15 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_OLD_CALCS
# ifdef FT_LONG64
#ifdef FT_LONG64
typedef FT_INT64 FT_Int64;
# define ADD_64( x, y, z ) z = (x) + (y)
# define MUL_64( x, y, z ) z = (FT_Int64)(x) * (y)
# define DIV_64( x, y ) ( (x) / (y) )
#define ADD_64( x, y, z ) z = (x) + (y)
#define MUL_64( x, y, z ) z = (FT_Int64)(x) * (y)
#define DIV_64( x, y ) ( (x) / (y) )
# define SQRT_64( z ) FT_Sqrt64( z )
#define SQRT_64( z ) FT_Sqrt64( z )
/*************************************************************************/
/* */
@ -60,7 +60,7 @@ FT_BEGIN_HEADER
FT_EXPORT( FT_Int32 ) FT_Sqrt64( FT_Int64 l );
# else /* !FT_LONG64 */
#else /* !FT_LONG64 */
typedef struct FT_Int64_
@ -71,9 +71,9 @@ FT_BEGIN_HEADER
} FT_Int64;
# define ADD_64( x, y, z ) FT_Add64( &x, &y, &z )
# define MUL_64( x, y, z ) FT_MulTo64( x, y, &z )
# define DIV_64( x, y ) FT_Div64by32( &x, y )
#define ADD_64( x, y, z ) FT_Add64( &x, &y, &z )
#define MUL_64( x, y, z ) FT_MulTo64( x, y, &z )
#define DIV_64( x, y ) FT_Div64by32( &x, y )
/*************************************************************************/
@ -145,7 +145,7 @@ FT_BEGIN_HEADER
FT_Int32 y );
# define SQRT_64( z ) FT_Sqrt64( &z )
#define SQRT_64( z ) FT_Sqrt64( &z )
/*************************************************************************/
/* */
@ -165,7 +165,7 @@ FT_BEGIN_HEADER
/* */
FT_EXPORT( FT_Int32 ) FT_Sqrt64( FT_Int64* x );
# endif /* !FT_LONG64 */
#endif /* !FT_LONG64 */
#endif /* FT_CONFIG_OPTION_OLD_CALCS */

8
src/base/ftcalc.c
View File

@ -41,11 +41,11 @@
/* we need to define a 64-bits data type here */
#ifndef FT_CONFIG_OPTION_OLD_CALCS
# ifdef FT_LONG64
#ifdef FT_LONG64
typedef FT_INT64 FT_Int64;
# else
#else
typedef struct FT_Int64_
{
@ -54,9 +54,9 @@
} FT_Int64;
# endif
#endif /* FT_LONG64 */
#endif
#endif /* !FT_CONFIG_OPTION_OLD_CALCS */
/*************************************************************************/