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/02/21 09:35:41 UTC
svn commit: r1570489 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color:
PDCalGray.java PDCalRGB.java PDDeviceRGB.java
Author: jahewson
Date: Fri Feb 21 08:35:41 2014
New Revision: 1570489
URL: http://svn.apache.org/r1570489
Log:
Fixes for color issues in PDFBOX-1893
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java?rev=1570489&r1=1570488&r2=1570489&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java Fri Feb 21 08:35:41 2014
@@ -74,4 +74,10 @@ public final class PDCalGray extends PDC
{
return INITIAL_COLOR;
}
+
+ @Override
+ public final float[] toRGB(float[] value)
+ {
+ return super.toRGB(new float[] { value[0], value[0], value[0] });
+ }
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java?rev=1570489&r1=1570488&r2=1570489&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java Fri Feb 21 08:35:41 2014
@@ -86,17 +86,12 @@ public class PDCalRGB extends PDCIEBased
}
@Override
- public final float[] toRGB(float[] value)
+ public float[] toRGB(float[] value)
{
// this is a hack, we simply skip CIE calibration of the RGB value
return new float[] { value[0], value[1], value[2] };
}
- private float clamp(float value)
- {
- return Math.min(Math.max(value, 0), 1);
- }
-
/**
* Returns the whitepoint tristimulus.
* A default of 1,1,1 will be returned if the PDF does not have any values yet.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java?rev=1570489&r1=1570488&r2=1570489&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java Fri Feb 21 08:35:41 2014
@@ -18,10 +18,16 @@ package org.apache.pdfbox.pdmodel.graphi
import org.apache.pdfbox.cos.COSName;
+import java.awt.Point;
+import java.awt.Transparency;
import java.awt.color.ColorSpace;
import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.Raster;
import java.awt.image.WritableRaster;
import java.io.IOException;
@@ -79,6 +85,9 @@ public final class PDDeviceRGB extends P
@Override
public BufferedImage toRGBImage(WritableRaster raster) throws IOException
{
- return toRGBImageAWT(raster, COLOR_SPACE_RGB);
+ ColorModel colorModel = new ComponentColorModel(COLOR_SPACE_RGB,
+ false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+
+ return new BufferedImage(colorModel, raster, false, null);
}
}