2006-05-30 Sven de Marothy <sven@physto.se>

	* gnu/java/awt/peer/gtk/CairoGraphics2D.java
	(drawImage): Use Toolkit to convert to BufferedImage.
	* gnu/java/awt/peer/gtk/CairoSurface.java
	(CairoSurface(GtkImage)): New Constructor.
	(getBufferedImage): New method.
	* gnu/java/awt/peer/gtk/ComponentGraphics.java
	Don't fill background - FIXME.
	* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java:
	Remove unused methods.
	* gnu/java/awt/peer/gtk/GtkImage.java:
	(pixbuflock): New field. Methods change to use this lock.
	* gnu/java/awt/peer/gtk/GtkToolkit.java
	(createImage): Use Cairo-backed surfaces via GtkImage instead of
	GtkPixbufDecoder.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
	(setPixels): Correct length in bytes.

1 files changed, 0 insertions, 39 deletions

diff --git a/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java b/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
index 4b8ba9472..9212a694d 100644
--- a/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
+++ b/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
@@ -683,43 +683,4 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder
       return getBufferedImage ();
     }
   }
-
-  // remaining helper class and static method is a convenience for the Gtk
-  // peers, for loading a BufferedImage in off a disk file without going
-  // through the whole imageio system. 
-
-  public static BufferedImage createBufferedImage (String filename)
-  {
-    GdkPixbufReader r = new GdkPixbufReader (getReaderSpi(), 
-                                             "png", // reader auto-detects, doesn't matter
-                                             new GdkPixbufDecoder (filename));
-    return r.getBufferedImage ();
-  }
-
-  public static BufferedImage createBufferedImage (URL u)
-  {
-    GdkPixbufReader r = new GdkPixbufReader (getReaderSpi(), 
-                                             "png", // reader auto-detects, doesn't matter
-                                             new GdkPixbufDecoder (u));
-    return r.getBufferedImage ();
-  }
-
-  public static BufferedImage createBufferedImage (byte[] imagedata, int imageoffset,
-                                                   int imagelength)
-  {
-    GdkPixbufReader r = new GdkPixbufReader (getReaderSpi(), 
-                                             "png", // reader auto-detects, doesn't matter
-                                             new GdkPixbufDecoder (imagedata,
-                                                                   imageoffset,
-                                                                   imagelength));
-    return r.getBufferedImage ();
-  }
-  
-  public static BufferedImage createBufferedImage (ImageProducer producer)
-  {
-    GdkPixbufReader r = new GdkPixbufReader (getReaderSpi(), "png" /* ignored */, null);
-    producer.startProduction(r);
-    return r.getBufferedImage ();
-  }
-
 }