[cairo-commit] cairo-java/src/java/org/freedesktop/cairo Surface.java, 1.19, 1.20

[Adam Jocksch]

Committed by: ajocksch

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

Modified Files:
	Surface.java 
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: Surface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Surface.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Surface.java	12 Feb 2006 09:05:44 -0000	1.19
+++ Surface.java	28 Feb 2006 17:51:37 -0000	1.20
@@ -72,7 +72,7 @@
 
     native static final private void cairo_surface_destroy(Handle obj);
 
-    native static final private int cairo_surface_finish(Handle obj);
+    native static final private void cairo_surface_finish(Handle obj);
 
     native static final private int cairo_surface_write_to_png(Handle obj,
             String filename);