bugzilla #49516: patch 29221; fixes gradient fill opacity incorrectly inherits stroke opacity of previous svg element
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/commons/trunk@1402820 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java b/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java
index dc605f8..918b6c0 100644
--- a/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java
+++ b/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java
@@ -428,6 +428,9 @@
this.paint = paint;
if(paint instanceof Color) {
foreground = (Color)paint;
+ } else {
+ // use default; otherwise the previous Color will be used
+ foreground = Color.black;
}
}
diff --git a/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java b/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java
new file mode 100644
index 0000000..3106f04
--- /dev/null
+++ b/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java
@@ -0,0 +1,46 @@
+/*
+ * 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: GraphicContext.java 1345683 2012-06-03 14:50:33Z gadams $ */
+
+package org.apache.xmlgraphics.java2d;
+
+import java.awt.Color;
+import java.awt.LinearGradientPaint;
+import java.awt.geom.Point2D;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class GraphicContextTestCase {
+
+ @Test
+ public void testSetPaint() {
+ GraphicContext gc = new GraphicContext();
+ Color red = Color.RED;
+ gc.setPaint(red);
+ assertEquals(red, gc.getColor());
+ Point2D start = new Point2D.Float(0, 0);
+ Point2D end = new Point2D.Float(50, 50);
+ float[] dist = {0.0f, 0.2f, 1.0f};
+ Color[] colors = {Color.RED, Color.WHITE, Color.BLUE};
+ LinearGradientPaint lgp = new LinearGradientPaint(start, end, dist, colors);
+ gc.setPaint(lgp);
+ assertEquals(Color.BLACK, gc.getColor());
+ }
+}
