[cairo-commit] cairo-ocaml/src ml_cairo_font.c, 1.4, 1.5 ml_cairo.c, 1.28, 1.29 cairo.mli, 1.23, 1.24 cairo.ml, 1.21, 1.22

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo-ocaml/src
In directory kemper:/tmp/cvs-serv9578/src

Modified Files:
	ml_cairo_font.c ml_cairo.c cairo.mli cairo.ml 
Log Message:
2007-11-04  Olivier Andrieu  <oandrieu at gmail.com>

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


Index: ml_cairo_font.c
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ml_cairo_font.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ml_cairo_font.c	23 Apr 2007 22:35:24 -0000	1.4
+++ ml_cairo_font.c	4 Nov 2007 21:56:21 -0000	1.5
@@ -101,7 +101,7 @@
 }
 
 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);

Index: ml_cairo.c
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ml_cairo.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ml_cairo.c	8 Nov 2006 23:42:34 -0000	1.28
+++ ml_cairo.c	4 Nov 2007 21:56:21 -0000	1.29
@@ -523,11 +523,16 @@
 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

Index: cairo.mli
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/cairo.mli,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cairo.mli	8 Nov 2006 23:42:34 -0000	1.23
+++ cairo.mli	4 Nov 2007 21:56:21 -0000	1.24
@@ -155,7 +155,7 @@
 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 @@
 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"

Index: cairo.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/cairo.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cairo.ml	8 Nov 2006 23:42:34 -0000	1.21
+++ cairo.ml	4 Nov 2007 21:56:22 -0000	1.22
@@ -141,7 +141,7 @@
 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 @@
   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"