Merge branch 'master' of https://github.com/tcsullivan/gamedev

1 files changed, 37 insertions, 37 deletions

diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index b66f036..27184c1 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -520,7 +520,7 @@ FT_BEGIN_HEADER
 
   /* */
 
-#define FT_CURVE_TAG( flag )  ( flag & 3 )
+#define FT_CURVE_TAG(flag)  (flag & 3)
 
 #define FT_CURVE_TAG_ON            1
 #define FT_CURVE_TAG_CONIC         0
@@ -531,8 +531,8 @@ FT_BEGIN_HEADER
 #define FT_CURVE_TAG_TOUCH_X       8  /* reserved for the TrueType hinter */
 #define FT_CURVE_TAG_TOUCH_Y      16  /* reserved for the TrueType hinter */
 
-#define FT_CURVE_TAG_TOUCH_BOTH    ( FT_CURVE_TAG_TOUCH_X | \
-                                     FT_CURVE_TAG_TOUCH_Y )
+#define FT_CURVE_TAG_TOUCH_BOTH    (FT_CURVE_TAG_TOUCH_X | \
+                                     FT_CURVE_TAG_TOUCH_Y)
 
 #define FT_Curve_Tag_On       FT_CURVE_TAG_ON
 #define FT_Curve_Tag_Conic    FT_CURVE_TAG_CONIC
@@ -562,8 +562,8 @@ FT_BEGIN_HEADER
   /*    Error code.  0~means success.                                      */
   /*                                                                       */
   typedef int
-  (*FT_Outline_MoveToFunc)( const FT_Vector*  to,
-                            void*             user );
+  (*FT_Outline_MoveToFunc)(const FT_Vector*  to,
+                            void*             user);
 
 #define FT_Outline_MoveTo_Func  FT_Outline_MoveToFunc
 
@@ -589,8 +589,8 @@ FT_BEGIN_HEADER
   /*    Error code.  0~means success.                                      */
   /*                                                                       */
   typedef int
-  (*FT_Outline_LineToFunc)( const FT_Vector*  to,
-                            void*             user );
+  (*FT_Outline_LineToFunc)(const FT_Vector*  to,
+                            void*             user);
 
 #define FT_Outline_LineTo_Func  FT_Outline_LineToFunc
 
@@ -620,9 +620,9 @@ FT_BEGIN_HEADER
   /*    Error code.  0~means success.                                      */
   /*                                                                       */
   typedef int
-  (*FT_Outline_ConicToFunc)( const FT_Vector*  control,
+  (*FT_Outline_ConicToFunc)(const FT_Vector*  control,
                              const FT_Vector*  to,
-                             void*             user );
+                             void*             user);
 
 #define FT_Outline_ConicTo_Func  FT_Outline_ConicToFunc
 
@@ -652,10 +652,10 @@ FT_BEGIN_HEADER
   /*    Error code.  0~means success.                                      */
   /*                                                                       */
   typedef int
-  (*FT_Outline_CubicToFunc)( const FT_Vector*  control1,
+  (*FT_Outline_CubicToFunc)(const FT_Vector*  control1,
                              const FT_Vector*  control2,
                              const FT_Vector*  to,
-                             void*             user );
+                             void*             user);
 
 #define FT_Outline_CubicTo_Func  FT_Outline_CubicToFunc
 
@@ -732,17 +732,17 @@ FT_BEGIN_HEADER
   /*    this:                                                              */
   /*                                                                       */
   /*    {                                                                  */
-  /*      #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  value         */
+  /*      #define FT_IMAGE_TAG(value, _x1, _x2, _x3, _x4)  value         */
   /*    }                                                                  */
   /*                                                                       */
   /*    to get a simple enumeration without assigning special numbers.     */
   /*                                                                       */
 #ifndef FT_IMAGE_TAG
-#define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 )  \
-          value = ( ( (unsigned long)_x1 << 24 ) | \
-                    ( (unsigned long)_x2 << 16 ) | \
-                    ( (unsigned long)_x3 << 8  ) | \
-                      (unsigned long)_x4         )
+#define FT_IMAGE_TAG(value, _x1, _x2, _x3, _x4)  \
+          value = (((unsigned long)_x1 << 24) | \
+                    ((unsigned long)_x2 << 16) | \
+                    ((unsigned long)_x3 << 8) | \
+                      (unsigned long)_x4  )
 #endif /* FT_IMAGE_TAG */
 
 
