[cairo-commit] cairo-java/src/jni org_freedesktop_cairo_Surface.c, 1.10, 1.11 org_freedesktop_cairo_Context.c, 1.8, 1.9

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	org_freedesktop_cairo_Surface.c 
	org_freedesktop_cairo_Context.c 
Log Message:
more upstream changes.

Index: org_freedesktop_cairo_Surface.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Surface.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_freedesktop_cairo_Surface.c	17 Jul 2005 20:50:46 -0000	1.10
+++ org_freedesktop_cairo_Surface.c	13 Aug 2005 22:35:13 -0000	1.11
@@ -116,6 +116,56 @@
 	cairo_surface_set_device_offset(surface, xoff, yoff);
 }
 
+/*
+ * Class:     org_freedesktop_cairo_Surface
+ * Method:    cairo_surface_get_font_options
+ * Signature: (Lorg/gnu/javagnome/Handle;)Lorg/gnu/javagnome/Handle;
+ */
+JNIEXPORT jobject JNICALL Java_org_freedesktop_cairo_Surface_cairo_1surface_1get_1font_1options
+  (JNIEnv *env, jclass cls, jobject obj)
+{
+	cairo_surface_t *surface = (cairo_surface_t*)getPointerFromHandle(env, obj);
+	cairo_font_options_t *fo;
+	cairo_surface_get_font_options(surface, fo);
+	return getHandleFromPointer(env, fo);
+}
+
+/*
+ * Class:     org_freedesktop_cairo_Surface
+ * Method:    cairo_surface_flush
+ * Signature: (Lorg/gnu/javagnome/Handle;)V
+ */
+JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Surface_cairo_1surface_1flush
+  (JNIEnv *env, jclass cls, jobject obj)
+{
+	cairo_surface_t *surface = (cairo_surface_t*)getPointerFromHandle(env, obj);
+	cairo_surface_flush(surface);
+}
+
+/*
+ * Class:     org_freedesktop_cairo_Surface
+ * Method:    cairo_surface_mark_dirty
+ * Signature: (Lorg/gnu/javagnome/Handle;)V
+ */
+JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Surface_cairo_1surface_1mark_1dirty
+  (JNIEnv *env, jclass cls, jobject obj)
+{
+	cairo_surface_t *surface = (cairo_surface_t*)getPointerFromHandle(env, obj);
+	cairo_surface_mark_dirty(surface);
+}
+
+/*
+ * Class:     org_freedesktop_cairo_Surface
+ * Method:    cairo_surface_mark_dirty_rectangle
+ * Signature: (Lorg/gnu/javagnome/Handle;IIII)V
+ */
+JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Surface_cairo_1surface_1mark_1dirty_1rectangle
+  (JNIEnv *env, jclass cls, jobject obj, jint x, jint y, jint w, jint h)
+{
+	cairo_surface_t *surface = (cairo_surface_t*)getPointerFromHandle(env, obj);
+	cairo_surface_mark_dirty_rectangle(surface, x, y, w, h);
+}
+
 
 #ifdef __cplusplus
 }

Index: org_freedesktop_cairo_Context.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Context.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_freedesktop_cairo_Context.c	13 Aug 2005 22:11:22 -0000	1.8
+++ org_freedesktop_cairo_Context.c	13 Aug 2005 22:35:13 -0000	1.9
@@ -1071,18 +1071,6 @@
 
 /*
  * Class:     org_freedesktop_cairo_Context
- * Method:    cairo_status_string
- * Signature: (Lorg/gnu/glib/Handle;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_freedesktop_cairo_Context_cairo_1status_1string
-  (JNIEnv *env, jclass cls, jobject obj)
-{
-	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
-	return (*env)->NewStringUTF(env, cairo_status_string(cr));
-}
-
-/*
- * Class:     org_freedesktop_cairo_Context
  * Method:    cairo_set_antialias
  * Signature: (Lorg/gnu/glib/Handle;I)
  */
@@ -1105,6 +1093,34 @@
 	return (jint)cairo_get_antialias(cr);
 }
 
+/*
+ * Class:     org_freedesktop_cairo_Context
+ * Method:    cairo_set_font_options
+ * Signature: (Lorg/gnu/javagnome/Handle;Lorg/gnu/javagnome/Handle;)V
+ */
+JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Context_cairo_1set_1font_1options
+  (JNIEnv *env, jclass cls, jobject obj, jobject fo)
+{
+	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
+	cairo_font_options_t *options = (cairo_font_options_t*)getPointerFromHandle(env, fo);
+	cairo_set_font_options(cr, options);
+}
+
+/*
+ * Class:     org_freedesktop_cairo_Context
+ * Method:    cairo_get_font_options
+ * Signature: (Lorg/gnu/javagnome/Handle;)Lorg/gnu/javagnome/Handle;
+ */
+JNIEXPORT jobject JNICALL Java_org_freedesktop_cairo_Context_cairo_1get_1font_1options
+  (JNIEnv *env, jclass cls, jobject obj)
+{
+	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
+	cairo_font_options_t *fo;
+	
+	cairo_get_font_options(cr, fo);
+	return getHandleFromPointer(env, fo);
+}
+
 
 #ifdef __cplusplus
 }