[cairo-commit] cairo-ocaml/src ml_cairo.c, 1.25, 1.26 ml_cairo_pattern.c, 1.2, 1.3 ml_cairo_matrix.c, 1.1, 1.2

Olivier Andrieu commit at pdx.freedesktop.org
Thu Nov 3 06:35:59 PST 2005


Committed by: oandrieu

Update of /cvs/cairo/cairo-ocaml/src
In directory gabe:/tmp/cvs-serv17813/src

Modified Files:
	ml_cairo.c ml_cairo_pattern.c ml_cairo_matrix.c 
Log Message:
* src/ml_cairo_pattern.c, src/ml_cairo_matrix.c, src/ml_cairo.c: fixes for 
  archs with ARCH_ALIGN_DOUBLE (patch from Samuel Mimram). 
VS: ----------------------------------------------------------------------


Index: ml_cairo.c
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ml_cairo.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ml_cairo.c	11 Aug 2005 00:33:04 -0000	1.25
+++ ml_cairo.c	3 Nov 2005 14:35:57 -0000	1.26
@@ -70,11 +70,11 @@
 		  Double_array_length (d), Double_val (off));
 #else
   int i, ndash = Double_array_length (d);
-  double *dashes = stat_alloc (ndash * sizeof (double));
-  for (i = 0; i < ndash, i++)
+  double *dashes = caml_stat_alloc (ndash * sizeof (double));
+  for (i = 0; i < ndash; i++)
     dashes[i] = Double_field (d, i);
   cairo_set_dash (cairo_t_val (cr), dashes, ndash, Double_val (off));
-  stat_free (dashes);
+  caml_stat_free (dashes);
 #endif
   check_cairo_status (cr);
   return Val_unit;

Index: ml_cairo_pattern.c
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ml_cairo_pattern.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ml_cairo_pattern.c	18 Jul 2005 19:11:05 -0000	1.2
+++ ml_cairo_pattern.c	3 Nov 2005 14:35:57 -0000	1.3
@@ -85,7 +85,7 @@
   cairo_matrix_t mat;
   cairo_pattern_get_matrix (cairo_pattern_t_val (p), &mat);
   check_pattern_status (p);
-  return ml_convert_cairo_matrix_out (m, &mat);
+  return ml_convert_cairo_matrix_out (&mat);
 #else
   CAMLparam1(p);
   value m = caml_alloc_small (6 * Double_wosize, Double_array_tag);

Index: ml_cairo_matrix.c
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ml_cairo_matrix.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ml_cairo_matrix.c	22 May 2005 20:03:15 -0000	1.1
+++ ml_cairo_matrix.c	3 Nov 2005 14:35:57 -0000	1.2
@@ -87,7 +87,7 @@
 #else
   cairo_matrix_t mat;
   ml_convert_cairo_matrix_in (m, &mat);
-  cairo_matrix_rotate (&mat, Double_val (a);
+  cairo_matrix_rotate (&mat, Double_val (a));
   return ml_convert_cairo_matrix_out (&mat);
 #endif
 }



More information about the cairo-commit mailing list