vhardy 02/04/16 06:11:51
Modified: sources/org/apache/batik/svggen SVGFont.java
SVGGraphics2D.java
Log:
Fixed bug #8151
Revision Changes Path
1.15 +3 -4 xml-batik/sources/org/apache/batik/svggen/SVGFont.java
Index: SVGFont.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGFont.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SVGFont.java 19 Feb 2002 16:48:23 -0000 1.14
+++ SVGFont.java 16 Apr 2002 13:11:50 -0000 1.15
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christophe Jolif</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGFont.java,v 1.14 2002/02/19 16:48:23 vhardy Exp $
+ * @version $Id: SVGFont.java,v 1.15 2002/04/16 13:11:50 vhardy Exp $
*/
public class SVGFont extends AbstractSVGConverter {
public static final float EXTRA_LIGHT =
@@ -138,14 +138,13 @@
* Used to keep track of which characters have been rendered by each font
* used.
*/
- static Map fontStringMap = new HashMap();
+ Map fontStringMap = new HashMap();
/**
* @param generatorContext used to build Elements
*/
public SVGFont(SVGGeneratorContext generatorContext) {
super(generatorContext);
- fontStringMap = new HashMap();
}
/**
@@ -153,7 +152,7 @@
* This is so we can keep track of which glyphs are required for each
* SVG font that is generated.
*/
- public static void recordFontUsage(String string, Font font) {
+ public void recordFontUsage(String string, Font font) {
Font commonSizeFont = createCommonSizeFont(font);
String fontKey = commonSizeFont.getFamily() + commonSizeFont.getStyle();
1.31 +2 -2 xml-batik/sources/org/apache/batik/svggen/SVGGraphics2D.java
Index: SVGGraphics2D.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGGraphics2D.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SVGGraphics2D.java 28 Nov 2001 12:49:27 -0000 1.30
+++ SVGGraphics2D.java 16 Apr 2002 13:11:50 -0000 1.31
@@ -45,7 +45,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Vincent Hardy</a>
- * @version $Id: SVGGraphics2D.java,v 1.30 2001/11/28 12:49:27 vhardy Exp $
+ * @version $Id: SVGGraphics2D.java,v 1.31 2002/04/16 13:11:50 vhardy Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
* @see org.apache.batik.svggen.DOMTreeManager
* @see org.apache.batik.svggen.DOMGroupManager
@@ -1086,7 +1086,7 @@
// record that the font is being used to draw this string, this is
// so that the SVG Font element will only create glyphs for the
// characters that are needed
- SVGFont.recordFontUsage(s, getFont());
+ domTreeManager.gcConverter.getFontConverter().recordFontUsage(s,
getFont());
}
Font font = getFont();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
