diff options
| author | Werner Lemberg <wl@gnu.org> | 2014-11-19 21:28:21 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2014-11-21 06:38:46 +0100 |
| commit | b3500af717010137046ec4076d1e1c0641e33727 (patch) | |
| tree | 447a425c2dc59022beb720fc478205edcc6f30ac /src/cache/ftcsbits.c | |
| parent | df485774fbbc7fd7dc9d3b278846f454654ad5df (diff) | |
| download | freetype-b3500af717010137046ec4076d1e1c0641e33727.tar.gz | |
Change some fields in `FT_Bitmap' to unsigned type.
This doesn't break ABI.
* include/ftimage.h (FT_Bitmap): Make `rows', `width', `num_grays',
`pixel_mode', and `palette_mode' unsigned types.
* src/base/ftbitmap.c: Updated.
(FT_Bitmap_Copy): Fix casts.
* src/cache/ftcsbits.c, src/raster/ftraster.c, src/sfnt/pngshim.c:
Updated.
Diffstat (limited to 'src/cache/ftcsbits.c')
| -rw-r--r-- | src/cache/ftcsbits.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c index 6df1c1993..59727d16e 100644 --- a/src/cache/ftcsbits.c +++ b/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; |