tkormann 01/09/04 05:31:52
Modified: sources/org/apache/batik/bridge SVGImageElementBridge.java
SVGMarkerElementBridge.java
SVGSVGElementBridge.java
Log:
The clip:rect(<x> <y> <w> <h>) property now works properly on marker, svg,
symbol and image elements.
Revision Changes Path
1.25 +3 -3
xml-batik/sources/org/apache/batik/bridge/SVGImageElementBridge.java
Index: SVGImageElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGImageElementBridge.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SVGImageElementBridge.java 2001/08/22 12:17:26 1.24
+++ SVGImageElementBridge.java 2001/09/04 12:31:51 1.25
@@ -45,7 +45,7 @@
* Bridge class for the <image> element.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: SVGImageElementBridge.java,v 1.24 2001/08/22 12:17:26 tkormann Exp
$
+ * @version $Id: SVGImageElementBridge.java,v 1.25 2001/09/04 12:31:51 tkormann Exp
$
*/
public class SVGImageElementBridge extends AbstractGraphicsNodeBridge {
@@ -270,8 +270,8 @@
// offsets[3] = left
clip = new Rectangle2D.Float(x+offsets[3],
y+offsets[0],
- w-offsets[1],
- h-offsets[2]);
+ w-offsets[1]-offsets[3],
+ h-offsets[2]-offsets[0]);
}
}
1.12 +3 -3
xml-batik/sources/org/apache/batik/bridge/SVGMarkerElementBridge.java
Index: SVGMarkerElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGMarkerElementBridge.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SVGMarkerElementBridge.java 2001/05/14 16:44:04 1.11
+++ SVGMarkerElementBridge.java 2001/09/04 12:31:51 1.12
@@ -35,7 +35,7 @@
* Bridge class for the <marker> element.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: SVGMarkerElementBridge.java,v 1.11 2001/05/14 16:44:04 tkormann
Exp $
+ * @version $Id: SVGMarkerElementBridge.java,v 1.12 2001/09/04 12:31:51 tkormann
Exp $
*/
public class SVGMarkerElementBridge extends AbstractSVGBridge
implements MarkerBridge, ErrorConstants {
@@ -199,8 +199,8 @@
markerClip = new Rectangle2D.Float
(offsets[3],
offsets[0],
- strokeWidth * markerWidth - offsets[1],
- strokeWidth * markerHeight - offsets[2]);
+ strokeWidth * markerWidth - offsets[1] - offsets[3],
+ strokeWidth * markerHeight - offsets[2] - offsets[0]);
}
CompositeGraphicsNode comp = new CompositeGraphicsNode();
1.15 +3 -3
xml-batik/sources/org/apache/batik/bridge/SVGSVGElementBridge.java
Index: SVGSVGElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGSVGElementBridge.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SVGSVGElementBridge.java 2001/05/02 14:34:15 1.14
+++ SVGSVGElementBridge.java 2001/09/04 12:31:51 1.15
@@ -31,7 +31,7 @@
* Bridge class for the <svg> element.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: SVGSVGElementBridge.java,v 1.14 2001/05/02 14:34:15 tkormann Exp $
+ * @version $Id: SVGSVGElementBridge.java,v 1.15 2001/09/04 12:31:51 tkormann Exp $
*/
public class SVGSVGElementBridge extends AbstractSVGBridge
implements GraphicsNodeBridge, ErrorConstants {
@@ -137,8 +137,8 @@
// offsets[3] = left
clip = new Rectangle2D.Float(x+offsets[3],
y+offsets[0],
- w-offsets[1],
- h-offsets[2]);
+ w-offsets[1]-offsets[3],
+ h-offsets[2]-offsets[0]);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
