cvs commit: xml-fop/src/org/apache/fop/render/pdf/fonts LazyFont.java
keiron 02/04/26 01:51:01
Modified:src/org/apache/fop/render/pdf/fonts LazyFont.java
Log:
comment for possible thread problem
Revision ChangesPath
1.6 +4 -1 xml-fop/src/org/apache/fop/render/pdf/fonts/LazyFont.java
Index: LazyFont.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/fonts/LazyFont.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LazyFont.java 11 Feb 2002 09:45:39 - 1.5
+++ LazyFont.java 26 Apr 2002 08:51:01 - 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: LazyFont.java,v 1.5 2002/02/11 09:45:39 keiron Exp $
+ * $Id: LazyFont.java,v 1.6 2002/04/26 08:51:01 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.
@@ -34,6 +34,9 @@
if(! isMetricsLoaded){
isMetricsLoaded = true;
try{
+
+// TODO - Possible thread problem here
+
FontReader reader = new FontReader(metricsFileName);
reader.useKerning(useKerning);
reader.setFontEmbedPath(fontEmbedPath);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/render/pdf/fonts LazyFont.java
keiron 01/08/13 00:52:21
Modified:src/org/apache/fop/render/pdf PDFRenderer.java
src/org/apache/fop/render/pdf/fonts LazyFont.java
Log:
pdf renderer now adds the fonts at the end of all pages rather than after each page
lazy font will set loaded to true after first attempt rather than keep trying if it
fails
Revision ChangesPath
1.81 +3 -2 xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- PDFRenderer.java 2001/08/09 13:51:55 1.80
+++ PDFRenderer.java 2001/08/13 07:52:21 1.81
@@ -1,5 +1,5 @@
/*
- * $Id: PDFRenderer.java,v 1.80 2001/08/09 13:51:55 keiron Exp $
+ * $Id: PDFRenderer.java,v 1.81 2001/08/13 07:52:21 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.
@@ -153,6 +153,7 @@
public void stopRenderer(OutputStream stream)
throws IOException {
+FontSetup.addToResources(this.pdfDoc, fontInfo);
pdfDoc.outputTrailer(stream);
}
@@ -684,7 +685,7 @@
this.pdfDoc.setIDReferences(idReferences);
this.renderPage(page);
-FontSetup.addToResources(this.pdfDoc, fontInfo);
+//FontSetup.addToResources(this.pdfDoc, fontInfo);
// TODO: this needs to be implemented
renderRootExtensions(page);
1.2 +2 -2 xml-fop/src/org/apache/fop/render/pdf/fonts/LazyFont.java
Index: LazyFont.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/fonts/LazyFont.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LazyFont.java 2001/08/06 09:43:08 1.1
+++ LazyFont.java 2001/08/13 07:52:21 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: LazyFont.java,v 1.1 2001/08/06 09:43:08 keiron Exp $
+ * $Id: LazyFont.java,v 1.2 2001/08/13 07:52:21 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.
@@ -33,6 +33,7 @@
private void load(){
if(! isMetricsLoaded){
+isMetricsLoaded = true;
try{
FontReader reader = new FontReader(metricsFileName);
reader.useKerning(useKerning);
@@ -41,7 +42,6 @@
if(realFont instanceof FontDescriptor){
realFontDescriptor = (FontDescriptor) realFont;
}
-isMetricsLoaded = true;
// System.out.println("Metrics " + metricsFileName + " loaded.");
} catch (Exception ex) {
MessageHandler.error("Failed to read font metrics file "
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/render/pdf/fonts LazyFont.java
keiron 01/08/06 02:43:08
Modified:src/org/apache/fop/pdf PDFDocument.java
src/org/apache/fop/render/pdf FontSetup.java
PDFRenderer.java
Added: src/org/apache/fop/render/pdf/fonts LazyFont.java
Log:
adds support for lazy loading of fonts
saves some cpu, memory
Submitted by: SASAKI Suguru <[EMAIL PROTECTED]>
Reviewed by: Keiron
Revision ChangesPath
1.27 +8 -2 xml-fop/src/org/apache/fop/pdf/PDFDocument.java
Index: PDFDocument.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/PDFDocument.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PDFDocument.java 2001/08/01 23:08:54 1.26
+++ PDFDocument.java 2001/08/06 09:43:07 1.27
@@ -1,5 +1,5 @@
/*
- * $Id: PDFDocument.java,v 1.26 2001/08/01 23:08:54 gears Exp $
+ * $Id: PDFDocument.java,v 1.27 2001/08/06 09:43:07 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.
@@ -18,6 +18,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.datatypes.IDReferences;
import org.apache.fop.layout.Page;
@@ -813,7 +814,12 @@
font.setDescriptor(pdfdesc);
if (subtype == PDFFont.TYPE0) {
-CIDFont cidMetrics = (CIDFont)metrics;
+CIDFont cidMetrics;
+if(metrics instanceof LazyFont){
+cidMetrics = (CIDFont) ((LazyFont) metrics).getRealFont();
+}else{
+cidMetrics = (CIDFont)metrics;
+}
PDFCIDSystemInfo sysInfo =
new PDFCIDSystemInfo(cidMetrics.getRegistry(),
cidMetrics.getOrdering(),
1.13 +8 -2 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FontSetup.java2001/07/30 20:29:33 1.12
+++ FontSetup.java2001/08/06 09:43:07 1.13
@@ -1,5 +1,5 @@
/*
- * $Id: FontSetup.java,v 1.12 2001/07/30 20:29:33 tore Exp $
+ * $Id: FontSetup.java,v 1.13 2001/08/06 09:43:07 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.
@@ -156,11 +156,17 @@
if (metricsFile != null) {
internalName = "F" + num;
num++;
+/*
reader = new FontReader(metricsFile);
reader.useKerning(configFontInfo.getKerning());
reader.setFontEmbedPath(configFontInfo.getEmbedFile());
fontInfo.addMetrics(internalName, reader.getFont());
-
+*/
+LazyFont font = new LazyFont(configFontInfo.getEmbedFile(),
+ metricsFile,
+ configFontInfo.getKerning());
+fontInfo.addMetrics(internalName, font);
+
Vector triplets = configFontInfo.getFontTriplets();
for (Enumeration t = triplets.elements();
t.hasMoreElements(); ) {
1.79 +8 -2 xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- PDFRenderer.java 2001/08/06 06:21:02 1.78
+++ PDFRenderer.java 2001/08/06 09:43:07 1.79
@@ -1,5 +1,5 @@
/*
- * $Id: PDFRenderer.java,v 1.78 2001/08/06 06:21:02 keiron Exp $
+ * $Id: PDFRenderer.java,v 1.79 2001/08/06 09:43:07 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.
@@ -22,6 +22,7 @@
import org.apache.fop.image.*;
import org.apache.fop.extensions.*;
import org.apache.fop.datatypes.IDReferences;
+import org.apache.fop.render.pdf.fonts.LazyFont;
import org.apache.batik.bridge.*;
import org.apache.batik.swing.svg.*;
@@ -487,8 +488,13 @@
