You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2024/10/26 15:03:21 UTC
svn commit: r1921565 - in /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel: PDAbstractContentStream.java PDPageContentStream.java
Author: tilman
Date: Sat Oct 26 15:03:21 2024
New Revision: 1921565
URL: http://svn.apache.org/viewvc?rev=1921565&view=rev
Log:
PDFBOX-5890: use simplified notation if there's only an MCID in the property list
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java?rev=1921565&r1=1921564&r2=1921565&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java Sat Oct 26 15:03:21 2024
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFac
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdfwriter.COSWriter;
@@ -1361,7 +1362,18 @@ abstract class PDAbstractContentStream i
public void beginMarkedContent(COSName tag, PDPropertyList propertyList) throws IOException
{
writeOperand(tag);
- writeOperand(resources.add(propertyList));
+
+ COSDictionary dict = propertyList.getCOSObject();
+ if (dict.getInt(COSName.MCID) > -1 && dict.size() == 1)
+ {
+ // PDFBOX-5890: use simplified notation if there's only an MCID
+ write("<</MCID " + dict.getInt(COSName.MCID) + ">> ");
+ }
+ else
+ {
+ writeOperand(resources.add(propertyList));
+ }
+
writeOperator(OperatorName.BEGIN_MARKED_CONTENT_SEQ);
}
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java?rev=1921565&r1=1921564&r2=1921565&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java Sat Oct 26 15:03:21 2024
@@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFac
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdfwriter.COSWriter;
@@ -2302,7 +2303,18 @@ public final class PDPageContentStream i
public void beginMarkedContent(COSName tag, PDPropertyList propertyList) throws IOException
{
writeOperand(tag);
- writeOperand(resources.add(propertyList));
+
+ COSDictionary dict = propertyList.getCOSObject();
+ if (dict.getInt(COSName.MCID) > -1 && dict.size() == 1)
+ {
+ // PDFBOX-5890: use simplified notation if there's only an MCID
+ write("<</MCID " + dict.getInt(COSName.MCID) + ">> ");
+ }
+ else
+ {
+ writeOperand(resources.add(propertyList));
+ }
+
writeOperator(OperatorName.BEGIN_MARKED_CONTENT_SEQ);
}