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 2019/04/22 11:11:34 UTC
svn commit: r1857949 - in /pdfbox/branches/2.0/pdfbox/src:
main/java/org/apache/pdfbox/contentstream/operator/
main/java/org/apache/pdfbox/pdfparser/
main/java/org/apache/pdfbox/pdfwriter/ main/java/org/apache/pdfbox/pdmodel/
test/java/org/apache/pdfbo...
Author: lehmi
Date: Mon Apr 22 11:11:34 2019
New Revision: 1857949
URL: http://svn.apache.org/viewvc?rev=1857949&view=rev
Log:
PDFBOX-4458: use new operator name constants
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorName.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/ContentStreamWriter.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/PDFStreamParserTest.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java?rev=1857949&r1=1857948&r2=1857949&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/Operator.java Mon Apr 22 11:11:34 2019
@@ -60,7 +60,8 @@ public final class Operator
public static Operator getOperator( String operator )
{
Operator operation;
- if (operator.equals("ID") || OperatorName.BEGIN_INLINE_IMAGE.equals(operator))
+ if (operator.equals(OperatorName.BEGIN_INLINE_IMAGE_DATA)
+ || OperatorName.BEGIN_INLINE_IMAGE.equals(operator))
{
//we can't cache the ID operators.
operation = new Operator( operator );
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorName.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorName.java?rev=1857949&r1=1857948&r2=1857949&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorName.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/OperatorName.java Mon Apr 22 11:11:34 2019
@@ -58,6 +58,8 @@ public final class OperatorName
// graphics
public static final String APPEND_RECT = "re";
public static final String BEGIN_INLINE_IMAGE = "BI";
+ public static final String BEGIN_INLINE_IMAGE_DATA = "ID";
+ public static final String END_INLINE_IMAGE = "EI";
public static final String CLIP_EVEN_ODD = "W*";
public static final String CLIP_NON_ZERO = "W";
public static final String CLOSE_AND_STROKE = "s";
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java?rev=1857949&r1=1857948&r2=1857949&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java Mon Apr 22 11:11:34 2019
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.contentstream.PDContentStream;
import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSBoolean;
import org.apache.pdfbox.cos.COSDictionary;
@@ -276,7 +277,7 @@ public class PDFStreamParser extends Bas
{
String next = readString();
retval = Operator.getOperator(next);
- if( next.equals( "BI" ) )
+ if (next.equals(OperatorName.BEGIN_INLINE_IMAGE))
{
Operator beginImageOP = (Operator)retval;
COSDictionary imageParams = new COSDictionary();
@@ -304,7 +305,7 @@ public class PDFStreamParser extends Bas
{
//Special case for ID operator
String id = "" + (char) seqSource.read() + (char) seqSource.read();
- if( !id.equals( "ID" ) )
+ if (!id.equals(OperatorName.BEGIN_INLINE_IMAGE_DATA))
{
throw new IOException( "Error: Expected operator 'ID' actual='" + id +
"' at stream offset " + seqSource.getPosition());
@@ -332,7 +333,7 @@ public class PDFStreamParser extends Bas
currentByte = seqSource.read();
}
// the EI operator isn't unread, as it won't be processed anyway
- retval = Operator.getOperator("ID");
+ retval = Operator.getOperator(OperatorName.BEGIN_INLINE_IMAGE_DATA);
// save the image data to the operator, so that it can be accessed later
((Operator)retval).setImageData( imageData.toByteArray() );
break;
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/ContentStreamWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/ContentStreamWriter.java?rev=1857949&r1=1857948&r2=1857949&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/ContentStreamWriter.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/ContentStreamWriter.java Mon Apr 22 11:11:34 2019
@@ -21,6 +21,7 @@ import java.io.OutputStream;
import java.util.List;
import java.util.Map;
import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSBoolean;
@@ -169,9 +170,9 @@ public class ContentStreamWriter
else if( o instanceof Operator)
{
Operator op = (Operator)o;
- if( op.getName().equals( "BI" ) )
+ if (op.getName().equals(OperatorName.BEGIN_INLINE_IMAGE))
{
- output.write( "BI".getBytes(Charsets.ISO_8859_1) );
+ output.write(OperatorName.BEGIN_INLINE_IMAGE.getBytes(Charsets.ISO_8859_1));
COSDictionary dic = op.getImageParameters();
for( COSName key : dic.keySet() )
{
@@ -181,11 +182,11 @@ public class ContentStreamWriter
writeObject( value );
output.write( EOL );
}
- output.write( "ID".getBytes(Charsets.ISO_8859_1) );
+ output.write(OperatorName.BEGIN_INLINE_IMAGE_DATA.getBytes(Charsets.ISO_8859_1));
output.write( EOL );
output.write( op.getImageData() );
output.write( EOL );
- output.write( "EI".getBytes(Charsets.ISO_8859_1) );
+ output.write(OperatorName.END_INLINE_IMAGE.getBytes(Charsets.ISO_8859_1));
output.write( EOL );
}
else
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=1857949&r1=1857948&r2=1857949&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 Mon Apr 22 11:11:34 2019
@@ -27,6 +27,7 @@ import java.util.Locale;
import java.util.Stack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
@@ -363,7 +364,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: Nested beginText() calls are not allowed.");
}
- writeOperator("BT");
+ writeOperator(OperatorName.BEGIN_TEXT);
inTextMode = true;
}
@@ -380,7 +381,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: You must call beginText() before calling endText.");
}
- writeOperator("ET");
+ writeOperator(OperatorName.END_TEXT);
inTextMode = false;
}
@@ -409,7 +410,7 @@ public final class PDPageContentStream i
writeOperand(resources.add(font));
writeOperand(fontSize);
- writeOperator("Tf");
+ writeOperator(OperatorName.SET_FONT_AND_SIZE);
}
/**
@@ -457,7 +458,7 @@ public final class PDPageContentStream i
}
}
write("] ");
- writeOperator("TJ");
+ writeOperator(OperatorName.SHOW_TEXT_ADJUSTED);
}
/**
@@ -471,7 +472,7 @@ public final class PDPageContentStream i
{
showTextInternal(text);
write(" ");
- writeOperator("Tj");
+ writeOperator(OperatorName.SHOW_TEXT);
}
/**
@@ -532,7 +533,7 @@ public final class PDPageContentStream i
public void setLeading(float leading) throws IOException
{
writeOperand(leading);
- writeOperator("TL");
+ writeOperator(OperatorName.SET_TEXT_LEADING);
}
/**
@@ -547,7 +548,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Must call beginText() before newLine()");
}
- writeOperator("T*");
+ writeOperator(OperatorName.NEXT_LINE);
}
/**
@@ -581,7 +582,7 @@ public final class PDPageContentStream i
}
writeOperand(tx);
writeOperand(ty);
- writeOperator("Td");
+ writeOperator(OperatorName.MOVE_TEXT);
}
/**
@@ -630,7 +631,7 @@ public final class PDPageContentStream i
throw new IllegalStateException("Error: must call beginText() before setTextMatrix");
}
writeAffineTransform(matrix.createAffineTransform());
- writeOperator("Tm");
+ writeOperator(OperatorName.SET_MATRIX);
}
/**
@@ -717,7 +718,7 @@ public final class PDPageContentStream i
transform(new Matrix(transform));
writeOperand(resources.add(image));
- writeOperator("Do");
+ writeOperator(OperatorName.DRAW_OBJECT);
restoreGraphicsState();
}
@@ -744,7 +745,7 @@ public final class PDPageContentStream i
transform(new Matrix(transform));
writeOperand(resources.add(image));
- writeOperator("Do");
+ writeOperator(OperatorName.DRAW_OBJECT);
restoreGraphicsState();
}
@@ -821,7 +822,7 @@ public final class PDPageContentStream i
// create the image dictionary
StringBuilder sb = new StringBuilder();
- sb.append("BI");
+ sb.append(OperatorName.BEGIN_INLINE_IMAGE);
sb.append("\n /W ");
sb.append(inlineImage.getWidth());
@@ -858,10 +859,10 @@ public final class PDPageContentStream i
writeLine();
// binary data
- writeOperator("ID");
+ writeOperator(OperatorName.BEGIN_INLINE_IMAGE_DATA);
writeBytes(inlineImage.getData());
writeLine();
- writeOperator("EI");
+ writeOperator(OperatorName.END_INLINE_IMAGE);
restoreGraphicsState();
}
@@ -920,7 +921,7 @@ public final class PDPageContentStream i
transform(new Matrix(transform));
writeOperand(objMapping);
- writeOperator("Do");
+ writeOperator(OperatorName.DRAW_OBJECT);
restoreGraphicsState();
}
@@ -940,7 +941,7 @@ public final class PDPageContentStream i
}
writeOperand(resources.add(form));
- writeOperator("Do");
+ writeOperator(OperatorName.DRAW_OBJECT);
}
/**
@@ -987,7 +988,7 @@ public final class PDPageContentStream i
}
writeAffineTransform(matrix.createAffineTransform());
- writeOperator("cm");
+ writeOperator(OperatorName.CONCAT);
}
/**
@@ -1013,7 +1014,7 @@ public final class PDPageContentStream i
{
nonStrokingColorSpaceStack.push(nonStrokingColorSpaceStack.peek());
}
- writeOperator("q");
+ writeOperator(OperatorName.SAVE);
}
/**
@@ -1039,7 +1040,7 @@ public final class PDPageContentStream i
{
nonStrokingColorSpaceStack.pop();
}
- writeOperator("Q");
+ writeOperator(OperatorName.RESTORE);
}
/**
@@ -1055,7 +1056,7 @@ public final class PDPageContentStream i
{
setStrokingColorSpaceStack(colorSpace);
writeOperand(getName(colorSpace));
- writeOperator("CS");
+ writeOperator(OperatorName.STROKING_COLORSPACE);
}
/**
@@ -1071,7 +1072,7 @@ public final class PDPageContentStream i
{
setNonStrokingColorSpaceStack(colorSpace);
writeOperand(getName(colorSpace));
- writeOperator("cs");
+ writeOperator(OperatorName.NON_STROKING_COLORSPACE);
}
private COSName getName(PDColorSpace colorSpace) throws IOException
@@ -1100,7 +1101,7 @@ public final class PDPageContentStream i
strokingColorSpaceStack.peek() != color.getColorSpace())
{
writeOperand(getName(color.getColorSpace()));
- writeOperator("CS");
+ writeOperator(OperatorName.STROKING_COLORSPACE);
setStrokingColorSpaceStack(color.getColorSpace());
}
@@ -1119,11 +1120,11 @@ public final class PDPageContentStream i
color.getColorSpace() instanceof PDDeviceN ||
color.getColorSpace() instanceof PDICCBased)
{
- writeOperator("SCN");
+ writeOperator(OperatorName.STROKING_COLOR_N);
}
else
{
- writeOperator("SC");
+ writeOperator(OperatorName.STROKING_COLOR);
}
}
@@ -1167,11 +1168,11 @@ public final class PDPageContentStream i
currentStrokingColorSpace instanceof PDPattern ||
currentStrokingColorSpace instanceof PDICCBased)
{
- writeOperator("SCN");
+ writeOperator(OperatorName.STROKING_COLOR_N);
}
else
{
- writeOperator("SC");
+ writeOperator(OperatorName.STROKING_COLOR);
}
}
@@ -1194,7 +1195,7 @@ public final class PDPageContentStream i
writeOperand(r / 255f);
writeOperand(g / 255f);
writeOperand(b / 255f);
- writeOperator("RG");
+ writeOperator(OperatorName.STROKING_COLOR_RGB);
setStrokingColorSpaceStack(PDDeviceRGB.INSTANCE);
}
@@ -1241,7 +1242,7 @@ public final class PDPageContentStream i
writeOperand(m);
writeOperand(y);
writeOperand(k);
- writeOperator("K");
+ writeOperator(OperatorName.STROKING_COLOR_CMYK);
setStrokingColorSpaceStack(PDDeviceCMYK.INSTANCE);
}
@@ -1291,7 +1292,7 @@ public final class PDPageContentStream i
throw new IllegalArgumentException("Parameter must be within 0..1, but is " + g);
}
writeOperand(g);
- writeOperator("G");
+ writeOperator(OperatorName.STROKING_COLOR_GRAY);
setStrokingColorSpaceStack(PDDeviceGray.INSTANCE);
}
@@ -1307,7 +1308,7 @@ public final class PDPageContentStream i
nonStrokingColorSpaceStack.peek() != color.getColorSpace())
{
writeOperand(getName(color.getColorSpace()));
- writeOperator("cs");
+ writeOperator(OperatorName.NON_STROKING_COLORSPACE);
setNonStrokingColorSpaceStack(color.getColorSpace());
}
@@ -1326,11 +1327,11 @@ public final class PDPageContentStream i
color.getColorSpace() instanceof PDDeviceN ||
color.getColorSpace() instanceof PDICCBased)
{
- writeOperator("scn");
+ writeOperator(OperatorName.NON_STROKING_COLOR_N);
}
else
{
- writeOperator("sc");
+ writeOperator(OperatorName.NON_STROKING_COLOR);
}
}
@@ -1374,11 +1375,11 @@ public final class PDPageContentStream i
currentNonStrokingColorSpace instanceof PDPattern ||
currentNonStrokingColorSpace instanceof PDICCBased)
{
- writeOperator("scn");
+ writeOperator(OperatorName.NON_STROKING_COLOR_N);
}
else
{
- writeOperator("sc");
+ writeOperator(OperatorName.NON_STROKING_COLOR);
}
}
@@ -1401,7 +1402,7 @@ public final class PDPageContentStream i
writeOperand(r / 255f);
writeOperand(g / 255f);
writeOperand(b / 255f);
- writeOperator("rg");
+ writeOperator(OperatorName.NON_STROKING_RGB);
setNonStrokingColorSpaceStack(PDDeviceRGB.INSTANCE);
}
@@ -1462,7 +1463,7 @@ public final class PDPageContentStream i
writeOperand(m);
writeOperand(y);
writeOperand(k);
- writeOperator("k");
+ writeOperator(OperatorName.NON_STROKING_CMYK);
setNonStrokingColorSpaceStack(PDDeviceCMYK.INSTANCE);
}
@@ -1510,7 +1511,7 @@ public final class PDPageContentStream i
throw new IllegalArgumentException("Parameter must be within 0..1, but is " + g);
}
writeOperand(g);
- writeOperator("g");
+ writeOperator(OperatorName.NON_STROKING_GRAY);
setNonStrokingColorSpaceStack(PDDeviceGray.INSTANCE);
}
@@ -1534,7 +1535,7 @@ public final class PDPageContentStream i
writeOperand(y);
writeOperand(width);
writeOperand(height);
- writeOperator("re");
+ writeOperator(OperatorName.APPEND_RECT);
}
/**
@@ -1602,7 +1603,7 @@ public final class PDPageContentStream i
writeOperand(y2);
writeOperand(x3);
writeOperand(y3);
- writeOperator("c");
+ writeOperator(OperatorName.CURVE_TO);
}
/**
@@ -1643,7 +1644,7 @@ public final class PDPageContentStream i
writeOperand(y2);
writeOperand(x3);
writeOperand(y3);
- writeOperator("v");
+ writeOperator(OperatorName.CURVE_TO_REPLICATE_INITIAL_POINT);
}
/**
@@ -1684,7 +1685,7 @@ public final class PDPageContentStream i
writeOperand(y1);
writeOperand(x3);
writeOperand(y3);
- writeOperator("y");
+ writeOperator(OperatorName.CURVE_TO_REPLICATE_FINAL_POINT);
}
/**
@@ -1703,7 +1704,7 @@ public final class PDPageContentStream i
}
writeOperand(x);
writeOperand(y);
- writeOperator("m");
+ writeOperator(OperatorName.MOVE_TO);
}
/**
@@ -1722,7 +1723,7 @@ public final class PDPageContentStream i
}
writeOperand(x);
writeOperand(y);
- writeOperator("l");
+ writeOperator(OperatorName.LINE_TO);
}
/**
@@ -1856,7 +1857,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: stroke is not allowed within a text block.");
}
- writeOperator("S");
+ writeOperator(OperatorName.STROKE_PATH);
}
/**
@@ -1871,7 +1872,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: closeAndStroke is not allowed within a text block.");
}
- writeOperator("s");
+ writeOperator(OperatorName.CLOSE_AND_STROKE);
}
/**
@@ -1911,7 +1912,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: fill is not allowed within a text block.");
}
- writeOperator("f");
+ writeOperator(OperatorName.FILL_NON_ZERO);
}
/**
@@ -1926,7 +1927,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: fillEvenOdd is not allowed within a text block.");
}
- writeOperator("f*");
+ writeOperator(OperatorName.FILL_EVEN_ODD);
}
/**
@@ -1943,7 +1944,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: fillAndStroke is not allowed within a text block.");
}
- writeOperator("B");
+ writeOperator(OperatorName.FILL_NON_ZERO_AND_STROKE);
}
/**
@@ -1960,7 +1961,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: fillAndStrokeEvenOdd is not allowed within a text block.");
}
- writeOperator("B*");
+ writeOperator(OperatorName.FILL_EVEN_ODD_AND_STROKE);
}
/**
@@ -1977,7 +1978,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: closeAndFillAndStroke is not allowed within a text block.");
}
- writeOperator("b");
+ writeOperator(OperatorName.CLOSE_FILL_NON_ZERO_AND_STROKE);
}
/**
@@ -1994,7 +1995,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: closeAndFillAndStrokeEvenOdd is not allowed within a text block.");
}
- writeOperator("b*");
+ writeOperator(OperatorName.CLOSE_FILL_EVEN_ODD_AND_STROKE);
}
/**
@@ -2012,7 +2013,7 @@ public final class PDPageContentStream i
}
writeOperand(resources.add(shading));
- writeOperator("sh");
+ writeOperator(OperatorName.SHADING_FILL);
}
/**
@@ -2039,7 +2040,7 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: closePath is not allowed within a text block.");
}
- writeOperator("h");
+ writeOperator(OperatorName.CLOSE_PATH);
}
/**
@@ -2059,17 +2060,17 @@ public final class PDPageContentStream i
}
if (windingRule == PathIterator.WIND_NON_ZERO)
{
- writeOperator("W");
+ writeOperator(OperatorName.CLIP_NON_ZERO);
}
else if (windingRule == PathIterator.WIND_EVEN_ODD)
{
- writeOperator("W*");
+ writeOperator(OperatorName.CLIP_EVEN_ODD);
}
else
{
throw new IllegalArgumentException("Error: unknown value for winding rule");
}
- writeOperator("n");
+ writeOperator(OperatorName.ENDPATH);
}
/**
@@ -2084,10 +2085,10 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: clip is not allowed within a text block.");
}
- writeOperator("W");
+ writeOperator(OperatorName.CLIP_NON_ZERO);
// end path without filling or stroking
- writeOperator("n");
+ writeOperator(OperatorName.ENDPATH);
}
/**
@@ -2102,10 +2103,10 @@ public final class PDPageContentStream i
{
throw new IllegalStateException("Error: clipEvenOdd is not allowed within a text block.");
}
- writeOperator("W*");
+ writeOperator(OperatorName.CLIP_EVEN_ODD);
// end path without filling or stroking
- writeOperator("n");
+ writeOperator(OperatorName.ENDPATH);
}
/**
@@ -2122,7 +2123,7 @@ public final class PDPageContentStream i
throw new IllegalStateException("Error: setLineWidth is not allowed within a text block.");
}
writeOperand(lineWidth);
- writeOperator("w");
+ writeOperator(OperatorName.SET_LINE_WIDTH);
}
/**
@@ -2142,7 +2143,7 @@ public final class PDPageContentStream i
if (lineJoinStyle >= 0 && lineJoinStyle <= 2)
{
writeOperand(lineJoinStyle);
- writeOperator("j");
+ writeOperator(OperatorName.SET_LINE_JOINSTYLE);
}
else
{
@@ -2167,7 +2168,7 @@ public final class PDPageContentStream i
if (lineCapStyle >= 0 && lineCapStyle <= 2)
{
writeOperand(lineCapStyle);
- writeOperator("J");
+ writeOperator(OperatorName.SET_LINE_CAPSTYLE);
}
else
{
@@ -2196,7 +2197,7 @@ public final class PDPageContentStream i
}
write("] ");
writeOperand(phase);
- writeOperator("d");
+ writeOperator(OperatorName.SET_LINE_DASHPATTERN);
}
/**
@@ -2216,7 +2217,7 @@ public final class PDPageContentStream i
throw new IllegalArgumentException("A miter limit <= 0 is invalid and will not render in Acrobat Reader");
}
writeOperand(miterLimit);
- writeOperator("M");
+ writeOperator(OperatorName.SET_LINE_MITERLIMIT);
}
/**
@@ -2241,7 +2242,7 @@ public final class PDPageContentStream i
public void beginMarkedContent(COSName tag) throws IOException
{
writeOperand(tag);
- writeOperator("BMC");
+ writeOperator(OperatorName.BEGIN_MARKED_CONTENT);
}
/**
@@ -2258,7 +2259,7 @@ public final class PDPageContentStream i
{
writeOperand(tag);
writeOperand(propsName);
- writeOperator("BDC");
+ writeOperator(OperatorName.BEGIN_MARKED_CONTENT_SEQ);
}
/**
@@ -2273,7 +2274,7 @@ public final class PDPageContentStream i
{
writeOperand(tag);
writeOperand(resources.add(propertyList));
- writeOperator("BDC");
+ writeOperator(OperatorName.BEGIN_MARKED_CONTENT_SEQ);
}
/**
@@ -2295,7 +2296,7 @@ public final class PDPageContentStream i
*/
public void endMarkedContent() throws IOException
{
- writeOperator("EMC");
+ writeOperator(OperatorName.END_MARKED_CONTENT);
}
/**
@@ -2385,7 +2386,7 @@ public final class PDPageContentStream i
public void setGraphicsStateParameters(PDExtendedGraphicsState state) throws IOException
{
writeOperand(resources.add(state));
- writeOperator("gs");
+ writeOperator(OperatorName.SET_GRAPHICS_STATE_PARAMS);
}
/**
@@ -2558,7 +2559,7 @@ public final class PDPageContentStream i
public void setRenderingMode(RenderingMode rm) throws IOException
{
writeOperand(rm.intValue());
- writeOperator("Tr");
+ writeOperator(OperatorName.SET_TEXT_RENDERINGMODE);
}
/**
@@ -2571,7 +2572,7 @@ public final class PDPageContentStream i
public void setCharacterSpacing(float spacing) throws IOException
{
writeOperand(spacing);
- writeOperator("Tc");
+ writeOperator(OperatorName.SET_CHAR_SPACING);
}
/**
@@ -2590,7 +2591,7 @@ public final class PDPageContentStream i
public void setWordSpacing(float spacing) throws IOException
{
writeOperand(spacing);
- writeOperator("Tw");
+ writeOperator(OperatorName.SET_WORD_SPACING);
}
/**
@@ -2603,7 +2604,7 @@ public final class PDPageContentStream i
public void setHorizontalScaling(float scale) throws IOException
{
writeOperand(scale);
- writeOperator("Tz");
+ writeOperator(OperatorName.SET_TEXT_HORIZONTAL_SCALING);
}
/**
@@ -2617,6 +2618,6 @@ public final class PDPageContentStream i
public void setTextRise(float rise) throws IOException
{
writeOperand(rise);
- writeOperator("Ts");
+ writeOperator(OperatorName.SET_TEXT_RISE);
}
}
Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/PDFStreamParserTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/PDFStreamParserTest.java?rev=1857949&r1=1857948&r2=1857949&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/PDFStreamParserTest.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/PDFStreamParserTest.java Mon Apr 22 11:11:34 2019
@@ -19,7 +19,7 @@ import java.io.IOException;
import java.util.List;
import junit.framework.TestCase;
import org.apache.pdfbox.contentstream.operator.Operator;
-
+import org.apache.pdfbox.contentstream.operator.OperatorName;
import static org.junit.Assert.assertArrayEquals;
@@ -94,7 +94,7 @@ public class PDFStreamParserTest extends
assertEquals(2, tokens.size());
- assertEquals("ID", ((Operator) tokens.get(0)).getName());
+ assertEquals(OperatorName.BEGIN_INLINE_IMAGE_DATA, ((Operator) tokens.get(0)).getName());
assertEquals(imageDataString.length(), ((Operator) tokens.get(0)).getImageData().length);
assertArrayEquals(imageDataString.getBytes(), ((Operator) tokens.get(0)).getImageData());
@@ -108,7 +108,7 @@ public class PDFStreamParserTest extends
assertEquals(1, tokens.size());
- assertEquals("ID", ((Operator) tokens.get(0)).getName());
+ assertEquals(OperatorName.BEGIN_INLINE_IMAGE_DATA, ((Operator) tokens.get(0)).getName());
assertEquals(imageDataString.length(), ((Operator) tokens.get(0)).getImageData().length);
assertArrayEquals(imageDataString.getBytes(), ((Operator) tokens.get(0)).getImageData());
}