Author: mehdi
Date: Thu Aug 16 13:14:50 2012
New Revision: 1373819
URL: http://svn.apache.org/viewvc?rev=1373819&view=rev
Log:
Bugfix#53468: Amendments made in order to compile against FOPv1.1. Based on
work by Matthias Reischenbacher.
Added:
xmlgraphics/fop-pdf-images/trunk/lib/fop-1.1rc1.jar (with props)
Removed:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxPDFImageHandler.java
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoolean.java
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFString.java
Added: xmlgraphics/fop-pdf-images/trunk/lib/fop-1.1rc1.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/lib/fop-1.1rc1.jar?rev=1373819&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlgraphics/fop-pdf-images/trunk/lib/fop-1.1rc1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoolean.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoolean.java?rev=1373819&r1=1373818&r2=1373819&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoolean.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoolean.java
Thu Aug 16 13:14:50 2012
@@ -21,7 +21,6 @@ package org.apache.fop.render.pdf.pdfbox
import java.io.IOException;
import java.io.OutputStream;
-import java.io.Writer;
import org.apache.commons.io.output.CountingOutputStream;
@@ -51,23 +50,10 @@ public class PDFBoolean extends PDFObjec
return this.value;
}
- /** {@inheritDoc} */
@Override
- protected int output(OutputStream stream) throws IOException {
+ public int output(OutputStream stream) throws IOException {
CountingOutputStream cout = new CountingOutputStream(stream);
- Writer writer = PDFDocument.getWriterFor(cout);
- if (hasObjectNumber()) {
- writer.write(getObjectID());
- }
-
- writer.write(Boolean.toString(getValue()));
-
- if (hasObjectNumber()) {
- writer.write("\nendobj\n");
- }
-
- writer.flush();
+ PDFDocument.flushTextBuffer(new
StringBuilder(Boolean.toString(getValue())), cout);
return cout.getCount();
}
-
}
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java?rev=1373819&r1=1373818&r2=1373819&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
Thu Aug 16 13:14:50 2012
@@ -282,12 +282,12 @@ class PDFBoxAdapter {
}
}
- private void transferDict(COSDictionary orgDict, PDFDictionary targetDict,
+ private void transferDict(COSDictionary orgDict, PDFStream targetDict,
Set filter) throws IOException {
transferDict(orgDict, targetDict, filter, false);
}
- private void transferDict(COSDictionary orgDict, PDFDictionary targetDict,
+ private void transferDict(COSDictionary orgDict, PDFStream targetDict,
Set filter, boolean inclusive) throws IOException {
Iterator iter = orgDict.keySet().iterator();
while (iter.hasNext()) {
@@ -350,9 +350,9 @@ class PDFBoxAdapter {
form = pdfDoc.addFormXObject(null, pageStream,
(pageResources != null ? pageResources.makeReference() :
null), key);
if (originalPageContents != null) {
- transferDict(originalPageContents, form, filter);
+ transferDict(originalPageContents, pageStream, filter);
}
- transferDict(page.getCOSDictionary(), form, page2form, true);
+ transferDict(page.getCOSDictionary(), pageStream, page2form, true);
AffineTransform at = form.getMatrix();
PDRectangle mediaBox = page.findMediaBox();
PDRectangle cropBox = page.findCropBox();
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFString.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFString.java?rev=1373819&r1=1373818&r2=1373819&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFString.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFString.java
Thu Aug 16 13:14:50 2012
@@ -22,7 +22,6 @@ package org.apache.fop.render.pdf.pdfbox
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import java.io.Writer;
import org.apache.commons.io.output.CountingOutputStream;
@@ -115,22 +114,10 @@ public class PDFString extends PDFObject
return this.binary;
}
- /** {@inheritDoc} */
@Override
- protected int output(OutputStream stream) throws IOException {
+ public int output(OutputStream stream) throws IOException {
CountingOutputStream cout = new CountingOutputStream(stream);
- Writer writer = PDFDocument.getWriterFor(cout);
- if (hasObjectNumber()) {
- writer.write(getObjectID());
- }
-
- writer.write(PDFText.escapeText(getString()));
-
- if (hasObjectNumber()) {
- writer.write("\nendobj\n");
- }
-
- writer.flush();
+ PDFDocument.flushTextBuffer(new
StringBuilder(PDFText.escapeText(getString())), cout);
return cout.getCount();
}
@@ -147,5 +134,4 @@ public class PDFString extends PDFObject
}
return true;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
