Return-Path: <fop-commits-return-13721-archive-asf-public=cust-asf.ponee.io@xmlgraphics.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id B0DD3200C86
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 31 May 2017 13:03:08 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id AF806160BCB; Wed, 31 May 2017 11:03:08 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 029B7160BBA
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 31 May 2017 13:03:07 +0200 (CEST)
Received: (qmail 82295 invoked by uid 500); 31 May 2017 11:03:06 -0000
Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:fop-commits-help@xmlgraphics.apache.org>
List-Unsubscribe: <mailto:fop-commits-unsubscribe@xmlgraphics.apache.org>
List-Post: <mailto:fop-commits@xmlgraphics.apache.org>
List-Id: <fop-commits.xmlgraphics.apache.org>
Reply-To: fop-dev@xmlgraphics.apache.org
Delivered-To: mailing list fop-commits@xmlgraphics.apache.org
Received: (qmail 82286 invoked by uid 99); 31 May 2017 11:03:06 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2017 11:03:06 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 268C63A02F0
	for <fop-commits@xmlgraphics.apache.org>; Wed, 31 May 2017 11:03:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1797012 - in /xmlgraphics/fop/trunk/fop-core/src:
 main/java/org/apache/fop/render/gradient/GradientMaker.java
 test/java/org/apache/fop/render/gradient/GradientTestCase.java
Date: Wed, 31 May 2017 11:03:05 -0000
To: fop-commits@xmlgraphics.apache.org
From: ssteiner@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170531110306.268C63A02F0@svn01-us-west.apache.org>
archived-at: Wed, 31 May 2017 11:03:08 -0000

Author: ssteiner
Date: Wed May 31 11:03:05 2017
New Revision: 1797012

URL: http://svn.apache.org/viewvc?rev=1797012&view=rev
Log:
FOP-2710: SVG Gradient missing

Modified:
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java
    xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java?rev=1797012&r1=1797011&r2=1797012&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/gradient/GradientMaker.java Wed May 31 11:03:05 2017
@@ -114,12 +114,16 @@ public final class GradientMaker {
 
     private static List<Float> makeBounds(MultipleGradientPaint gradient) {
         float[] fractions = gradient.getFractions();
-        List<Float> bounds = new java.util.ArrayList<Float>(fractions.length);
+        List<Float> bounds = new ArrayList<Float>(fractions.length);
         for (float offset : fractions) {
-            if (0f < offset && offset < 1f) {
+            if (0f < offset) {
                 bounds.add(offset);
             }
         }
+        float last = bounds.get(bounds.size() - 1);
+        if (last == 1f) {
+            bounds.remove(bounds.size() - 1);
+        }
         return bounds;
     }
 

Modified: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java?rev=1797012&r1=1797011&r2=1797012&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java Wed May 31 11:03:05 2017
@@ -288,4 +288,18 @@ public class GradientTestCase {
         return colors;
     }
 
+    @Test
+    public void testMakeBounds() {
+        RadialGradientPaint gradient = new RadialGradientPaint(0, 0, 100, 100, 100,
+                fractions(0f, 1f, 0.9f), colors(Color.WHITE, Color.RED, Color.GREEN));
+        Pattern pattern = GradientMaker.makeRadialGradient(gradient, new AffineTransform(), new AffineTransform());
+        ShadingChecker shadingChecker = new PatternChecker(pattern).shading()
+                .coords(70.7036, 70.7036, 0.0, 0.0, 0.0, 100.0);
+        shadingChecker.function()
+                .functionType(3)
+                .bounds(1f, 0.9f)
+                .encode(0.0, 1.0, 0.0, 1.0, 0.0, 1.0)
+                .functions(3);
+    }
+
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org