create opaque image surfaces; target cairo 1.2 APIs; remove surfaceData field

1 files changed, 39 insertions, 0 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index 1e2e2553ac..465b2dab73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
@@ -552,6 +552,32 @@ public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*
 		lock.unlock();
 	}
 }
+/**
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
+public static final native int /*long*/ _cairo_image_surface_get_data(int /*long*/ surface);
+public static final int /*long*/ cairo_image_surface_get_data(int /*long*/ surface) {
+	lock.lock();
+	try {
+		return _cairo_image_surface_get_data(surface);
+	} finally {
+		lock.unlock();
+	}
+}
+/**
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
+public static final native int _cairo_image_surface_get_format(int /*long*/ surface);
+public static final int cairo_image_surface_get_format(int /*long*/ surface) {
+	lock.lock();
+	try {
+		return _cairo_image_surface_get_format(surface);
+	} finally {
+		lock.unlock();
+	}
+}
 /** @param surface cast=(cairo_surface_t *) */
 public static final native int _cairo_image_surface_get_height(int /*long*/ surface);
 public static final int cairo_image_surface_get_height(int /*long*/ surface) {
@@ -572,6 +598,19 @@ public static final int cairo_image_surface_get_width(int /*long*/ surface) {
 		lock.unlock();
 	}
 }
+/**
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
+public static final native int _cairo_image_surface_get_stride(int /*long*/ surface);
+public static final int cairo_image_surface_get_stride(int /*long*/ surface) {
+	lock.lock();
+	try {
+		return _cairo_image_surface_get_stride(surface);
+	} finally {
+		lock.unlock();
+	}
+}
 /** @param cr cast=(cairo_t *) */
 public static final native int _cairo_in_fill(int /*long*/ cr, double x, double y);
 public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {