You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2018/01/17 06:54:22 UTC
svn commit: r1821349 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
Author: lehmi
Date: Wed Jan 17 06:54:22 2018
New Revision: 1821349
URL: http://svn.apache.org/viewvc?rev=1821349&view=rev
Log:
PDFBOX-4060: enable caching for all numbers of input colors
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java?rev=1821349&r1=1821348&r2=1821349&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java Wed Jan 17 06:54:22 2018
@@ -280,9 +280,9 @@ public class PDDeviceN extends PDSpecial
//
private BufferedImage toRGBWithTintTransform(WritableRaster raster) throws IOException
{
- // map only in use if one color component
- Map<Float,int[]> map1 = new HashMap<Float,int[]>();
- float key = 0;
+ // cache color mappings
+ Map<String, int[]> map1 = new HashMap<String, int[]>();
+ String key = null;
int width = raster.getWidth();
int height = raster.getHeight();
@@ -299,27 +299,23 @@ public class PDDeviceN extends PDSpecial
for (int x = 0; x < width; x++)
{
raster.getPixel(x, y, src);
- if (numSrcComponents == 1)
+ // use a string representation as key
+ key = Float.toString(src[0]);
+ for (int s = 1; s < numSrcComponents; s++)
{
- int[] pxl = map1.get(src[0]);
- if (pxl != null)
- {
- rgbRaster.setPixel(x, y, pxl);
- continue;
- }
- else
- {
- // need to remember key because src is modified
- key = src[0];
- }
+ key += "#" + Float.toString(src[s]);
+ }
+ int[] pxl = map1.get(key);
+ if (pxl != null)
+ {
+ rgbRaster.setPixel(x, y, pxl);
+ continue;
}
-
// scale to 0..1
for (int s = 0; s < numSrcComponents; s++)
{
src[s] = src[s] / 255;
}
-
// convert to alternate color space via tint transform
float[] result = tintTransform.eval(src);
@@ -331,12 +327,8 @@ public class PDDeviceN extends PDSpecial
// scale to 0..255
rgb[s] = (int) (rgbFloat[s] * 255f);
}
-
- if (numSrcComponents == 1)
- {
- // must clone because rgb is reused
- map1.put(key, rgb.clone());
- }
+ // must clone because rgb is reused
+ map1.put(key, rgb.clone());
rgbRaster.setPixel(x, y, rgb);
}