Remove const qualifiers that only make things happy with a from-cvs version of freetype. Now we should be back to being happy with a released version.

2 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index de5e5ff6..af3e5980 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-07-28  Carl Worth  <cworth@cworth.org>
 
+	* src/cairo-ft-font.c: (_move_to), (_line_to), (_conic_to),
+	(_cubic_to): Remove const qualifiers that only make things happy
+	with a from-cvs version of freetype. Now we should be back to
+	being happy with a released version.
+
+2005-07-28  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo-png.c (read_png): Add missing cast.
+
+2005-07-28  Carl Worth  <cworth@cworth.org>
+
 	* test/Makefile.am (EXTRA_DIST): Remove
 	text-antialias-subpixel-ref.png from the list since it doesn't
 	exist yet.
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 3a762c20..afe80dff 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1875,7 +1875,7 @@ _cairo_ft_scaled_font_show_glyphs (void		       *abstract_font,
 
 
 static int
-_move_to (const FT_Vector *to, void *closure)
+_move_to (FT_Vector *to, void *closure)
 {
     cairo_path_fixed_t *path = closure;
     cairo_fixed_t x, y;
@@ -1890,7 +1890,7 @@ _move_to (const FT_Vector *to, void *closure)
 }
 
 static int
-_line_to (const FT_Vector *to, void *closure)
+_line_to (FT_Vector *to, void *closure)
 {
     cairo_path_fixed_t *path = closure;
     cairo_fixed_t x, y;
@@ -1904,7 +1904,7 @@ _line_to (const FT_Vector *to, void *closure)
 }
 
 static int
-_conic_to (const FT_Vector *control, const FT_Vector *to, void *closure)
+_conic_to (FT_Vector *control, FT_Vector *to, void *closure)
 {
     cairo_path_fixed_t *path = closure;
 
@@ -1937,8 +1937,8 @@ _conic_to (const FT_Vector *control, const FT_Vector *to, void *closure)
 }
 
 static int
-_cubic_to (const FT_Vector *control1, const FT_Vector *control2,
-	   const FT_Vector *to, void *closure)
+_cubic_to (FT_Vector *control1, FT_Vector *control2,
+	   FT_Vector *to, void *closure)
 {
     cairo_path_fixed_t *path = closure;
     cairo_fixed_t x0, y0;