Author: vhennebert
Date: Fri Aug 1 15:30:26 2014
New Revision: 1615142
URL: http://svn.apache.org/r1615142
Log:
FOP-2393: only the gradient's transform should be used. Other transforms will
have already been applied to the user space.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java?rev=1615142&r1=1615141&r2=1615142&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
Fri Aug 1 15:30:26 2014
@@ -76,7 +76,7 @@ public class PSSVGGraphics2D extends PSG
super.applyPaint(paint, fill);
if (paint instanceof LinearGradientPaint) {
Pattern pattern =
GradientMaker.makeLinearGradient((LinearGradientPaint) paint,
- getBaseTransform(), getTransform());
+ new AffineTransform(), new AffineTransform());
try {
gen.write(outputPattern(pattern));
} catch (IOException ioe) {
@@ -84,7 +84,7 @@ public class PSSVGGraphics2D extends PSG
}
} else if (paint instanceof RadialGradientPaint) {
Pattern pattern =
GradientMaker.makeRadialGradient((RadialGradientPaint) paint,
- getBaseTransform(), getTransform());
+ new AffineTransform(), new AffineTransform());
try {
gen.write(outputPattern(pattern));
} catch (IOException ioe) {
@@ -142,11 +142,6 @@ public class PSSVGGraphics2D extends PSG
shading.output(out, doubleFormatter, functionRenderer);
}
- protected AffineTransform getBaseTransform() {
- AffineTransform at = new AffineTransform(this.getTransform());
- return at;
- }
-
/**
* Creates a new <code>Graphics</code> object that is
* a copy of this <code>Graphics</code> object.
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java?rev=1615142&r1=1615141&r2=1615142&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
Fri Aug 1 15:30:26 2014
@@ -66,6 +66,7 @@ public class GradientTestCase {
ByteArrayOutputStream out = new ByteArrayOutputStream();
PSSVGGraphics2D svgGraphics2D = new PSSVGGraphics2D(false, new
PSGenerator(out));
svgGraphics2D.setGraphicContext(new GraphicContext());
+ svgGraphics2D.translate(100, 100);
svgGraphics2D.applyPaint(gradient, true);
byte[] actual = out.toByteArray();
byte[] expected =
IOUtils.toByteArray(getClass().getResourceAsStream(expectedResourceName));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
