keiron 01/06/18 01:19:34
Modified: src/org/apache/fop/svg PDFDocumentGraphics2D.java
PDFGraphics2D.java SVGElement.java
Log:
PDFNumber uses static methods
Revision Changes Path
1.5 +3 -4 xml-fop/src/org/apache/fop/svg/PDFDocumentGraphics2D.java
Index: PDFDocumentGraphics2D.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFDocumentGraphics2D.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PDFDocumentGraphics2D.java 2001/05/18 10:03:15 1.4
+++ PDFDocumentGraphics2D.java 2001/06/18 08:19:19 1.5
@@ -1,4 +1,4 @@
-/* $Id: PDFDocumentGraphics2D.java,v 1.4 2001/05/18 10:03:15 keiron Exp $
+/* $Id: PDFDocumentGraphics2D.java,v 1.5 2001/06/18 08:19:19 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources."
@@ -24,7 +24,7 @@
* <tt>PDFGraphics2D</tt>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Keiron Liddle</a>
- * @version $Id: PDFDocumentGraphics2D.java,v 1.4 2001/05/18 10:03:15 keiron Exp $
+ * @version $Id: PDFDocumentGraphics2D.java,v 1.5 2001/06/18 08:19:19 keiron Exp $
* @see org.apache.fop.svg.PDFGraphics2D
*/
public class PDFDocumentGraphics2D extends PDFGraphics2D {
@@ -79,8 +79,7 @@
* The result is scaled so that the svg fits correctly inside the pdf document.
*/
public void setSVGDimension(float w, float h) {
- PDFNumber pdfNumber = new PDFNumber();
- currentStream.write("" + pdfNumber.doubleOut(width / w) + " 0 0 " +
pdfNumber.doubleOut(height / h) + " 0 0 cm\n");
+ currentStream.write("" + PDFNumber.doubleOut(width / w) + " 0 0 " +
PDFNumber.doubleOut(height / h) + " 0 0 cm\n");
}
/**
1.7 +54 -63 xml-fop/src/org/apache/fop/svg/PDFGraphics2D.java
Index: PDFGraphics2D.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFGraphics2D.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PDFGraphics2D.java 2001/06/07 10:08:42 1.6
+++ PDFGraphics2D.java 2001/06/18 08:19:20 1.7
@@ -1,4 +1,4 @@
-/* $Id: PDFGraphics2D.java,v 1.6 2001/06/07 10:08:42 keiron Exp $
+/* $Id: PDFGraphics2D.java,v 1.7 2001/06/18 08:19:20 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources."
@@ -38,7 +38,7 @@
* implementing a <tt>Graphic2D</tt> piece-meal.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Keiron Liddle</a>
- * @version $Id: PDFGraphics2D.java,v 1.6 2001/06/07 10:08:42 keiron Exp $
+ * @version $Id: PDFGraphics2D.java,v 1.7 2001/06/18 08:19:20 keiron Exp $
* @see org.apache.batik.ext.awt.g2d.AbstractGraphics2D
*/
public class PDFGraphics2D extends AbstractGraphics2D {
@@ -416,8 +416,6 @@
currentColour = new PDFColor(c.getRed(), c.getGreen(), c.getBlue());
currentStream.write(currentColour.getColorSpaceOut(false));
- PDFNumber pdfNumber = new PDFNumber();
-
applyPaint(getPaint(), false);
applyStroke(getStroke());
@@ -427,26 +425,26 @@
int type = iter.currentSegment(vals);
switch (type) {
case PathIterator.SEG_CUBICTO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + " " +
- pdfNumber.doubleOut(vals[2]) + " " +
- pdfNumber.doubleOut(vals[3]) + " " +
- pdfNumber.doubleOut(vals[4]) + " " +
- pdfNumber.doubleOut(vals[5]) + " c\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + " " +
+ PDFNumber.doubleOut(vals[2]) + " " +
+ PDFNumber.doubleOut(vals[3]) + " " +
+ PDFNumber.doubleOut(vals[4]) + " " +
+ PDFNumber.doubleOut(vals[5]) + " c\n");
break;
case PathIterator.SEG_LINETO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + "
l\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + "
l\n");
break;
case PathIterator.SEG_MOVETO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + "
m\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + "
m\n");
break;
case PathIterator.SEG_QUADTO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + " " +
- pdfNumber.doubleOut(vals[2]) + " " +
- pdfNumber.doubleOut(vals[3]) + " y\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + " " +
+ PDFNumber.doubleOut(vals[2]) + " " +
+ PDFNumber.doubleOut(vals[3]) + " y\n");
break;
case PathIterator.SEG_CLOSE:
currentStream.write("h\n");
@@ -461,34 +459,32 @@
}
protected void writeClip(Shape s) {
- PDFNumber pdfNumber = new PDFNumber();
-
PathIterator iter = s.getPathIterator(getTransform());
while (!iter.isDone()) {
double vals[] = new double[6];
int type = iter.currentSegment(vals);
switch (type) {
case PathIterator.SEG_CUBICTO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + " " +
- pdfNumber.doubleOut(vals[2]) + " " +
- pdfNumber.doubleOut(vals[3]) + " " +
- pdfNumber.doubleOut(vals[4]) + " " +
- pdfNumber.doubleOut(vals[5]) + " c\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + " " +
+ PDFNumber.doubleOut(vals[2]) + " " +
+ PDFNumber.doubleOut(vals[3]) + " " +
+ PDFNumber.doubleOut(vals[4]) + " " +
+ PDFNumber.doubleOut(vals[5]) + " c\n");
break;
case PathIterator.SEG_LINETO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + "
l\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + "
l\n");
break;
case PathIterator.SEG_MOVETO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + "
m\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + "
m\n");
break;
case PathIterator.SEG_QUADTO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + " " +
- pdfNumber.doubleOut(vals[2]) + " " +
- pdfNumber.doubleOut(vals[3]) + " y\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + " " +
+ PDFNumber.doubleOut(vals[2]) + " " +
+ PDFNumber.doubleOut(vals[3]) + " y\n");
break;
case PathIterator.SEG_CLOSE:
currentStream.write("h\n");
@@ -559,7 +555,6 @@
protected void applyStroke(Stroke stroke) {
if(stroke instanceof BasicStroke) {
BasicStroke bs = (BasicStroke)stroke;
- PDFNumber pdfNumber = new PDFNumber();
float[] da = bs.getDashArray();
if(da != null) {
@@ -600,10 +595,10 @@
break;
}
float lw = bs.getLineWidth();
- currentStream.write(pdfNumber.doubleOut(lw) + " w\n");
+ currentStream.write(PDFNumber.doubleOut(lw) + " w\n");
float ml = bs.getMiterLimit();
- currentStream.write(pdfNumber.doubleOut(ml) + " M\n");
+ currentStream.write(PDFNumber.doubleOut(ml) + " M\n");
}
}
@@ -706,12 +701,11 @@
trans.translate(x, y);
double[] vals = new double[6];
trans.getMatrix(vals);
- PDFNumber pdfNumber = new PDFNumber();
- currentStream.write(pdfNumber.doubleOut(vals[0]) + " " +
pdfNumber.doubleOut(vals[1]) + " "
-+ pdfNumber.doubleOut(vals[2]) + " " + pdfNumber.doubleOut(vals[3]) + " " +
pdfNumber.doubleOut(vals[4])
-+ " " + pdfNumber.doubleOut(vals[5]) + " " +
- pdfNumber.doubleOut(vals[6]) + " Tm [" + s + "]");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) + " " +
PDFNumber.doubleOut(vals[1]) + " "
++ PDFNumber.doubleOut(vals[2]) + " " + PDFNumber.doubleOut(vals[3]) + " " +
PDFNumber.doubleOut(vals[4])
++ " " + PDFNumber.doubleOut(vals[5]) + " " +
+ PDFNumber.doubleOut(vals[6]) + " Tm [" + s + "]");
currentStream.write("ET\n");
}
@@ -757,15 +751,14 @@
trans.translate(x, y);
double[] vals = new double[6];
trans.getMatrix(vals);
- PDFNumber pdfNumber = new PDFNumber();
for(char ch = iterator.first(); ch != CharacterIterator.DONE; ch =
iterator.next()) {
Map attr = iterator.getAttributes();
- currentStream.write(pdfNumber.doubleOut(vals[0]) + " " +
pdfNumber.doubleOut(vals[1]) + " "
-+ pdfNumber.doubleOut(vals[2]) + " " + pdfNumber.doubleOut(vals[3]) + " " +
pdfNumber.doubleOut(vals[4])
-+ " " + pdfNumber.doubleOut(vals[5]) + " " +
- pdfNumber.doubleOut(vals[6]) + " Tm [" + ch + "]");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) + " " +
PDFNumber.doubleOut(vals[1]) + " "
++ PDFNumber.doubleOut(vals[2]) + " " + PDFNumber.doubleOut(vals[3]) + " " +
PDFNumber.doubleOut(vals[4])
++ " " + PDFNumber.doubleOut(vals[5]) + " " +
+ PDFNumber.doubleOut(vals[6]) + " Tm [" + ch + "]");
}
currentStream.write("ET\n");
@@ -799,34 +792,32 @@
applyPaint(getPaint(), true);
- PDFNumber pdfNumber = new PDFNumber();
-
PathIterator iter = s.getPathIterator(getTransform());
while (!iter.isDone()) {
double vals[] = new double[6];
int type = iter.currentSegment(vals);
switch (type) {
case PathIterator.SEG_CUBICTO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + " " +
- pdfNumber.doubleOut(vals[2]) + " " +
- pdfNumber.doubleOut(vals[3]) + " " +
- pdfNumber.doubleOut(vals[4]) + " " +
- pdfNumber.doubleOut(vals[5]) + " c\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + " " +
+ PDFNumber.doubleOut(vals[2]) + " " +
+ PDFNumber.doubleOut(vals[3]) + " " +
+ PDFNumber.doubleOut(vals[4]) + " " +
+ PDFNumber.doubleOut(vals[5]) + " c\n");
break;
case PathIterator.SEG_LINETO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + "
l\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + "
l\n");
break;
case PathIterator.SEG_MOVETO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + "
m\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + "
m\n");
break;
case PathIterator.SEG_QUADTO:
- currentStream.write(pdfNumber.doubleOut(vals[0]) +
- " " + pdfNumber.doubleOut(vals[1]) + " " +
- pdfNumber.doubleOut(vals[2]) + " " +
- pdfNumber.doubleOut(vals[3]) + " y\n");
+ currentStream.write(PDFNumber.doubleOut(vals[0]) +
+ " " + PDFNumber.doubleOut(vals[1]) + " " +
+ PDFNumber.doubleOut(vals[2]) + " " +
+ PDFNumber.doubleOut(vals[3]) + " y\n");
break;
case PathIterator.SEG_CLOSE:
currentStream.write("h\n");
1.4 +2 -6 xml-fop/src/org/apache/fop/svg/SVGElement.java
Index: SVGElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGElement.java 2001/05/21 12:06:42 1.3
+++ SVGElement.java 2001/06/18 08:19:25 1.4
@@ -1,7 +1,7 @@
-/* $Id: SVGElement.java,v 1.3 2001/05/21 12:06:42 keiron Exp $
+/* $Id: SVGElement.java,v 1.4 2001/06/18 08:19:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
- * LICENSE file included with these sources."
+ * LICENSE file included with these sources.
*/
package org.apache.fop.svg;
@@ -82,10 +82,6 @@
// this is an error
throw new FOPException("SVG not in fo:instream-foreign-object");
}
-
- /*if (this.marker == BREAK_AFTER) {
- return new Status(Status.OK);
- }*/
if (this.marker == START) {
this.fs = area.getFontState();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
