Add Jordi and Olvier to the AUTHORS file.

Fix broken return value for nchars (thanks to Jordi Mas <jordi@ximian.com>).

5 files changed, 14 insertions, 5 deletions

diff --git a/AUTHORS b/AUTHORS
index c260fdd97..a43a08ab5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
+Olivier Andrieu <oliv__a@users.sourceforge.net> PNG backend
 Dave Beckett <dave.beckett@bristol.ac.uk> Track rename of libpixman, build fixes
 Andrew Chant <andrew.chant@utoronto.ca> Adding const where needed
 John Ellson <ellson@research.att.com> First font/glyph extents functions
@@ -5,6 +6,7 @@ Richard Henderson <rth@twiddle.net> "slim" macros for better shared libraries
 James Henstridge <james@daa.com.au> Build fixes related to freetype
 Graydon Hoare <graydon@redhat.com> Support for non-render X server, first real text support
 Thomas Hunger <info@teh-web.de> Initial version of cairo_in_stroke/fill
+Jordi Mas <jordi@ximian.com> Bug fix for cairo_show_text
 Keith Packard <keithp@keithp.com> Original concept, polygon tessellation, dashing
 Christof Petig <christof@petig-baender.de> Build fixes related to freetype
 Jamey Sharp <jamey@minilop.net> Surface/font backend virtualization, XCB backend
diff --git a/ChangeLog b/ChangeLog
index 45fc947c6..d75549b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-26  Carl Worth  <cworth@isi.edu>
+
+	* AUTHORS: Add Jordi and Olvier to the AUTHORS file.
+
+	* src/cairo_ft_font.c (_utf8_to_ucs4): Fix broken return value for
+	nchars (thanks to Jordi Mas <jordi@ximian.com>).
+
 2004-02-24  Olivier Andrieu  <oliv__a@users.sourceforge.net>
 
 	* src/cairo.h:
diff --git a/TODO b/TODO
index ddf16a6a1..6be575593 100644
--- a/TODO
+++ b/TODO
@@ -73,10 +73,10 @@ Path construction operators
 ---------------------------
 in cairo: arc, arcn (arc_negative), newpath, moveto, rmoveto
 (rel_move_to), lineto, rlineto (rel_line_to), curveto, rcurveto
-(rel_curve_to), closepath, currentpoint, charpath (text_path)
+(rel_curve_to), closepath, currentpoint, charpath (text_path),
+pathforall (current_path), flattenpath (current_path_flat)
 
-not in cairo: arct, arcto, flattenpath, reversepath, strokepath,
-clippath, pathbbox, pathforall
+not in cairo: arct, arcto, reversepath, strokepath, clippath, pathbbox
 
 Clipping
 --------
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 1b04397cb..913ed8369 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -263,7 +263,7 @@ _utf8_to_ucs4 (char const *utf8,
         len -= step;
         utf8 += step;
     }
-    *nchars = alloc;
+    *nchars = n;
 }
 
 static void
diff --git a/src/cairo_ft_font.c b/src/cairo_ft_font.c
index 1b04397cb..913ed8369 100644
--- a/src/cairo_ft_font.c
+++ b/src/cairo_ft_font.c
@@ -263,7 +263,7 @@ _utf8_to_ucs4 (char const *utf8,
         len -= step;
         utf8 += step;
     }
-    *nchars = alloc;
+    *nchars = n;
 }
 
 static void