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:35:42 UTC

svn commit: r1682461 - in /pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight: graphic/ICCProfileWrapper.java graphic/StandardColorSpaceHelper.java process/CatalogValidationProcess.java

Author: tilman
Date: Fri May 29 13:35:42 2015
New Revision: 1682461

URL: http://svn.apache.org/r1682461
Log:
PDFBOX-2819: load ICC profile as a stream, not as a byte array because of java error

Modified:
    pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
    pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
    pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java

Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java?rev=1682461&r1=1682460&r2=1682461&view=diff
==============================================================================
--- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java (original)
+++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java Fri May 29 13:35:42 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/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1682461&r1=1682460&r2=1682461&view=diff
==============================================================================
--- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java (original)
+++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Fri May 29 13:35:42 2015
@@ -234,7 +234,7 @@ public class StandardColorSpaceHelper im
         PDICCBased iccBased = (PDICCBased) pdcs;
         try
         {
-            ICC_Profile iccp = ICC_Profile.getInstance(iccBased.getPDStream().getByteArray());
+            ICC_Profile iccp = ICC_Profile.getInstance(iccBased.getPDStream().createInputStream());
             if (iccp == null)
             {
                 context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_ICCBASED,

Modified: pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java?rev=1682461&r1=1682460&r2=1682461&view=diff
==============================================================================
--- pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java (original)
+++ pdfbox/branches/1.8/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java Fri May 29 13:35:42 2015
@@ -417,7 +417,7 @@ public class CatalogValidationProcess ex
                 return;
             }
 
-            ICC_Profile iccp = ICC_Profile.getInstance(stream.getByteArray());
+            ICC_Profile iccp = ICC_Profile.getInstance(stream.createInputStream());
             PreflightConfiguration config = ctx.getConfig();
             // check the ICC Profile version (6.2.2)
             if (iccp.getMajorVersion() == 2)