diff options
| author | David Turner <david@freetype.org> | 2005-05-01 10:11:32 +0000 |
|---|---|---|
| committer | David Turner <david@freetype.org> | 2005-05-01 10:11:32 +0000 |
| commit | 29519bbada2cf7642aaec74bf40047476562fb63 (patch) | |
| tree | 1a09cc2528a17624f4ecf89938312689bf46eaf3 /src/truetype | |
| parent | 7315df76c662c333a842b660e9741e3dcadea9ad (diff) | |
| download | freetype2-29519bbada2cf7642aaec74bf40047476562fb63.tar.gz | |
* Jamfile: removing otvalid from the list of compiled modules
* include/freetype/internal/ftserv.h: added compiler pragmas to get rid
of annoying warnings with Visual C++ compiler in maximum warning mode
* src/autofit/afhints.c, src/autofit/aflatin.c, src/base/ftstroke.c,
src/bdf/bdfdrivr.c, src/cache/ftcbasic.c, src/cache/ftccmap.c,
src/cache/ftcmanag.c, src/cff/cffload.c, src/cid/cidload.c,
src/lzw/zopen.c, src/otvalid/otvgdef.c, src/pcf/pcfread.c,
src/sfnt/sfobjs.c, src/truetype/ttgxvar.c: removing compiler warnings
Diffstat (limited to 'src/truetype')
| -rw-r--r-- | src/truetype/ttgxvar.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index c7ff3e9b4..e6051a289 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -154,18 +154,18 @@ if ( runcnt & GX_PT_POINTS_ARE_WORDS ) { runcnt = runcnt & GX_PT_POINT_RUN_COUNT_MASK; - points[i++] = first = FT_GET_USHORT(); + first = points[i++] = FT_GET_USHORT(); /* first point not included in runcount */ for ( j = 0; j < runcnt; ++j ) - points[i++] = ( first += FT_GET_USHORT() ); + points[i++] = (FT_UShort)( first += FT_GET_USHORT() ); } else { - points[i++] = first = FT_GET_BYTE(); + first = points[i++] = FT_GET_BYTE(); for ( j = 0; j < runcnt; ++j ) - points[i++] = ( first += FT_GET_BYTE() ); + points[i++] = (FT_UShort)( first += FT_GET_BYTE() ); } } @@ -1209,7 +1209,7 @@ } apply = ft_var_apply_tuple( blend, - tupleIndex, + (FT_UShort) tupleIndex, tuple_coords, im_start_coords, im_end_coords ); @@ -1238,15 +1238,19 @@ { /* this means that there are deltas for every entry in cvt */ for ( j = 0; j < face->cvt_size; ++j ) - face->cvt[j] += (FT_Short)FT_MulFix( deltas[j], - apply ); + face->cvt[j] = (FT_Short)( face->cvt[j] + FT_MulFix( deltas[j], + apply ) ); } else { for ( j = 0; j < point_count; ++j ) - face->cvt[localpoints[j]] += (FT_Short)FT_MulFix( deltas[j], - apply ); + { + int pindex = localpoints[j]; + + face->cvt[pindex] = (FT_Short)( face->cvt[pindex] + + FT_MulFix( deltas[j], apply ) ); + } } if ( localpoints != ALL_POINTS ) @@ -1314,7 +1318,7 @@ FT_Fixed* im_end_coords = NULL; FT_UInt point_count, spoint_count = 0; FT_UShort* sharedpoints = NULL; - FT_UShort* localpoints; + FT_UShort* localpoints = NULL; FT_UShort* points; FT_Short *deltas_x, *deltas_y; @@ -1400,7 +1404,7 @@ } apply = ft_var_apply_tuple( blend, - tupleIndex, + (FT_UShort) tupleIndex, tuple_coords, im_start_coords, im_end_coords ); |