[cairo-commit] cairo-java/src/jni org_freedesktop_cairo_Cairo.c, 1.11, 1.12 org_freedesktop_cairo_Surface.c, 1.2, 1.3

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	org_freedesktop_cairo_Cairo.c org_freedesktop_cairo_Surface.c 
Log Message:
changes to bring current with cairo cvs

Index: org_freedesktop_cairo_Cairo.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Cairo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- org_freedesktop_cairo_Cairo.c	15 Mar 2005 02:12:01 -0000	1.11
+++ org_freedesktop_cairo_Cairo.c	17 Mar 2005 01:32:08 -0000	1.12
@@ -719,9 +719,9 @@
   (JNIEnv *env, jclass cls, jobject obj, jstring text)
 {
 	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
-	const char* t = (const char*)(*env)->GetStringUTFChars(env, text, NULL);
+	const unsigned char* t = (const unsigned char*)(*env)->GetStringUTFChars(env, text, NULL);
 	cairo_show_text(cr, t);
-	(*env)->ReleaseStringUTFChars(env, text, t);
+	(*env)->ReleaseStringUTFChars(env, text, (char*)t);
 }
 
 /*
@@ -794,7 +794,7 @@
 	cr = (cairo_t*)getPointerFromHandle(env, obj);
 	extents_g = g_new(cairo_text_extents_t, 1);
 	cairo_text_extents(cr, text_g, extents_g);
-	(*env)->ReleaseStringUTFChars(env, text, text_g);
+	(*env)->ReleaseStringUTFChars(env, text, (char *)text_g);
 	updateHandle(env, extents, extents_g);
 }
 
@@ -825,7 +825,7 @@
 	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
 	const unsigned char* text_g = (const unsigned char*)(*env)->GetStringUTFChars(env, text, NULL);
 	cairo_text_path(cr, text_g);
-	(*env)->ReleaseStringUTFChars(env, text, text_g);
+	(*env)->ReleaseStringUTFChars(env, text, (char*)text_g);
 }
 
 /*

Index: org_freedesktop_cairo_Surface.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Surface.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_freedesktop_cairo_Surface.c	5 Mar 2005 12:56:11 -0000	1.2
+++ org_freedesktop_cairo_Surface.c	17 Mar 2005 01:32:08 -0000	1.3
@@ -83,6 +83,19 @@
 
 /*
  * Class:     org_freedesktop_cairo_Surface
+ * Method:    cairo_surface_finish
+ * Signature: (Lorg/gnu/glib/Handle;)I
+ */
+JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Surface_cairo_1surface_1finish
+  (JNIEnv *env, jclass cls, jobject obj)
+{
+	cairo_surface_t *surface = (cairo_surface_t*)getPointerFromHandle(env, obj);
+	cairo_surface_finish(surface);
+}
+
+
+/*
+ * Class:     org_freedesktop_cairo_Surface
  * Method:    cairo_surface_set_matrix
  * Signature: (Lorg/gnu/glib/Handle;Lorg/gnu/glib/Handle;)I
  */