diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-09 16:35:08 -0700 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-08-19 11:42:11 -0700 |
| commit | a3a6685e80688af254c5c23a62a2f3b0bcef5e5f (patch) | |
| tree | 7e67208cafc4572557e8d10469fb5dc173ca2edf /src/cache/ftcsbits.c | |
| parent | 6bb07037be23a1523b3af5b1be5432bd4ccf22b7 (diff) | |
| download | android_external_freetype-stable/cm-11.0-XNG3C.tar.gz android_external_freetype-stable/cm-11.0-XNG3C.tar.bz2 android_external_freetype-stable/cm-11.0-XNG3C.zip | |
Update to freetype 2.6.0stable/cm-11.0-XNG3C
Bug 18751561
RM-154
Change-Id: Ia8c081f8fd38a1f78c72d30234c5ace8cfffe6a9
(cherry picked from commit c341565733345bef8ebe68db3c175301afe4ec97)
Diffstat (limited to 'src/cache/ftcsbits.c')
| -rw-r--r-- | src/cache/ftcsbits.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c index 6df1c19..8141719 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-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -52,7 +52,7 @@ if ( pitch < 0 ) pitch = -pitch; - size = (FT_ULong)( pitch * bitmap->rows ); + size = (FT_ULong)pitch * bitmap->rows; if ( !FT_ALLOC( sbit->buffer, size ) ) FT_MEM_COPY( sbit->buffer, bitmap->buffer, size ); @@ -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; @@ -181,7 +181,7 @@ /* now, compute size */ if ( asize ) - *asize = FT_ABS( sbit->pitch ) * sbit->height; + *asize = (FT_ULong)FT_ABS( sbit->pitch ) * sbit->height; } /* glyph loading successful */ @@ -302,7 +302,7 @@ pitch = -pitch; /* add the size of a given glyph image */ - size += pitch * sbit->height; + size += (FT_Offset)pitch * sbit->height; } } |