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/10/12 13:40:51 UTC
svn commit: r1868340 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
Author: tilman
Date: Sat Oct 12 13:40:51 2019
New Revision: 1868340
URL: http://svn.apache.org/viewvc?rev=1868340&view=rev
Log:
PDFBOX-4341: fix matrix setter (it only stored 6 values of the 3x3 matrix), by Emmeran Seehuber
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
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=1868340&r1=1868339&r2=1868340&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 Sat Oct 12 13:40:51 2019
@@ -174,7 +174,18 @@ public class PDCalRGB extends PDCIEDicti
COSArray matrixArray = null;
if(matrix != null)
{
- matrixArray = matrix.toCOSArray();
+ // We can't use matrix.toCOSArray(), as it only returns a subset of the matrix
+ float[][] values = matrix.getValues();
+ matrixArray = new COSArray();
+ matrixArray.add(new COSFloat(values[0][0]));
+ matrixArray.add(new COSFloat(values[0][1]));
+ matrixArray.add(new COSFloat(values[0][2]));
+ matrixArray.add(new COSFloat(values[1][0]));
+ matrixArray.add(new COSFloat(values[1][1]));
+ matrixArray.add(new COSFloat(values[1][2]));
+ matrixArray.add(new COSFloat(values[2][0]));
+ matrixArray.add(new COSFloat(values[2][1]));
+ matrixArray.add(new COSFloat(values[2][2]));
}
dictionary.setItem(COSName.MATRIX, matrixArray);
}