shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Prepare source code for amalgamation (2/6).

* src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine FLOOR,
CEILING, TRUNC, and SCALED before defining it.

git/fs: mount .git/fs: mount/attach disallowed

binary files a/ChangeLog b/ChangeLog differ

--- a/src/raster/ftraster.c

+++ b/src/raster/ftraster.c

@@ -428,6 +428,10 @@

   /* NOTE: These operations are only valid on 2's complement processors */

+#undef FLOOR

+#undef CEILING

+#undef TRUNC

+#undef SCALED

 #define FLOOR( x )    ( (x) & -ras.precision )

 #define CEILING( x )  ( ( (x) + ras.precision - 1 ) & -ras.precision )

--- a/src/smooth/ftgrays.c

+++ b/src/smooth/ftgrays.c

@@ -253,6 +253,11 @@

   /* must be at least 6 bits! */

 #define PIXEL_BITS  8

+#undef FLOOR

+#undef CEILING

+#undef TRUNC

+#undef SCALED

+

 #define ONE_PIXEL       ( 1L << PIXEL_BITS )

 #define PIXEL_MASK      ( -1L << PIXEL_BITS )

 #define TRUNC( x )      ( (TCoord)( (x) >> PIXEL_BITS ) )