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 ss...@apache.org on 2015/02/24 12:23:45 UTC
svn commit: r1661887 [1/2] - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/pdf/ src/java/org/apache/fop/pdf/xref/
src/java/org/apache/fop/render/pdf/ src/java/org/apache/fop/svg/
test/java/org/apache/fop/pdf/ test/java/org/apache/fop/pdf/xref/
Author: ssteiner
Date: Tue Feb 24 11:23:44 2015
New Revision: 1661887
URL: http://svn.apache.org/r1661887
Log:
FOP-2445: Merge PDF Linearization branch
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLinearization.java
- copied unchanged from r1661884, xmlgraphics/fop/branches/Temp_PDFLinearization/src/java/org/apache/fop/pdf/PDFLinearization.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObjectNumber.java
- copied unchanged from r1661884, xmlgraphics/fop/branches/Temp_PDFLinearization/src/java/org/apache/fop/pdf/PDFObjectNumber.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFLinearizationTestCase.java
- copied unchanged from r1661884, xmlgraphics/fop/branches/Temp_PDFLinearization/test/java/org/apache/fop/pdf/PDFLinearizationTestCase.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CompressedObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CompressedObjectReference.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/TrailerDictionary.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceStreamTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java Tue Feb 24 11:23:44 2015
@@ -21,6 +21,7 @@ package org.apache.fop.pdf;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Set;
import org.apache.commons.io.output.CountingOutputStream;
@@ -36,7 +37,9 @@ public abstract class AbstractPDFStream
/** The filters that should be applied */
private PDFFilterList filters;
- private final boolean encodeOnTheFly;
+ private boolean encodeOnTheFly;
+
+ private PDFNumber refLength = new PDFNumber();
protected AbstractPDFStream() {
this(true);
@@ -220,11 +223,11 @@ public abstract class AbstractPDFStream
StringBuilder textBuffer = new StringBuilder(64);
StreamCache encodedStream = null;
- PDFNumber refLength = null;
final Object lengthEntry;
if (encodeOnTheFly) {
- refLength = new PDFNumber();
- getDocumentSafely().registerObject(refLength);
+ if (!refLength.hasObjectNumber()) {
+ registerChildren();
+ }
lengthEntry = refLength;
} else {
encodedStream = encodeStream();
@@ -281,4 +284,18 @@ public abstract class AbstractPDFStream
protected boolean multipleFiltersAllowed() {
return true;
}
+
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ dictionary.getChildren(children);
+ if (encodeOnTheFly) {
+ children.add(refLength);
+ }
+ }
+
+ public void registerChildren() {
+ if (encodeOnTheFly) {
+ getDocument().registerObject(refLength);
+ }
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java Tue Feb 24 11:23:44 2015
@@ -51,7 +51,7 @@ public class BitmapImage implements PDFI
* @param mask the transparency mask reference if any
*/
public BitmapImage(String k, int width, int height, byte[] data,
- String mask) {
+ PDFReference mask) {
this.key = k;
this.height = height;
this.width = width;
@@ -59,7 +59,7 @@ public class BitmapImage implements PDFI
this.colorSpace = new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_RGB);
this.bitmaps = data;
if (mask != null) {
- maskRef = new PDFReference(mask);
+ maskRef = mask;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CompressedObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CompressedObject.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CompressedObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CompressedObject.java Tue Feb 24 11:23:44 2015
@@ -35,7 +35,7 @@ interface CompressedObject {
*
* @return the object number.
*/
- int getObjectNumber();
+ PDFObjectNumber getObjectNumber();
/**
* Outputs this object's content into the given stream.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java Tue Feb 24 11:23:44 2015
@@ -21,6 +21,7 @@ package org.apache.fop.pdf;
// Java
import java.util.List;
+import java.util.Set;
/**
* class representing an object which is a list of annotations.
@@ -73,4 +74,9 @@ public class PDFAnnotList extends PDFObj
* 19 0 R
* ]
*/
+
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ PDFDictionary.getChildren(links, children);
+ }
}
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?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFArray.java Tue Feb 24 11:23:44 2015
@@ -21,7 +21,9 @@ package org.apache.fop.pdf;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import org.apache.commons.io.output.CountingOutputStream;
@@ -213,4 +215,14 @@ public class PDFArray extends PDFObject
return cout.getCount();
}
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ List<Object> contents = new ArrayList<Object>();
+ for (Object c : values) {
+ if (!(c instanceof PDFReference)) {
+ contents.add(c);
+ }
+ }
+ PDFDictionary.getChildren(contents, children);
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java Tue Feb 24 11:23:44 2015
@@ -21,6 +21,7 @@ package org.apache.fop.pdf;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.util.Set;
import org.apache.fop.fonts.CIDFontType;
@@ -301,5 +302,20 @@ public class PDFCIDFont extends PDFObjec
return bout.toByteArray();
}
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ super.getChildren(children);
+ if (cidMap != null) {
+ children.add(cidMap);
+ cidMap.getChildren(children);
+ }
+ children.add(descriptor);
+ descriptor.getChildren(children);
+ if (cmap != null) {
+ children.add(cmap);
+ cmap.getChildren(children);
+ }
+ }
+
}
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?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDictionary.java Tue Feb 24 11:23:44 2015
@@ -21,8 +21,12 @@ package org.apache.fop.pdf;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.io.output.CountingOutputStream;
@@ -30,7 +34,7 @@ import org.apache.commons.io.output.Coun
* Class representing a PDF dictionary object
*/
public class PDFDictionary extends PDFObject {
-
+ private boolean visited;
/**
* the entry map
*/
@@ -134,4 +138,28 @@ public class PDFDictionary extends PDFOb
textBuffer.append(">>");
}
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ if (!visited) {
+ visited = true;
+ Map<String, Object> childrenMap = new HashMap<String, Object>(entries);
+ childrenMap.remove("Parent");
+ getChildren(childrenMap.values(), children);
+ visited = false;
+ }
+ }
+
+ public static void getChildren(Collection<Object> values, Set<PDFObject> children) {
+ for (Object x : values) {
+ if (x instanceof PDFReference) {
+ x = ((PDFReference) x).getObject();
+ }
+ if (x instanceof PDFObject) {
+ if (((PDFObject) x).hasObjectNumber()) {
+ children.add((PDFObject) x);
+ }
+ ((PDFObject) x).getChildren(children);
+ }
+ }
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java Tue Feb 24 11:23:44 2015
@@ -78,18 +78,18 @@ public class PDFDocument {
private Log log = LogFactory.getLog("org.apache.fop.pdf");
/** the current character position */
- private long position;
+ protected long position;
/** the character position of each object */
- private List<Long> indirectObjectOffsets = new ArrayList<Long>();
+ protected List<Long> indirectObjectOffsets = new ArrayList<Long>();
- private Collection<PDFStructElem> structureTreeElements;
+ protected List<PDFStructElem> structureTreeElements;
/** List of objects to write in the trailer */
- private List<PDFObject> trailerObjects = new ArrayList<PDFObject>();
+ protected List<PDFObject> trailerObjects = new ArrayList<PDFObject>();
/** the objects themselves */
- private List<PDFObject> objects = new LinkedList<PDFObject>();
+ protected List<PDFObject> objects = new LinkedList<PDFObject>();
/** Controls the PDF version of this document */
private VersionController versionController;
@@ -128,6 +128,8 @@ public class PDFDocument {
/** the counter for XObject numbering */
private int xObjectCount;
+ protected int gStateObjectCount;
+
/* TODO: Should be modified (works only for image subtype) */
private Map<String, PDFXObject> xObjectsMap = new HashMap<String, PDFXObject>();
@@ -155,6 +157,8 @@ public class PDFDocument {
private List<PDFLaunch> launches = new ArrayList<PDFLaunch>();
+ protected List<PDFPage> pageObjs = new ArrayList<PDFPage>();
+
private List<PDFLayer> layers;
private List<PDFNavigator> navigators;
@@ -169,6 +173,10 @@ public class PDFDocument {
private boolean mergeFontsEnabled;
+ private boolean linearizationEnabled;
+
+ protected boolean outputStarted;
+
/**
* Creates an empty PDF document.
*
@@ -348,6 +356,14 @@ public class PDFDocument {
}
/**
+ * Get the Structural Tree Collection for this document
+ * @return
+ */
+ public List<PDFStructElem> getStructureTreeElements() {
+ return structureTreeElements;
+ }
+
+ /**
* Creates and returns a StructTreeRoot object.
*
* @param parentTree the value of the ParenTree entry
@@ -398,6 +414,9 @@ public class PDFDocument {
public PDFObject registerObject(PDFObject obj) {
assignObjectNumber(obj);
addObject(obj);
+ if (obj instanceof AbstractPDFStream) {
+ ((AbstractPDFStream) obj).registerChildren();
+ }
return obj;
}
@@ -421,6 +440,9 @@ public class PDFDocument {
* @param obj {@link PDFObject} to assign a number to
*/
public void assignObjectNumber(PDFObject obj) {
+ if (outputStarted && isLinearizationEnabled()) {
+ throw new IllegalStateException("Can't assign number after start of output");
+ }
if (obj == null) {
throw new NullPointerException("obj must not be null");
}
@@ -436,7 +458,7 @@ public class PDFDocument {
+ "PDFObject already has a parent PDFDocument");
}
- obj.setObjectNumber(++this.objectcount);
+ obj.setObjectNumber(this);
if (currentParent == null) {
obj.setDocument(this);
@@ -485,6 +507,7 @@ public class PDFDocument {
}
if (obj instanceof PDFPage) {
this.pages.notifyKidRegistered((PDFPage)obj);
+ pageObjs.add((PDFPage) obj);
}
if (obj instanceof PDFLaunch) {
this.launches.add((PDFLaunch) obj);
@@ -551,7 +574,7 @@ public class PDFDocument {
public void setEncryption(PDFEncryptionParams params) {
getProfile().verifyEncryptionAllowed();
fileIDGenerator = FileIDGenerator.getRandomFileIDGenerator();
- this.encryption = PDFEncryptionManager.newInstance(++this.objectcount, params, this);
+ this.encryption = PDFEncryptionManager.newInstance(params, this);
if (this.encryption != null) {
PDFObject pdfObject = (PDFObject)this.encryption;
addTrailerObject(pdfObject);
@@ -965,6 +988,7 @@ public class PDFDocument {
* @throws IOException if there is an exception writing to the output stream
*/
public void output(OutputStream stream) throws IOException {
+ outputStarted = true;
//Write out objects until the list is empty. This approach (used with a
//LinkedList) allows for output() methods to create and register objects
//on the fly even during serialization.
@@ -974,9 +998,29 @@ public class PDFDocument {
}
}
- private void streamIndirectObject(PDFObject o, OutputStream stream) throws IOException {
+ protected void writeTrailer(OutputStream stream, int first, int last, int size, long mainOffset, long startxref)
+ throws IOException {
+ TrailerOutputHelper trailerOutputHelper = mayCompressStructureTreeElements()
+ ? new CompressedTrailerOutputHelper()
+ : new UncompressedTrailerOutputHelper();
+ if (structureTreeElements != null) {
+ trailerOutputHelper.outputStructureTreeElements(stream);
+ }
+ TrailerDictionary trailerDictionary = createTrailerDictionary(mainOffset != 0);
+ if (mainOffset != 0) {
+ trailerDictionary.getDictionary().put("Prev", mainOffset);
+ }
+ trailerOutputHelper.outputCrossReferenceObject(stream, trailerDictionary, first, last, size);
+ String trailer = "\nstartxref\n" + startxref + "\n%%EOF\n";
+ stream.write(encode(trailer));
+ }
+
+ protected int streamIndirectObject(PDFObject o, OutputStream stream) throws IOException {
+ outputStarted = true;
recordObjectOffset(o);
- this.position += outputIndirectObject(o, stream);
+ int len = outputIndirectObject(o, stream);
+ this.position += len;
+ return len;
}
private void streamIndirectObjects(Collection<? extends PDFObject> objects, OutputStream stream)
@@ -987,7 +1031,7 @@ public class PDFDocument {
}
private void recordObjectOffset(PDFObject object) {
- int index = object.getObjectNumber() - 1;
+ int index = object.getObjectNumber().getNumber() - 1;
while (indirectObjectOffsets.size() <= index) {
indirectObjectOffsets.add(null);
}
@@ -1076,23 +1120,26 @@ public class PDFDocument {
trailerOutputHelper.outputStructureTreeElements(stream);
}
streamIndirectObjects(trailerObjects, stream);
- TrailerDictionary trailerDictionary = createTrailerDictionary();
- long startxref = trailerOutputHelper.outputCrossReferenceObject(stream, trailerDictionary);
+ TrailerDictionary trailerDictionary = createTrailerDictionary(true);
+ long startxref = trailerOutputHelper.outputCrossReferenceObject(stream, trailerDictionary, 0,
+ indirectObjectOffsets.size(), indirectObjectOffsets.size());
String trailer = "\nstartxref\n" + startxref + "\n%%EOF\n";
stream.write(encode(trailer));
}
private boolean mayCompressStructureTreeElements() {
return accessibilityEnabled
- && versionController.getPDFVersion().compareTo(Version.V1_5) >= 0;
+ && versionController.getPDFVersion().compareTo(Version.V1_5) >= 0
+ && !isLinearizationEnabled();
}
- private TrailerDictionary createTrailerDictionary() {
+ private TrailerDictionary createTrailerDictionary(boolean addRoot) {
FileIDGenerator gen = getFileIDGenerator();
- TrailerDictionary trailerDictionary = new TrailerDictionary(this)
- .setRoot(root)
- .setInfo(info)
- .setFileID(gen.getOriginalFileID(), gen.getUpdatedFileID());
+ TrailerDictionary trailerDictionary = new TrailerDictionary(this);
+ if (addRoot) {
+ trailerDictionary.setRoot(root).setInfo(info);
+ }
+ trailerDictionary.setFileID(gen.getOriginalFileID(), gen.getUpdatedFileID());
if (isEncryptionActive()) {
trailerDictionary.setEncryption(encryption);
}
@@ -1117,7 +1164,8 @@ public class PDFDocument {
/**
* @return the offset of the cross-reference object (the value of startxref)
*/
- long outputCrossReferenceObject(OutputStream stream, TrailerDictionary trailerDictionary)
+ long outputCrossReferenceObject(OutputStream stream, TrailerDictionary trailerDictionary,
+ int first, int last, int size)
throws IOException;
}
@@ -1129,9 +1177,9 @@ public class PDFDocument {
}
public long outputCrossReferenceObject(OutputStream stream,
- TrailerDictionary trailerDictionary) throws IOException {
+ TrailerDictionary trailerDictionary, int first, int last, int size) throws IOException {
new CrossReferenceTable(trailerDictionary, position,
- indirectObjectOffsets).output(stream);
+ indirectObjectOffsets, first, last, size).output(stream);
return position;
}
}
@@ -1150,7 +1198,7 @@ public class PDFDocument {
}
public long outputCrossReferenceObject(OutputStream stream,
- TrailerDictionary trailerDictionary) throws IOException {
+ TrailerDictionary trailerDictionary, int first, int last, int size) throws IOException {
// Outputting the object streams should not have created new indirect objects
assert objects.isEmpty();
new CrossReferenceStream(PDFDocument.this, ++objectcount, trailerDictionary, position,
@@ -1175,4 +1223,13 @@ public class PDFDocument {
}
return fileIDGenerator;
}
+
+ public boolean isLinearizationEnabled() {
+ return linearizationEnabled;
+ }
+
+ public void setLinearizationEnabled(boolean b) {
+ linearizationEnabled = b;
+ }
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java Tue Feb 24 11:23:44 2015
@@ -621,11 +621,11 @@ public final class PDFEncryptionJCE exte
private class EncryptionFilter extends PDFFilter {
- private int streamNumber;
+ private PDFObjectNumber streamNumber;
private int streamGeneration;
- EncryptionFilter(int streamNumber, int streamGeneration) {
+ EncryptionFilter(PDFObjectNumber streamNumber, int streamGeneration) {
this.streamNumber = streamNumber;
this.streamGeneration = streamGeneration;
}
@@ -658,7 +658,7 @@ public final class PDFEncryptionJCE exte
out.flush();
return new CipherOutputStream(out, cipher);
} else {
- byte[] key = createEncryptionKey(streamNumber, streamGeneration);
+ byte[] key = createEncryptionKey(streamNumber.getNumber(), streamGeneration);
Cipher cipher = initCipher(key);
return new CipherOutputStream(out, cipher);
}
@@ -666,7 +666,7 @@ public final class PDFEncryptionJCE exte
}
- private PDFEncryptionJCE(int objectNumber, PDFEncryptionParams params, PDFDocument pdf) {
+ private PDFEncryptionJCE(PDFObjectNumber objectNumber, PDFEncryptionParams params, PDFDocument pdf) {
setObjectNumber(objectNumber);
try {
if (params.getEncryptionLengthInBits() == 256) {
@@ -692,7 +692,7 @@ public final class PDFEncryptionJCE exte
* @return the newly created encryption object
*/
public static PDFEncryption make(
- int objectNumber, PDFEncryptionParams params, PDFDocument pdf) {
+ PDFObjectNumber objectNumber, PDFEncryptionParams params, PDFDocument pdf) {
return new PDFEncryptionJCE(objectNumber, params, pdf);
}
@@ -714,7 +714,7 @@ public final class PDFEncryptionJCE exte
System.arraycopy(encryptedData, 0, storedData, 16, encryptedData.length);
return storedData;
} else {
- byte[] key = createEncryptionKey(o.getObjectNumber(), o.getGeneration());
+ byte[] key = createEncryptionKey(o.getObjectNumber().getNumber(), o.getGeneration());
return encryptWithKey(key, data);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java Tue Feb 24 11:23:44 2015
@@ -107,20 +107,21 @@ public final class PDFEncryptionManager
/**
* Creates a new PDFEncryption instance if PDF encryption is available.
- * @param objnum PDF object number
* @param params PDF encryption parameters
* @param pdf the PDF document to encrypt
* @return PDFEncryption the newly created instance, null if PDF encryption
* is unavailable.
*/
- public static PDFEncryption newInstance(int objnum, PDFEncryptionParams params,
+ public static PDFEncryption newInstance(PDFEncryptionParams params,
PDFDocument pdf) {
try {
+ PDFObjectNumber pdfObjectNumber = new PDFObjectNumber();
+ pdfObjectNumber.setDocument(pdf);
Class<?> clazz = Class.forName("org.apache.fop.pdf.PDFEncryptionJCE");
Method makeMethod = clazz.getMethod("make",
- new Class[] {int.class, PDFEncryptionParams.class, PDFDocument.class});
+ new Class[] {PDFObjectNumber.class, PDFEncryptionParams.class, PDFDocument.class});
Object obj = makeMethod.invoke(null,
- new Object[] {new Integer(objnum), params, pdf});
+ new Object[] {pdfObjectNumber, params, pdf});
return (PDFEncryption)obj;
} catch (ClassNotFoundException e) {
if (checkAvailableAlgorithms()) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java Tue Feb 24 11:23:44 2015
@@ -105,7 +105,7 @@ public class PDFFactory {
*/
public PDFRoot makeRoot(PDFPages pages) {
//Make a /Pages object. This object is written in the trailer.
- PDFRoot pdfRoot = new PDFRoot(++this.document.objectcount, pages);
+ PDFRoot pdfRoot = new PDFRoot(document, pages);
pdfRoot.setDocument(getDocument());
getDocument().addTrailerObject(pdfRoot);
return pdfRoot;
@@ -117,7 +117,7 @@ public class PDFFactory {
* @return a new PDF Pages object for adding pages to
*/
public PDFPages makePages() {
- PDFPages pdfPages = new PDFPages(++(this.document.objectcount));
+ PDFPages pdfPages = new PDFPages(getDocument());
pdfPages.setDocument(getDocument());
getDocument().addTrailerObject(pdfPages);
return pdfPages;
@@ -129,7 +129,7 @@ public class PDFFactory {
* @return a new PDF resources object
*/
public PDFResources makeResources() {
- PDFResources pdfResources = new PDFResources(++this.document.objectcount);
+ PDFResources pdfResources = new PDFResources(getDocument());
pdfResources.setDocument(getDocument());
getDocument().addTrailerObject(pdfResources);
return pdfResources;
@@ -197,7 +197,14 @@ public class PDFFactory {
* create a PDFPage with the next object number, the given
* resources, contents and dimensions
*/
- PDFPage page = new PDFPage(resources, pageIndex, mediaBox, cropBox, bleedBox, trimBox);
+ PDFResources res = getDocument().getFactory().makeResources();
+ if (getDocument().isLinearizationEnabled()) {
+ getDocument().trailerObjects.remove(resources);
+ }
+ res.setParentResources(resources);
+
+ PDFPage page = new PDFPage(res, pageIndex, mediaBox, cropBox, bleedBox, trimBox);
+ res.setParent(page);
getDocument().assignObjectNumber(page);
getDocument().getPages().addPage(page);
@@ -763,7 +770,7 @@ public class PDFFactory {
* @return the new PDF outline object
*/
public PDFOutline makeOutline(PDFOutline parent, String label,
- String actionRef, boolean showSubItems) {
+ PDFReference actionRef, boolean showSubItems) {
PDFOutline pdfOutline = new PDFOutline(label, actionRef, showSubItems);
if (parent != null) {
parent.addOutline(pdfOutline);
@@ -785,7 +792,7 @@ public class PDFFactory {
PDFAction pdfAction, boolean showSubItems) {
return pdfAction == null
? null
- : makeOutline(parent, label, pdfAction.getAction(), showSubItems);
+ : makeOutline(parent, label, new PDFReference(pdfAction.getAction()), showSubItems);
}
// This one is obsolete now, at least it isn't called from anywhere inside FOP
@@ -804,7 +811,7 @@ public class PDFFactory {
boolean showSubItems) {
String goToRef = getGoToReference(destination, yoffset);
- return makeOutline(parent, label, goToRef, showSubItems);
+ return makeOutline(parent, label, new PDFReference(goToRef), showSubItems);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java Tue Feb 24 11:23:44 2015
@@ -105,13 +105,17 @@ public class PDFGState extends PDFObject
}
private Map values = new java.util.HashMap();
+ private int objNum;
/**
* Returns the name of this object
* @return the name
*/
public String getName() {
- return "GS" + getObjectNumber();
+ if (objNum == 0) {
+ objNum = ++getDocument().gStateObjectCount;
+ }
+ return "GS" + objNum;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java Tue Feb 24 11:23:44 2015
@@ -31,7 +31,7 @@ public class PDFGoTo extends PDFAction {
/**
* the pageReference
*/
- private String pageReference;
+ private PDFReference pageReference;
private String destination;
private float xPosition;
private float yPosition;
@@ -43,7 +43,9 @@ public class PDFGoTo extends PDFAction {
*/
public PDFGoTo(String pageReference) {
super();
- setPageReference(pageReference);
+ if (pageReference != null) {
+ setPageReference(new PDFReference(pageReference));
+ }
}
/**
@@ -63,7 +65,7 @@ public class PDFGoTo extends PDFAction {
*
* @param pageReference the new page reference to use
*/
- public void setPageReference(String pageReference) {
+ public void setPageReference(PDFReference pageReference) {
this.pageReference = pageReference;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java Tue Feb 24 11:23:44 2015
@@ -23,6 +23,7 @@ import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Set;
import org.apache.commons.io.IOUtils;
@@ -155,4 +156,10 @@ public class PDFICCBasedColorSpace exten
return sRGBProfile;
}
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ super.getChildren(children);
+ children.add(iccStream);
+ iccStream.getChildren(children);
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java Tue Feb 24 11:23:44 2015
@@ -22,6 +22,7 @@ package org.apache.fop.pdf;
// Java
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Set;
/* modified by JKT to integrate with 0.12.0 */
/* modified by Eric SCHAEFFER to integrate with 0.13.0 */
@@ -171,4 +172,14 @@ public class PDFImageXObject extends PDF
return pdfimage.multipleFiltersAllowed();
}
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ super.getChildren(children);
+ PDFICCStream pdfICCStream = pdfimage.getICCStream();
+ if (pdfICCStream != null) {
+ children.add(pdfICCStream);
+ pdfICCStream.getChildren(children);
+ }
+ }
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFInfo.java Tue Feb 24 11:23:44 2015
@@ -22,7 +22,7 @@ package org.apache.fop.pdf;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TimeZone;
@@ -317,7 +317,7 @@ public class PDFInfo extends PDFObject {
throw new IllegalArgumentException(key + " is a reserved keyword");
}
if (customProperties == null) {
- customProperties = new HashMap<PDFName, String>();
+ customProperties = new LinkedHashMap<PDFName, String>();
}
customProperties.put(new PDFName(key), value);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java Tue Feb 24 11:23:44 2015
@@ -21,6 +21,7 @@ package org.apache.fop.pdf;
// Java
import java.awt.geom.Rectangle2D;
+import java.util.Set;
/**
* class representing an /Annot object of /Subtype /Link
@@ -142,5 +143,14 @@ public class PDFLink extends PDFObject {
return true;
}
+
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ super.getChildren(children);
+ if (action.hasObjectNumber()) {
+ children.add(action);
+ }
+ action.getChildren(children);
+ }
}
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?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java Tue Feb 24 11:23:44 2015
@@ -22,6 +22,7 @@ package org.apache.fop.pdf;
// Java
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,7 +42,8 @@ public abstract class PDFObject implemen
/**
* the object's number
*/
- private int objnum;
+ private boolean hasObjNum;
+ private PDFObjectNumber objNum = new PDFObjectNumber();
/**
* the object's generation (0 in new documents)
@@ -60,11 +62,11 @@ public abstract class PDFObject implemen
* Returns the object's number.
* @return the PDF Object number
*/
- public int getObjectNumber() {
- if (this.objnum == 0) {
+ public PDFObjectNumber getObjectNumber() {
+ if (!hasObjNum) {
throw new IllegalStateException("Object has no number assigned: " + this.toString());
}
- return this.objnum;
+ return objNum;
}
/**
@@ -88,23 +90,33 @@ public abstract class PDFObject implemen
* @return True if it has an object number
*/
public boolean hasObjectNumber() {
- return this.objnum > 0;
+ return hasObjNum;
}
/**
* Sets the object number
- * @param objnum the object number
*/
- public void setObjectNumber(int objnum) {
- this.objnum = objnum;
+ public void setObjectNumber(PDFDocument document) {
+ objNum.setDocument(document);
+ hasObjNum = true;
PDFDocument doc = getDocument();
setParent(null);
setDocument(doc); //Restore reference to PDFDocument after setting parent to null
if (log.isTraceEnabled()) {
- log.trace("Assigning " + this + " object number " + objnum);
+ log.trace("Assigning " + this + " object number " + objNum);
}
}
+ public void setObjectNumber(PDFObjectNumber objectNumber) {
+ objNum = objectNumber;
+ hasObjNum = true;
+ }
+
+ public void setObjectNumber(int objectNumber) {
+ objNum = new PDFObjectNumber(objectNumber);
+ hasObjNum = true;
+ }
+
/**
* Returns this object's generation.
* @return the PDF Object generation
@@ -184,8 +196,7 @@ public abstract class PDFObject implemen
throw new IllegalArgumentException(
"Cannot reference this object. It doesn't have an object number");
}
- String ref = getObjectNumber() + " " + getGeneration() + " R";
- return ref;
+ return makeReference().toString();
}
/**
@@ -344,4 +355,7 @@ public abstract class PDFObject implemen
protected boolean contentEquals(PDFObject o) {
return this.equals(o);
}
+
+ public void getChildren(Set<PDFObject> children) {
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFOutline.java Tue Feb 24 11:23:44 2015
@@ -22,6 +22,7 @@ package org.apache.fop.pdf;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.List;
+import java.util.Set;
/**
* <p>This represents a single Outline object in a PDF, including the root Outlines
@@ -58,7 +59,7 @@ public class PDFOutline extends PDFObjec
*/
private String title;
- private String actionRef;
+ private PDFReference actionRef;
/**
* Create a PDF outline with the title and action.
@@ -67,7 +68,7 @@ public class PDFOutline extends PDFObjec
* @param action the action for this outline
* @param openItem indicator of whether child items are visible or not
*/
- public PDFOutline(String title, String action, boolean openItem) {
+ public PDFOutline(String title, PDFReference action, boolean openItem) {
super();
subentries = new java.util.ArrayList();
count = 0;
@@ -170,4 +171,19 @@ public class PDFOutline extends PDFObjec
return bout.toByteArray();
}
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ if (parent != null) {
+ children.add(parent);
+ }
+ if (first != null && last != null) {
+ children.add(first);
+ children.add(last);
+ first.getChildren(children);
+ last.getChildren(children);
+ }
+ if (actionRef != null) {
+ children.add(actionRef.getObject());
+ }
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java Tue Feb 24 11:23:44 2015
@@ -50,11 +50,9 @@ public class PDFPages extends PDFObject
* It must also be allocated an object ID (so that the kids
* can refer to the parent) so that the XRef table needs to
* be updated before this object is written.
- *
- * @param objnum the object's number
*/
- public PDFPages(int objnum) {
- setObjectNumber(objnum);
+ public PDFPages(PDFDocument document) {
+ setObjectNumber(document);
}
/**
@@ -81,9 +79,9 @@ public class PDFPages extends PDFObject
throw new IllegalStateException("A page already exists at index "
+ idx + " (zero-based).");
}
- this.kids.set(idx, page.referencePDF());
+ this.kids.set(idx, page.makeReference());
} else {
- this.kids.add(page.referencePDF());
+ this.kids.add(page.makeReference());
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFReference.java Tue Feb 24 11:23:44 2015
@@ -31,7 +31,7 @@ import java.lang.ref.SoftReference;
*/
public class PDFReference implements PDFWritable {
- private int objectNumber;
+ private PDFObjectNumber objectNumber;
private int generation;
private Reference<PDFObject> objReference;
@@ -56,7 +56,7 @@ public class PDFReference implements PDF
}
String[] parts = ref.split(" ");
assert parts.length == 3;
- this.objectNumber = Integer.parseInt(parts[0]);
+ this.objectNumber = new PDFObjectNumber(Integer.parseInt(parts[0]));
this.generation = Integer.parseInt(parts[1]);
assert "R".equals(parts[2]);
}
@@ -81,7 +81,7 @@ public class PDFReference implements PDF
* Returns the object number.
* @return the object number
*/
- public int getObjectNumber() {
+ public PDFObjectNumber getObjectNumber() {
return this.objectNumber;
}
@@ -103,7 +103,7 @@ public class PDFReference implements PDF
/** {@inheritDoc} */
public void outputInline(OutputStream out, StringBuilder textBuffer) {
- textBuffer.append(getObjectNumber()).append(' ').append(getGeneration()).append(" R");
+ textBuffer.append(getObjectNumber().getNumber()).append(' ').append(getGeneration()).append(" R");
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFResources.java Tue Feb 24 11:23:44 2015
@@ -52,7 +52,7 @@ public class PDFResources extends PDFDic
*/
protected Set<PDFXObject> xObjects = new LinkedHashSet<PDFXObject>();
/** Map of color spaces (key: color space name) */
- protected Map<PDFName, PDFColorSpace> colorSpaces = new LinkedHashMap<PDFName, PDFColorSpace>();
+ protected Map<LazyName, PDFColorSpace> colorSpaces = new LinkedHashMap<LazyName, PDFColorSpace>();
/** Map of ICC color spaces (key: ICC profile description) */
protected Map<String, PDFICCBasedColorSpace> iccColorSpaces = new LinkedHashMap<String, PDFICCBasedColorSpace>();
@@ -68,13 +68,11 @@ public class PDFResources extends PDFDic
/**
* create a /Resources object.
- *
- * @param objnum the object's number
*/
- public PDFResources(int objnum) {
+ public PDFResources(PDFDocument doc) {
/* generic creation of object */
super();
- setObjectNumber(objnum);
+ setObjectNumber(doc);
}
public void addContext(PDFResourceContext c) {
@@ -156,7 +154,7 @@ public class PDFResources extends PDFDic
* @param colorSpace the color space
*/
public void addColorSpace(PDFColorSpace colorSpace) {
- this.colorSpaces.put(new PDFName(colorSpace.getName()), colorSpace);
+ this.colorSpaces.put(new LazyName(colorSpace), colorSpace);
if (colorSpace instanceof PDFICCBasedColorSpace) {
PDFICCBasedColorSpace icc = (PDFICCBasedColorSpace)colorSpace;
String desc = ColorProfileUtil.getICCProfileDescription(
@@ -165,6 +163,16 @@ public class PDFResources extends PDFDic
}
}
+ static class LazyName {
+ private PDFColorSpace colorSpace;
+ public LazyName(PDFColorSpace colorSpace) {
+ this.colorSpace = colorSpace;
+ }
+ public PDFName getName() {
+ return new PDFName(colorSpace.getName());
+ }
+ }
+
/**
* Returns a ICCBased color space by profile name.
* @param desc the name of the color space
@@ -181,8 +189,12 @@ public class PDFResources extends PDFDic
* @return the requested color space or null if it wasn't found
*/
public PDFColorSpace getColorSpace(PDFName name) {
- PDFColorSpace cs = this.colorSpaces.get(name);
- return cs;
+ for (Map.Entry<LazyName, PDFColorSpace> x : colorSpaces.entrySet()) {
+ if (x.getKey().getName().equals(name)) {
+ return x.getValue();
+ }
+ }
+ return null;
}
/**
@@ -303,4 +315,43 @@ public class PDFResources extends PDFDic
}
}
+ @Override
+ public void getChildren(Set<PDFObject> children) {
+ getChildren(children, false);
+ }
+
+ private void getChildren(Set<PDFObject> children, boolean isParent) {
+ super.getChildren(children);
+ for (PDFDictionary f : fonts.values()) {
+ children.add(f);
+ f.getChildren(children);
+ }
+ for (PDFResourceContext c : contexts) {
+ for (PDFXObject x : c.getXObjects()) {
+ children.add(x);
+ x.getChildren(children);
+ }
+ for (PDFPattern x : c.getPatterns()) {
+ children.add(x);
+ x.getChildren(children);
+ }
+ for (PDFShading x : c.getShadings()) {
+ children.add(x);
+ x.getChildren(children);
+ }
+ for (PDFGState x : c.getGStates()) {
+ children.add(x);
+ x.getChildren(children);
+ }
+ }
+ if (!isParent) {
+ for (PDFColorSpace x : colorSpaces.values()) {
+ children.add((PDFObject)x);
+ ((PDFObject)x).getChildren(children);
+ }
+ }
+ if (parent != null) {
+ parent.getChildren(children, true);
+ }
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFRoot.java Tue Feb 24 11:23:44 2015
@@ -50,6 +50,9 @@ public class PDFRoot extends PDFDictiona
*/
public static final int PAGEMODE_FULLSCREEN = 3;
+ private final PDFDocument document;
+
+
private static final PDFName[] PAGEMODE_NAMES = new PDFName[] {
new PDFName("UseNone"),
new PDFName("UseOutlines"),
@@ -67,9 +70,9 @@ public class PDFRoot extends PDFDictiona
* @param objnum the object's number
* @param pages the PDFPages object
*/
- public PDFRoot(int objnum, PDFPages pages) {
- super();
- setObjectNumber(objnum);
+ public PDFRoot(PDFDocument document, PDFPages pages) {
+ this.document = document;
+ setObjectNumber(document);
put("Type", new PDFName("Catalog"));
setRootPages(pages);
setLanguage("x-unknown");
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFStream.java Tue Feb 24 11:23:44 2015
@@ -187,7 +187,7 @@ public class PDFStream extends AbstractP
final int len = super.output(stream);
//Now that the data has been written, it can be discarded.
- this.data = null;
+// this.data = null;
return len;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CompressedObjectReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CompressedObjectReference.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CompressedObjectReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CompressedObjectReference.java Tue Feb 24 11:23:44 2015
@@ -22,15 +22,17 @@ package org.apache.fop.pdf.xref;
import java.io.DataOutputStream;
import java.io.IOException;
+import org.apache.fop.pdf.PDFObjectNumber;
+
/**
* A reference to an indirect object stored in an object stream. Contains the relevant
* information to add to a cross-reference stream.
*/
public class CompressedObjectReference implements ObjectReference {
- private final int objectNumber;
+ private final PDFObjectNumber objectNumber;
- private final int objectStreamNumber;
+ private final PDFObjectNumber objectStreamNumber;
private final int index;
@@ -42,7 +44,7 @@ public class CompressedObjectReference i
* object is to be found
* @param index the index of the compressed object in the object stream
*/
- public CompressedObjectReference(int objectNumber, int objectStreamNumber, int index) {
+ public CompressedObjectReference(PDFObjectNumber objectNumber, PDFObjectNumber objectStreamNumber, int index) {
this.objectNumber = objectNumber;
this.objectStreamNumber = objectStreamNumber;
this.index = index;
@@ -50,16 +52,16 @@ public class CompressedObjectReference i
public void output(DataOutputStream out) throws IOException {
out.write(2);
- out.writeLong(objectStreamNumber);
+ out.writeLong(objectStreamNumber.getNumber());
out.write(0);
out.write(index);
}
- public int getObjectNumber() {
+ public PDFObjectNumber getObjectNumber() {
return objectNumber;
}
- public int getObjectStreamNumber() {
+ public PDFObjectNumber getObjectStreamNumber() {
return objectStreamNumber;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceStream.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceStream.java Tue Feb 24 11:23:44 2015
@@ -31,6 +31,7 @@ import org.apache.fop.pdf.PDFDictionary;
import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFFilterList;
import org.apache.fop.pdf.PDFName;
+import org.apache.fop.pdf.PDFObjectNumber;
import org.apache.fop.pdf.PDFStream;
/**
@@ -60,7 +61,10 @@ public class CrossReferenceStream extend
objectReferences.add(offset == null ? null : new UncompressedObjectReference(offset));
}
for (CompressedObjectReference ref : compressedObjectReferences) {
- this.objectReferences.set(ref.getObjectNumber() - 1, ref);
+ while (ref.getObjectNumber().getNumber() > objectReferences.size()) {
+ objectReferences.add(null);
+ }
+ this.objectReferences.set(ref.getObjectNumber().getNumber() - 1, ref);
}
}
@@ -77,7 +81,7 @@ public class CrossReferenceStream extend
}
};
- helperStream.setObjectNumber(objectNumber);
+ helperStream.setObjectNumber(new PDFObjectNumber(objectNumber));
helperStream.setDocument(document);
ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream(byteArray);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceTable.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceTable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/CrossReferenceTable.java Tue Feb 24 11:23:44 2015
@@ -35,10 +35,17 @@ public class CrossReferenceTable extends
private final StringBuilder pdf = new StringBuilder(256);
+ private int last;
+ private int first;
+ private int size;
+
public CrossReferenceTable(TrailerDictionary trailerDictionary, long startxref,
- List<Long> location) {
+ List<Long> location, int first, int last, int size) {
super(trailerDictionary, startxref);
this.objectReferences = location;
+ this.first = first;
+ this.last = last;
+ this.size = size;
}
public void output(OutputStream stream) throws IOException {
@@ -47,10 +54,17 @@ public class CrossReferenceTable extends
}
private void outputXref() throws IOException {
- pdf.append("xref\n0 ");
- pdf.append(objectReferences.size() + 1);
- pdf.append("\n0000000000 65535 f \n");
- for (Long objectReference : objectReferences) {
+ if (first == 0) {
+ pdf.append("xref\n0 ");
+ pdf.append(last + 1);
+ pdf.append("\n0000000000 65535 f \n");
+ } else {
+ pdf.append("xref\n" + (first + 1) + " ");
+ pdf.append(last + "\n");
+ }
+ for (int i = first; i < first + last; i++) {
+ Long objectReference = objectReferences.get(i);
+ assert objectReference != null;
final String padding = "0000000000";
String s = String.valueOf(objectReference);
if (s.length() > 10) {
@@ -66,7 +80,7 @@ public class CrossReferenceTable extends
pdf.append("trailer\n");
stream.write(PDFDocument.encode(pdf.toString()));
PDFDictionary dictionary = trailerDictionary.getDictionary();
- dictionary.put("/Size", objectReferences.size() + 1);
+ dictionary.put("/Size", size + 1);
dictionary.output(stream);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/TrailerDictionary.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/TrailerDictionary.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/TrailerDictionary.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/xref/TrailerDictionary.java Tue Feb 24 11:23:44 2015
@@ -87,7 +87,7 @@ public class TrailerDictionary {
return this;
}
- PDFDictionary getDictionary() {
+ public PDFDictionary getDictionary() {
return dictionary;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java Tue Feb 24 11:23:44 2015
@@ -28,6 +28,7 @@ import java.io.OutputStream;
import org.apache.fop.pdf.PDFColorHandler;
import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFFilterList;
+import org.apache.fop.pdf.PDFLinearization;
import org.apache.fop.pdf.PDFNumber;
import org.apache.fop.pdf.PDFPaintingState;
import org.apache.fop.pdf.PDFReference;
@@ -148,6 +149,9 @@ public class PDFContentGenerator {
* @throws IOException if an error occurs while flushing the PDF objects
*/
public void flushPDFDoc() throws IOException {
+ if (document.isLinearizationEnabled()) {
+ new PDFLinearization(document).outputPages(outputStream);
+ }
this.document.output(this.outputStream);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java Tue Feb 24 11:23:44 2015
@@ -41,6 +41,7 @@ import org.apache.fop.pdf.PDFAnnotList;
import org.apache.fop.pdf.PDFArray;
import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFPage;
+import org.apache.fop.pdf.PDFReference;
import org.apache.fop.pdf.PDFResources;
import org.apache.fop.render.extensions.prepress.PageBoundaries;
import org.apache.fop.render.extensions.prepress.PageScale;
@@ -180,9 +181,13 @@ public class PDFDocumentHandler extends
/** {@inheritDoc} */
public void endDocument() throws IFException {
+ pdfDoc.getResources().addFonts(pdfDoc, fontInfo);
try {
- pdfDoc.getResources().addFonts(pdfDoc, fontInfo);
- pdfDoc.outputTrailer(this.outputStream);
+ if (pdfDoc.isLinearizationEnabled()) {
+ generator.flushPDFDoc();
+ } else {
+ pdfDoc.outputTrailer(this.outputStream);
+ }
this.pdfDoc = null;
pdfResources = null;
@@ -286,8 +291,11 @@ public class PDFDocumentHandler extends
this.pdfDoc.addObject(annots);
}
this.pdfDoc.addObject(currentPage);
- this.generator.flushPDFDoc();
- this.generator = null;
+
+ if (!pdfDoc.isLinearizationEnabled()) {
+ this.generator.flushPDFDoc();
+ this.generator = null;
+ }
} catch (IOException ioe) {
throw new IFException("I/O error in endPage()", ioe);
}
@@ -329,17 +337,15 @@ public class PDFDocumentHandler extends
static final class PageReference {
- private final String pageRef;
+ private final PDFReference pageRef;
private final Dimension pageDimension;
private PageReference(PDFPage page, Dimension dim) {
- // Avoid keeping references to PDFPage as memory usage is
- // considerably increased when handling thousands of pages.
- this.pageRef = page.makeReference().toString();
+ this.pageRef = page.makeReference();
this.pageDimension = new Dimension(dim);
}
- public String getPageRef() {
+ public PDFReference getPageRef() {
return this.pageRef;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java Tue Feb 24 11:23:44 2015
@@ -31,6 +31,7 @@ import org.apache.fop.pdf.PDFFactory;
import org.apache.fop.pdf.PDFGoTo;
import org.apache.fop.pdf.PDFLink;
import org.apache.fop.pdf.PDFOutline;
+import org.apache.fop.pdf.PDFReference;
import org.apache.fop.pdf.PDFStructElem;
import org.apache.fop.render.intermediate.IFDocumentNavigationHandler;
import org.apache.fop.render.intermediate.IFException;
@@ -87,7 +88,7 @@ public class PDFDocumentNavigationHandle
parent = getPDFDoc().getOutlineRoot();
}
PDFAction action = getAction(bookmark.getAction());
- String actionRef = (action != null ? action.makeReference().toString() : null);
+ PDFReference actionRef = (action != null ? action.makeReference() : null);
PDFOutline pdfOutline = getPDFDoc().getFactory().makeOutline(parent,
bookmark.getTitle(), actionRef, bookmark.isShown());
Iterator iter = bookmark.getChildBookmarks().iterator();
@@ -194,7 +195,7 @@ public class PDFDocumentNavigationHandle
p2d = new Point2D.Double(
action.getTargetLocation().x / 1000.0,
(pageRef.getPageDimension().height - action.getTargetLocation().y) / 1000.0);
- String pdfPageRef = pageRef.getPageRef();
+ PDFReference pdfPageRef = pageRef.getPageRef();
pdfGoTo.setPageReference(pdfPageRef);
pdfGoTo.setPosition(p2d);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java Tue Feb 24 11:23:44 2015
@@ -85,7 +85,7 @@ public class PDFImageHandlerGraphics2D e
final boolean textAsShapes = false;
PDFGraphics2D graphics = new PDFGraphics2D(textAsShapes,
pdfContext.getFontInfo(), generator.getDocument(),
- generator.getResourceContext(), pdfContext.getPage().referencePDF(),
+ generator.getResourceContext(), pdfContext.getPage().makeReference(),
"", 0.0f, null);
graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java Tue Feb 24 11:23:44 2015
@@ -171,7 +171,7 @@ public class PDFImageHandlerSVG implemen
PDFGraphics2D graphics = new PDFGraphics2D(true, pdfContext.getFontInfo(),
generator.getDocument(),
- generator.getResourceContext(), pdfContext.getPage().referencePDF(),
+ generator.getResourceContext(), pdfContext.getPage().makeReference(),
"", 0, new TransparencyIgnoredEventListener(pdfContext, imageSVG));
graphics.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java Tue Feb 24 11:23:44 2015
@@ -171,7 +171,9 @@ public class PDFPainter extends Abstract
prepareImageMCID(structElem);
}
drawImageUsingURI(uri, rect);
- flushPDFDoc();
+ if (!getDocumentHandler().getPDFDocument().isLinearizationEnabled()) {
+ flushPDFDoc();
+ }
}
}
@@ -228,7 +230,9 @@ public class PDFPainter extends Abstract
prepareImageMCID(structElem);
}
drawImageUsingDocument(doc, rect);
- flushPDFDoc();
+ if (!getDocumentHandler().getPDFDocument().isLinearizationEnabled()) {
+ flushPDFDoc();
+ }
}
private void flushPDFDoc() throws IFException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java Tue Feb 24 11:23:44 2015
@@ -56,6 +56,7 @@ import static org.apache.fop.render.pdf.
import static org.apache.fop.render.pdf.PDFEncryptionOption.USER_PASSWORD;
import static org.apache.fop.render.pdf.PDFRendererOption.DISABLE_SRGB_COLORSPACE;
import static org.apache.fop.render.pdf.PDFRendererOption.FILTER_LIST;
+import static org.apache.fop.render.pdf.PDFRendererOption.LINEARIZATION;
import static org.apache.fop.render.pdf.PDFRendererOption.MERGE_FONTS;
import static org.apache.fop.render.pdf.PDFRendererOption.OUTPUT_PROFILE;
import static org.apache.fop.render.pdf.PDFRendererOption.PDF_A_MODE;
@@ -137,6 +138,7 @@ public final class PDFRendererConfig imp
parseAndPut(OUTPUT_PROFILE, cfg);
parseAndPut(DISABLE_SRGB_COLORSPACE, cfg);
parseAndPut(MERGE_FONTS, cfg);
+ parseAndPut(LINEARIZATION, cfg);
parseAndPut(VERSION, cfg);
} catch (ConfigurationException e) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java Tue Feb 24 11:23:44 2015
@@ -72,6 +72,12 @@ public enum PDFRendererOption implements
return Boolean.valueOf(value);
}
},
+ LINEARIZATION("linearization", false) {
+ @Override
+ Boolean deserialize(String value) {
+ return Boolean.valueOf(value);
+ }
+ },
/** Rendering Options key for the ICC profile for the output intent. */
OUTPUT_PROFILE("output-profile") {
@Override
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java Tue Feb 24 11:23:44 2015
@@ -31,6 +31,7 @@ import org.apache.fop.pdf.Version;
import static org.apache.fop.render.pdf.PDFRendererOption.DISABLE_SRGB_COLORSPACE;
import static org.apache.fop.render.pdf.PDFRendererOption.FILTER_LIST;
+import static org.apache.fop.render.pdf.PDFRendererOption.LINEARIZATION;
import static org.apache.fop.render.pdf.PDFRendererOption.MERGE_FONTS;
import static org.apache.fop.render.pdf.PDFRendererOption.OUTPUT_PROFILE;
import static org.apache.fop.render.pdf.PDFRendererOption.PDF_A_MODE;
@@ -125,4 +126,8 @@ public final class PDFRendererOptionsCon
public Boolean getMergeFontsEnabled() {
return (Boolean)properties.get(MERGE_FONTS);
}
+
+ public Boolean getLinearizationEnabled() {
+ return (Boolean)properties.get(LINEARIZATION);
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java Tue Feb 24 11:23:44 2015
@@ -588,6 +588,7 @@ class PDFRenderingUtil {
this.pdfDoc.enableAccessibility(userAgent.isAccessibilityEnabled());
pdfDoc.setMergeFontsEnabled(rendererConfig.getMergeFontsEnabled());
+ pdfDoc.setLinearizationEnabled(rendererConfig.getLinearizationEnabled());
return this.pdfDoc;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java Tue Feb 24 11:23:44 2015
@@ -337,7 +337,7 @@ public class PDFDocumentGraphics2D exten
width, height);
resourceContext = page;
pdfContext.setCurrentPage(page);
- pageRef = page.referencePDF();
+ pageRef = page.makeReference();
currentStream.write("q\n");
AffineTransform at = new AffineTransform(1.0, 0.0, 0.0, -1.0,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java Tue Feb 24 11:23:44 2015
@@ -88,6 +88,7 @@ import org.apache.fop.pdf.PDFLink;
import org.apache.fop.pdf.PDFNumber;
import org.apache.fop.pdf.PDFPaintingState;
import org.apache.fop.pdf.PDFPattern;
+import org.apache.fop.pdf.PDFReference;
import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFResources;
import org.apache.fop.pdf.PDFShading;
@@ -132,7 +133,7 @@ public class PDFGraphics2D extends Abstr
/**
* The PDF reference of the current page.
*/
- protected String pageRef;
+ protected PDFReference pageRef;
/**
* The PDF painting state
@@ -212,7 +213,7 @@ public class PDFGraphics2D extends Abstr
* @param size the current font size
*/
public PDFGraphics2D(boolean textAsShapes, FontInfo fi, PDFDocument doc,
- PDFResourceContext page, String pref, String font, float size,
+ PDFResourceContext page, PDFReference pref, String font, float size,
TransparencyIgnoredEventListener listener) {
this(textAsShapes);
pdfDoc = doc;
@@ -331,7 +332,7 @@ public class PDFGraphics2D extends Abstr
* Gets the PDF reference of the current page.
* @return the PDF reference of the current page
*/
- public String getPageReference() {
+ public PDFReference getPageReference() {
return this.pageRef;
}
@@ -422,7 +423,7 @@ public class PDFGraphics2D extends Abstr
if (linkType != PDFLink.EXTERNAL) {
String pdfdest = "/FitR " + dest;
resourceContext.addAnnotation(
- pdfDoc.getFactory().makeLink(rect, getPageReference(), pdfdest));
+ pdfDoc.getFactory().makeLink(rect, getPageReference().toString(), pdfdest));
} else {
resourceContext.addAnnotation(
pdfDoc.getFactory().makeLink(rect, dest, linkType, 0));
@@ -474,7 +475,7 @@ public class PDFGraphics2D extends Abstr
}
private void flushPDFDocument() {
- if (outputStream != null) {
+ if (outputStream != null && !pdfDoc.isLinearizationEnabled()) {
try {
this.pdfDoc.output(outputStream);
} catch (IOException ioe) {
@@ -1068,13 +1069,13 @@ public class PDFGraphics2D extends Abstr
}
}
- String maskRef = null;
+ PDFReference maskRef = null;
if (mask != null) {
BitmapImage fopimg = new BitmapImage(
"TempImageMask:" + pctx.toString(), devW, devH, mask, null);
fopimg.setColorSpace(new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY));
PDFImageXObject xobj = pdfDoc.addImage(resourceContext, fopimg);
- maskRef = xobj.referencePDF();
+ maskRef = xobj.makeReference();
flushPDFDocument();
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java Tue Feb 24 11:23:44 2015
@@ -49,7 +49,7 @@ public class AbstractPDFStreamTestCase e
encodedBytes[i++] = (byte) (in & 0xff);
}
}
- private String startStream = "<< /Length 5 0 R /Filter /FlateDecode >>\n"
+ private String startStream = "<< /Length 1 0 R /Filter /FlateDecode >>\n"
+ "stream\n";
private String endStream = "endstream";
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java Tue Feb 24 11:23:44 2015
@@ -46,7 +46,7 @@ public class ObjectStreamManagerTestCase
int objectStreamNumber2 = assertSameObjectStream(expectedCapacity, expectedCapacity * 2);
int objectStreamNumber3 = assertSameObjectStream(expectedCapacity * 2, numCompressedObjects);
assertDifferent(objectStreamNumber1, objectStreamNumber2, objectStreamNumber3);
- assertEquals(objectStreamNumber3, pdfDocument.previous.getObjectNumber());
+ assertEquals(objectStreamNumber3, pdfDocument.previous.getObjectNumber().getNumber());
}
private void createCompressObjectReferences(int numObjects) {
@@ -82,8 +82,8 @@ public class ObjectStreamManagerTestCase
private CompressedObject createCompressedObject(final int objectNumber) {
return new CompressedObject() {
- public int getObjectNumber() {
- return objectNumber;
+ public PDFObjectNumber getObjectNumber() {
+ return new PDFObjectNumber(objectNumber);
}
public int output(OutputStream outputStream) throws IOException {
@@ -101,7 +101,7 @@ public class ObjectStreamManagerTestCase
}
private int getObjectStreamNumber(int index) {
- return compressedObjectReferences.get(index).getObjectStreamNumber();
+ return compressedObjectReferences.get(index).getObjectStreamNumber().getNumber();
}
private void assertDifferent(int objectStreamNumber1, int objectStreamNumber2,
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java Tue Feb 24 11:23:44 2015
@@ -86,13 +86,14 @@ public class ObjectStreamTestCase {
private String getExpectedOutput() {
int numObs = compressedObjects.size();
- int objectStreamNumber = objectStream.getObjectNumber();
+ int objectStreamNumber = objectStream.getObjectNumber().getNumber();
int offsetsLength = 9;
StringBuilder expected = new StringBuilder();
expected.append("<<\n");
ObjectStream previous = (ObjectStream) objectStream.get("Extends");
if (previous != null) {
expected.append(" /Extends ").append(previous.getObjectNumber()).append(" 0 R\n");
+ objectStreamNumber++;
}
expected.append(" /Type /ObjStm\n")
.append(" /N ").append(numObs).append("\n")
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java Tue Feb 24 11:23:44 2015
@@ -286,7 +286,7 @@ public class PDFEncryptionJCETestCase {
public final void testMake() {
PDFEncryption testEncryptionObj = createEncryptionObject(new PDFEncryptionParams());
assertTrue(testEncryptionObj instanceof PDFEncryptionJCE);
- assertEquals(1, ((PDFEncryptionJCE) testEncryptionObj).getObjectNumber());
+ assertEquals(1, ((PDFEncryptionJCE) testEncryptionObj).getObjectNumber().getNumber());
}
@Test
@@ -608,7 +608,7 @@ public class PDFEncryptionJCETestCase {
};
}
};
- return (PDFEncryptionJCE) PDFEncryptionJCE.make(1, params, doc);
+ return (PDFEncryptionJCE) PDFEncryptionJCE.make(new PDFObjectNumber(1), params, doc);
}
private void runEncryptionTests() throws IOException {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java Tue Feb 24 11:23:44 2015
@@ -58,10 +58,10 @@ public class PDFObjectTestCase {
@Test
public void testSetObjectNumber() {
pdfObjectUnderTest.setObjectNumber(1);
- assertEquals(1, pdfObjectUnderTest.getObjectNumber());
+ assertEquals(1, pdfObjectUnderTest.getObjectNumber().getNumber());
pdfObjectUnderTest.setObjectNumber(5);
- assertEquals(5, pdfObjectUnderTest.getObjectNumber());
+ assertEquals(5, pdfObjectUnderTest.getObjectNumber().getNumber());
}
/**
@@ -157,12 +157,12 @@ public class PDFObjectTestCase {
PDFDictionary dict = new PDFDictionary();
dict.setObjectNumber(7);
PDFReference ref = dict.makeReference();
- assertEquals(ref.getObjectNumber(), 7);
+ assertEquals(ref.getObjectNumber().getNumber(), 7);
assertEquals(ref.getGeneration(), 0);
assertEquals(ref.toString(), "7 0 R");
ref = new PDFReference("8 0 R");
- assertEquals(ref.getObjectNumber(), 8);
+ assertEquals(ref.getObjectNumber().getNumber(), 8);
assertEquals(ref.getGeneration(), 0);
assertEquals(ref.toString(), "8 0 R");
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java Tue Feb 24 11:23:44 2015
@@ -27,6 +27,8 @@ import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
+import org.apache.fop.pdf.PDFObjectNumber;
+
public class CompressedObjectReferenceTestCase extends ObjectReferenceTest {
@Test
@@ -41,7 +43,7 @@ public class CompressedObjectReferenceTe
private void runTest(List<Integer> expectedObjectStreamBytes, int index) throws IOException {
int objectStreamNumber = (int) computeNumberFromBytes(expectedObjectStreamBytes);
- sut = new CompressedObjectReference(0, objectStreamNumber, index);
+ sut = new CompressedObjectReference(new PDFObjectNumber(0), new PDFObjectNumber(objectStreamNumber), index);
byte[] expected = createExpectedOutput((byte) 2, expectedObjectStreamBytes, index);
byte[] actual = getActualOutput();
assertArrayEquals(expected, actual);
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java?rev=1661887&r1=1661886&r2=1661887&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java Tue Feb 24 11:23:44 2015
@@ -52,7 +52,7 @@ public abstract class CrossReferenceObje
pdfDocument = new PDFDocument("Apache FOP");
Map<String, List<String>> filterMap = pdfDocument.getFilterMap();
filterMap.put("default", Arrays.asList("null"));
- PDFRoot root = new PDFRoot(1, new PDFPages(10));
+ PDFRoot root = new PDFRoot(pdfDocument, new PDFPages(pdfDocument));
PDFInfo info = new PDFInfo();
info.setObjectNumber(2);
byte[] fileID =
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org