Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
4eb6cb88
by Alexander Borsuk at 2021-12-27T07:48:04+01:00
2 changed files:
Changes:
... | ... | @@ -26,6 +26,7 @@ |
26 | 26 |
#include "ftccback.h"
|
27 | 27 |
#include "ftcerror.h"
|
28 | 28 |
|
29 |
+#undef FT_COMPONENT
|
|
29 | 30 |
#define FT_COMPONENT cache
|
30 | 31 |
|
31 | 32 |
|
... | ... | @@ -333,7 +333,9 @@ typedef ptrdiff_t FT_PtrDist; |
333 | 333 |
#define PIXEL_BITS 8
|
334 | 334 |
|
335 | 335 |
#define ONE_PIXEL ( 1 << PIXEL_BITS )
|
336 |
+#undef TRUNC
|
|
336 | 337 |
#define TRUNC( x ) (TCoord)( (x) >> PIXEL_BITS )
|
338 |
+#undef FRACT
|
|
337 | 339 |
#define FRACT( x ) (TCoord)( (x) & ( ONE_PIXEL - 1 ) )
|
338 | 340 |
|
339 | 341 |
#if PIXEL_BITS >= 6
|