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 2020/08/29 12:07:17 UTC
svn commit: r1881297 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java
Author: tilman
Date: Sat Aug 29 12:07:17 2020
New Revision: 1881297
URL: http://svn.apache.org/viewvc?rev=1881297&view=rev
Log:
PDFBOX-4847: merge "if" statements
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java?rev=1881297&r1=1881296&r2=1881297&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java Sat Aug 29 12:07:17 2020
@@ -216,22 +216,19 @@ public final class PDIndexed extends PDS
public BufferedImage toRawImage(WritableRaster raster)
{
// We can only convert sRGB index colorspaces, depending on the base colorspace
- if (baseColorSpace instanceof PDICCBased)
+ if (baseColorSpace instanceof PDICCBased && ((PDICCBased) baseColorSpace).isSRGB())
{
- if (((PDICCBased) baseColorSpace).isSRGB())
+ byte[] r = new byte[colorTable.length];
+ byte[] g = new byte[colorTable.length];
+ byte[] b = new byte[colorTable.length];
+ for (int i = 0; i < colorTable.length; i++)
{
- byte[] r = new byte[colorTable.length];
- byte[] g = new byte[colorTable.length];
- byte[] b = new byte[colorTable.length];
- for (int i = 0; i < colorTable.length; i++)
- {
- r[i] = (byte) ((int) (colorTable[i][0] * 255) & 0xFF);
- g[i] = (byte) ((int) (colorTable[i][1] * 255) & 0xFF);
- b[i] = (byte) ((int) (colorTable[i][2] * 255) & 0xFF);
- }
- ColorModel colorModel = new IndexColorModel(8, colorTable.length, r, g, b);
- return new BufferedImage(colorModel, raster, false, null);
+ r[i] = (byte) ((int) (colorTable[i][0] * 255) & 0xFF);
+ g[i] = (byte) ((int) (colorTable[i][1] * 255) & 0xFF);
+ b[i] = (byte) ((int) (colorTable[i][2] * 255) & 0xFF);
}
+ ColorModel colorModel = new IndexColorModel(8, colorTable.length, r, g, b);
+ return new BufferedImage(colorModel, raster, false, null);
}
// We can't handle all other cases at the moment.