[cairo-commit] cairo-java/src/jni org_freedesktop_cairo_Matrix.c, 1.5, 1.6 org_freedesktop_cairo_Context.c, 1.3, 1.4 org_freedesktop_cairo_Pattern.c, 1.2, 1.3

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	org_freedesktop_cairo_Matrix.c org_freedesktop_cairo_Context.c 
	org_freedesktop_cairo_Pattern.c 
Log Message:
update so we compile after massive upstream API change.

Index: org_freedesktop_cairo_Matrix.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Matrix.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_freedesktop_cairo_Matrix.c	7 May 2005 00:27:02 -0000	1.5
+++ org_freedesktop_cairo_Matrix.c	7 May 2005 00:46:23 -0000	1.6
@@ -187,31 +187,6 @@
 
 /*
  * Class:     org_freedesktop_cairo_Matrix
- * Method:    cairo_matrix_get_affine
- * Signature: (Lorg/gnu/glib/Handle;[D[D[D[D[D[D)I
- */
-JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Matrix_cairo_1matrix_1get_1affine
-  (JNIEnv *env, jclass cls, jobject obj, jdoubleArray a, jdoubleArray b, jdoubleArray c, 
-  			jdoubleArray d, jdoubleArray tx, jdoubleArray ty)
-{
-	cairo_matrix_t *matrix = (cairo_matrix_t*)getPointerFromHandle(env, obj);
-	double *a_g = (double*)(*env)->GetDoubleArrayElements(env, a, NULL);
-	double *b_g = (double*)(*env)->GetDoubleArrayElements(env, b, NULL);
-	double *c_g = (double*)(*env)->GetDoubleArrayElements(env, c, NULL);
-	double *d_g = (double*)(*env)->GetDoubleArrayElements(env, d, NULL);
-	double *tx_g = (double*)(*env)->GetDoubleArrayElements(env, tx, NULL);
-	double *ty_g = (double*)(*env)->GetDoubleArrayElements(env, ty, NULL);
-	cairo_matrix_get_affine(matrix, a_g, b_g, c_g, d_g, tx_g, ty_g);
-	(*env)->ReleaseDoubleArrayElements(env, a, a_g, 0);
-	(*env)->ReleaseDoubleArrayElements(env, b, b_g, 0);
-	(*env)->ReleaseDoubleArrayElements(env, c, c_g, 0);
-	(*env)->ReleaseDoubleArrayElements(env, d, d_g, 0);
-	(*env)->ReleaseDoubleArrayElements(env, tx, tx_g, 0);
-	(*env)->ReleaseDoubleArrayElements(env, ty, ty_g, 0);
-}
-
-/*
- * Class:     org_freedesktop_cairo_Matrix
  * Method:    cairo_matrix_translate
  * Signature: (Lorg/gnu/glib/Handle;DD)I
  */

Index: org_freedesktop_cairo_Context.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Context.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_freedesktop_cairo_Context.c	7 May 2005 00:27:02 -0000	1.3
+++ org_freedesktop_cairo_Context.c	7 May 2005 00:46:23 -0000	1.4
@@ -601,7 +601,7 @@
 	cairo_t *cr;
 	
 	cr = (cairo_t*)getPointerFromHandle(env, obj);
-	cairl_fill_preserve(cr);
+	cairo_fill_preserve(cr);
 }
 
 /*

Index: org_freedesktop_cairo_Pattern.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Pattern.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_freedesktop_cairo_Pattern.c	23 Apr 2005 16:48:28 -0000	1.2
+++ org_freedesktop_cairo_Pattern.c	7 May 2005 00:46:23 -0000	1.3
@@ -145,10 +145,10 @@
 
 /*
  * Class:     org_freedesktop_cairo_Pattern
- * Method:    cairo_pattern_get_extents
+ * Method:    cairo_pattern_get_extend
  * Signature: (Lorg/gnu/glib/Handle;)I
  */
-JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Pattern_cairo_1pattern_1get_1extents
+JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Pattern_cairo_1pattern_1get_1extend
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_pattern_t *pat = (cairo_pattern_t*)getPointerFromHandle(env, obj);