Tue Feb 28 09:51:39 PST 2006

Committed by: ajocksch

Update of /cvs/cairo/cairo-java/src/jni
In directory kemper:/tmp/cvs-serv18170/src/jni

Modified Files:
	org_freedesktop_cairo_Context.c 
	org_freedesktop_cairo_FontExtents.c 
	org_freedesktop_cairo_FontFace.c 
	org_freedesktop_cairo_FontOptions.c 
	org_freedesktop_cairo_Glyph.c 
	org_freedesktop_cairo_ImageSurface.c 
	org_freedesktop_cairo_Matrix.c 
	org_freedesktop_cairo_PDFSurface.c 
	org_freedesktop_cairo_Pattern.c 
	org_freedesktop_cairo_ScaledFont.c 
	org_freedesktop_cairo_Status.c org_freedesktop_cairo_Surface.c 
	org_freedesktop_cairo_TextExtents.c 
Log Message:
2006-02-28  Adam Jocksch  <ajocksch at toothpaste.toronto.redhat.com>

	* src/java/org/freedesktop/cairo/Sufrace.java (cairo_surface_finish):
	Changed to return void.	
	* src/jni/org_freedesktop_cairo_FontFace.c: Ditto.
	* src/jni/org_freedesktop_cairo_FontOptions.c: Ditto.
	* src/jni/org_freedesktop_cairo_Glyph.c: Ditto.
	* src/jni/org_freedesktop_cairo_ImageSurface.c: Ditto.
	* src/jni/org_freedesktop_cairo_PDFSurface.c: Ditto.
	* src/jni/org_freedesktop_cairo_Pattern.c: Ditto.
	* src/jni/org_freedesktop_cairo_ScaledFont.c: Ditto.
	* src/jni/org_freedesktop_cairo_Status.c: Ditto.
	* src/jni/org_freedesktop_cairo_TextExtents.c: Ditto.
	* src/jni/org_freedesktop_cairo_Surface.c: Ditto, Added include for string.h.
	(Java_org_freedesktop_cairo_Surface_cairo_1surface_1write_1to_1png_1stream):
	Removed usued variables.
	* src/jni/org_freedesktop_cairo_Matrix.c: Added generated .h file.
	(Java_org_freedesktop_cairo_Matrix_getYX): Now returns a double.
	(Java_org_freedesktop_cairo_Matrix_getXY): Ditto.
	(Java_org_freedesktop_cairo_Matrix_getYY): Ditto.
	(Java_org_freedesktop_cairo_Matrix_getX0): Ditto.
	(Java_org_freedesktop_cairo_Matrix_getY0): Ditto.
	* src/jni/org_freedesktop_cairo_Context.c: Added generated .h file.
	(Java_org_freedesktop_cairo_Context_cairo_1get_1font_1options):
	Initialized fo prior to use.
	* src/jni/org_freedesktop_cairo_FontExtents.c: Added generated .h file and
	include for stdlib.h.

2006-02-27  Andrew Cagney  <cagney at redhat.com>

	* configure.ac: Use AC_CHECK_PROGS to check for JAVAH.
	* Makefile.am (CLASSPATH): Define as $(GJJAR), use.
	(BUILT_SOURCES): Add cairo$(apiversion).jar.
	(jni_cairo_source_files): Replace list with include of
	Makefile.jni.
	(java_cairo_pdf_source_files, jni_cairo_pdf_source_files): Delete.
	(AM_CLFAGS): Replace libcairojni_la_CFLAGS.
	(src/jni/org_freedesktop_cairo_PDFSurface.h)
	(src/jni/org_freedesktop_cairo_PDFSurface.lo, CLEANFILES): Add
	explicit rules for building and removing
	org_freedesktop_cairo_PDFSurface.h.
	* autogen.sh: Generate Makefile.jni.


Index: org_freedesktop_cairo_Context.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Context.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13

--- org_freedesktop_cairo_Context.c	2 Dec 2005 10:36:58 -0000	1.12
+++ org_freedesktop_cairo_Context.c	28 Feb 2006 17:51:37 -0000	1.13
@@ -14,6 +14,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_Context
 #define _Included_org_freedesktop_cairo_Context
