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/13 19:54:37 UTC
cvs commit: xml-batik/sources/org/apache/batik/bridge BridgeContext.java GVTBuilder.java SVGFeMergeElementBridge.java
tkormann 01/03/13 10:54:36
Modified: sources/org/apache/batik/bridge BridgeContext.java
GVTBuilder.java SVGFeMergeElementBridge.java
Log:
bug fix. filter chain for feMergeNode filter primitive is now correct
Revision Changes Path
1.17 +2 -2 xml-batik/sources/org/apache/batik/bridge/BridgeContext.java
Index: BridgeContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/BridgeContext.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BridgeContext.java 2001/03/12 09:58:04 1.16
+++ BridgeContext.java 2001/03/13 18:54:31 1.17
@@ -41,7 +41,7 @@
* a SVG DOM tree such as the current viewport or the user agent.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: BridgeContext.java,v 1.16 2001/03/12 09:58:04 tkormann Exp $
+ * @version $Id: BridgeContext.java,v 1.17 2001/03/13 18:54:31 tkormann Exp $
*/
public class BridgeContext implements ErrorConstants {
@@ -295,7 +295,7 @@
/**
* Returns the actual size of the document or null if the document
- * has not ben built yet.
+ * has not been built yet.
*/
public Dimension2D getDocumentSize() {
return documentSize;
1.4 +5 -2 xml-batik/sources/org/apache/batik/bridge/GVTBuilder.java
Index: GVTBuilder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/GVTBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GVTBuilder.java 2001/03/08 12:39:21 1.3
+++ GVTBuilder.java 2001/03/13 18:54:32 1.4
@@ -22,18 +22,21 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.apache.batik.dom.svg.SVGOMPathElement;
+import org.apache.batik.dom.svg.SVGOMGElement;
+
/**
* This class is responsible for creating a GVT tree using an SVG DOM tree.
*
* @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
- * @version $Id: GVTBuilder.java,v 1.3 2001/03/08 12:39:21 tkormann Exp $
+ * @version $Id: GVTBuilder.java,v 1.4 2001/03/13 18:54:32 tkormann Exp $
*/
public class GVTBuilder implements SVGConstants {
/**
* Constructs a new builder.
*/
- public GVTBuilder() {}
+ public GVTBuilder() { }
/**
* Builds using the specified bridge context the specified SVG document.
1.8 +13 -11 xml-batik/sources/org/apache/batik/bridge/SVGFeMergeElementBridge.java
Index: SVGFeMergeElementBridge.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGFeMergeElementBridge.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGFeMergeElementBridge.java 2001/03/08 12:39:25 1.7
+++ SVGFeMergeElementBridge.java 2001/03/13 18:54:33 1.8
@@ -28,7 +28,7 @@
* Bridge class for the <feMerge> element.
*
* @author <a href="mailto:tkormann@apache.org">Thierry Kormann</a>
- * @version $Id: SVGFeMergeElementBridge.java,v 1.7 2001/03/08 12:39:25 tkormann Exp $
+ * @version $Id: SVGFeMergeElementBridge.java,v 1.8 2001/03/13 18:54:33 tkormann Exp $
*/
public class SVGFeMergeElementBridge
extends SVGAbstractFilterPrimitiveElementBridge {
@@ -66,6 +66,7 @@
List srcs = extractFeMergeNode(filterElement,
filteredElement,
filteredNode,
+ inputFilter,
filterMap,
ctx);
@@ -106,12 +107,15 @@
* @param filterElement the feMerge filter element
* @param filteredElement the filtered element
* @param filteredNode the filtered graphics node
+ * @param inputFilter the <tt>Filter</tt> that represents the current
+ * filter input if the filter chain.
* @param filterMap the filter map that contains named filter primitives
* @param ctx the bridge context
*/
protected static List extractFeMergeNode(Element filterElement,
Element filteredElement,
GraphicsNode filteredNode,
+ Filter inputFilter,
Map filterMap,
BridgeContext ctx) {
@@ -133,9 +137,9 @@
Filter filter = ((SVGFeMergeNodeElementBridge)bridge).createFilter
(ctx,
e,
- filterElement,
filteredElement,
filteredNode,
+ inputFilter,
filterMap);
if (filter != null) {
if (srcs == null) {
@@ -172,19 +176,17 @@
* know its name.
*/
public Filter createFilter(BridgeContext ctx,
- Element mergeNodeElement,
Element filterElement,
Element filteredElement,
GraphicsNode filteredNode,
+ Filter inputFilter,
Map filterMap) {
-
- String in = mergeNodeElement.getAttributeNS(null, SVG_IN_ATTRIBUTE);
- return getFilterSource(filterElement,
- in,
- filteredElement,
- filteredNode,
- filterMap,
- ctx);
+ return getIn(filterElement,
+ filteredElement,
+ filteredNode,
+ inputFilter,
+ filterMap,
+ ctx);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org