From cf24cc5673fd2a5ad71347a091abff749e6d124f Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Thu, 10 Jul 2014 17:37:30 +0000 Subject: [PATCH] Factorized creation of gradient bounds git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP-2393_gradient-rendering@1609518 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/svg/PDFGraphics2D.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java index 06dd1f575..0403fa465 100644 --- a/src/java/org/apache/fop/svg/PDFGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java @@ -880,19 +880,12 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand List colors = createGradientColors(gp); - float[] fractions = gp.getFractions(); - List theBounds = new java.util.ArrayList(); - for (int count = 0; count < fractions.length; count++) { - float offset = fractions[count]; - if (0f < offset && offset < 1f) { - theBounds.add(new Double(offset)); - } - } + List bounds = createGradientBounds(gp); //Gradients are currently restricted to sRGB PDFDeviceColorSpace colSpace = new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_RGB); PDFGradientFactory gradientFactory = new PDFGradientFactory(this); - PDFPattern myPat = gradientFactory.createGradient(false, colSpace, colors, theBounds, + PDFPattern myPat = gradientFactory.createGradient(false, colSpace, colors, bounds, theCoords, matrix); currentStream.write(myPat.getColorSpaceOut(fill)); @@ -941,19 +934,12 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand List colors = createGradientColors(gp); - float[] fractions = gp.getFractions(); - List theBounds = new java.util.ArrayList(); - for (int count = 0; count < fractions.length; count++) { - float offset = fractions[count]; - if (0f < offset && offset < 1f) { - theBounds.add(new Double(offset)); - } - } + List bounds = createGradientBounds(gp); //Gradients are currently restricted to sRGB PDFDeviceColorSpace colSpace = new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_RGB); PDFGradientFactory gradientFactory = new PDFGradientFactory(this); - PDFPattern myPat = gradientFactory.createGradient(true, colSpace, colors, theBounds, + PDFPattern myPat = gradientFactory.createGradient(true, colSpace, colors, bounds, theCoords, matrix); currentStream.write(myPat.getColorSpaceOut(fill)); @@ -991,6 +977,18 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand return gradientColors; } + private List createGradientBounds(MultipleGradientPaint gradient) { + // TODO is the conversion to double necessary? + float[] fractions = gradient.getFractions(); + List bounds = new java.util.ArrayList(fractions.length); + for (float offset : fractions) { + if (0f < offset && offset < 1f) { + bounds.add(Double.valueOf(offset)); + } + } + return bounds; + } + private boolean createPattern(PatternPaint pp, boolean fill) { preparePainting(); -- 2.39.5