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 je...@apache.org on 2007/05/11 10:47:12 UTC
svn commit: r537129 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf:
PDFArray.java PDFDictionary.java PDFObject.java
Author: jeremias
Date: Fri May 11 01:47:11 2007
New Revision: 537129
URL: http://svn.apache.org/viewvc?view=rev&rev=537129
Log:
Bugfix: Integers were not correctly formatted in PDF. This fixes a problem with embedded fonts.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java?view=diff&rev=537129&r1=537128&r2=537129
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java Fri May 11 01:47:11 2007
@@ -127,11 +127,7 @@
p.append(" ");
}
Object obj = this.values.get(i);
- if (obj instanceof PDFWritable) {
- p.append(((PDFWritable)obj).toInlinePDFString());
- } else {
- p.append("(").append(obj).append(")");
- }
+ formatObject(obj, p);
}
p.append("]");
if (hasObjectNumber()) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java?view=diff&rev=537129&r1=537128&r2=537129
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java Fri May 11 01:47:11 2007
@@ -84,11 +84,7 @@
p.append(key);
p.append(" ");
Object obj = this.entries.get(key);
- if (obj instanceof PDFWritable) {
- p.append(((PDFWritable)obj).toInlinePDFString());
- } else {
- p.append("(").append(obj).append(")");
- }
+ formatObject(obj, p);
}
p.append("\n>>\n");
if (hasObjectNumber()) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java?view=diff&rev=537129&r1=537128&r2=537129
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java Fri May 11 01:47:11 2007
@@ -245,6 +245,21 @@
}*/
}
+ /**
+ * Formats an object for serialization to PDF.
+ * @param obj the object
+ * @param sb the StringBuffer to write to
+ */
+ protected void formatObject(Object obj, StringBuffer sb) {
+ if (obj instanceof PDFWritable) {
+ sb.append(((PDFWritable)obj).toInlinePDFString());
+ } else if (obj instanceof Number) {
+ sb.append(obj);
+ } else {
+ sb.append("(").append(obj).append(")");
+ }
+ }
+
/** Formatting pattern for PDF date */
protected static final SimpleDateFormat DATE_FORMAT
= new SimpleDateFormat("'D:'yyyyMMddHHmmss");
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org