Skip to content

Commit 9693a6c

Browse files
committed
PDFBOX-5660: optimize, as suggested by Valery Bokov; closes #267
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1928832 13f79535-47bb-0310-9956-ffa450edef68
1 parent d1c27cc commit 9693a6c

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -656,28 +656,29 @@ protected COSName getName(PDColorSpace colorSpace)
656656
*/
657657
public void setStrokingColor(PDColor color) throws IOException
658658
{
659+
PDColorSpace colorSpace = color.getColorSpace();
659660
if (strokingColorSpaceStack.isEmpty() ||
660-
strokingColorSpaceStack.peek() != color.getColorSpace())
661+
strokingColorSpaceStack.peek() != colorSpace)
661662
{
662-
writeOperand(getName(color.getColorSpace()));
663+
writeOperand(getName(colorSpace));
663664
writeOperator(OperatorName.STROKING_COLORSPACE);
664-
setStrokingColorSpaceStack(color.getColorSpace());
665+
setStrokingColorSpaceStack(colorSpace);
665666
}
666667

667668
for (float value : color.getComponents())
668669
{
669670
writeOperand(value);
670671
}
671672

672-
if (color.getColorSpace() instanceof PDPattern)
673+
if (colorSpace instanceof PDPattern)
673674
{
674675
writeOperand(color.getPatternName());
675676
}
676677

677-
if (color.getColorSpace() instanceof PDPattern ||
678-
color.getColorSpace() instanceof PDSeparation ||
679-
color.getColorSpace() instanceof PDDeviceN ||
680-
color.getColorSpace() instanceof PDICCBased)
678+
if (colorSpace instanceof PDPattern ||
679+
colorSpace instanceof PDSeparation ||
680+
colorSpace instanceof PDDeviceN ||
681+
colorSpace instanceof PDICCBased)
681682
{
682683
writeOperator(OperatorName.STROKING_COLOR_N);
683684
}
@@ -775,28 +776,29 @@ public void setStrokingColor(float g) throws IOException
775776
*/
776777
public void setNonStrokingColor(PDColor color) throws IOException
777778
{
779+
PDColorSpace colorSpace = color.getColorSpace();
778780
if (nonStrokingColorSpaceStack.isEmpty() ||
779-
nonStrokingColorSpaceStack.peek() != color.getColorSpace())
781+
nonStrokingColorSpaceStack.peek() != colorSpace)
780782
{
781-
writeOperand(getName(color.getColorSpace()));
783+
writeOperand(getName(colorSpace));
782784
writeOperator(OperatorName.NON_STROKING_COLORSPACE);
783-
setNonStrokingColorSpaceStack(color.getColorSpace());
785+
setNonStrokingColorSpaceStack(colorSpace);
784786
}
785787

786788
for (float value : color.getComponents())
787789
{
788790
writeOperand(value);
789791
}
790792

791-
if (color.getColorSpace() instanceof PDPattern)
793+
if (colorSpace instanceof PDPattern)
792794
{
793795
writeOperand(color.getPatternName());
794796
}
795797

796-
if (color.getColorSpace() instanceof PDPattern ||
797-
color.getColorSpace() instanceof PDSeparation ||
798-
color.getColorSpace() instanceof PDDeviceN ||
799-
color.getColorSpace() instanceof PDICCBased)
798+
if (colorSpace instanceof PDPattern ||
799+
colorSpace instanceof PDSeparation ||
800+
colorSpace instanceof PDDeviceN ||
801+
colorSpace instanceof PDICCBased)
800802
{
801803
writeOperator(OperatorName.NON_STROKING_COLOR_N);
802804
}

0 commit comments

Comments
 (0)