From 584ec684cccf3c8735eaef5680fdd154ed6de4ff Mon Sep 17 00:00:00 2001 From: kitfox Date: Wed, 3 Oct 2012 18:59:41 +0000 Subject: Fixing color parsing bug in gradients. git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@129 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b --- build.xml | 7 +++++-- src/main/java/com/kitfox/svg/LinearGradient.java | 11 ++++++----- src/main/java/com/kitfox/svg/Stop.java | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index 0fbc9b1..f7d3693 100755 --- a/build.xml +++ b/build.xml @@ -95,6 +95,7 @@ + @@ -121,9 +122,11 @@ - - + diff --git a/src/main/java/com/kitfox/svg/LinearGradient.java b/src/main/java/com/kitfox/svg/LinearGradient.java index 81be3d5..ab48052 100644 --- a/src/main/java/com/kitfox/svg/LinearGradient.java +++ b/src/main/java/com/kitfox/svg/LinearGradient.java @@ -132,13 +132,14 @@ public class LinearGradient extends Gradient { viewXform.translate(bounds.getX(), bounds.getY()); //This is a hack to get around shapes that have a width or height of 0. Should be close enough to the true answer. - double width = bounds.getWidth(); - double height = bounds.getHeight(); - if (width == 0) width = 1; - if (height == 0) height = 1; + double width = Math.max(1, bounds.getWidth()); + double height = Math.max(1, bounds.getHeight()); viewXform.scale(width, height); - viewXform.concatenate(gradientTransform); + if (gradientTransform != null) + { + viewXform.concatenate(gradientTransform); + } paint = new com.kitfox.svg.batik.LinearGradientPaint( pt1, diff --git a/src/main/java/com/kitfox/svg/Stop.java b/src/main/java/com/kitfox/svg/Stop.java index b3990c6..3cd6145 100644 --- a/src/main/java/com/kitfox/svg/Stop.java +++ b/src/main/java/com/kitfox/svg/Stop.java @@ -104,7 +104,7 @@ public class Stop extends SVGElement { } } - if (getPres(sty.setName("stop-color"))) + if (getStyle(sty.setName("stop-color"))) { Color newVal = sty.getColorValue(); if (newVal != color) @@ -114,7 +114,7 @@ public class Stop extends SVGElement { } } - if (getPres(sty.setName("stop-opacity"))) + if (getStyle(sty.setName("stop-opacity"))) { float newVal = sty.getFloatValue(); if (newVal != opacity) -- cgit v1.2.3-55-g7522