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 2019/02/05 19:27:58 UTC
svn commit: r1853028 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color:
PDColorSpace.java PDICCBased.java
Author: tilman
Date: Tue Feb 5 19:27:58 2019
New Revision: 1853028
URL: http://svn.apache.org/viewvc?rev=1853028&view=rev
Log:
PDFBOX-4411: Support caching of ICC based color spaces, by Itai Shaked
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java?rev=1853028&r1=1853027&r2=1853028&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java Tue Feb 5 19:27:58 2019
@@ -189,7 +189,7 @@ public abstract class PDColorSpace imple
}
else if (name == COSName.ICCBASED)
{
- return new PDICCBased(array);
+ return PDICCBased.create(array, resources);
}
else if (name == COSName.LAB)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1853028&r1=1853027&r2=1853028&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Tue Feb 5 19:27:58 2019
@@ -39,7 +39,9 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
+import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.common.COSArrayList;
import org.apache.pdfbox.pdmodel.common.PDRange;
import org.apache.pdfbox.pdmodel.common.PDStream;
@@ -90,11 +92,55 @@ public final class PDICCBased extends PD
/**
* Creates a new ICC color space using the PDF array.
*
- * @param iccArray the ICC stream object
- * @throws IOException if there is an error reading the ICC profile or if the parameter
- * is invalid.
+ * @param iccArray the ICC stream object.
+ * @throws IOException if there is an error reading the ICC profile or if the parameter is
+ * invalid.
*/
- public PDICCBased(COSArray iccArray) throws IOException
+ private PDICCBased(COSArray iccArray) throws IOException
+ {
+ checkArray(iccArray);
+ useOnlyAlternateColorSpace = System
+ .getProperty("org.apache.pdfbox.rendering.UseAlternateInsteadOfICCColorSpace") != null;
+ array = iccArray;
+ stream = new PDStream((COSStream) iccArray.getObject(1));
+ loadICCProfile();
+ }
+
+ /**
+ * Creates a new ICC color space using the PDF array, optionally using a resource cache.
+ *
+ * @param iccArray the ICC stream object.
+ * @param resources resources to use as cache, or null for no caching.
+ * @return an ICC color space.
+ * @throws IOException if there is an error reading the ICC profile or if the parameter is
+ * invalid.
+ */
+ public static PDICCBased create(COSArray iccArray, PDResources resources) throws IOException
+ {
+ checkArray(iccArray);
+ COSBase base = iccArray.get(1);
+ COSObject indirect = null;
+ if (base instanceof COSObject)
+ {
+ indirect = (COSObject) base;
+ }
+ if (indirect != null && resources != null && resources.getResourceCache() != null)
+ {
+ PDColorSpace space = resources.getResourceCache().getColorSpace(indirect);
+ if (space != null && space instanceof PDICCBased)
+ {
+ return (PDICCBased) space;
+ }
+ }
+ PDICCBased space = new PDICCBased(iccArray);
+ if (indirect != null && resources != null && resources.getResourceCache() != null)
+ {
+ resources.getResourceCache().put(indirect, space);
+ }
+ return space;
+ }
+
+ private static void checkArray(COSArray iccArray) throws IOException
{
if (iccArray.size() < 2)
{
@@ -104,11 +150,6 @@ public final class PDICCBased extends PD
{
throw new IOException("ICCBased colorspace array must have a stream as second element");
}
- useOnlyAlternateColorSpace = System
- .getProperty("org.apache.pdfbox.rendering.UseAlternateInsteadOfICCColorSpace") != null;
- array = iccArray;
- stream = new PDStream((COSStream) iccArray.getObject(1));
- loadICCProfile();
}
@Override