Commit a13a473dd90d645d7e81baaf27c8331255002a00
2000-11-02T15:14:38
More C++ fixes.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 294c648..b0c6abb 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -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 ||
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 9dc0c19..b18732d 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -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 )
{
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 7bb4b25..787aab2 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -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,