Changeset 10787 in josm for trunk/src/com/kitfox/svg/LinearGradient.java

Timestamp:

2016-08-12T03:16:58+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13291 - upgrade to svgSalamander v1.1.0 (patched)

now detects two invalid SVG files: presets/sport/volleyball.svg and presets/shop/diy_store.svg

File:

• trunk/src/com/kitfox/svg/LinearGradient.java (modified) (6 diffs)

trunk/src/com/kitfox/svg/LinearGradient.java

@@ -38 +38 @@
 import com.kitfox.svg.xml.StyleAttribute;
 import java.awt.Color;
+import java.awt.LinearGradientPaint;
+import java.awt.MultipleGradientPaint;
 import java.awt.Paint;
 import java.awt.geom.AffineTransform;
@@ -97 +99 @@
     public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
     {
-        com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
+        MultipleGradientPaint.CycleMethod method;
         switch (spreadMethod)
         {
             default:
             case SM_PAD:
-                method = com.kitfox.svg.batik.MultipleGradientPaint.NO_CYCLE;
+                method = MultipleGradientPaint.CycleMethod.NO_CYCLE;
                 break;
             case SM_REPEAT:
-                method = com.kitfox.svg.batik.MultipleGradientPaint.REPEAT;
+                method = MultipleGradientPaint.CycleMethod.REPEAT;
                 break;
             case SM_REFLECT:
-                method = com.kitfox.svg.batik.MultipleGradientPaint.REFLECT;
+                method = MultipleGradientPaint.CycleMethod.REFLECT;
                 break;
         }
@@ -121 +123 @@
         } else if (gradientUnits == GU_USER_SPACE_ON_USE)
         {
-            paint = new com.kitfox.svg.batik.LinearGradientPaint(
+            paint = new LinearGradientPaint(
                 pt1,
                 pt2,
@@ -127 +129 @@
                 getStopColors(),
                 method,
-                com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
+                MultipleGradientPaint.ColorSpaceType.SRGB,
                 gradientTransform == null
                 ? new AffineTransform()
@@ -146 +148 @@
             }
 
-            paint = new com.kitfox.svg.batik.LinearGradientPaint(
+            paint = new LinearGradientPaint(
                 pt1,
                 pt2,
@@ -152 +154 @@
                 getStopColors(),
                 method,
-                com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
+                MultipleGradientPaint.ColorSpaceType.SRGB,
                 viewXform);
         }