configure: Regenerate.
2006-06-13 Thomas Fitzsimmons <fitzsim@redhat.com> * configure: Regenerate. * Makefile.in: Regenerate. * configure.ac (--enable-plugin): New option. (ac_configure_args): Add --enable-tool-wrappers. (ac_configure_args): Add --disable-plugin unless --enable-plugin was specified. * gcj/Makefile.in: Regenerate. * sources.am (gnu_java_net_source_files): Add classpath/gnu/java/net/IndexListParser.java. (property_files): Remove classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties, classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties. Add classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties, classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties, classpath/resource/gnu/classpath/tools/getopt/Messages.properties, classpath/resource/gnu/classpath/tools/jar/messages.properties, classpath/resource/gnu/classpath/tools/jarsigner/messages.properties, classpath/resource/gnu/classpath/tools/keytool/messages.properties, classpath/resource/gnu/classpath/tools/native2ascii/messages.properties, classpath/resource/gnu/classpath/tools/serialver/messages.properties. * classpath/Makefile.in: Regenerate. * classpath/native/jni/gtk-peer/cairographics2d.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Merge from GNU Classpath. * classpath/native/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.am: Install libjawt.so in GCJ's versioned library directory. * classpath/native/Makefile.am: Add plugin directory if --enable-plugin was specified. * classpath/native/plugin/Makefile.in: Regenerate. * classpath/native/plugin/Makefile.am: Install libgcjwebplugin.so in GCJ's versioned library directory. * classpath/resource/gnu/classpath/tools/native2ascii/messages.properties: New file. * classpath/resource/gnu/classpath/tools/getopt/Messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/keytool/messages.properties: New file. * classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties: New file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties: Likewise. * classpath/resource/gnu/classpath/tools/jar/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/serialver/messages.properties: Likewise. * classpath/gnu/java/net/IndexListParser.java: Likewise. * classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java, classpath/gnu/java/awt/peer/gtk/CairoSurface.java, classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java, classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java, classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java, classpath/gnu/java/awt/java2d/PolyEdge.java, classpath/gnu/java/awt/java2d/AbstractGraphics2D.java: Merge from GNU Classpath. * classpath/tools/toolwrapper.c: Replace tools.zip reference with libgcj-tools-4.2.0.jar. * classpath/tools/Makefile.in: Regenerate. * classpath/tools/Makefile.am: Rename tools.zip to libgcj-tools-4.2.0.jar. Install libgcj-tools-4.2.0.jar in $(datadir)/java. * classpath/javax/swing/JTabbedPane.java, classpath/javax/swing/text/DefaultStyledDocument.java, classpath/javax/swing/text/html/HTMLDocument.java, classpath/javax/swing/text/GapContent.java, classpath/javax/swing/JComponent.java, classpath/javax/swing/RepaintManager.java, classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java, classpath/javax/swing/plaf/basic/BasicScrollBarUI.java, classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java, classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java, classpath/javax/swing/plaf/basic/BasicLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalButtonUI.java, classpath/java/text/Bidi.java, classpath/java/awt/image/BufferedImage.java, classpath/java/awt/datatransfer/DataFlavor.java, classpath/java/awt/geom/AffineTransform.java, classpath/java/awt/dnd/DropTargetDropEvent.java, classpath/java/awt/dnd/DropTargetContext.java, classpath/java/awt/font/TextLayout.java, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h, classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h, classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h, classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h, classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h, classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h: Merge from GNU Classpath. * classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h, classpath/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c, classpath/native/jni/gtk-peer/gtkcairopeer.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Remove files. * classpath/Makefile.am (SUBDIRS, DIST_SUBDIRS): Include tools directory. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r114633
This commit is contained in:
Thomas Fitzsimmons
Thomas Fitzsimmons
parent
e3d437c056
commit
648e8d6dd3
102 changed files with 3933 additions and 4458 deletions
|
|
@ -88,49 +88,65 @@ public class CairoSurface extends DataBuffer
|
|||
/**
|
||||
* Allocates and clears the buffer and creates the cairo surface.
|
||||
* @param width, height - the image size
|
||||
* @param stride - the buffer row stride.
|
||||
* @param stride - the buffer row stride. (in ints)
|
||||
*/
|
||||
private native void create(int width, int height, int stride);
|
||||
|
||||
/**
|
||||
* Destroys the cairo surface and frees the buffer.
|
||||
*/
|
||||
private native void destroy();
|
||||
private native void destroy(long surfacePointer, long bufferPointer);
|
||||
|
||||
/**
|
||||
* Gets buffer elements
|
||||
*/
|
||||
private native int nativeGetElem(int i);
|
||||
private native int nativeGetElem(long bufferPointer, int i);
|
||||
|
||||
/**
|
||||
* Sets buffer elements.
|
||||
*/
|
||||
private native void nativeSetElem(int i, int val);
|
||||
private native void nativeSetElem(long bufferPointer, int i, int val);
|
||||
|
||||
/**
|
||||
* Draws this image to a given CairoGraphics context,
|
||||
* with an affine transform given by i2u.
|
||||
*/
|
||||
public native void drawSurface(CairoGraphics2D context, double[] i2u);
|
||||
public native void nativeDrawSurface(long surfacePointer, long contextPointer,
|
||||
double[] i2u, double alpha);
|
||||
|
||||
public void drawSurface(long contextPointer, double[] i2u, double alpha)
|
||||
{
|
||||
nativeDrawSurface(surfacePointer, contextPointer, i2u, alpha);
|
||||
}
|
||||
|
||||
/**
|
||||
* getPixels -return the pixels as a java array.
|
||||
*/
|
||||
native int[] getPixels(int size);
|
||||
native int[] nativeGetPixels(long bufferPointer, int size);
|
||||
|
||||
public int[] getPixels(int size)
|
||||
{
|
||||
return nativeGetPixels(bufferPointer, size);
|
||||
}
|
||||
|
||||
/**
|
||||
* getPixels -return the pixels as a java array.
|
||||
*/
|
||||
native void setPixels(int[] pixels);
|
||||
native void nativeSetPixels(long bufferPointer, int[] pixels);
|
||||
|
||||
native long getFlippedBuffer(int size);
|
||||
public void setPixels(int[] pixels)
|
||||
{
|
||||
nativeSetPixels(bufferPointer, pixels);
|
||||
}
|
||||
|
||||
native long getFlippedBuffer(long bufferPointer, int size);
|
||||
|
||||
/**
|
||||
* Create a cairo_surface_t with specified width and height.
|
||||
* The format will be ARGB32 with premultiplied alpha and native bit
|
||||
* and word ordering.
|
||||
*/
|
||||
CairoSurface(int width, int height)
|
||||
public CairoSurface(int width, int height)
|
||||
{
|
||||
super(DataBuffer.TYPE_INT, width * height);
|
||||
|
||||
|
|
@ -140,7 +156,7 @@ public class CairoSurface extends DataBuffer
|
|||
this.width = width;
|
||||
this.height = height;
|
||||
|
||||
create(width, height, width * 4);
|
||||
create(width, height, width);
|
||||
|
||||
if(surfacePointer == 0 || bufferPointer == 0)
|
||||
throw new Error("Could not allocate bitmap.");
|
||||
|
|
@ -160,7 +176,7 @@ public class CairoSurface extends DataBuffer
|
|||
width = image.width;
|
||||
height = image.height;
|
||||
|
||||
create(width, height, width * 4);
|
||||
create(width, height, width);
|
||||
|
||||
if(surfacePointer == 0 || bufferPointer == 0)
|
||||
throw new Error("Could not allocate bitmap.");
|
||||
|
|
@ -195,7 +211,7 @@ public class CairoSurface extends DataBuffer
|
|||
public void dispose()
|
||||
{
|
||||
if(surfacePointer != 0)
|
||||
destroy();
|
||||
destroy(surfacePointer, bufferPointer);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -211,7 +227,8 @@ public class CairoSurface extends DataBuffer
|
|||
*/
|
||||
public GtkImage getGtkImage()
|
||||
{
|
||||
return new GtkImage( width, height, getFlippedBuffer( width * height ));
|
||||
return new GtkImage( width, height,
|
||||
getFlippedBuffer(bufferPointer, width * height ));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -251,7 +268,7 @@ public class CairoSurface extends DataBuffer
|
|||
{
|
||||
if(bank != 0 || i < 0 || i >= width*height)
|
||||
throw new IndexOutOfBoundsException(i+" size: "+width*height);
|
||||
return nativeGetElem(i);
|
||||
return nativeGetElem(bufferPointer, i);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -261,7 +278,7 @@ public class CairoSurface extends DataBuffer
|
|||
{
|
||||
if(bank != 0 || i < 0 || i >= width*height)
|
||||
throw new IndexOutOfBoundsException(i+" size: "+width*height);
|
||||
nativeSetElem(i, val);
|
||||
nativeSetElem(bufferPointer, i, val);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -277,12 +294,22 @@ public class CairoSurface extends DataBuffer
|
|||
* Creates a cairo_t drawing context, returns the pointer as a long.
|
||||
* Used by CairoSurfaceGraphics.
|
||||
*/
|
||||
native long newCairoContext();
|
||||
native long nativeNewCairoContext(long surfacePointer);
|
||||
|
||||
public long newCairoContext()
|
||||
{
|
||||
return nativeNewCairoContext(surfacePointer);
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy an area of the surface. Expects parameters must be within bounds.
|
||||
* Count on a segfault otherwise.
|
||||
*/
|
||||
native void copyAreaNative(int x, int y, int width, int height,
|
||||
int dx, int dy, int stride);
|
||||
native void copyAreaNative2(long bufferPointer, int x, int y, int width,
|
||||
int height, int dx, int dy, int stride);
|
||||
public void copyAreaNative(int x, int y, int width,
|
||||
int height, int dx, int dy, int stride)
|
||||
{
|
||||
copyAreaNative2(bufferPointer, x, y, width, height, dx, dy, stride);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue