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 2012/12/16 13:08:33 UTC
svn commit: r1422562 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/pdmodel/edit/ test/java/org/apache/pdfbox/
test/java/org/apache/pdfbox/pdmodel/edit/
Author: lehmi
Date: Sun Dec 16 12:08:32 2012
New Revision: 1422562
URL: http://svn.apache.org/viewvc?rev=1422562&view=rev
Log:
PDFBOX-1469: fixed CYMK setter as proposed by Yegor Kozlov
Added:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java (with props)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/edit/PDPageContentStream.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/edit/PDPageContentStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/edit/PDPageContentStream.java?rev=1422562&r1=1422561&r2=1422562&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/edit/PDPageContentStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/edit/PDPageContentStream.java Sun Dec 16 12:08:32 2012
@@ -652,7 +652,7 @@ public class PDPageContentStream
else if( colorSpace.getType() == ColorSpace.TYPE_CMYK )
{
color.getColorComponents( colorComponents );
- setStrokingColor( colorComponents[0], colorComponents[2], colorComponents[2], colorComponents[3] );
+ setStrokingColor( colorComponents[0], colorComponents[1], colorComponents[2], colorComponents[3] );
}
else
{
@@ -681,7 +681,7 @@ public class PDPageContentStream
else if( colorSpace.getType() == ColorSpace.TYPE_CMYK )
{
color.getColorComponents( colorComponents );
- setNonStrokingColor( colorComponents[0], colorComponents[2], colorComponents[2], colorComponents[3] );
+ setNonStrokingColor( colorComponents[0], colorComponents[1], colorComponents[2], colorComponents[3] );
}
else
{
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java?rev=1422562&r1=1422561&r2=1422562&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java Sun Dec 16 12:08:32 2012
@@ -31,6 +31,7 @@ import org.apache.pdfbox.io.ccitt.TestPa
import org.apache.pdfbox.pdmodel.TestFDF;
import org.apache.pdfbox.pdmodel.TestPDDocumentCatalog;
import org.apache.pdfbox.pdmodel.TestPDDocumentInformation;
+import org.apache.pdfbox.pdmodel.edit.TestPDPageContentStream;
import org.apache.pdfbox.pdmodel.interactive.form.TestFields;
import org.apache.pdfbox.util.TestDateUtil;
import org.apache.pdfbox.util.TestImageIOUtils;
@@ -96,6 +97,8 @@ public class TestAll extends TestCase
suite.addTestSuite( TestCCITTFaxG31DDecodeInputStream.class );
suite.addTestSuite( TestExtractText.class );
+
+ suite.addTestSuite(TestPDPageContentStream.class);
return suite;
}
Added: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java?rev=1422562&view=auto
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java (added)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java Sun Dec 16 12:08:32 2012
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pdfbox.pdmodel.edit;
+
+import junit.framework.TestCase;
+import org.apache.pdfbox.cos.COSFloat;
+import org.apache.pdfbox.cos.COSStream;
+import org.apache.pdfbox.exceptions.COSVisitorException;
+import org.apache.pdfbox.pdfparser.PDFStreamParser;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.graphics.color.ColorSpaceCMYK;
+import org.apache.pdfbox.util.PDFOperator;
+
+import java.awt.Color;
+import java.awt.color.ColorSpace;
+import java.io.IOException;
+
+/**
+ * @author Yegor Kozlov
+ */
+public class TestPDPageContentStream extends TestCase {
+
+ public void testSetCmykColors() throws IOException, COSVisitorException {
+ PDDocument doc = new PDDocument();
+
+ ColorSpace colorSpace = new ColorSpaceCMYK();
+
+ PDPage page = new PDPage();
+ doc.addPage(page);
+
+ PDPageContentStream contentStream = new PDPageContentStream(doc, page, false, false);
+ // pass a non-stroking color in CMYK color space
+ contentStream.setNonStrokingColor(
+ new Color(colorSpace, new float[]{0.1f, 0.2f, 0.3f, 0.4f}, 1.0f));
+ contentStream.close();
+
+ // now read the PDF stream and verify that the CMYK values are correct
+ COSStream stream = page.getContents().getStream();
+ PDFStreamParser parser = new PDFStreamParser(stream);
+ parser.parse();
+ java.util.List<Object> pageTokens = parser.getTokens();
+ // expected five tokens :
+ // [0] = COSFloat{0.1}
+ // [1] = COSFloat{0.2}
+ // [2] = COSFloat{0.3}
+ // [3] = COSFloat{0.4}
+ // [4] = PDFOperator{"k"}
+ assertEquals(0.1f, ((COSFloat)pageTokens.get(0)).floatValue());
+ assertEquals(0.2f, ((COSFloat)pageTokens.get(1)).floatValue());
+ assertEquals(0.3f, ((COSFloat)pageTokens.get(2)).floatValue());
+ assertEquals(0.4f, ((COSFloat)pageTokens.get(3)).floatValue());
+ assertEquals("k", ((PDFOperator) pageTokens.get(4)).getOperation());
+
+ // same as above but for PDPageContentStream#setStrokingColor
+ page = new PDPage();
+ doc.addPage(page);
+
+ contentStream = new PDPageContentStream(doc, page, false, false);
+ // pass a non-stroking color in CMYK color space
+ contentStream.setStrokingColor(new Color(colorSpace,
+ new float[]{0.5f, 0.6f, 0.7f, 0.8f}, 1.0f));
+ contentStream.close();
+
+ // now read the PDF stream and verify that the CMYK values are correct
+ stream = page.getContents().getStream();
+ parser = new PDFStreamParser(stream);
+ parser.parse();
+ pageTokens = parser.getTokens();
+ // expected five tokens :
+ // [0] = COSFloat{0.5}
+ // [1] = COSFloat{0.6}
+ // [2] = COSFloat{0.7}
+ // [3] = COSFloat{0.8}
+ // [4] = PDFOperator{"K"}
+ assertEquals(0.5f, ((COSFloat)pageTokens.get(0)).floatValue());
+ assertEquals(0.6f, ((COSFloat)pageTokens.get(1)).floatValue());
+ assertEquals(0.7f, ((COSFloat)pageTokens.get(2)).floatValue());
+ assertEquals(0.8f, ((COSFloat)pageTokens.get(3)).floatValue());
+ assertEquals("K", ((PDFOperator)pageTokens.get(4)).getOperation());
+ }
+}
Propchange: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/edit/TestPDPageContentStream.java
------------------------------------------------------------------------------
svn:eol-style = native