@@ -786,12 +786,12 @@ FT_BEGIN_HEADER
   /*                                                                       */
   typedef enum  FT_Glyph_Format_
   {
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_NONE, 0, 0, 0, 0 ),
+    FT_IMAGE_TAG(FT_GLYPH_FORMAT_NONE, 0, 0, 0, 0),
 
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_COMPOSITE, 'c', 'o', 'm', 'p' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_BITMAP,    'b', 'i', 't', 's' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_OUTLINE,   'o', 'u', 't', 'l' ),
-    FT_IMAGE_TAG( FT_GLYPH_FORMAT_PLOTTER,   'p', 'l', 'o', 't' )
+    FT_IMAGE_TAG(FT_GLYPH_FORMAT_COMPOSITE, 'c', 'o', 'm', 'p'),
+    FT_IMAGE_TAG(FT_GLYPH_FORMAT_BITMAP,    'b', 'i', 't', 's'),
+    FT_IMAGE_TAG(FT_GLYPH_FORMAT_OUTLINE,   'o', 'u', 't', 'l'),
+    FT_IMAGE_TAG(FT_GLYPH_FORMAT_PLOTTER,   'p', 'l', 'o', 't')
 
   } FT_Glyph_Format;
 
@@ -943,10 +943,10 @@ FT_BEGIN_HEADER
   /*    only for those scanlines that do have `gray' pixels on them.       */
   /*                                                                       */
   typedef void
-  (*FT_SpanFunc)( int             y,
+  (*FT_SpanFunc)(int             y,
                   int             count,
                   const FT_Span*  spans,
-                  void*           user );
+                  void*           user);
 
 #define FT_Raster_Span_Func  FT_SpanFunc
 
@@ -975,9 +975,9 @@ FT_BEGIN_HEADER
   /*   1~if the pixel is `set', 0~otherwise.                               */
   /*                                                                       */
   typedef int
-  (*FT_Raster_BitTest_Func)( int    y,
+  (*FT_Raster_BitTest_Func)(int    y,
                              int    x,
-                             void*  user );
+                             void*  user);
 
 
   /*************************************************************************/
@@ -1003,9 +1003,9 @@ FT_BEGIN_HEADER
   /*    1~if the pixel is `set', 0~otherwise.                              */
   /*                                                                       */
   typedef void
-  (*FT_Raster_BitSet_Func)( int    y,
+  (*FT_Raster_BitSet_Func)(int    y,
                             int    x,
-                            void*  user );
+                            void*  user);
 
 
   /*************************************************************************/
@@ -1150,8 +1150,8 @@ FT_BEGIN_HEADER
   /*    completely ignored by a given raster implementation.               */
   /*                                                                       */
   typedef int
-  (*FT_Raster_NewFunc)( void*       memory,
-                        FT_Raster*  raster );
+  (*FT_Raster_NewFunc)(void*       memory,
+                        FT_Raster*  raster);
 
 #define FT_Raster_New_Func  FT_Raster_NewFunc
 
@@ -1168,7 +1168,7 @@ FT_BEGIN_HEADER
   /*    raster :: A handle to the raster object.                           */
   /*                                                                       */
   typedef void
-  (*FT_Raster_DoneFunc)( FT_Raster  raster );
+  (*FT_Raster_DoneFunc)(FT_Raster  raster);
 
 #define FT_Raster_Done_Func  FT_Raster_DoneFunc
 
@@ -1201,9 +1201,9 @@ FT_BEGIN_HEADER
   /*    recommended for efficiency purposes.                               */
   /*                                                                       */
   typedef void
-  (*FT_Raster_ResetFunc)( FT_Raster       raster,
+  (*FT_Raster_ResetFunc)(FT_Raster       raster,
                           unsigned char*  pool_base,
-                          unsigned long   pool_size );
+                          unsigned long   pool_size);
 
 #define FT_Raster_Reset_Func  FT_Raster_ResetFunc
 
@@ -1227,9 +1227,9 @@ FT_BEGIN_HEADER
   /*    args   :: A pointer to the new mode/property to use.               */
   /*                                                                       */
   typedef int
-  (*FT_Raster_SetModeFunc)( FT_Raster      raster,
+  (*FT_Raster_SetModeFunc)(FT_Raster      raster,
                             unsigned long  mode,
-                            void*          args );
+                            void*          args);
 
 #define FT_Raster_Set_Mode_Func  FT_Raster_SetModeFunc
 
@@ -1269,8 +1269,8 @@ FT_BEGIN_HEADER
   /*         composition).                                                 */
   /*                                                                       */
   typedef int
-  (*FT_Raster_RenderFunc)( FT_Raster                raster,
-                           const FT_Raster_Params*  params );
+  (*FT_Raster_RenderFunc)(FT_Raster                raster,
+                           const FT_Raster_Params*  params);
 
 #define FT_Raster_Render_Func  FT_Raster_RenderFunc