[cairo-commit] CairoJava/jni Cairo.cpp, 1.4, 1.5 CairoException.cpp, 1.5, 1.6 CairoFont.cpp, 1.4, 1.5 CairoPattern.cpp, 1.4, 1.5

Charles Tuckey commit at pdx.freedesktop.org
Sun Dec 5 19:44:55 PST 2004 

Committed by: ctuckey

Update of /cvs/cairo/CairoJava/jni
In directory gabe:/tmp/cvs-serv12012/jni

Modified Files:
	Cairo.cpp CairoException.cpp CairoFont.cpp CairoPattern.cpp 
Log Message:
Use getter methods to get enumerated type values found in cairo.h 
instead of hardcoding them in java classes.
Added new cairo_status_t elements:
    CAIRO_STATUS_NO_TARGET_SURFACE,
    CAIRO_STATUS_NULL_POINTER
to CairoException class.


Index: Cairo.cpp
===================================================================
RCS file: /cvs/cairo/CairoJava/jni/Cairo.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Cairo.cpp	8 Nov 2004 17:52:57 -0000	1.4
+++ Cairo.cpp	6 Dec 2004 03:44:53 -0000	1.5
@@ -1536,3 +1536,356 @@
 {
     // TODO: Finish this properly
 }
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFORMAT_ARGB32
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFORMAT_1ARGB32
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FORMAT_ARGB32;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFORMAT_RGB24
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFORMAT_1RGB24
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FORMAT_RGB24;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFORMAT_A8
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFORMAT_1A8
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FORMAT_A8;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFORMAT_A1
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFORMAT_1A1
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FORMAT_A1;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_CLEAR
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1CLEAR
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_CLEAR;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_SRC
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1SRC
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_SRC;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_DST
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1DST
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_DST;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_OVER
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1OVER
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_OVER;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_OVER_REVERSE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1OVER_1REVERSE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_OVER_REVERSE;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_IN
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1IN
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_IN;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_IN_REVERSE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1IN_1REVERSE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_IN_REVERSE;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_OUT
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1OUT
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_OUT;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_OUT_REVERSE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1OUT_1REVERSE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_OUT_REVERSE;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_ATOP
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1ATOP
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_ATOP;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_ATOP_REVERSE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1ATOP_1REVERSE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_ATOP_REVERSE;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_XOR
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1XOR
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_XOR;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_ADD
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1ADD
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_ADD;
+}
+ 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getOPERATOR_SATURATE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getOPERATOR_1SATURATE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_OPERATOR_SATURATE;
+}
+  
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILL_RULE_WINDING
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILL_1RULE_1WINDING
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILL_RULE_WINDING;
+}
+  
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILL_RULE_EVEN_ODD
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILL_1RULE_1EVEN_1ODD
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILL_RULE_EVEN_ODD;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getLINE_CAP_BUTT
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getLINE_1CAP_1BUTT
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_LINE_CAP_BUTT;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getLINE_CAP_ROUND
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getLINE_1CAP_1ROUND
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_LINE_CAP_ROUND;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getLINE_CAP_SQUARE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getLINE_1CAP_1SQUARE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_LINE_CAP_SQUARE;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getLINE_JOIN_MITER
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getLINE_1JOIN_1MITER
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_LINE_JOIN_MITER;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getLINE_JOIN_ROUND
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getLINE_1JOIN_1ROUND
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_LINE_JOIN_ROUND;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getLINE_JOIN_BEVEL
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getLINE_1JOIN_1BEVEL
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_LINE_JOIN_BEVEL;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILTER_FAST
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILTER_1FAST
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILTER_FAST;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILTER_GOOD
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILTER_1GOOD
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILTER_GOOD;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILTER_BEST
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILTER_1BEST
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILTER_BEST;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILTER_NEAREST
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILTER_1NEAREST
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILTER_NEAREST;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILTER_BILINEAR
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILTER_1BILINEAR
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILTER_BILINEAR;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getFILTER_GAUSSIAN
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_Cairo_getFILTER_1GAUSSIAN
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FILTER_GAUSSIAN;
+}
+

Index: CairoException.cpp
===================================================================
RCS file: /cvs/cairo/CairoJava/jni/CairoException.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CairoException.cpp	8 Nov 2004 17:52:57 -0000	1.5
+++ CairoException.cpp	6 Dec 2004 03:44:53 -0000	1.6
@@ -87,3 +87,90 @@
     return env->NewStringUTF(msg);
 }
 
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_SUCCESS
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1SUCCESS
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_SUCCESS;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_NO_MEMORY
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1NO_1MEMORY
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_NO_MEMORY;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_INVALID_RESTORE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1INVALID_1RESTORE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_INVALID_RESTORE;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_INVALID_POP_GROUP
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1INVALID_1POP_1GROUP
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_INVALID_POP_GROUP;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_NO_CURRENT_POINT
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1NO_1CURRENT_1POINT
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_NO_CURRENT_POINT;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_INVALID_MATRIX
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1INVALID_1MATRIX
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_INVALID_MATRIX;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_NO_TARGET_SURFACE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1NO_1TARGET_1SURFACE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_NO_TARGET_SURFACE;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSTATUS_NULL_POINTER
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoException_getSTATUS_1NULL_1POINTER
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_STATUS_NULL_POINTER;
+}

Index: CairoFont.cpp
===================================================================
RCS file: /cvs/cairo/CairoJava/jni/CairoFont.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CairoFont.cpp	8 Nov 2004 17:52:57 -0000	1.4
+++ CairoFont.cpp	6 Dec 2004 03:44:53 -0000	1.5
@@ -113,3 +113,58 @@
     cairo_font_current_transform(TO_PTR(cairo_font_t, fontp),
                                  TO_PTR(cairo_matrix_t, matrixp));
 }
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSLANT_NORMAL
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoFont_getSLANT_1NORMAL
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FONT_SLANT_NORMAL;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSLANT_ITALIC
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoFont_getSLANT_1ITALIC
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FONT_SLANT_ITALIC;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getSLANT_OBLIQUE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoFont_getSLANT_1OBLIQUE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FONT_SLANT_OBLIQUE;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getWEIGHT_NORMAL
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoFont_getWEIGHT_1NORMAL
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FONT_WEIGHT_NORMAL;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getWEIGHT_BOLD
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoFont_getWEIGHT_1BOLD
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_FONT_WEIGHT_BOLD;
+}

Index: CairoPattern.cpp
===================================================================
RCS file: /cvs/cairo/CairoJava/jni/CairoPattern.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CairoPattern.cpp	8 Nov 2004 17:52:57 -0000	1.4
+++ CairoPattern.cpp	6 Dec 2004 03:44:53 -0000	1.5
@@ -185,3 +185,36 @@
 #endif
     return cairo_pattern_get_filter(TO_PTR(cairo_pattern_t, patternp));
 }
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getEXTEND_NONE
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoPattern_getEXTEND_1NONE
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_EXTEND_NONE;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getEXTEND_REPEAT
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoPattern_getEXTEND_1REPEAT
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_EXTEND_REPEAT;
+}
+
+/*
+ * Class:     org_cairographics_cairo_Cairo
+ * Method:    getEXTEND_REFLECT
+ * Signature: ()S
+ */
+JNIEXPORT jshort JNICALL Java_org_cairographics_cairo_CairoPattern_getEXTEND_1REFLECT
+  (JNIEnv *env, jclass me)
+{
+  return CAIRO_EXTEND_REFLECT;
+}

More information about the cairo-commit mailing list