rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More C++ fixes.

This commit is contained in:
Werner Lemberg 2000-11-02 15:14:38 +00:00
parent ae7dc21fd1
commit cf6bc2e22d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cache/ftcimage.c vendored
View File

@ -96,7 +96,7 @@
&face, &size );
if ( !error )
{
FT_UInt glyph_index = node->root.glyph_index;
FT_UInt gindex = node->root.glyph_index;
FT_UInt load_flags = FT_LOAD_DEFAULT;
FT_UInt image_type = imageset->description.image_type;
@ -126,7 +126,7 @@
if ( image_type & ftc_image_flag_autohinted )
load_flags |= FT_LOAD_FORCE_AUTOHINT;
error = FT_Load_Glyph( face, glyph_index, load_flags );
error = FT_Load_Glyph( face, gindex, load_flags );
if ( !error )
{
if ( face->glyph->format == ft_glyph_format_bitmap ||

12
src/truetype/ttinterp.c
View File

@ -1278,21 +1278,21 @@
/*************************************************************************/
static
LOCAL_FUNC_X
FT_F26Dot6 Read_CVT( EXEC_OP_ FT_ULong index )
{
return CUR.cvt[index];
}
static
LOCAL_FUNC_X
FT_F26Dot6 Read_CVT_Stretched( EXEC_OP_ FT_ULong index )
{
return TT_MULFIX( CUR.cvt[index], CURRENT_Ratio() );
}
static
LOCAL_FUNC_X
void Write_CVT( EXEC_OP_ FT_ULong index,
FT_F26Dot6 value )
{
@ -1300,7 +1300,7 @@
}
static
LOCAL_FUNC_X
void Write_CVT_Stretched( EXEC_OP_ FT_ULong index,
FT_F26Dot6 value )
{
@ -1308,7 +1308,7 @@
}
static
LOCAL_FUNC_X
void Move_CVT( EXEC_OP_ FT_ULong index,
FT_F26Dot6 value )
{
@ -1316,7 +1316,7 @@
}
static
LOCAL_FUNC_X
void Move_CVT_Stretched( EXEC_OP_ FT_ULong index,
FT_F26Dot6 value )
{

4
src/type1/t1load.c
View File

@ -972,7 +972,7 @@
/* We need to `zero' out encoding_table.elements */
for ( n = 0; n < count; n++ )
{
char* notdef = ".notdef";
char* notdef = (char *)".notdef";
T1_Add_Table( char_table, n, notdef, 8 );
@ -1342,7 +1342,7 @@
/* 0 333 hsbw endchar */
FT_Byte notdef_glyph[] = {0x8B, 0xF7, 0xE1, 0x0D, 0x0E};
char* notdef_name = ".notdef";
char* notdef_name = (char *)".notdef";
error = T1_Add_Table( name_table, n,