questionable patch: merge of a lot of stuff from the svg branch

[org.ibex.core.git] / src / org / ibex / graphics / Paint.java

diff --git a/src/org/ibex/graphics/Paint.java b/src/org/ibex/graphics/Paint.java
index 3ba71b0..d75ed49 100644 (file)
--- a/src/org/ibex/graphics/Paint.java
+++ b/src/org/ibex/graphics/Paint.java
@@ -7,22 +7,24 @@ package org.ibex.graphics;
 import java.util.*;
 
 public abstract class Paint {
-    public abstract void fillTrapezoid(float tx1, float tx2, float ty1, float tx3, float tx4, float ty2, PixelBuffer buf);
+    //public abstract void fillTrapezoid(float tx1, float tx2, float ty1, float tx3, float tx4, float ty2, PixelBuffer buf);
 
     public static class SingleColorPaint extends Paint {
         public int color;
         public SingleColorPaint(int color) { this.color = color; }
+        /*
         public void fillTrapezoid(float x1, float x2, float y1, float x3, float x4, float y2, PixelBuffer buf) {
             buf.fillTrapezoid((int)Math.round(x1), (int)Math.round(x2), (int)Math.round(y1),
                               (int)Math.round(x3), (int)Math.round(x4), (int)Math.round(y2), color);
         }
+        */
     }
 
     public static class TexturePaint extends Paint {
         Affine a, invert;
         Picture p;
         public TexturePaint(Picture p, Affine a) { this.p = p; this.a = a.copy(); this.invert = a.copy().invert(); }
-        public void fillTrapezoid(float tx1, float tx2, float ty1, float tx3, float tx4, float ty2, PixelBuffer buf) {
+        //public void fillTrapezoid(float tx1, float tx2, float ty1, float tx3, float tx4, float ty2, PixelBuffer buf) {
             /*
             float x1 = invert.multiply_px(tx1, ty1);
             float x2 = invert.multiply_px(tx2, ty1);
@@ -32,7 +34,7 @@ public abstract class Paint {
             float y2 = invert.multiply_py(tx3, ty2);
             */
             //buf.paintTrapezoid((int)tx1, (int)tx2, (int)ty1, (int)tx3, (int)tx4, (int)ty2, p, a);
-        }
+        //}
     }
 
     public static abstract class GradientPaint extends Paint {
@@ -55,7 +57,7 @@ public abstract class Paint {
         float[] stop_offsets;
         float cx, cy, r, fx, fy;
         
-        public void fillTrapezoid(float tx1, float tx2, float ty1, float tx3, float tx4, float ty2, PixelBuffer buf) {
+        //public void fillTrapezoid(float tx1, float tx2, float ty1, float tx3, float tx4, float ty2, PixelBuffer buf) {
             /*
             Affine a = buf.a;
             Affine inverse = a.copy().invert();
@@ -97,7 +99,7 @@ public abstract class Paint {
                 }
             }
             */
-        }
+        //}
     }
     /*
     public static class LinearGradientPaint extends GradientPaint {