This commit was manufactured by cvs2svn to create taghammer-3_3-merge-20030131

'hammer-3_3-merge-20030131'.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/tags/hammer-3_3-merge-20030131@62199 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 13 insertions, 15 deletions

diff --git a/libjava/gnu/awt/j2d/DirectRasterGraphics.java b/libjava/gnu/awt/j2d/DirectRasterGraphics.java
index 8d25b88d018..28aad9b0404 100644
--- a/libjava/gnu/awt/j2d/DirectRasterGraphics.java
+++ b/libjava/gnu/awt/j2d/DirectRasterGraphics.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -61,7 +61,8 @@ public interface DirectRasterGraphics extends Cloneable
   
   public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints);
   
-  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints);
+  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
+			  int translateX, int translateY);
   
   public void drawString(String str, int x, int y);
   
diff --git a/libjava/gnu/awt/j2d/Graphics2DImpl.java b/libjava/gnu/awt/j2d/Graphics2DImpl.java
index ef4d742c056..5af41bfc9cb 100644
--- a/libjava/gnu/awt/j2d/Graphics2DImpl.java
+++ b/libjava/gnu/awt/j2d/Graphics2DImpl.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -24,6 +24,7 @@ import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
 import java.awt.image.ImageObserver;
 import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
 import java.awt.image.RenderedImage;
 import java.awt.image.renderable.RenderableImage;
 import java.text.AttributedCharacterIterator;
@@ -459,7 +460,7 @@ public class Graphics2DImpl extends Graphics2D implements Cloneable
     throw new UnsupportedOperationException(msg);
   }
   
-  public void drawImage(BufferedImage image, BufferedImage op, int x, int y)
+  public void drawImage(BufferedImage image, BufferedImageOp op, int x, int y)
   {
     throw new UnsupportedOperationException("not implemented yet");  
   }
diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.java b/libjava/gnu/awt/j2d/IntegerGraphicsState.java
index 90a1a4d2ab5..bfea6611ca5 100644
--- a/libjava/gnu/awt/j2d/IntegerGraphicsState.java
+++ b/libjava/gnu/awt/j2d/IntegerGraphicsState.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -212,7 +212,7 @@ public class IntegerGraphicsState extends AbstractGraphicsState
   
   public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
   {
-    if ((tx == 0) || (ty == 0))
+    if ((tx == 0) && (ty == 0))
       {
 	directGfx.drawPolyline(xPoints, yPoints, nPoints);
 	return;
@@ -223,7 +223,7 @@ public class IntegerGraphicsState extends AbstractGraphicsState
 
   public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
   {
-    if ((tx == 0) || (ty == 0))
+    if ((tx == 0) && (ty == 0))
       {
 	directGfx.drawPolygon(xPoints, yPoints, nPoints);
 	return;
@@ -232,15 +232,11 @@ public class IntegerGraphicsState extends AbstractGraphicsState
     throw new UnsupportedOperationException("translate not implemented");
   }
   
-  public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
+  public void fillPolygon (int[] xPoints, int[] yPoints, int nPoints)
   {
-    if ((tx == 0) || (ty == 0))
-      {
-	directGfx.fillPolygon(xPoints, yPoints, nPoints);
-	return;
-      }
-    
-    throw new UnsupportedOperationException("translate not implemented");
+    // FIXME: remove tx & ty args once translation via AffineTransform
+    // is implemented.
+    directGfx.fillPolygon (xPoints, yPoints, nPoints, tx, ty);
   }
 
   public boolean drawImage(Image image, int x, int y,