diff options
| author | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
| commit | 7785694244cdfc5939ca4754cab4e08bd6980f99 (patch) | |
| tree | e317021c83941073a12d69494425f0dbcbc9eaf8 /freetype/src/cache/ftcsbits.c | |
| parent | c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (diff) | |
| download | vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.gz vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.bz2 vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.zip | |
Upgraded to freetype 2.5.5
Diffstat (limited to 'freetype/src/cache/ftcsbits.c')
| -rw-r--r-- | freetype/src/cache/ftcsbits.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/freetype/src/cache/ftcsbits.c b/freetype/src/cache/ftcsbits.c index 6df1c1993..59727d16e 100644 --- a/freetype/src/cache/ftcsbits.c +++ b/freetype/src/cache/ftcsbits.c @@ -4,7 +4,7 @@ /* */ /* FreeType sbits manager (body). */ /* */ -/* Copyright 2000-2006, 2009-2011, 2013 by */ +/* Copyright 2000-2006, 2009-2011, 2013, 2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -142,12 +142,12 @@ goto BadGlyph; } - /* Check that our values fit into 8-bit containers! */ + /* Check whether our values fit into 8-bit containers! */ /* If this is not the case, our bitmap is too large */ /* and we will leave it as `missing' with sbit.buffer = 0 */ -#define CHECK_CHAR( d ) ( temp = (FT_Char)d, temp == d ) -#define CHECK_BYTE( d ) ( temp = (FT_Byte)d, temp == d ) +#define CHECK_CHAR( d ) ( temp = (FT_Char)d, (FT_Int) temp == (FT_Int) d ) +#define CHECK_BYTE( d ) ( temp = (FT_Byte)d, (FT_UInt)temp == (FT_UInt)d ) /* horizontal advance in pixels */ xadvance = ( slot->advance.x + 32 ) >> 6; |