You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by tk...@apache.org on 2001/03/27 17:57:04 UTC

cvs commit: xml-batik/sources/org/apache/batik/bridge SVGFeConvolveMatrixElementBridge.java SVGFeDisplacementMapElementBridge.java SVGFeGaussianBlurElementBridge.java SVGFeMorphologyElementBridge.java

tkormann    01/03/27 07:57:04

  Modified:    sources/org/apache/batik/bridge
                        SVGFeConvolveMatrixElementBridge.java
                        SVGFeDisplacementMapElementBridge.java
                        SVGFeGaussianBlurElementBridge.java
                        SVGFeMorphologyElementBridge.java
  Log:
  add an extra pad for area Ops.
  
  Revision  Changes    Path
  1.8       +7 -3      xml-batik/sources/org/apache/batik/bridge/SVGFeConvolveMatrixElementBridge.java
  
  Index: SVGFeConvolveMatrixElementBridge.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGFeConvolveMatrixElementBridge.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SVGFeConvolveMatrixElementBridge.java	2001/03/26 21:27:24	1.7
  +++ SVGFeConvolveMatrixElementBridge.java	2001/03/27 15:57:03	1.8
  @@ -29,7 +29,7 @@
    * Bridge class for the <feConvolveMatrix> element.
    *
    * @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
  - * @version $Id: SVGFeConvolveMatrixElementBridge.java,v 1.7 2001/03/26 21:27:24 deweese Exp $
  + * @version $Id: SVGFeConvolveMatrixElementBridge.java,v 1.8 2001/03/27 15:57:03 tkormann Exp $
    */
   public class SVGFeConvolveMatrixElementBridge
       extends SVGAbstractFilterPrimitiveElementBridge {
  @@ -121,6 +121,7 @@
                                                           ctx);
   
           PadRable pad = new PadRable8Bit(in, primitiveRegion, PadMode.ZERO_PAD);
  +
           // build the convolve filter
           ConvolveMatrixRable convolve = new ConvolveMatrixRable8Bit(pad);
           for (int i = 0; i < kernelMatrix.length; i++) {
  @@ -133,10 +134,13 @@
           convolve.setKernelUnitLength(kernelUnitLength);
           convolve.setPreserveAlpha(preserveAlpha);
   
  +        PadRable filter = new PadRable8Bit
  +            (convolve, primitiveRegion, PadMode.ZERO_PAD);
  +
           // update the filter Map
  -        updateFilterMap(filterElement, convolve, filterMap);
  +        updateFilterMap(filterElement, filter, filterMap);
   
  -        return convolve;
  +        return filter;
       }
   
       /**
  
  
  
  1.8       +6 -3      xml-batik/sources/org/apache/batik/bridge/SVGFeDisplacementMapElementBridge.java
  
  Index: SVGFeDisplacementMapElementBridge.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGFeDisplacementMapElementBridge.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SVGFeDisplacementMapElementBridge.java	2001/03/26 21:27:24	1.7
  +++ SVGFeDisplacementMapElementBridge.java	2001/03/27 15:57:03	1.8
  @@ -29,7 +29,7 @@
    * Bridge class for the &lt;feDisplacementMap> element.
    *
    * @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
  - * @version $Id: SVGFeDisplacementMapElementBridge.java,v 1.7 2001/03/26 21:27:24 deweese Exp $
  + * @version $Id: SVGFeDisplacementMapElementBridge.java,v 1.8 2001/03/27 15:57:03 tkormann Exp $
    */
   public class SVGFeDisplacementMapElementBridge
       extends SVGAbstractFilterPrimitiveElementBridge {
  @@ -121,14 +121,17 @@
                                                           ctx);
   
           PadRable pad
  -            = new PadRable8Bit(inputFilter, primitiveRegion, PadMode.ZERO_PAD);
  +            = new PadRable8Bit(in, primitiveRegion, PadMode.ZERO_PAD);
   
           // build the displacement map filter
           List srcs = new ArrayList(2);
           srcs.add(pad);
           srcs.add(in2);
  -        Filter filter = new DisplacementMapRable8Bit
  +        Filter displacementMap = new DisplacementMapRable8Bit
               (srcs, scale, xChannelSelector, yChannelSelector);
  +
  +        PadRable filter = new PadRable8Bit
  +            (displacementMap, primitiveRegion, PadMode.ZERO_PAD);
   
           // update the filter Map
           updateFilterMap(filterElement, filter, filterMap);
  
  
  
  1.8       +7 -3      xml-batik/sources/org/apache/batik/bridge/SVGFeGaussianBlurElementBridge.java
  
  Index: SVGFeGaussianBlurElementBridge.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGFeGaussianBlurElementBridge.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SVGFeGaussianBlurElementBridge.java	2001/03/26 21:27:24	1.7
  +++ SVGFeGaussianBlurElementBridge.java	2001/03/27 15:57:04	1.8
  @@ -27,7 +27,7 @@
    * Bridge class for the &lt;feGaussianBlur> element.
    *
    * @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
  - * @version $Id: SVGFeGaussianBlurElementBridge.java,v 1.7 2001/03/26 21:27:24 deweese Exp $
  + * @version $Id: SVGFeGaussianBlurElementBridge.java,v 1.8 2001/03/27 15:57:04 tkormann Exp $
    */
   public class SVGFeGaussianBlurElementBridge
       extends SVGAbstractFilterPrimitiveElementBridge {
  @@ -104,11 +104,15 @@
                                                           filterRegion,
                                                           ctx);
   
  -        PadRable pad = new PadRable8Bit(in, primitiveRegion, PadMode.ZERO_PAD);
  +        PadRable pad
  +            = new PadRable8Bit(in, primitiveRegion, PadMode.ZERO_PAD);
   
           // build filter
  -        Filter filter = new GaussianBlurRable8Bit
  +        Filter blur = new GaussianBlurRable8Bit
               (pad, stdDeviationXY[0], stdDeviationXY[1]);
  +
  +        PadRable filter
  +            = new PadRable8Bit(blur, primitiveRegion, PadMode.ZERO_PAD);
   
           // update the filter Map
           updateFilterMap(filterElement, filter, filterMap);
  
  
  
  1.8       +5 -2      xml-batik/sources/org/apache/batik/bridge/SVGFeMorphologyElementBridge.java
  
  Index: SVGFeMorphologyElementBridge.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGFeMorphologyElementBridge.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SVGFeMorphologyElementBridge.java	2001/03/26 21:27:25	1.7
  +++ SVGFeMorphologyElementBridge.java	2001/03/27 15:57:04	1.8
  @@ -26,7 +26,7 @@
    * Bridge class for the &lt;feMorphology> element.
    *
    * @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
  - * @version $Id: SVGFeMorphologyElementBridge.java,v 1.7 2001/03/26 21:27:25 deweese Exp $
  + * @version $Id: SVGFeMorphologyElementBridge.java,v 1.8 2001/03/27 15:57:04 tkormann Exp $
    */
   public class SVGFeMorphologyElementBridge
       extends SVGAbstractFilterPrimitiveElementBridge {
  @@ -109,8 +109,11 @@
           PadRable pad = new PadRable8Bit(in, primitiveRegion, PadMode.ZERO_PAD);
   
           // build tfilter
  -        Filter filter
  +        Filter morphology
               = new MorphologyRable8Bit(pad, radii[0], radii[1], isDilate);
  +
  +        PadRable filter = new PadRable8Bit
  +            (morphology, primitiveRegion, PadMode.ZERO_PAD);
   
           // update the filter Map
           updateFilterMap(filterElement, filter, filterMap);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org