You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ch...@apache.org on 2002/06/11 02:01:16 UTC
cvs commit: xml-fop/src/org/apache/fop/svg PDFDocumentGraphics2D.java PDFGraphics2D.java PDFTranscoder.java
chrisg 2002/06/10 17:01:15
Modified: src/org/apache/fop/apps Tag: fop-0_20_2-maintain
StreamRenderer.java
src/org/apache/fop/render Tag: fop-0_20_2-maintain
PrintRenderer.java Renderer.java
src/org/apache/fop/render/awt Tag: fop-0_20_2-maintain
AWTRenderer.java FontSetup.java
src/org/apache/fop/render/pdf Tag: fop-0_20_2-maintain
FontSetup.java
src/org/apache/fop/render/ps Tag: fop-0_20_2-maintain
PSRenderer.java
src/org/apache/fop/render/svg Tag: fop-0_20_2-maintain
SVGRenderer.java
src/org/apache/fop/render/xml Tag: fop-0_20_2-maintain
XMLRenderer.java
src/org/apache/fop/svg Tag: fop-0_20_2-maintain
PDFDocumentGraphics2D.java PDFGraphics2D.java
PDFTranscoder.java
Log:
fixed compile error from previous commit (basedir) .. Doh
Revision Changes Path
No revision
No revision
1.6.2.3 +2 -0 xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java
Index: StreamRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/StreamRenderer.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- StreamRenderer.java 17 Mar 2002 23:37:06 -0000 1.6.2.2
+++ StreamRenderer.java 11 Jun 2002 00:01:14 -0000 1.6.2.3
@@ -128,6 +128,8 @@
try {
renderer.setupFontInfo(fontInfo);
renderer.startRenderer(outputStream);
+ } catch (FOPException fe) {
+ throw new SAXException(fe);
} catch (IOException e) {
throw new SAXException(e);
}
No revision
No revision
1.14.2.3 +3 -2 xml-fop/src/org/apache/fop/render/PrintRenderer.java
Index: PrintRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/PrintRenderer.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- PrintRenderer.java 23 Apr 2002 22:26:58 -0000 1.14.2.2
+++ PrintRenderer.java 11 Jun 2002 00:01:14 -0000 1.14.2.3
@@ -19,6 +19,7 @@
import org.apache.fop.layout.inline.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.render.pdf.FontSetup;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.svg.SVGArea;
@@ -405,7 +406,7 @@
*
* @param fontInfo font info to set up
*/
- public void setupFontInfo(FontInfo fontInfo) {
+ public void setupFontInfo(FontInfo fontInfo) throws FOPException {
this.fontInfo = fontInfo;
FontSetup.setup(fontInfo);
}
1.19.2.2 +2 -2 xml-fop/src/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/Renderer.java,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -r1.19.2.1 -r1.19.2.2
--- Renderer.java 17 Mar 2002 23:37:07 -0000 1.19.2.1
+++ Renderer.java 11 Jun 2002 00:01:14 -0000 1.19.2.2
@@ -36,7 +36,7 @@
/**
* set up the given FontInfo
*/
- public void setupFontInfo(FontInfo fontInfo);
+ public void setupFontInfo(FontInfo fontInfo) throws FOPException;
/**
* set up renderer options
No revision
No revision
1.38.2.4 +3 -2 xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.38.2.3
retrieving revision 1.38.2.4
diff -u -r1.38.2.3 -r1.38.2.4
--- AWTRenderer.java 19 May 2002 21:05:04 -0000 1.38.2.3
+++ AWTRenderer.java 11 Jun 2002 00:01:14 -0000 1.38.2.4
@@ -475,7 +475,8 @@
a.getAllocationWidth(), a.getHeight());
}
- public void setupFontInfo(FontInfo fontInfo) {
+ public void setupFontInfo(FontInfo fontInfo)
+ throws FOPException {
// create a temp Image to test font metrics on
BufferedImage fontImage =
new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
1.3.2.2 +8 -3 xml-fop/src/org/apache/fop/render/awt/FontSetup.java
Index: FontSetup.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/FontSetup.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- FontSetup.java 12 Feb 2002 01:02:24 -0000 1.3.2.1
+++ FontSetup.java 11 Jun 2002 00:01:14 -0000 1.3.2.2
@@ -13,6 +13,8 @@
import org.apache.fop.layout.FontDescriptor;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.configuration.FontTriplet;
+import org.apache.fop.apps.FOPException;
+
// Java
import java.util.Enumeration;
@@ -48,7 +50,9 @@
* @param parent needed, since a live AWT component is needed
* to get a valid java.awt.FontMetrics object
*/
- public static void setup(FontInfo fontInfo, Graphics2D graphics) {
+ public static void setup(FontInfo fontInfo, Graphics2D graphics)
+ throws FOPException {
+
FontMetricsMapper metric;
MessageHandler.logln("setting up fonts");
@@ -188,7 +192,8 @@
* internalnames F<num>
*/
public static void addConfiguredFonts(
- FontInfo fontInfo, int num, Graphics2D graphics) {
+ FontInfo fontInfo, int num, Graphics2D graphics)
+ throws FOPException {
FontMetricsMapper metric;
String internalName = null;
No revision
No revision
1.13.2.1 +5 -3 xml-fop/src/org/apache/fop/render/pdf/FontSetup.java
Index: FontSetup.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/FontSetup.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- FontSetup.java 6 Aug 2001 09:43:07 -0000 1.13
+++ FontSetup.java 11 Jun 2002 00:01:15 -0000 1.13.2.1
@@ -16,6 +16,7 @@
import org.apache.fop.pdf.PDFResources;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.configuration.FontTriplet;
+import org.apache.fop.apps.FOPException;
// Java
import java.util.Enumeration;
@@ -38,7 +39,7 @@
*
* @param fontInfo the font info object to set up
*/
- public static void setup(FontInfo fontInfo) {
+ public static void setup(FontInfo fontInfo) throws FOPException {
MessageHandler.logln("setting up fonts");
fontInfo.addMetrics("F1", new Helvetica());
@@ -138,7 +139,8 @@
* Add fonts from configuration file starting with
* internalnames F<num>
*/
- public static void addConfiguredFonts(FontInfo fontInfo, int num) {
+ public static void addConfiguredFonts(FontInfo fontInfo, int num)
+ throws FOPException {
String internalName = null;
FontReader reader = null;
No revision
No revision
1.15.2.4 +4 -2 xml-fop/src/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -r1.15.2.3 -r1.15.2.4
--- PSRenderer.java 23 Apr 2002 22:33:40 -0000 1.15.2.3
+++ PSRenderer.java 11 Jun 2002 00:01:15 -0000 1.15.2.4
@@ -21,6 +21,7 @@
import org.apache.fop.fo.properties.*;
import org.apache.fop.render.pdf.Font;
import org.apache.fop.image.*;
+import org.apache.fop.apps.FOPException;
import org.apache.batik.bridge.*;
import org.apache.batik.swing.svg.*;
@@ -247,7 +248,8 @@
*
* @param fontInfo the font info object to set up
*/
- public void setupFontInfo(FontInfo fontInfo) {
+ public void setupFontInfo(FontInfo fontInfo)
+ throws FOPException {
/* use PDF's font setup to get PDF metrics */
org.apache.fop.render.pdf.FontSetup.setup(fontInfo);
this.fontInfo = fontInfo;
No revision
No revision
1.3.2.2 +3 -2 xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- SVGRenderer.java 23 Apr 2002 22:33:40 -0000 1.3.2.1
+++ SVGRenderer.java 11 Jun 2002 00:01:15 -0000 1.3.2.2
@@ -14,6 +14,7 @@
import org.apache.fop.image.*;
import org.apache.fop.svg.SVGArea;
import org.apache.fop.svg.SVGUtilities;
+import org.apache.fop.apps.FOPException;
import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
@@ -344,7 +345,7 @@
a.getAllocationWidth(), a.getHeight());
}
- public void setupFontInfo(FontInfo fontInfo) {
+ public void setupFontInfo(FontInfo fontInfo) throws FOPException {
// create a temp Image to test font metrics on
BufferedImage fontImage =
new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
No revision
No revision
1.27.2.3 +3 -2 xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -r1.27.2.2 -r1.27.2.3
--- XMLRenderer.java 23 Apr 2002 22:28:09 -0000 1.27.2.2
+++ XMLRenderer.java 11 Jun 2002 00:01:15 -0000 1.27.2.3
@@ -17,6 +17,7 @@
import org.apache.fop.layout.inline.*;
import org.apache.fop.pdf.*;
import org.apache.fop.fo.properties.LeaderPattern;
+import org.apache.fop.apps.FOPException;
// Avalon
import org.apache.avalon.framework.logger.Logger;
@@ -149,7 +150,7 @@
*
* @param fontInfo the font info object to set up
*/
- public void setupFontInfo(FontInfo fontInfo) {
+ public void setupFontInfo(FontInfo fontInfo) throws FOPException {
/* use PDF's font setup to get PDF metrics */
org.apache.fop.render.pdf.FontSetup.setup(fontInfo);
No revision
No revision
1.11.2.1 +3 -3 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.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- PDFDocumentGraphics2D.java 14 Aug 2001 14:50:30 -0000 1.11
+++ PDFDocumentGraphics2D.java 11 Jun 2002 00:01:15 -0000 1.11.2.1
@@ -56,7 +56,7 @@
* @param height the height of the document
*/
public PDFDocumentGraphics2D(boolean textAsShapes, OutputStream stream,
- int width, int height) {
+ int width, int height) throws FOPException {
super(textAsShapes);
if (!textAsShapes) {
1.20.2.5 +3 -2 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.20.2.4
retrieving revision 1.20.2.5
diff -u -r1.20.2.4 -r1.20.2.5
--- PDFGraphics2D.java 4 Jun 2002 08:13:21 -0000 1.20.2.4
+++ PDFGraphics2D.java 11 Jun 2002 00:01:15 -0000 1.20.2.5
@@ -15,6 +15,7 @@
import org.apache.fop.datatypes.ColorSpace;
import org.apache.fop.render.pdf.CIDFont;
import org.apache.fop.render.pdf.fonts.LazyFont;
+import org.apache.fop.apps.FOPException;
import org.apache.batik.ext.awt.g2d.*;
import org.apache.batik.ext.awt.image.GraphicsUtil;
1.11.2.3 +12 -4 xml-fop/src/org/apache/fop/svg/PDFTranscoder.java
Index: PDFTranscoder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFTranscoder.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- PDFTranscoder.java 13 May 2002 10:29:52 -0000 1.11.2.2
+++ PDFTranscoder.java 11 Jun 2002 00:01:15 -0000 1.11.2.3
@@ -32,6 +32,8 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.fop.apps.FOPException;
+
import org.apache.batik.transcoder.*;
import org.apache.batik.bridge.BridgeContext;
@@ -151,7 +153,8 @@
* @exception TranscoderException if an error occured while transcoding
*/
protected void transcode(Document document, String uri,
- TranscoderOutput output) throws TranscoderException {
+ TranscoderOutput output)
+ throws TranscoderException {
if (!(document instanceof SVGOMDocument)) {
throw new TranscoderException(Messages.formatMessage("notsvg",
@@ -259,8 +262,13 @@
int w = (int)width;
int h = (int)height;
- PDFDocumentGraphics2D graphics = new PDFDocumentGraphics2D(stroke,
+ PDFDocumentGraphics2D graphics;
+ try {
+ graphics = new PDFDocumentGraphics2D(stroke,
output.getOutputStream(), w, h);
+ } catch (FOPException ex) {
+ throw new TranscoderException(ex);
+ }
graphics.setSVGDimension(docWidth, docHeight);
currentTransform.setTransform(1, 0, 0, -1, 0, height);
if (!stroke) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org