+#include "org_freedesktop_cairo_Context.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1120,7 +1121,7 @@
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_t *cr = (cairo_t*)getPointerFromHandle(env, obj);
-	cairo_font_options_t *fo;
+	cairo_font_options_t *fo = NULL;
 	
 	cairo_get_font_options(cr, fo);
 	return getHandleFromPointer(env, fo);

Index: org_freedesktop_cairo_FontExtents.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_FontExtents.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_freedesktop_cairo_FontExtents.c	13 Sep 2005 03:14:10 -0000	1.3
+++ org_freedesktop_cairo_FontExtents.c	28 Feb 2006 17:51:37 -0000	1.4
@@ -10,9 +10,11 @@
 #include <jni.h>
 #include <cairo.h>
 #include <jg_jnu.h>
+#include <stdlib.h>
 
 #ifndef _Included_org_freedesktop_cairo_FontExtents
 #define _Included_org_freedesktop_cairo_FontExtents
+#include "org_freedesktop_cairo_FontExtents.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_FontFace.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_FontFace.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_freedesktop_cairo_FontFace.c	17 Aug 2005 00:23:44 -0000	1.6
+++ org_freedesktop_cairo_FontFace.c	28 Feb 2006 17:51:37 -0000	1.7
@@ -14,6 +14,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_FontFace
 #define _Included_org_freedesktop_cairo_FontFace
+#include "org_freedesktop_cairo_FontFace.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_FontOptions.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_FontOptions.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_freedesktop_cairo_FontOptions.c	13 Sep 2005 03:14:10 -0000	1.2
+++ org_freedesktop_cairo_FontOptions.c	28 Feb 2006 17:51:37 -0000	1.3
@@ -14,6 +14,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_FontOptions
 #define _Included_org_freedesktop_cairo_FontOptions
+#include "org_freedesktop_cairo_FontOptions.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_Glyph.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Glyph.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_freedesktop_cairo_Glyph.c	13 Sep 2005 03:14:10 -0000	1.3
+++ org_freedesktop_cairo_Glyph.c	28 Feb 2006 17:51:37 -0000	1.4
@@ -14,6 +14,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_Glyph
 #define _Included_org_freedesktop_cairo_Glyph
+#include "org_freedesktop_cairo_Glyph.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_ImageSurface.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_ImageSurface.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_freedesktop_cairo_ImageSurface.c	17 Aug 2005 00:23:44 -0000	1.4
+++ org_freedesktop_cairo_ImageSurface.c	28 Feb 2006 17:51:37 -0000	1.5
@@ -13,6 +13,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_ImageSurface
 #define _Included_org_freedesktop_cairo_ImageSurface
+#include "org_freedesktop_cairo_ImageSurface.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_Matrix.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Matrix.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_freedesktop_cairo_Matrix.c	28 Oct 2005 23:04:46 -0000	1.8
+++ org_freedesktop_cairo_Matrix.c	28 Feb 2006 17:51:37 -0000	1.9
@@ -13,6 +13,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_Matrix
 #define _Included_org_freedesktop_cairo_Matrix
+#include "org_freedesktop_cairo_Matrix.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,7 +37,7 @@
  * Method:    getYX
  * Signature: (Lorg/gnu/glib/Handle;)I
  */
-JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Matrix_getYX
+JNIEXPORT jdouble JNICALL Java_org_freedesktop_cairo_Matrix_getYX
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_matrix_t *matrix;
@@ -50,7 +51,7 @@
  * Method:    getXY
  * Signature: (Lorg/gnu/glib/Handle;)I
  */
-JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Matrix_getXY
+JNIEXPORT jdouble JNICALL Java_org_freedesktop_cairo_Matrix_getXY
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_matrix_t *matrix;
@@ -64,7 +65,7 @@
  * Method:    getYY
  * Signature: (Lorg/gnu/glib/Handle;)I
  */
-JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Matrix_getYY
+JNIEXPORT jdouble JNICALL Java_org_freedesktop_cairo_Matrix_getYY
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_matrix_t *matrix;
@@ -78,7 +79,7 @@
  * Method:    getX0
  * Signature: (Lorg/gnu/glib/Handle;)I
  */
-JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Matrix_getX0
+JNIEXPORT jdouble JNICALL Java_org_freedesktop_cairo_Matrix_getX0
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_matrix_t *matrix;
@@ -92,7 +93,7 @@
  * Method:    getY0
  * Signature: (Lorg/gnu/glib/Handle;)I
  */
-JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Matrix_getY0
+JNIEXPORT jdouble JNICALL Java_org_freedesktop_cairo_Matrix_getY0
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_matrix_t *matrix;

Index: org_freedesktop_cairo_PDFSurface.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_PDFSurface.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_freedesktop_cairo_PDFSurface.c	13 Sep 2005 03:14:10 -0000	1.7
+++ org_freedesktop_cairo_PDFSurface.c	28 Feb 2006 17:51:37 -0000	1.8
@@ -15,6 +15,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_PDFSurface
 #define _Included_org_freedesktop_cairo_PDFSurface
+#include "org_freedesktop_cairo_PDFSurface.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_Pattern.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Pattern.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_freedesktop_cairo_Pattern.c	13 Sep 2005 03:14:10 -0000	1.8
+++ org_freedesktop_cairo_Pattern.c	28 Feb 2006 17:51:37 -0000	1.9
@@ -13,6 +13,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_Pattern
 #define _Included_org_freedesktop_cairo_Pattern
+#include "org_freedesktop_cairo_Pattern.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_ScaledFont.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_ScaledFont.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_freedesktop_cairo_ScaledFont.c	28 Oct 2005 23:04:46 -0000	1.6
+++ org_freedesktop_cairo_ScaledFont.c	28 Feb 2006 17:51:37 -0000	1.7
@@ -13,6 +13,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_ScaledFont
 #define _Included_org_freedesktop_cairo_ScaledFont
+#include "org_freedesktop_cairo_ScaledFont.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_Status.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Status.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_freedesktop_cairo_Status.c	17 Aug 2005 00:23:44 -0000	1.1
+++ org_freedesktop_cairo_Status.c	28 Feb 2006 17:51:37 -0000	1.2
@@ -13,6 +13,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_Status
 #define _Included_org_freedesktop_cairo_Status
+#include "org_freedesktop_cairo_Status.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: org_freedesktop_cairo_Surface.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_Surface.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- org_freedesktop_cairo_Surface.c	13 Sep 2005 03:14:10 -0000	1.14
+++ org_freedesktop_cairo_Surface.c	28 Feb 2006 17:51:37 -0000	1.15
@@ -12,9 +12,11 @@
 #include <cairo.h>
 #include <stdlib.h>
 #include <jg_jnu.h>
+#include <string.h>
 
 #ifndef _Included_org_freedesktop_cairo_Surface
 #define _Included_org_freedesktop_cairo_Surface
+#include "org_freedesktop_cairo_Surface.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -55,7 +57,7 @@
  * Method:    cairo_surface_finish
  * Signature: (Lorg/gnu/glib/Handle;)I
  */
-JNIEXPORT jint JNICALL Java_org_freedesktop_cairo_Surface_cairo_1surface_1finish
+JNIEXPORT void 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);
@@ -140,8 +142,6 @@
   (JNIEnv *env, jclass cls, jobject obj, jobject ostream)
 {
 	cairo_surface_t *surface;
-	char *png_g;
-	cairo_status_t status;
 	write_to_png_closure_t png_closure;
 	jclass ostreamClass;
 
@@ -182,7 +182,7 @@
   (JNIEnv *env, jclass cls, jobject obj)
 {
 	cairo_surface_t *surface = (cairo_surface_t*)getPointerFromHandle(env, obj);
-	cairo_font_options_t *fo;
+	cairo_font_options_t *fo = NULL;
 	cairo_surface_get_font_options(surface, fo);
 	return getHandleFromPointer(env, fo);
 }

Index: org_freedesktop_cairo_TextExtents.c
===================================================================
RCS file: /cvs/cairo/cairo-java/src/jni/org_freedesktop_cairo_TextExtents.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_freedesktop_cairo_TextExtents.c	14 Mar 2005 16:24:06 -0000	1.2
+++ org_freedesktop_cairo_TextExtents.c	28 Feb 2006 17:51:37 -0000	1.3
@@ -13,6 +13,7 @@
 
 #ifndef _Included_org_freedesktop_cairo_TextExtents
 #define _Included_org_freedesktop_cairo_TextExtents
+#include "org_freedesktop_cairo_TextExtents.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

