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/05/29 15:28:00 UTC
svn commit: r1682458 - in
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight:
graphic/ICCProfileWrapper.java graphic/StandardColorSpaceHelper.java
process/CatalogValidationProcess.java
Author: tilman
Date: Fri May 29 13:27:59 2015
New Revision: 1682458
URL: http://svn.apache.org/r1682458
Log:
PDFBOX-2819: load ICC profile as a stream, not as a byte array because of java error
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java?rev=1682458&r1=1682457&r2=1682458&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java Fri May 29 13:27:59 2015
@@ -138,7 +138,7 @@ public class ICCProfileWrapper
document.getDocument()));
if (stream != null)
{
- ICC_Profile iccp = ICC_Profile.getInstance(stream.getByteArray());
+ ICC_Profile iccp = ICC_Profile.getInstance(stream.createInputStream());
return new ICCProfileWrapper(iccp);
}
}
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=1682458&r1=1682457&r2=1682458&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 Fri May 29 13:27:59 2015
@@ -235,7 +235,7 @@ public class StandardColorSpaceHelper im
PDICCBased iccBased = (PDICCBased) colorSpace;
try
{
- ICC_Profile.getInstance(iccBased.getPDStream().getByteArray());
+ ICC_Profile.getInstance(iccBased.getPDStream().createInputStream());
PDColorSpace altpdcs = iccBased.getAlternateColorSpace();
if (altpdcs != null)
{
@@ -261,7 +261,7 @@ public class StandardColorSpaceHelper im
{
// this is not a ICC_Profile
context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_ICCBASED,
- "ICCBase color space is invalid: " + e.getMessage(), e));
+ "ICCBased color space is invalid: " + e.getMessage(), e));
}
catch (IOException e)
{
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java?rev=1682458&r1=1682457&r2=1682458&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java Fri May 29 13:27:59 2015
@@ -425,7 +425,7 @@ public class CatalogValidationProcess ex
return;
}
- ICC_Profile iccp = ICC_Profile.getInstance(stream.getByteArray());
+ ICC_Profile iccp = ICC_Profile.getInstance(stream.createInputStream());
if (!validateICCProfileNEntry(stream, ctx, iccp))
{