small formatting issues.

This commit is contained in:
Werner Lemberg 2000-09-11 22:50:13 +00:00
parent a8194a97db
commit f9b0375002
5 changed files with 15 additions and 12 deletions

View File

@ -298,6 +298,7 @@
FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
{
FT_Int64 z;
z = (FT_Int64)(x) << 16;
@ -772,11 +773,13 @@
{
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 */

View File

@ -1419,10 +1419,10 @@
FT_Bool external_stream;
/* test for valid `library' and `args' delayed to */
/* 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 )