You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2022/10/29 13:58:27 UTC
svn commit: r1904918 [1/2] - in /pdfbox/trunk: examples/src/main/java/org/apache/pdfbox/examples/printing/ examples/src/main/java/org/apache/pdfbox/examples/util/ pdfbox/src/main/java/org/apache/pdfbox/contentstream/ pdfbox/src/main/java/org/apache/pdf...
Author: lehmi
Date: Sat Oct 29 13:58:26 2022
New Revision: 1904918
URL: http://svn.apache.org/viewvc?rev=1904918&view=rev
Log:
PDFBOX-5536: make OperatorProcessor.context private final
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextColors.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFGraphicsStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorProcessor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorN.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorSpace.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceCMYKColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceGrayColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceRGBColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorN.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorSpace.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceCMYKColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceGrayColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceRGBColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipEvenOddRule.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipNonZeroRule.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseAndStrokePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillEvenOddAndStrokePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillNonZeroAndStrokePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/EndPath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddAndStrokePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddRule.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroAndStrokePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroRule.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/GraphicsOperatorProcessor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LegacyFillNonZeroRule.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/StrokePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Concatenate.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Restore.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Save.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetFlatness.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineCapStyle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineDashPattern.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineJoinStyle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineMiterLimit.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineWidth.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetMatrix.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetRenderingIntent.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/BeginText.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/EndText.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/MoveText.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/MoveTextSetLeading.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/NextLine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetCharSpacing.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetFontAndSize.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetTextHorizontalScaling.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetTextLeading.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetTextRenderingMode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetTextRise.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetWordSpacing.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/ShowText.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/ShowTextAdjusted.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/ShowTextLine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/ShowTextLineAndSpace.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/StubOperator.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/printing/OpaquePDFRenderer.java Sat Oct 29 13:58:26 2022
@@ -26,6 +26,7 @@ import javax.print.PrintServiceLookup;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -95,7 +96,7 @@ public class OpaquePDFRenderer extends P
public OpaquePageDrawer(PageDrawerParameters parameters) throws IOException
{
super(parameters);
- addOperator(new OpaqueDrawObject());
+ addOperator(new OpaqueDrawObject(this));
}
}
@@ -103,6 +104,10 @@ public class OpaquePDFRenderer extends P
// but doesn't call showTransparencyGroup
private static class OpaqueDrawObject extends GraphicsOperatorProcessor
{
+ public OpaqueDrawObject(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
private static final Log LOG = LogFactory.getLog(OpaqueDrawObject.class);
@@ -119,6 +124,7 @@ public class OpaquePDFRenderer extends P
return;
}
COSName objectName = (COSName) base0;
+ PDFGraphicsStreamEngine context = getGraphicsContext();
PDXObject xobject = context.getResources().getXObject(objectName);
if (xobject == null)
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java Sat Oct 29 13:58:26 2022
@@ -54,12 +54,12 @@ public class PrintImageLocations extends
*/
public PrintImageLocations() throws IOException
{
- addOperator(new Concatenate());
- addOperator(new DrawObject());
- addOperator(new SetGraphicsStateParameters());
- addOperator(new Save());
- addOperator(new Restore());
- addOperator(new SetMatrix());
+ addOperator(new Concatenate(this));
+ addOperator(new DrawObject(this));
+ addOperator(new SetGraphicsStateParameters(this));
+ addOperator(new Save(this));
+ addOperator(new Restore(this));
+ addOperator(new SetMatrix(this));
}
/**
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextColors.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextColors.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextColors.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextColors.java Sat Oct 29 13:58:26 2022
@@ -60,18 +60,18 @@ public class PrintTextColors extends PDF
*/
public PrintTextColors() throws IOException
{
- addOperator(new SetStrokingColorSpace());
- addOperator(new SetNonStrokingColorSpace());
- addOperator(new SetStrokingDeviceCMYKColor());
- addOperator(new SetNonStrokingDeviceCMYKColor());
- addOperator(new SetNonStrokingDeviceRGBColor());
- addOperator(new SetStrokingDeviceRGBColor());
- addOperator(new SetNonStrokingDeviceGrayColor());
- addOperator(new SetStrokingDeviceGrayColor());
- addOperator(new SetStrokingColor());
- addOperator(new SetStrokingColorN());
- addOperator(new SetNonStrokingColor());
- addOperator(new SetNonStrokingColorN());
+ addOperator(new SetStrokingColorSpace(this));
+ addOperator(new SetNonStrokingColorSpace(this));
+ addOperator(new SetStrokingDeviceCMYKColor(this));
+ addOperator(new SetNonStrokingDeviceCMYKColor(this));
+ addOperator(new SetNonStrokingDeviceRGBColor(this));
+ addOperator(new SetStrokingDeviceRGBColor(this));
+ addOperator(new SetNonStrokingDeviceGrayColor(this));
+ addOperator(new SetStrokingDeviceGrayColor(this));
+ addOperator(new SetStrokingColor(this));
+ addOperator(new SetStrokingColorN(this));
+ addOperator(new SetNonStrokingColor(this));
+ addOperator(new SetNonStrokingColorN(this));
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFGraphicsStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFGraphicsStreamEngine.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFGraphicsStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFGraphicsStreamEngine.java Sat Oct 29 13:58:26 2022
@@ -106,71 +106,71 @@ public abstract class PDFGraphicsStreamE
{
this.page = page;
- addOperator(new CloseFillNonZeroAndStrokePath());
- addOperator(new FillNonZeroAndStrokePath());
- addOperator(new CloseFillEvenOddAndStrokePath());
- addOperator(new FillEvenOddAndStrokePath());
- addOperator(new BeginInlineImage());
- addOperator(new BeginText());
- addOperator(new CurveTo());
- addOperator(new Concatenate());
- addOperator(new SetStrokingColorSpace());
- addOperator(new SetNonStrokingColorSpace());
- addOperator(new SetLineDashPattern());
- addOperator(new DrawObject()); // special graphics version
- addOperator(new EndText());
- addOperator(new FillNonZeroRule());
- addOperator(new LegacyFillNonZeroRule());
- addOperator(new FillEvenOddRule());
- addOperator(new SetStrokingDeviceGrayColor());
- addOperator(new SetNonStrokingDeviceGrayColor());
- addOperator(new SetGraphicsStateParameters());
- addOperator(new ClosePath());
- addOperator(new SetFlatness());
- addOperator(new SetLineJoinStyle());
- addOperator(new SetLineCapStyle());
- addOperator(new SetStrokingDeviceCMYKColor());
- addOperator(new SetNonStrokingDeviceCMYKColor());
- addOperator(new LineTo());
- addOperator(new MoveTo());
- addOperator(new SetLineMiterLimit());
- addOperator(new EndPath());
- addOperator(new Save());
- addOperator(new Restore());
- addOperator(new AppendRectangleToPath());
- addOperator(new SetStrokingDeviceRGBColor());
- addOperator(new SetNonStrokingDeviceRGBColor());
- addOperator(new SetRenderingIntent());
- addOperator(new CloseAndStrokePath());
- addOperator(new StrokePath());
- addOperator(new SetStrokingColor());
- addOperator(new SetNonStrokingColor());
- addOperator(new SetStrokingColorN());
- addOperator(new SetNonStrokingColorN());
- addOperator(new ShadingFill());
- addOperator(new NextLine());
- addOperator(new SetCharSpacing());
- addOperator(new MoveText());
- addOperator(new MoveTextSetLeading());
- addOperator(new SetFontAndSize());
- addOperator(new ShowText());
- addOperator(new ShowTextAdjusted());
- addOperator(new SetTextLeading());
- addOperator(new SetMatrix());
- addOperator(new SetTextRenderingMode());
- addOperator(new SetTextRise());
- addOperator(new SetWordSpacing());
- addOperator(new SetTextHorizontalScaling());
- addOperator(new CurveToReplicateInitialPoint());
- addOperator(new SetLineWidth());
- addOperator(new ClipNonZeroRule());
- addOperator(new ClipEvenOddRule());
- addOperator(new CurveToReplicateFinalPoint());
- addOperator(new ShowTextLine());
- addOperator(new ShowTextLineAndSpace());
- addOperator(new BeginMarkedContentSequence());
- addOperator(new BeginMarkedContentSequenceWithProperties());
- addOperator(new EndMarkedContentSequence());
+ addOperator(new CloseFillNonZeroAndStrokePath(this));
+ addOperator(new FillNonZeroAndStrokePath(this));
+ addOperator(new CloseFillEvenOddAndStrokePath(this));
+ addOperator(new FillEvenOddAndStrokePath(this));
+ addOperator(new BeginInlineImage(this));
+ addOperator(new BeginText(this));
+ addOperator(new CurveTo(this));
+ addOperator(new Concatenate(this));
+ addOperator(new SetStrokingColorSpace(this));
+ addOperator(new SetNonStrokingColorSpace(this));
+ addOperator(new SetLineDashPattern(this));
+ addOperator(new DrawObject(this)); // special graphics version
+ addOperator(new EndText(this));
+ addOperator(new FillNonZeroRule(this));
+ addOperator(new LegacyFillNonZeroRule(this));
+ addOperator(new FillEvenOddRule(this));
+ addOperator(new SetStrokingDeviceGrayColor(this));
+ addOperator(new SetNonStrokingDeviceGrayColor(this));
+ addOperator(new SetGraphicsStateParameters(this));
+ addOperator(new ClosePath(this));
+ addOperator(new SetFlatness(this));
+ addOperator(new SetLineJoinStyle(this));
+ addOperator(new SetLineCapStyle(this));
+ addOperator(new SetStrokingDeviceCMYKColor(this));
+ addOperator(new SetNonStrokingDeviceCMYKColor(this));
+ addOperator(new LineTo(this));
+ addOperator(new MoveTo(this));
+ addOperator(new SetLineMiterLimit(this));
+ addOperator(new EndPath(this));
+ addOperator(new Save(this));
+ addOperator(new Restore(this));
+ addOperator(new AppendRectangleToPath(this));
+ addOperator(new SetStrokingDeviceRGBColor(this));
+ addOperator(new SetNonStrokingDeviceRGBColor(this));
+ addOperator(new SetRenderingIntent(this));
+ addOperator(new CloseAndStrokePath(this));
+ addOperator(new StrokePath(this));
+ addOperator(new SetStrokingColor(this));
+ addOperator(new SetNonStrokingColor(this));
+ addOperator(new SetStrokingColorN(this));
+ addOperator(new SetNonStrokingColorN(this));
+ addOperator(new ShadingFill(this));
+ addOperator(new NextLine(this));
+ addOperator(new SetCharSpacing(this));
+ addOperator(new MoveText(this));
+ addOperator(new MoveTextSetLeading(this));
+ addOperator(new SetFontAndSize(this));
+ addOperator(new ShowText(this));
+ addOperator(new ShowTextAdjusted(this));
+ addOperator(new SetTextLeading(this));
+ addOperator(new SetMatrix(this));
+ addOperator(new SetTextRenderingMode(this));
+ addOperator(new SetTextRise(this));
+ addOperator(new SetWordSpacing(this));
+ addOperator(new SetTextHorizontalScaling(this));
+ addOperator(new CurveToReplicateInitialPoint(this));
+ addOperator(new SetLineWidth(this));
+ addOperator(new ClipNonZeroRule(this));
+ addOperator(new ClipEvenOddRule(this));
+ addOperator(new CurveToReplicateFinalPoint(this));
+ addOperator(new ShowTextLine(this));
+ addOperator(new ShowTextLineAndSpace(this));
+ addOperator(new BeginMarkedContentSequence(this));
+ addOperator(new BeginMarkedContentSequenceWithProperties(this));
+ addOperator(new EndMarkedContentSequence(this));
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Sat Oct 29 13:58:26 2022
@@ -108,7 +108,6 @@ public abstract class PDFStreamEngine
*/
public final void addOperator(OperatorProcessor op)
{
- op.setContext(this);
operators.put(op.getName(), op);
}
@@ -893,7 +892,6 @@ public abstract class PDFStreamEngine
OperatorProcessor processor = operators.get(name);
if (processor != null)
{
- processor.setContext(this);
try
{
processor.process(operator, operands);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java Sat Oct 29 13:58:26 2022
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
@@ -37,6 +37,11 @@ public class DrawObject extends Operator
{
private static final Log LOG = LogFactory.getLog(DrawObject.class);
+ public DrawObject(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
@@ -51,6 +56,7 @@ public class DrawObject extends Operator
}
COSName name = (COSName) base0;
+ PDFStreamEngine context = getContext();
if (context.getResources().isImageXObject(name))
{
// we're done here, don't decode images when doing text extraction
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorProcessor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorProcessor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorProcessor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorProcessor.java Sat Oct 29 13:58:26 2022
@@ -30,17 +30,19 @@ import java.io.IOException;
public abstract class OperatorProcessor
{
/** The processing context. */
- protected PDFStreamEngine context;
+ private final PDFStreamEngine context;
/**
* Creates a new OperatorProcessor.
*/
- protected OperatorProcessor()
+ protected OperatorProcessor(PDFStreamEngine context)
{
+ this.context = context;
}
/**
* Returns the processing context.
+ *
* @return the processing context
*/
protected final PDFStreamEngine getContext()
@@ -49,15 +51,6 @@ public abstract class OperatorProcessor
}
/**
- * Sets the processing context.
- * @param context the processing context.
- */
- public void setContext(PDFStreamEngine context)
- {
- this.context = context;
- }
-
- /**
* Process the operator.
* @param operator the operator to process
* @param operands the operands to use when processing
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetColor.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
@@ -36,6 +37,11 @@ import org.apache.pdfbox.pdmodel.graphic
*/
public abstract class SetColor extends OperatorProcessor
{
+ public SetColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColor.java Sat Oct 29 13:58:26 2022
@@ -16,6 +16,7 @@
*/
package org.apache.pdfbox.contentstream.operator.color;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
@@ -27,6 +28,11 @@ import org.apache.pdfbox.pdmodel.graphic
*/
public class SetNonStrokingColor extends SetColor
{
+ public SetNonStrokingColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
/**
* Returns the non-stroking color.
* @return The non-stroking color.
@@ -34,7 +40,7 @@ public class SetNonStrokingColor extends
@Override
protected PDColor getColor()
{
- return context.getGraphicsState().getNonStrokingColor();
+ return getContext().getGraphicsState().getNonStrokingColor();
}
/**
@@ -44,7 +50,7 @@ public class SetNonStrokingColor extends
@Override
protected void setColor(PDColor color)
{
- context.getGraphicsState().setNonStrokingColor(color);
+ getContext().getGraphicsState().setNonStrokingColor(color);
}
/**
@@ -54,7 +60,7 @@ public class SetNonStrokingColor extends
@Override
protected PDColorSpace getColorSpace()
{
- return context.getGraphicsState().getNonStrokingColorSpace();
+ return getContext().getGraphicsState().getNonStrokingColorSpace();
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorN.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorN.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorN.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorN.java Sat Oct 29 13:58:26 2022
@@ -17,6 +17,7 @@
package org.apache.pdfbox.contentstream.operator.color;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.OperatorName;
/**
@@ -27,6 +28,11 @@ import org.apache.pdfbox.contentstream.o
*/
public class SetNonStrokingColorN extends SetNonStrokingColor
{
+ public SetNonStrokingColorN(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public String getName()
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorSpace.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorSpace.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorSpace.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorSpace.java Sat Oct 29 13:58:26 2022
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
@@ -34,6 +35,11 @@ import org.apache.pdfbox.contentstream.o
*/
public class SetNonStrokingColorSpace extends OperatorProcessor
{
+ public SetNonStrokingColorSpace(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
@@ -46,6 +52,7 @@ public class SetNonStrokingColorSpace ex
{
return;
}
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace((COSName) base);
context.getGraphicsState().setNonStrokingColorSpace(cs);
context.getGraphicsState().setNonStrokingColor(cs.getInitialColor());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceCMYKColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceCMYKColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceCMYKColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceCMYKColor.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -33,9 +34,15 @@ import java.util.List;
*/
public class SetNonStrokingDeviceCMYKColor extends SetNonStrokingColor
{
+ public SetNonStrokingDeviceCMYKColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICECMYK);
context.getGraphicsState().setNonStrokingColorSpace(cs);
super.process(operator, arguments);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceGrayColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceGrayColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceGrayColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceGrayColor.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -33,9 +34,15 @@ import java.util.List;
*/
public class SetNonStrokingDeviceGrayColor extends SetNonStrokingColor
{
+ public SetNonStrokingDeviceGrayColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICEGRAY);
context.getGraphicsState().setNonStrokingColorSpace(cs);
super.process(operator, arguments);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceRGBColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceRGBColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceRGBColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceRGBColor.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -33,9 +34,15 @@ import java.util.List;
*/
public class SetNonStrokingDeviceRGBColor extends SetNonStrokingColor
{
+ public SetNonStrokingDeviceRGBColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICERGB);
context.getGraphicsState().setNonStrokingColorSpace(cs);
super.process(operator, arguments);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColor.java Sat Oct 29 13:58:26 2022
@@ -16,6 +16,7 @@
*/
package org.apache.pdfbox.contentstream.operator.color;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
@@ -27,6 +28,11 @@ import org.apache.pdfbox.pdmodel.graphic
*/
public class SetStrokingColor extends SetColor
{
+ public SetStrokingColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
/**
* Returns the stroking color.
* @return The stroking color.
@@ -34,7 +40,7 @@ public class SetStrokingColor extends Se
@Override
protected PDColor getColor()
{
- return context.getGraphicsState().getStrokingColor();
+ return getContext().getGraphicsState().getStrokingColor();
}
/**
@@ -44,7 +50,7 @@ public class SetStrokingColor extends Se
@Override
protected void setColor(PDColor color)
{
- context.getGraphicsState().setStrokingColor(color);
+ getContext().getGraphicsState().setStrokingColor(color);
}
/**
@@ -54,7 +60,7 @@ public class SetStrokingColor extends Se
@Override
protected PDColorSpace getColorSpace()
{
- return context.getGraphicsState().getStrokingColorSpace();
+ return getContext().getGraphicsState().getStrokingColorSpace();
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorN.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorN.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorN.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorN.java Sat Oct 29 13:58:26 2022
@@ -17,6 +17,7 @@
package org.apache.pdfbox.contentstream.operator.color;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.OperatorName;
/**
@@ -27,6 +28,11 @@ import org.apache.pdfbox.contentstream.o
*/
public class SetStrokingColorN extends SetStrokingColor
{
+ public SetStrokingColorN(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public String getName()
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorSpace.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorSpace.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorSpace.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorSpace.java Sat Oct 29 13:58:26 2022
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
@@ -34,6 +35,11 @@ import org.apache.pdfbox.contentstream.o
*/
public class SetStrokingColorSpace extends OperatorProcessor
{
+ public SetStrokingColorSpace(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
@@ -46,6 +52,7 @@ public class SetStrokingColorSpace exten
{
return;
}
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace((COSName) base);
context.getGraphicsState().setStrokingColorSpace(cs);
context.getGraphicsState().setStrokingColor(cs.getInitialColor());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceCMYKColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceCMYKColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceCMYKColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceCMYKColor.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -32,9 +33,15 @@ import java.util.List;
*/
public class SetStrokingDeviceCMYKColor extends SetStrokingColor
{
+ public SetStrokingDeviceCMYKColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICECMYK);
context.getGraphicsState().setStrokingColorSpace(cs);
super.process(operator, arguments);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceGrayColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceGrayColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceGrayColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceGrayColor.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -33,9 +34,15 @@ import java.util.List;
*/
public class SetStrokingDeviceGrayColor extends SetStrokingColor
{
+ public SetStrokingDeviceGrayColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICEGRAY);
context.getGraphicsState().setStrokingColorSpace(cs);
super.process(operator, arguments);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceRGBColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceRGBColor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceRGBColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceRGBColor.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -32,6 +33,11 @@ import java.util.List;
*/
public class SetStrokingDeviceRGBColor extends SetStrokingColor
{
+ public SetStrokingDeviceRGBColor(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
/**
* RG Set the stroking colour space to DeviceRGB and set the colour to
* use for stroking operations.
@@ -43,6 +49,7 @@ public class SetStrokingDeviceRGBColor e
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ PDFStreamEngine context = getContext();
PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICERGB);
context.getGraphicsState().setStrokingColorSpace(cs);
super.process(operator, arguments);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.awt.geom.Point2D;
import java.io.IOException;
import java.util.List;
+
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
@@ -33,6 +35,12 @@ import org.apache.pdfbox.contentstream.o
*/
public final class AppendRectangleToPath extends GraphicsOperatorProcessor
{
+
+ public AppendRectangleToPath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -56,6 +64,7 @@ public final class AppendRectangleToPath
float x2 = w.floatValue() + x1;
float y2 = h.floatValue() + y1;
+ PDFGraphicsStreamEngine context = getGraphicsContext();
Point2D p0 = context.transformedPoint(x1, y1);
Point2D p1 = context.transformedPoint(x2, y1);
Point2D p2 = context.transformedPoint(x2, y2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java Sat Oct 29 13:58:26 2022
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.pdmodel.graphics.image.PDImage;
import org.apache.pdfbox.pdmodel.graphics.image.PDInlineImage;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -32,6 +33,11 @@ import org.apache.pdfbox.contentstream.o
*/
public final class BeginInlineImage extends GraphicsOperatorProcessor
{
+ public BeginInlineImage(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -39,6 +45,7 @@ public final class BeginInlineImage exte
{
return;
}
+ PDFGraphicsStreamEngine context = getGraphicsContext();
PDImage image = new PDInlineImage(operator.getImageParameters(),
operator.getImageData(),
context.getResources());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipEvenOddRule.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipEvenOddRule.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipEvenOddRule.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipEvenOddRule.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,10 +32,15 @@ import org.apache.pdfbox.contentstream.o
*/
public final class ClipEvenOddRule extends GraphicsOperatorProcessor
{
+ public ClipEvenOddRule(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.clip(Path2D.WIND_EVEN_ODD);
+ getGraphicsContext().clip(Path2D.WIND_EVEN_ODD);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipNonZeroRule.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipNonZeroRule.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipNonZeroRule.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClipNonZeroRule.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,10 +32,15 @@ import org.apache.pdfbox.contentstream.o
*/
public class ClipNonZeroRule extends GraphicsOperatorProcessor
{
+ public ClipNonZeroRule(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.clip(Path2D.WIND_NON_ZERO);
+ getGraphicsContext().clip(Path2D.WIND_NON_ZERO);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseAndStrokePath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseAndStrokePath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseAndStrokePath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseAndStrokePath.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,9 +33,15 @@ import java.io.IOException;
*/
public class CloseAndStrokePath extends GraphicsOperatorProcessor
{
+ public CloseAndStrokePath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
+ PDFStreamEngine context = getContext();
context.processOperator(OperatorName.CLOSE_PATH, arguments);
context.processOperator(OperatorName.STROKE_PATH, arguments);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillEvenOddAndStrokePath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillEvenOddAndStrokePath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillEvenOddAndStrokePath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillEvenOddAndStrokePath.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -30,9 +32,15 @@ import java.io.IOException;
*/
public final class CloseFillEvenOddAndStrokePath extends GraphicsOperatorProcessor
{
+ public CloseFillEvenOddAndStrokePath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ PDFStreamEngine context = getContext();
context.processOperator(OperatorName.CLOSE_PATH, operands);
context.processOperator(OperatorName.FILL_EVEN_ODD_AND_STROKE, operands);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillNonZeroAndStrokePath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillNonZeroAndStrokePath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillNonZeroAndStrokePath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CloseFillNonZeroAndStrokePath.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,9 +33,15 @@ import java.io.IOException;
*/
public final class CloseFillNonZeroAndStrokePath extends GraphicsOperatorProcessor
{
+ public CloseFillNonZeroAndStrokePath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
+ PDFStreamEngine context = getContext();
context.processOperator(OperatorName.CLOSE_PATH, operands);
context.processOperator(OperatorName.FILL_NON_ZERO_AND_STROKE, operands);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java Sat Oct 29 13:58:26 2022
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -34,15 +35,20 @@ public final class ClosePath extends Gra
{
private static final Log LOG = LogFactory.getLog(ClosePath.class);
+ public ClosePath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- if (context.getCurrentPoint() == null)
+ if (getGraphicsContext().getCurrentPoint() == null)
{
LOG.warn("ClosePath without initial MoveTo");
return;
}
- context.closePath();
+ getGraphicsContext().closePath();
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.util.List;
import java.awt.geom.Point2D;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
@@ -37,6 +38,11 @@ public class CurveTo extends GraphicsOpe
{
private static final Log LOG = LogFactory.getLog(CurveTo.class);
+ public CurveTo(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -55,6 +61,7 @@ public class CurveTo extends GraphicsOpe
COSNumber x3 = (COSNumber)operands.get(4);
COSNumber y3 = (COSNumber)operands.get(5);
+ PDFGraphicsStreamEngine context = getGraphicsContext();
Point2D.Float point1 = context.transformedPoint(x1.floatValue(), y1.floatValue());
Point2D.Float point2 = context.transformedPoint(x2.floatValue(), y2.floatValue());
Point2D.Float point3 = context.transformedPoint(x3.floatValue(), y3.floatValue());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
import java.awt.geom.Point2D;
+
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
@@ -33,6 +35,11 @@ import org.apache.pdfbox.contentstream.o
*/
public final class CurveToReplicateFinalPoint extends GraphicsOperatorProcessor
{
+ public CurveToReplicateFinalPoint(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -49,6 +56,7 @@ public final class CurveToReplicateFinal
COSNumber x3 = (COSNumber)operands.get(2);
COSNumber y3 = (COSNumber)operands.get(3);
+ PDFGraphicsStreamEngine context = getGraphicsContext();
Point2D.Float point1 = context.transformedPoint(x1.floatValue(), y1.floatValue());
Point2D.Float point3 = context.transformedPoint(x3.floatValue(), y3.floatValue());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java Sat Oct 29 13:58:26 2022
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
@@ -37,6 +38,11 @@ public class CurveToReplicateInitialPoin
{
private static final Log LOG = LogFactory.getLog(CurveToReplicateInitialPoint.class);
+ public CurveToReplicateInitialPoint(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -53,6 +59,7 @@ public class CurveToReplicateInitialPoin
COSNumber x3 = (COSNumber)operands.get(2);
COSNumber y3 = (COSNumber)operands.get(3);
+ PDFGraphicsStreamEngine context = getGraphicsContext();
Point2D currentPoint = context.getCurrentPoint();
Point2D.Float point2 = context.transformedPoint(x2.floatValue(), y2.floatValue());
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
@@ -42,6 +43,11 @@ public final class DrawObject extends Gr
{
private static final Log LOG = LogFactory.getLog(DrawObject.class);
+ public DrawObject(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -55,6 +61,7 @@ public final class DrawObject extends Gr
return;
}
COSName objectName = (COSName) base0;
+ PDFGraphicsStreamEngine context = getGraphicsContext();
PDXObject xobject = context.getResources().getXObject(objectName);
if (xobject == null)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/EndPath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/EndPath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/EndPath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/EndPath.java Sat Oct 29 13:58:26 2022
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -30,10 +31,15 @@ import org.apache.pdfbox.contentstream.o
*/
public final class EndPath extends GraphicsOperatorProcessor
{
+ public EndPath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.endPath();
+ getGraphicsContext().endPath();
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddAndStrokePath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddAndStrokePath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddAndStrokePath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddAndStrokePath.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,10 +32,15 @@ import java.io.IOException;
*/
public final class FillEvenOddAndStrokePath extends GraphicsOperatorProcessor
{
+ public FillEvenOddAndStrokePath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.fillAndStrokePath(Path2D.WIND_EVEN_ODD);
+ getGraphicsContext().fillAndStrokePath(Path2D.WIND_EVEN_ODD);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddRule.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddRule.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddRule.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillEvenOddRule.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,10 +32,15 @@ import org.apache.pdfbox.contentstream.o
*/
public final class FillEvenOddRule extends GraphicsOperatorProcessor
{
+ public FillEvenOddRule(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.fillPath(Path2D.WIND_EVEN_ODD);
+ getGraphicsContext().fillPath(Path2D.WIND_EVEN_ODD);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroAndStrokePath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroAndStrokePath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroAndStrokePath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroAndStrokePath.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -33,10 +34,15 @@ import java.io.IOException;
*/
public class FillNonZeroAndStrokePath extends GraphicsOperatorProcessor
{
+ public FillNonZeroAndStrokePath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.fillAndStrokePath(Path2D.WIND_NON_ZERO);
+ getGraphicsContext().fillAndStrokePath(Path2D.WIND_NON_ZERO);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroRule.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroRule.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroRule.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/FillNonZeroRule.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,10 +32,15 @@ import org.apache.pdfbox.contentstream.o
*/
public class FillNonZeroRule extends GraphicsOperatorProcessor
{
+ public FillNonZeroRule(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public final void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.fillPath(Path2D.WIND_NON_ZERO);
+ getGraphicsContext().fillPath(Path2D.WIND_NON_ZERO);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/GraphicsOperatorProcessor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/GraphicsOperatorProcessor.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/GraphicsOperatorProcessor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/GraphicsOperatorProcessor.java Sat Oct 29 13:58:26 2022
@@ -17,7 +17,6 @@
package org.apache.pdfbox.contentstream.operator.graphics;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
-import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
/**
@@ -27,13 +26,19 @@ import org.apache.pdfbox.contentstream.o
*/
public abstract class GraphicsOperatorProcessor extends OperatorProcessor
{
- /** The processing context. */
- protected PDFGraphicsStreamEngine context;
- @Override
- public void setContext(PDFStreamEngine context)
+ public GraphicsOperatorProcessor(PDFGraphicsStreamEngine context)
{
- super.setContext(context);
- this.context = (PDFGraphicsStreamEngine)context;
+ super(context);
+ }
+
+ /**
+ * GraphicsOperatorProcessor uses a spezialized engine.
+ *
+ * @return PDFGraphicsStreamEngine to be used for processing
+ */
+ protected PDFGraphicsStreamEngine getGraphicsContext()
+ {
+ return (PDFGraphicsStreamEngine) getContext();
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LegacyFillNonZeroRule.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LegacyFillNonZeroRule.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LegacyFillNonZeroRule.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LegacyFillNonZeroRule.java Sat Oct 29 13:58:26 2022
@@ -17,6 +17,7 @@
package org.apache.pdfbox.contentstream.operator.graphics;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.OperatorName;
/**
@@ -26,6 +27,11 @@ import org.apache.pdfbox.contentstream.o
*/
public final class LegacyFillNonZeroRule extends FillNonZeroRule
{
+ public LegacyFillNonZeroRule(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public String getName()
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java Sat Oct 29 13:58:26 2022
@@ -22,6 +22,7 @@ import java.awt.geom.Point2D;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
@@ -37,6 +38,11 @@ public class LineTo extends GraphicsOper
{
private static final Log LOG = LogFactory.getLog(LineTo.class);
+ public LineTo(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -58,6 +64,7 @@ public class LineTo extends GraphicsOper
COSNumber x = (COSNumber) base0;
COSNumber y = (COSNumber) base1;
+ PDFGraphicsStreamEngine context = getGraphicsContext();
Point2D.Float pos = context.transformedPoint(x.floatValue(), y.floatValue());
if (context.getCurrentPoint() == null)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/MoveTo.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.awt.geom.Point2D;
import java.io.IOException;
import java.util.List;
+
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
@@ -33,6 +35,11 @@ import org.apache.pdfbox.contentstream.o
*/
public final class MoveTo extends GraphicsOperatorProcessor
{
+ public MoveTo(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -52,6 +59,7 @@ public final class MoveTo extends Graphi
}
COSNumber x = (COSNumber) base0;
COSNumber y = (COSNumber) base1;
+ PDFGraphicsStreamEngine context = getGraphicsContext();
Point2D.Float pos = context.transformedPoint(x.floatValue(), y.floatValue());
context.moveTo(pos.x, pos.y);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ShadingFill.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
@@ -32,6 +33,11 @@ import org.apache.pdfbox.contentstream.o
*/
public final class ShadingFill extends GraphicsOperatorProcessor
{
+ public ShadingFill(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
@@ -39,7 +45,7 @@ public final class ShadingFill extends G
{
throw new MissingOperandException(operator, operands);
}
- context.shadingFill((COSName) operands.get(0));
+ getGraphicsContext().shadingFill((COSName) operands.get(0));
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/StrokePath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/StrokePath.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/StrokePath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/StrokePath.java Sat Oct 29 13:58:26 2022
@@ -19,6 +19,7 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -31,10 +32,15 @@ import java.io.IOException;
*/
public final class StrokePath extends GraphicsOperatorProcessor
{
+ public StrokePath(PDFGraphicsStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> operands) throws IOException
{
- context.strokePath();
+ getGraphicsContext().strokePath();
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
@@ -32,6 +33,11 @@ import org.apache.pdfbox.contentstream.o
*/
public class BeginMarkedContentSequence extends OperatorProcessor
{
+ public BeginMarkedContentSequence(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
@@ -43,7 +49,7 @@ public class BeginMarkedContentSequence
tag = (COSName) argument;
}
}
- context.beginMarkedContentSequence(tag, null);
+ getContext().beginMarkedContentSequence(tag, null);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java Sat Oct 29 13:58:26 2022
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
@@ -33,6 +34,11 @@ import org.apache.pdfbox.contentstream.o
*/
public class BeginMarkedContentSequenceWithProperties extends OperatorProcessor
{
+ public BeginMarkedContentSequenceWithProperties(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
@@ -49,7 +55,7 @@ public class BeginMarkedContentSequenceW
properties = (COSDictionary) argument;
}
}
- context.beginMarkedContentSequence(tag, properties);
+ getContext().beginMarkedContentSequence(tag, properties);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java Sat Oct 29 13:58:26 2022
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
@@ -42,6 +43,11 @@ public class DrawObject extends Operator
{
private static final Log LOG = LogFactory.getLog(DrawObject.class);
+ public DrawObject(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
@@ -55,6 +61,7 @@ public class DrawObject extends Operator
return;
}
COSName name = (COSName) base0;
+ PDFStreamEngine context = getContext();
PDXObject xobject = context.getResources().getXObject(name);
((PDFMarkedContentExtractor) context).xobject(xobject);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java?rev=1904918&r1=1904917&r2=1904918&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java Sat Oct 29 13:58:26 2022
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
@@ -31,10 +32,15 @@ import org.apache.pdfbox.contentstream.o
*/
public class EndMarkedContentSequence extends OperatorProcessor
{
+ public EndMarkedContentSequence(PDFStreamEngine context)
+ {
+ super(context);
+ }
+
@Override
public void process(Operator operator, List<COSBase> arguments) throws IOException
{
- context.endMarkedContentSequence();
+ getContext().endMarkedContentSequence();
}
@Override