You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/04/04 16:39:48 UTC
svn commit: r1790147 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java
Author: tilman
Date: Tue Apr 4 16:39:48 2017
New Revision: 1790147
URL: http://svn.apache.org/viewvc?rev=1790147&view=rev
Log:
PDFBOX-2852: sonar fix
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java?rev=1790147&r1=1790146&r2=1790147&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java Tue Apr 4 16:39:48 2017
@@ -432,28 +432,23 @@ public abstract class PreflightStreamEng
}
}
// fills
- if ("f".equals(op) || "F".equals(op) || "f*".equals(op) ||
- "B".equals(op) || "B*".equals(op) || "b".equals(op) || "b*".equals(op))
+ if (("f".equals(op) || "F".equals(op) || "f*".equals(op) ||
+ "B".equals(op) || "B*".equals(op) || "b".equals(op) || "b*".equals(op)) &&
+ getGraphicsState().getNonStrokingColor().getColorSpace() instanceof PDDeviceGray)
{
- if (getGraphicsState().getNonStrokingColor().getColorSpace() instanceof PDDeviceGray)
- {
- v = true;
- }
+ v = true;
}
// strokes
- if ("B".equals(op) || "B*".equals(op) || "b".equals(op) || "b*".equals(op) ||
- "s".equals(op) || "S".equals(op))
+ if (("B".equals(op) || "B*".equals(op) || "b".equals(op) || "b*".equals(op) ||
+ "s".equals(op) || "S".equals(op)) &&
+ getGraphicsState().getStrokingColor().getColorSpace() instanceof PDDeviceGray)
{
- if (getGraphicsState().getStrokingColor().getColorSpace() instanceof PDDeviceGray)
- {
- v = true;
- }
+ v = true;
}
- if (v)
+ if (v && !validColorSpaceDestOutputProfile(PreflightStreamEngine.ColorSpaceType.ALL))
{
- if (!validColorSpaceDestOutputProfile(PreflightStreamEngine.ColorSpaceType.ALL))
- registerError("/DeviceGray default for operator \"" + op +
- "\" can't be used without Color Profile",
+ registerError("/DeviceGray default for operator \"" + op
+ + "\" can't be used without Color Profile",
ERROR_GRAPHIC_INVALID_COLOR_SPACE_MISSING);
}
}