Changeset 14328 in josm for trunk/src/com/kitfox/svg/Gradient.java

Timestamp:

2018-10-14T15:15:50+02:00 (8 years ago)

Author:

Don-vip

Message:

see #14319, see #16838 - update to svgSalamander 1.1.2

File:

• trunk/src/com/kitfox/svg/Gradient.java (modified) (3 diffs)

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

@@ -160 +160 @@
     }
 
+    private void buildStops()
+    {
+        ArrayList<Stop> stopList = new ArrayList<>(stops);
+        stopList.sort((o1, o2) -> Float.compare(o1.offset, o2.offset));
+
+        //Remove doubles
+        for (int i = stopList.size() - 2; i > 0; --i)
+        {
+            if (stopList.get(i + 1).offset == stopList.get(i).offset)
+            {
+                stopList.remove(i + 1);
+            }
+        }
+        
+        stopFractions = new float[stopList.size()];
+        stopColors = new Color[stopList.size()];
+        int idx = 0;
+        for (Stop stop : stopList)
+        {
+            int stopColorVal = stop.color.getRGB();
+            Color stopColor = new Color((stopColorVal >> 16) & 0xff, (stopColorVal >> 8) & 0xff, stopColorVal & 0xff, clamp((int) (stop.opacity * 255), 0, 255));
+
+            stopColors[idx] = stopColor;
+            stopFractions[idx] = stop.offset;
+            idx++;
+        }
+    }
+
     public float[] getStopFractions()
     {
@@ -173 +201 @@
         }
 
-        stopFractions = new float[stops.size()];
-        int idx = 0;
-        for (Stop stop : stops) {
-            float val = stop.offset;
-            if (idx != 0 && val < stopFractions[idx - 1])
-            {
-                val = stopFractions[idx - 1];
-            }
-            stopFractions[idx++] = val;
-        }
+        buildStops();
 
         return stopFractions;
@@ -200 +219 @@
         }
 
-        stopColors = new Color[stops.size()];
-        int idx = 0;
-        for (Stop stop : stops) {
-            int stopColorVal = stop.color.getRGB();
-            Color stopColor = new Color((stopColorVal >> 16) & 0xff, (stopColorVal >> 8) & 0xff, stopColorVal & 0xff, clamp((int) (stop.opacity * 255), 0, 255));
-            stopColors[idx++] = stopColor;
-        }
+        buildStops();
 
         return stopColors;
-    }
-
-    public void setStops(Color[] colors, float[] fractions)
-    {
-        if (colors.length != fractions.length)
-        {
-            throw new IllegalArgumentException();
-        }
-
-        this.stopColors = colors;
-        this.stopFractions = fractions;
-        stopRef = null;
     }