FOP-2817: AFP should reset color for new segment

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1841594 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 58 insertions, 0 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java b/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java
index d7da42cae..854484b21 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/modca/GraphicsObject.java
@@ -376,6 +376,7 @@ public class GraphicsObject extends AbstractDataObject {
     public void newSegment() {
         getData().newSegment();
         graphicsState.lineWidth = 0; //Looks like a new segment invalidates the graphics state
+        graphicsState.color = Color.BLACK;
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java
new file mode 100644
index 000000000..dde744e06
--- /dev/null
+++ b/fop-core/src/test/java/org/apache/fop/afp/modca/GraphicsObjectTestCase.java
@@ -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);
+    }
+}