deweese 2003/11/07 10:25:03
Modified: sources/org/apache/batik/bridge SVGGlyphElementBridge.java
sources/org/apache/batik/dom/svg
SVGOMFEPointLightElement.java
sources/org/apache/batik/ext/awt/geom RectListManager.java
Log:
1) Fixed NPE in RectListManager when the rect list was empty.
2) FePointLightElement now returns the Z attribute not Y when appropriate.
3) The glyph element's d attribute now uses the winding-rule property value
from the text element not from the glyph element (as per the SVG
specification)
Revision Changes Path
1.12 +3 -2
xml-batik/sources/org/apache/batik/bridge/SVGGlyphElementBridge.java
Index: SVGGlyphElementBridge.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/SVGGlyphElementBridge.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SVGGlyphElementBridge.java 7 Sep 2003 22:25:27 -0000 1.11
+++ SVGGlyphElementBridge.java 7 Nov 2003 18:25:03 -0000 1.12
@@ -126,7 +126,8 @@
Shape dShape = null;
if (d.length() != 0) {
AWTPathProducer app = new AWTPathProducer();
- app.setWindingRule(CSSUtilities.convertFillRule(glyphElement));
+ // Glyph is supposed to use properties from text element.
+ app.setWindingRule(CSSUtilities.convertFillRule(textElement));
try {
PathParser pathParser = new PathParser();
pathParser.setPathHandler(app);
1.11 +2 -2
xml-batik/sources/org/apache/batik/dom/svg/SVGOMFEPointLightElement.java
Index: SVGOMFEPointLightElement.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMFEPointLightElement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGOMFEPointLightElement.java 8 Aug 2003 11:39:00 -0000 1.10
+++ SVGOMFEPointLightElement.java 7 Nov 2003 18:25:03 -0000 1.11
@@ -106,7 +106,7 @@
* <b>DOM</b>: Implements [EMAIL PROTECTED] SVGFEPointLightElement#getZ()}.
*/
public SVGAnimatedNumber getZ() {
- return getAnimatedNumberAttribute(null, SVG_Y_ATTRIBUTE, 0f);
+ return getAnimatedNumberAttribute(null, SVG_Z_ATTRIBUTE, 0f);
}
/**
1.8 +3 -1
xml-batik/sources/org/apache/batik/ext/awt/geom/RectListManager.java
Index: RectListManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/ext/awt/geom/RectListManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RectListManager.java 31 Oct 2003 22:39:41 -0000 1.7
+++ RectListManager.java 7 Nov 2003 18:25:03 -0000 1.8
@@ -618,6 +618,7 @@
}
public void mergeRects(int overhead, int lineOverhead) {
+ if (size == 0) return;
Rectangle r, cr, mr;
int cost1, cost2, cost3;
mr = new Rectangle();
@@ -708,6 +709,7 @@
}
size = j;
r = getBounds();
+ if (r == null) return;
if (overhead + (r.height*lineOverhead) + (r.height*r.width) < area) {
rects[0] = r;
size=1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
