Compiler warning and typo fixes

* src/ml_cairo.c: fix a C compiler warning
* src/cairo.ml, src/ml_cairo_font.c: fix typos

6 files changed, 18 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ef6dc8..7410506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-04  Olivier Andrieu  <oandrieu@gmail.com>
+
+	* src/ml_cairo.c: fix a C compiler warning
+	* src/cairo.ml, src/ml_cairo_font.c: fix typos
+
 2007-08-27  Olivier Andrieu  <oandrieu@gmail.com>
 
 	* src/ml_cairo_bigarr.c: fix compilation with OCaml 3.10
diff --git a/README b/README
index 337a299..fad0547 100644
--- a/README
+++ b/README
@@ -38,4 +38,4 @@ and is also available here:
 
 Author
 ======
-Olivier Andrieu <oliv__a@users.sourceforge.net>
+Olivier Andrieu <oandrieu@gmail.com>
diff --git a/src/cairo.ml b/src/cairo.ml
index 7ac4442..8703a0e 100644
--- a/src/cairo.ml
+++ b/src/cairo.ml
@@ -141,7 +141,7 @@ external set_miter_limit : t -> float -> unit = "ml_cairo_set_miter_limit"
 external translate : t -> tx:float -> ty:float -> unit = "ml_cairo_translate"
 external scale : t -> sx:float -> sy:float -> unit = "ml_cairo_scale"
 external rotate : t -> angle:float -> unit = "ml_cairo_rotate"
-external transform : t -> matrix -> unit = "ml_cairo_trasnform"
+external transform : t -> matrix -> unit = "ml_cairo_transform"
 external set_matrix : t -> matrix -> unit = "ml_cairo_set_matrix"
 external identity_matrix : t -> unit = "ml_cairo_identity_matrix"
 external user_to_device : t -> point -> point = "ml_cairo_user_to_device"
@@ -307,7 +307,7 @@ let downcast_to_toy f =
   then (Obj.magic f : [`Any|`TOY] t) 
   else invalid_arg "Cairo: scaled font downcast"
 external font_extents : [> `Any] t -> font_extents = "ml_cairo_scaled_font_extents"
-external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_text_extents"
+external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_font_text_extents"
 external glyph_extents : [> `Any] t -> glyph array -> text_extents = "ml_cairo_scaled_font_glyph_extents"
 external get_font_face : ([>`Any] as 'a) t -> 'a font_face = "ml_cairo_scaled_font_get_font_face"
 external get_font_matrix : ([>`Any] as 'a) t -> matrix = "ml_cairo_scaled_font_get_font_matrix"
diff --git a/src/cairo.mli b/src/cairo.mli
index 5ea1bc3..ec908aa 100644
--- a/src/cairo.mli
+++ b/src/cairo.mli
@@ -155,7 +155,7 @@ external set_miter_limit : t -> float -> unit = "ml_cairo_set_miter_limit"
 external translate : t -> tx:float -> ty:float -> unit = "ml_cairo_translate"
 external scale : t -> sx:float -> sy:float -> unit = "ml_cairo_scale"
 external rotate : t -> angle:float -> unit = "ml_cairo_rotate"
-external transform : t -> matrix -> unit = "ml_cairo_trasnform"
+external transform : t -> matrix -> unit = "ml_cairo_transform"
 external set_matrix : t -> matrix -> unit = "ml_cairo_set_matrix"
 external identity_matrix : t -> unit = "ml_cairo_identity_matrix"
 
@@ -297,7 +297,7 @@ external create : ([>`Any] as 'a) font_face -> matrix -> matrix -> Font_Options.
 val get_type : [> `Any] t -> [font_type|`Any]
 val downcast_to_toy : [> `Any] t -> [`Any|`TOY] t
 external font_extents : [> `Any] t -> font_extents = "ml_cairo_scaled_font_extents"
-external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_text_extents"
+external text_extents : [> `Any] t -> string -> text_extents = "ml_cairo_scaled_font_text_extents"
 external glyph_extents : [>`Any] t -> glyph array -> text_extents = "ml_cairo_scaled_font_glyph_extents"
 external get_font_face : ([>`Any] as 'a) t -> 'a font_face = "ml_cairo_scaled_font_get_font_face"
 external get_font_matrix : ([>`Any] as 'a) t -> matrix = "ml_cairo_scaled_font_get_font_matrix"
diff --git a/src/ml_cairo.c b/src/ml_cairo.c
index ad5fbaa..7f50a1d 100644
--- a/src/ml_cairo.c
+++ b/src/ml_cairo.c
@@ -523,11 +523,16 @@ value *
 ml_cairo_make_closure (value f)
 {
   CAMLparam1(f);
-  value c;
+  value c, *r;
   c = caml_alloc_small (2, 0);
   Field (c, 0) = f;
   Field (c, 1) = Val_unit;
-  CAMLreturn (ml_cairo_make_root (c));
+  r = ml_cairo_make_root (c);
+#ifdef CAMLreturnT
+  CAMLreturnT (value*, r);
+#else
+  CAMLreturn (r);
+#endif
 }
 
 cairo_status_t
diff --git a/src/ml_cairo_font.c b/src/ml_cairo_font.c
index 0874294..536bbd0 100644
--- a/src/ml_cairo_font.c
+++ b/src/ml_cairo_font.c
@@ -101,7 +101,7 @@ ml_cairo_scaled_font_extents (value sf)
 }
 
 CAMLprim value
-ml_scaled_font_text_extents (value sf, value v_utf8)
+ml_cairo_scaled_font_text_extents (value sf, value v_utf8)
 {
   cairo_text_extents_t c_extents;
   cairo_scaled_font_text_extents (cairo_scaled_font_t_val (sf), String_val (v_utf8), &c_extents);