Author: ssteiner
Date: Fri Sep 21 14:24:53 2018
New Revision: 1841594
URL: http://svn.apache.org/viewvc?rev=1841594&view=rev
Log:
FOP-2817: AFP should reset color for new segment
Added:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java
(with props)
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=1841594&r1=1841593&r2=1841594&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java
Fri Sep 21 14:24:53 2018
@@ -376,6 +376,7 @@ public class GraphicsObject extends Abst
public void newSegment() {
getData().newSegment();
graphicsState.lineWidth = 0; //Looks like a new segment invalidates
the graphics state
+ graphicsState.color = Color.BLACK;
}
/** {@inheritDoc} */
Added:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java?rev=1841594&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java
(added)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java
Fri Sep 21 14:24:53 2018
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+/* $Id$ */
+package org.apache.fop.afp.modca;
+
+import java.awt.Color;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.xmlgraphics.java2d.color.DefaultColorConverter;
+
+import org.apache.fop.afp.Factory;
+import org.apache.fop.afp.parser.MODCAParser;
+
+public class GraphicsObjectTestCase {
+ @Test
+ public void testSetColor() throws IOException {
+ GraphicsObject go = new GraphicsObject(new Factory(), null);
+ go.setColorConverter(DefaultColorConverter.getInstance());
+ go.newSegment();
+ go.setColor(Color.white);
+ go.newSegment();
+ go.setColor(Color.white);
+ Assert.assertEquals(go.objects.get(0).getDataLength(), 66);
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ go.writeContent(bos);
+
+ MODCAParser modcaParser = new MODCAParser(new
ByteArrayInputStream(bos.toByteArray()));
+ byte[] field = modcaParser.readNextStructuredField().getData();
+ ByteArrayInputStream bis = new ByteArrayInputStream(field);
+ bis.skip(55);
+ //White data:
+ Assert.assertEquals(bis.read(), 255);
+ Assert.assertEquals(bis.read(), 255);
+ Assert.assertEquals(bis.read(), 255);
+ }
+}
Propchange:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
