rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify `TYPEOF' macro. 

No need for two arguments.

* include/config/ftconfig.h, builds/unix/ftconfig.in,
builds/vms/ftconfig.h (TYPEOF): Updated.

* include/internal/ftobjs.h (FT_PAD_FLOOR, FT_PIX_FLOOR),
src/autofit/afwarp.h (AF_WARPER_FLOOR): Updated.
This commit is contained in:
Werner Lemberg 2015-03-02 06:54:08 +01:00
parent 851e815127
commit a07029ef5f
6 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,4 +1,16 @@
2015-02-25 Werner Lemberg <wl@gnu.org>
2015-03-02 Werner Lemberg <wl@gnu.org>
Simplify `TYPEOF' macro.
No need for two arguments.
* include/config/ftconfig.h, builds/unix/ftconfig.in,
builds/vms/ftconfig.h (TYPEOF): Updated.
* include/internal/ftobjs.h (FT_PAD_FLOOR, FT_PIX_FLOOR),
src/autofit/afwarp.h (AF_WARPER_FLOOR): Updated.
2015-03-01 Werner Lemberg <wl@gnu.org>
Various compiler warning fixes for `make multi'.

4
builds/unix/ftconfig.in
View File

@ -366,9 +366,9 @@ FT_BEGIN_HEADER
#if ( __GNUC__ >= 2 || \
defined( __IBM__TYPEOF__ ) || \
( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
#define TYPEOF( type, x ) (__typeof__ (type))(x)
#define TYPEOF( type ) (__typeof__ (type))
#else
#define TYPEOF( type, x ) (x)
#define TYPEOF( type ) /* empty */
#endif

4
builds/vms/ftconfig.h
View File

@ -309,9 +309,9 @@ FT_BEGIN_HEADER
#if ( __GNUC__ >= 2 || \
defined( __IBM__TYPEOF__ ) || \
( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
#define TYPEOF( type, x ) (__typeof__ (type))(x)
#define TYPEOF( type ) (__typeof__ (type))
#else
#define TYPEOF( type, x ) (x)
#define TYPEOF( type ) /* empty */
#endif

4
include/config/ftconfig.h
View File

@ -336,9 +336,9 @@ FT_BEGIN_HEADER
#if ( __GNUC__ >= 2 || \
defined( __IBM__TYPEOF__ ) || \
( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
#define TYPEOF( type, x ) (__typeof__ (type))(x)
#define TYPEOF( type ) (__typeof__ (type))
#else
#define TYPEOF( type, x ) (x)
#define TYPEOF( type ) /* empty */
#endif

4
include/internal/ftobjs.h
View File

@ -84,11 +84,11 @@ FT_BEGIN_HEADER
: y + ( 3 * x >> 3 ) )
/* we use the TYPEOF macro to suppress signedness compilation warnings */
#define FT_PAD_FLOOR( x, n ) ( (x) & ~TYPEOF( x, (n)-1 ) )
#define FT_PAD_FLOOR( x, n ) ( (x) & ~TYPEOF( x )( (n)-1 ) )
#define FT_PAD_ROUND( x, n ) FT_PAD_FLOOR( (x) + ((n)/2), n )
#define FT_PAD_CEIL( x, n ) FT_PAD_FLOOR( (x) + ((n)-1), n )
#define FT_PIX_FLOOR( x ) ( (x) & ~TYPEOF( x, 63 ) )
#define FT_PIX_FLOOR( x ) ( (x) & ~TYPEOF( x )63 )
#define FT_PIX_ROUND( x ) FT_PIX_FLOOR( (x) + 32 )
#define FT_PIX_CEIL( x ) FT_PIX_FLOOR( (x) + 63 )

2
src/autofit/afwarp.h
View File

@ -25,7 +25,7 @@ FT_BEGIN_HEADER
#define AF_WARPER_SCALE
#define AF_WARPER_FLOOR( x ) ( (x) & ~TYPEOF( x, 63 ) )
#define AF_WARPER_FLOOR( x ) ( (x) & ~TYPEOF( x )63 )
#define AF_WARPER_CEIL( x ) AF_WARPER_FLOOR( (x) + 63 )