diff options
| author | Olivier Andrieu <oandrieu@gmail.com> | 2009-12-01 23:58:07 +0100 |
|---|---|---|
| committer | Olivier Andrieu <oandrieu@gmail.com> | 2009-12-01 23:58:07 +0100 |
| commit | 1b8fc3cca643263168111793339e18f48c22d952 (patch) | |
| tree | 97edf67b2114d363857cf75f021153ddd9f9a317 | |
| parent | 1f95a4821276f5105e21a55bcd5732024061b9c9 (diff) | |
use the new bigarray names
Use the new caml bigarray symbols instead of relying on compatibility.h.
| -rw-r--r-- | src/ml_cairo_bigarr.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ml_cairo_bigarr.c b/src/ml_cairo_bigarr.c index b1ae244..0f93500 100644 --- a/src/ml_cairo_bigarr.c +++ b/src/ml_cairo_bigarr.c @@ -6,29 +6,29 @@ /* GNU Lesser General Public License version 2.1 (the "LGPL"). */ /**************************************************************************/ -#include <caml/bigarray.h> - #include "ml_cairo.h" -unsigned long bigarray_byte_size (struct caml_bigarray *); +#include <caml/bigarray.h> + +unsigned long bigarray_byte_size (struct caml_ba_array *); CAMLprim value ml_bigarray_byte_size (value b) { - return Val_long (bigarray_byte_size (Bigarray_val (b))); + return Val_long (caml_ba_byte_size (Caml_ba_array_val (b))); } CAMLprim value ml_bigarray_kind_float (value v) { - struct caml_bigarray *ba = Bigarray_val (v); + struct caml_ba_array *ba = Caml_ba_array_val (v); - switch (ba->flags & BIGARRAY_KIND_MASK) + switch (ba->flags & CAML_BA_KIND_MASK) { - case BIGARRAY_FLOAT32: - case BIGARRAY_FLOAT64: - case BIGARRAY_COMPLEX32: - case BIGARRAY_COMPLEX64: + case CAML_BA_FLOAT32: + case CAML_BA_FLOAT64: + case CAML_BA_COMPLEX32: + case CAML_BA_COMPLEX64: return Val_true; default: return Val_false; @@ -39,7 +39,7 @@ CAMLprim value ml_cairo_image_surface_create_for_data (value img, value fmt, value w, value h, value stride) { cairo_surface_t *surf; - surf = cairo_image_surface_create_for_data (Data_bigarray_val (img), + surf = cairo_image_surface_create_for_data (Caml_ba_data_val (img), cairo_format_t_val (fmt), Int_val (w), Int_val (h), |