small formatting issues.
This commit is contained in:
parent
a8194a97db
commit
f9b0375002
|
@ -34,7 +34,7 @@
|
|||
|
||||
#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 DIV_64( x, y ) ( (x) / (y) )
|
||||
|
||||
#ifdef FT_CONFIG_OPTION_OLD_CALCS
|
||||
|
||||
|
@ -74,7 +74,7 @@
|
|||
|
||||
#ifdef FT_CONFIG_OPTION_OLD_CALCS
|
||||
|
||||
FT_EXPORT_DEF(FT_Int32) FT_SqrtFixed( FT_Int32 x );
|
||||
FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x );
|
||||
|
||||
#define SQRT_64( z ) FT_Sqrt64( &z )
|
||||
|
||||
|
|
|
@ -65,8 +65,8 @@
|
|||
FT_Long size,
|
||||
void** P );
|
||||
|
||||
BASE_DEF( void ) FT_Free( FT_Memory memory,
|
||||
void** P );
|
||||
BASE_DEF( void ) FT_Free( FT_Memory memory,
|
||||
void** P );
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -296,8 +296,9 @@
|
|||
}
|
||||
|
||||
|
||||
FT_EXPORT_DEF(FT_Int32) FT_SqrtFixed( FT_Int32 x )
|
||||
FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
|
||||
{
|
||||
|
||||
FT_Int64 z;
|
||||
|
||||
z = (FT_Int64)(x) << 16;
|
||||
|
@ -768,15 +769,17 @@
|
|||
}
|
||||
|
||||
|
||||
FT_EXPORT_DEF(FT_Int32) FT_SqrtFixed( FT_Int32 x )
|
||||
FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
|
||||
{
|
||||
FT_Int64 z;
|
||||
|
||||
|
||||
z.hi = (FT_UInt32)((FT_Int32)(x) >> 16);
|
||||
z.lo = (FT_UInt32)( x << 16 );
|
||||
return FT_Sqrt64( &z );
|
||||
}
|
||||
|
||||
|
||||
#endif /* FT_CONFIG_OPTION_OLD_CALCS */
|
||||
|
||||
#endif /* FT_LONG64 */
|
||||
|
|
|
@ -1419,10 +1419,10 @@
|
|||
FT_Bool external_stream;
|
||||
|
||||
|
||||
/* test for valid `library' and `args' delayed to */
|
||||
/* ft_new_input_stream() */
|
||||
/* test for valid `library' delayed to */
|
||||
/* ft_new_input_stream() */
|
||||
|
||||
if ( !aface )
|
||||
if ( !aface || !args )
|
||||
return FT_Err_Invalid_Argument;
|
||||
|
||||
*aface = 0;
|
||||
|
@ -1438,7 +1438,7 @@
|
|||
|
||||
/* If the font driver is specified in the `args' structure, use */
|
||||
/* it. Otherwise, we scan the list of registered drivers. */
|
||||
if ( args->flags & ft_open_driver && args->driver )
|
||||
if ( ( args->flags & ft_open_driver ) && args->driver )
|
||||
{
|
||||
driver = FT_DRIVER( args->driver );
|
||||
|
||||
|
@ -1508,7 +1508,7 @@
|
|||
}
|
||||
|
||||
Success:
|
||||
FT_TRACE4(( "FT_New_Face: New face object, adding to list\n" ));
|
||||
FT_TRACE4(( "FT_Open_Face: New face object, adding to list\n" ));
|
||||
|
||||
/* set the FT_FACE_FLAG_EXTERNAL_STREAM bit for FT_Done_Face */
|
||||
if ( external_stream )
|
||||
|
|
|
@ -1740,7 +1740,7 @@
|
|||
if ( ras.max_ex > 24 || ras.max_ey > 24 )
|
||||
level++;
|
||||
if ( ras.max_ex > 120 || ras.max_ey > 120 )
|
||||
level ++;
|
||||
level++;
|
||||
|
||||
ras.conic_level <<= level;
|
||||
ras.cubic_level <<= level;
|
||||
|
|
Loading…
Reference in New Issue