[cairo-commit] cairo-java/src/java/org/freedesktop/cairo Matrix.java, 1.7, 1.8 Pattern.java, 1.3, 1.4 Surface.java, 1.8, 1.9 ImageSurface.java, 1.8, 1.9

[Jeffrey Morgan]

Committed by: kuzman

Update of /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo
In directory gabe:/tmp/cvs-serv25458/src/java/org/freedesktop/cairo

Modified Files:
	Matrix.java Pattern.java Surface.java ImageSurface.java 
Log Message:
update so we compile after massive upstream API change.

Index: Matrix.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Matrix.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Matrix.java	7 May 2005 00:27:02 -0000	1.7
+++ Matrix.java	7 May 2005 00:46:23 -0000	1.8
@@ -159,10 +159,20 @@
 	native static final private void setYY(Handle matrix, double yy);
 	native static final private void setX0(Handle matrix, double x0);
 	native static final private void setY0(Handle matrix, double y0);
-
-	native static final private void cairo_matrix_get_affine(Handle matrix,
-			double[] a, double[] b, double[] c, double[] d, double[] tx,
-			double[] ty);
+	
+	// TODO: API JNI
+	native static final private void cairo_matrix_init(Handle matrix,
+			double xx, double yx, double xy, double yy, double x0, double y0);
+	// TODO: API JNI
+	native static final private void cairo_matrix_init_identity(Handle matrix);
+	// TODO: API JNI
+	native static final private void cairo_matrix_init_translate(Handle matrix,
+			double tx, double ty);
+	// TODO: API JNI
+	native static final private void cairo_matrix_init_scale(Handle matrix,
+			double sx, double sy);
+	// TODO: API JNI
+	native static final private void cairo_matrix_init_rotate(Handle matrix, double radians);
 	native static final private void cairo_matrix_translate(Handle matrix,
 			double tx, double ty);
 	native static final private void cairo_matrix_scale(Handle matrix,
@@ -176,4 +186,5 @@
 			Handle handle, double[] dx, double[] dy);
 	native static final private void cairo_matrix_transform_point(
 			Handle handle, double[] x, double[] y);
+
 }

Index: Pattern.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Pattern.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Pattern.java	23 Apr 2005 16:48:28 -0000	1.3
+++ Pattern.java	7 May 2005 00:46:23 -0000	1.4
@@ -95,7 +95,7 @@
      * @return The current extend option
      */
 	public Extend getExtend() {
-		return Extend.intern(cairo_pattern_get_extents(getHandle()));
+		return Extend.intern(cairo_pattern_get_extend(getHandle()));
 	}
 	
     /**
@@ -131,7 +131,7 @@
 	native static final private int cairo_pattern_set_matrix(Handle pat, Handle matrix);
 	native static final private int cairo_pattern_get_matrix(Handle pat, Handle matrix);
 	native static final private int cairo_pattern_set_extend(Handle pat, int extend);
-	native static final private int cairo_pattern_get_extents(Handle pat);
+	native static final private int cairo_pattern_get_extend(Handle pat);
 	native static final private int cairo_pattern_set_filter(Handle pat, int filter);
 	native static final private int cairo_pattern_get_filter(Handle pat);
 }

Index: Surface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Surface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Surface.java	7 May 2005 00:27:02 -0000	1.8
+++ Surface.java	7 May 2005 00:46:23 -0000	1.9
@@ -55,7 +55,14 @@
     native static final private void cairo_surface_reference(Handle obj);
     native static final private void cairo_surface_destroy(Handle obj);
     native static final private int cairo_surface_finish(Handle obj);
-    
+	
+	// TODO: API JNI
+	native static final private int cairo_surface_write_to_png(Handle obj, String filename);
+//	native static final private int cairo_surface_write_to_png_stream(Handle obj, String func);
+//	cairo_status_t
+//	cairo_surface_write_to_png_stream (cairo_surface_t	*surface,
+//					   cairo_write_func_t	write_func,
+//					   void			*closure);
     native static final private void cairo_surface_set_device_offset(Handle obj, double xOff, double yOff);
 
 }

Index: ImageSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/ImageSurface.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ImageSurface.java	7 May 2005 00:27:02 -0000	1.8
+++ ImageSurface.java	7 May 2005 00:46:23 -0000	1.9
@@ -46,4 +46,17 @@
 	 */
 	native static final private Handle cairo_image_surface_create(int format, int width, int height);
 	native static final private Handle cairo_image_surface_create_for_data(char[] data, int format, int width, int height, int stride);
+	// TODO: API JNI
+	native static final private int cairo_image_surface_get_width(Handle obj);
+	// TODO: API JNI
+	native static final private int cairo_image_surface_get_height(Handle obj);
+	// TODO: API JNI
+	native static final private Handle cairo_image_surface_create_from_png(String filename);
+	// TODO:
+//	native static final private Handle cairo_image_surface_create_from_png_stream(String func);
+//	cairo_surface_t *
+//	cairo_image_surface_create_from_png_stream (cairo_read_func_t	read_func,
+//						    void		*closure);
+
+	
 }