Commit f9b0375002872fc8502cc87a65c8b16f6d48508c
2000-09-11T22:50:13
small formatting issues.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index 45313f3..bfba538 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -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 )
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index bb4dabc..48403ec 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -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 );
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 7c4fc2e..85c4116 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -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 */
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index f3f7625..7a8694a 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -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 )
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 17b9ffe..442939f 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -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;