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 2015/01/23 21:04:32 UTC
svn commit: r1654357 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjImageValidator.java
Author: tilman
Date: Fri Jan 23 20:04:31 2015
New Revision: 1654357
URL: http://svn.apache.org/r1654357
Log:
PDFBOX-2576: remove unneeded null checks
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjImageValidator.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjImageValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjImageValidator.java?rev=1654357&r1=1654356&r2=1654357&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjImageValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjImageValidator.java Fri Jan 23 20:04:31 2015
@@ -84,13 +84,10 @@ public class XObjImageValidator extends
*/
protected void checkInterpolate() throws ValidationException
{
- if (this.xobject.getItem("Interpolate") != null)
+ if (this.xobject.getBoolean("Interpolate", true))
{
- if (this.xobject.getBoolean("Interpolate", true))
- {
- context.addValidationError(new ValidationError(ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY,
- "Unexpected 'true' value for 'Interpolate' Key"));
- }
+ context.addValidationError(new ValidationError(ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY,
+ "Unexpected 'true' value for 'Interpolate' Key"));
}
}
@@ -156,7 +153,7 @@ public class XObjImageValidator extends
private boolean isImageMaskTrue()
{
COSBase imgMask = this.xobject.getItem("ImageMask");
- if (imgMask != null && imgMask instanceof COSBoolean)
+ if (imgMask instanceof COSBoolean)
{
return ((COSBoolean) imgMask).getValue();
}