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

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	org_freedesktop_cairo_Context.c 
	org_freedesktop_cairo_FontFace.c 
Log Message:
Continued API restructuring and cleanup

Index: org_freedesktop_cairo_Context.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Context.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_freedesktop_cairo_Context.c	7 May 2005 00:46:23 -0000	1.4
+++ org_freedesktop_cairo_Context.c	9 May 2005 14:47:03 -0000	1.5
@@ -35,20 +35,6 @@
 
 /*
  * Class:     org_freedesktop_cairo_Context
- * Method:    cairo_reference
- * Signature: (Lorg/gnu/javagnome/Handle;)V
- */
-JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Context_cairo_1reference
-  (JNIEnv *env, jclass cls, jobject obj)
-{
-	cairo_t *cr;
-	
-	cr = (cairo_t*)getPointerFromHandle(env, obj);
-	cairo_reference(cr);
-}
-
-/*
- * Class:     org_freedesktop_cairo_Context
  * Method:    cairo_destroy
  * Signature: (Lorg/gnu/glib/Handle;)V
  */
@@ -522,6 +508,18 @@
 
 /*
  * Class:     org_freedesktop_cairo_Context
+ * Method:    cairo_paint_with_alpha
+ * Signature: (Lorg/gnu/javagnome/Handle;)V
+ */
+JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Context_cairo_1paint_1with_1alpha
+  (JNIEnv *env, jclass cls, jobject obj, jdouble alpha)
+{
+	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
+	cairo_paint_with_alpha(cr, alpha);
+}
+
+/*
+ * Class:     org_freedesktop_cairo_Context
  * Method:    cairo_mask
  * Signature: (Lorg/gnu/javagnome/Handle;Lorg/gnu/javagnome/Handle;)V
  */
@@ -931,24 +929,6 @@
 
 /*
  * Class:     org_freedesktop_cairo_Context
- * Method:    cairo_get_rgb_color
- * Signature: (Lorg/gnu/glib/Handle;[D[D[D)V
- */
-JNIEXPORT void JNICALL Java_org_freedesktop_cairo_Context_cairo_1get_1rgb_1color
-  (JNIEnv *env, jclass cls, jobject obj, jdoubleArray red, jdoubleArray green, jdoubleArray blue)
-{
-	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
-	double *r = (double*)(*env)->GetDoubleArrayElements(env, red, NULL);
-	double *g = (double*)(*env)->GetDoubleArrayElements(env, green, NULL);
-	double *b = (double*)(*env)->GetDoubleArrayElements(env, blue, NULL);
-	cairo_get_rgb_color(cr, r, g, b);
-	(*env)->ReleaseDoubleArrayElements(env, red, r, 0);
-	(*env)->ReleaseDoubleArrayElements(env, green, g, 0);
-	(*env)->ReleaseDoubleArrayElements(env, blue, b, 0);
-}
-
-/*
- * Class:     org_freedesktop_cairo_Context
  * Method:    cairo_get_source
  * Signature: (Lorg/gnu/glib/Handle;)Lorg/gnu/glib/Handle;
  */

Index: org_freedesktop_cairo_FontFace.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_FontFace.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_freedesktop_cairo_FontFace.c	23 Apr 2005 19:25:56 -0000	1.2
+++ org_freedesktop_cairo_FontFace.c	9 May 2005 14:47:03 -0000	1.3
@@ -17,17 +17,6 @@
 extern "C" {
 #endif
 
-/*
- * Class:     org_freedesktop_cairo_FontFace
- * Method:    cairo_font_face_reference
- * Signature: (Lorg/gnu/glib/Handle;)V
- */
-JNIEXPORT void JNICALL Java_org_freedesktop_cairo_FontFace_cairo_1font_1face_1reference
-  (JNIEnv *env, jclass cls, jobject obj)
-{
-	cairo_font_face_t *font = (cairo_font_face_t*)getPointerFromHandle(env, obj);
-	cairo_font_face_reference(font);
-}
 
 /*
  * Class:     org_freedesktop_cairo_FontFace