minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

* src/pcf/pcfread (pcf_load_font), src/bdf/bdfdrivr.c 

(BDF_Face_Init), src/truetype/ttgxvar (TT_Get_MM_Var,
tt_face_vary_cvt): Fix compiler warnings.
This commit is contained in:
Werner Lemberg 2004-07-31 23:04:23 +00:00
parent 004f3da80a
commit 3273a99160
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-07-31 Werner Lemberg <wl@gnu.org>
* src/pcf/pcfread (pcf_load_font), src/bdf/bdfdrivr.c
(BDF_Face_Init), src/truetype/ttgxvar (TT_Get_MM_Var,
tt_face_vary_cvt): Fix compiler warnings.
2004-07-26 Søren Sandmann <sandmann@daimi.au.dk>
* src/pcf/pcfread.c (pcf_interpret_style): Always allocate memory for

2
src/bdf/bdfdrivr.c
View File

@ -416,7 +416,7 @@ THE SOFTWARE.
FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
bsize->height = font->font_ascent + font->font_descent;
bsize->height = (FT_Short)( font->font_ascent + font->font_descent );
prop = bdf_get_font_property( font, "AVERAGE_WIDTH" );
if ( prop )

3
src/pcf/pcfread.c
View File

@ -1102,7 +1102,8 @@ THE SOFTWARE.
FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
bsize->height = face->accel.fontAscent + face->accel.fontDescent;
bsize->height = (FT_Short)( face->accel.fontAscent +
face->accel.fontDescent );
prop = pcf_find_property( face, "AVERAGE_WIDTH" );
if ( prop )

14
src/truetype/ttgxvar.c
View File

@ -736,10 +736,10 @@
a->maximum = axis_rec.maxValue; /* A Fixed */
a->strid = axis_rec.nameID;
a->name[0] = a->tag >> 24;
a->name[1] = ( a->tag >> 16 ) & 0xFF;
a->name[2] = ( a->tag >> 8 ) & 0xFF;
a->name[3] = ( a->tag ) & 0xFF;
a->name[0] = (FT_String)( a->tag >> 24 );
a->name[1] = (FT_String)( ( a->tag >> 16 ) & 0xFF );
a->name[2] = (FT_String)( ( a->tag >> 8 ) & 0xFF );
a->name[3] = (FT_String)( ( a->tag ) & 0xFF );
a->name[4] = 0;
++a;
@ -1238,13 +1238,15 @@
{
/* this means that there are deltas for every entry in cvt */
for ( j = 0; j < face->cvt_size; ++j )
face->cvt[j] += FT_MulFix( deltas[j], apply );
face->cvt[j] += (FT_Short)FT_MulFix( deltas[j],
apply );
}
else
{
for ( j = 0; j < point_count; ++j )
face->cvt[localpoints[j]] += FT_MulFix( deltas[j], apply );
face->cvt[localpoints[j]] += (FT_Short)FT_MulFix( deltas[j],
apply );
}
if ( localpoints != ALL_POINTS )