You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/11/01 20:26:16 UTC
svn commit: r1636019 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
Author: jahewson
Date: Sat Nov 1 19:26:16 2014
New Revision: 1636019
URL: http://svn.apache.org/r1636019
Log:
PDFBOX-2403: Reverted r1636009
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1636019&r1=1636018&r2=1636019&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Sat Nov 1 19:26:16 2014
@@ -269,7 +269,7 @@ public class StandardColorSpaceHelper im
catch (IOException e)
{
context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE,
- "Unable to read ICCBase color space. Caused by : " + e.getMessage()));
+ "Unable to read ICCBase color space. Caused by : " + e.getMessage(), e));
}
}
@@ -328,7 +328,7 @@ public class StandardColorSpaceHelper im
catch (IOException e)
{
context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE,
- "Unable to read DeviceN color space : " + e.getMessage()));
+ "Unable to read DeviceN color space : " + e.getMessage(), e));
}
}
@@ -395,7 +395,7 @@ public class StandardColorSpaceHelper im
catch (IOException e)
{
context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE,
- "Unable to read Separation color space : " + e.getMessage()));
+ "Unable to read Separation color space : " + e.getMessage(), e));
}
}
@@ -419,15 +419,18 @@ public class StandardColorSpaceHelper im
try
{
- if (pdcs.getName().equals(ColorSpaces.DeviceCMYK.getLabel()))
+ if (pdcs.getName().equals(ColorSpaces.DeviceCMYK.getLabel()) &&
+ resources.hasColorSpace(COSName.DEFAULT_CMYK))
{
defaultCS = resources.getColorSpace(COSName.DEFAULT_CMYK);
}
- else if (pdcs.getName().equals(ColorSpaces.DeviceRGB.getLabel()))
+ else if (pdcs.getName().equals(ColorSpaces.DeviceRGB.getLabel()) &&
+ resources.hasColorSpace(COSName.DEFAULT_RGB))
{
defaultCS = resources.getColorSpace(COSName.DEFAULT_RGB);
}
- else if (pdcs.getName().equals(ColorSpaces.DeviceGray.getLabel()))
+ else if (pdcs.getName().equals(ColorSpaces.DeviceGray.getLabel()) &&
+ resources.hasColorSpace(COSName.DEFAULT_GRAY))
{
defaultCS = resources.getColorSpace(COSName.DEFAULT_GRAY);
}
@@ -435,7 +438,7 @@ public class StandardColorSpaceHelper im
catch (IOException e)
{
context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE,
- "Unable to read default color space : " + e.getMessage()));
+ "Unable to read default color space : " + e.getMessage(), e));
}
if (defaultCS != null)