You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2007/11/27 06:07:26 UTC

svn commit: r598518 - /xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java

Author: cam
Date: Mon Nov 26 21:07:26 2007
New Revision: 598518

URL: http://svn.apache.org/viewvc?rev=598518&view=rev
Log:
Apply motion animation transform after the one given by the transform=""
attribute.  Fixes bug 43953.

Modified:
    xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java?rev=598518&r1=598517&r2=598518&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java Mon Nov 26 21:07:26 2007
@@ -165,15 +165,7 @@
     protected AffineTransform computeTransform(SVGTransformable te,
                                                BridgeContext ctx) {
         try {
-            // motion animation
             AffineTransform at = new AffineTransform();
-            if (e instanceof SVGMotionAnimatableElement) {
-                SVGMotionAnimatableElement mae = (SVGMotionAnimatableElement) e;
-                AffineTransform mat = mae.getMotionTransform();
-                if (mat != null) {
-                    at.concatenate(mat);
-                }
-            }
 
             // 'transform'
             SVGOMAnimatedTransformList atl =
@@ -183,6 +175,15 @@
                 AbstractSVGTransformList tl =
                     (AbstractSVGTransformList) te.getTransform().getAnimVal();
                 at.concatenate(tl.getAffineTransform());
+            }
+
+            // motion animation
+            if (e instanceof SVGMotionAnimatableElement) {
+                SVGMotionAnimatableElement mae = (SVGMotionAnimatableElement) e;
+                AffineTransform mat = mae.getMotionTransform();
+                if (mat != null) {
+                    at.concatenate(mat);
+                }
             }
 
             return at;