summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2011-03-19 02:28:21 +0100
committerWerner Lemberg <wl@gnu.org>2011-03-19 02:28:21 +0100
commitc7f26a19827e132b1be59a4cd3123e3d871d4dae (patch)
tree2a72927caa33528408f793ad26892b5ed52bf98e
parent8fb8841430e34b4e61f6e79bb983479ca831e266 (diff)
C++ compilation fixes.
* src/autofit/aflatin.c (af_latin_hints_apply), src/autofit/afcjk.c (af_cjk_hints_apply): Use cast for `dim'.
-rw-r--r--ChangeLog7
-rw-r--r--src/autofit/afcjk.c6
-rw-r--r--src/autofit/aflatin.c6
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 068da8f0..ce3ec766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-18 Werner Lemberg <wl@gnu.org>
+
+ C++ compilation fixes.
+
+ * src/autofit/aflatin.c (af_latin_hints_apply), src/autofit/afcjk.c
+ (af_cjk_hints_apply): Use cast for `dim'.
+
2011-03-17 Alexei Podtelezhnikov <apodtele@gmail.com>
A better fix for Savannah bug #32671.
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 0fcee4d8..d8aa52d3 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -1406,8 +1406,10 @@
FT_Pos delta;
- af_warper_compute( &warper, hints, dim, &scale, &delta );
- af_glyph_hints_scale_dim( hints, dim, scale, delta );
+ af_warper_compute( &warper, hints, (AF_Dimension)dim,
+ &scale, &delta );
+ af_glyph_hints_scale_dim( hints, (AF_Dimension)dim,
+ scale, delta );
continue;
}
#endif /* AF_CONFIG_OPTION_USE_WARPER */
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 116c6c55..59176fb6 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -2207,8 +2207,10 @@
FT_Pos delta;
- af_warper_compute( &warper, hints, dim, &scale, &delta );
- af_glyph_hints_scale_dim( hints, dim, scale, delta );
+ af_warper_compute( &warper, hints, (AF_Dimension)dim,
+ &scale, &delta );
+ af_glyph_hints_scale_dim( hints, (AF_Dimension)dim,
+ scale, delta );
continue;
}
#endif