Commit c6a14086d27fba8778fbce21efc6b6e069a6c701
2007-02-12T22:08:15
* src/truetype/ttinterp.c (Project_x, Project_y): Remove compiler warnings. * src/pcf/pcfread.c (pcf_interpret_style), src/bdf/bdfdrivr.c (bdf_interpret_style): Ditto.
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
diff --git a/ChangeLog b/ChangeLog
index fa968ed..0c0ac62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-12 Werner Lemberg <wl@gnu.org>
+
+ * src/truetype/ttinterp.c (Project_x, Project_y): Remove compiler
+ warnings.
+
+ * src/pcf/pcfread.c (pcf_interpret_style), src/bdf/bdfdrivr.c
+ (bdf_interpret_style): Ditto.
+
2007-02-12 David Turner <david@freetype.org>
Simplify projection and dual-projection code interface.
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 30580c5..74cc2f1 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -248,7 +248,7 @@ THE SOFTWARE.
if ( len == 0 )
{
- strings[0] = "Regular";
+ strings[0] = (char *)"Regular";
lengths[0] = ft_strlen( strings[0] );
len = lengths[0] + 1;
}
@@ -265,9 +265,10 @@ THE SOFTWARE.
for ( nn = 0; nn < 4; nn++ )
{
char* src = strings[nn];
- int len = lengths[nn];
+ len = lengths[nn];
+
if ( src == NULL )
continue;
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 2a142fc..b9123cf 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -1039,7 +1039,7 @@ THE SOFTWARE.
if ( len == 0 )
{
- strings[0] = "Regular";
+ strings[0] = (char *)"Regular";
lengths[0] = ft_strlen( strings[0] );
len = lengths[0] + 1;
}
@@ -1056,9 +1056,10 @@ THE SOFTWARE.
for ( nn = 0; nn < 4; nn++ )
{
char* src = strings[nn];
- int len = lengths[nn];
+ len = lengths[nn];
+
if ( src == NULL )
continue;
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 3b5d36e..1e89923 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -1858,9 +1858,9 @@
{
FT_F26Dot6 val;
-
FT_UNUSED_EXEC;
+
if ( distance >= 0 )
{
val = distance + compensation + 63;
@@ -2217,6 +2217,7 @@
FT_Pos dy )
{
FT_UNUSED_EXEC;
+ FT_UNUSED( dy );
return dx;
}
@@ -2243,6 +2244,7 @@
FT_Pos dy )
{
FT_UNUSED_EXEC;
+ FT_UNUSED( dx );
return dy;
}