From: Bryan Gardiner <bog@khumba.net>
Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13724
Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456

Updates Scilab 5.5.2 to build against xmlgraphics-common >=2.0.  This is not
tested, as I'm not sure of a test case, and a similar patch (where the
super.processShape calls are passed cached=true) is already awaiting upstream
review.

--- a/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+++ b/scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
@@ -857,7 +857,7 @@ public class Export {
                     }
 
                     @Override
-                    public int processShape(Shape s) throws IOException {
+                    public int processShape(Shape s, boolean cached) throws IOException {
                         if (s instanceof Ellipse2D.Double) {
                             Ellipse2D.Double ell = (Ellipse2D.Double) s;
                             if (ell.height == ell.width) {
@@ -880,10 +880,10 @@ public class Export {
                                     buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
                                     it.next();
                                 } else {
-                                    return super.processShape(s);
+                                    return super.processShape(s, cached);
                                 }
                             } else {
-                                return super.processShape(s);
+                                return super.processShape(s, cached);
                             }
 
                             for (; !it.isDone(); it.next()) {
@@ -891,7 +891,7 @@ public class Export {
                                 if (type == PathIterator.SEG_LINETO) {
                                     buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
                                 } else {
-                                    return super.processShape(s);
+                                    return super.processShape(s, cached);
                                 }
                             }
                             buffer.append("] DP");
@@ -899,7 +899,7 @@ public class Export {
                             return PathIterator.WIND_NON_ZERO;
                         }
 
-                        return super.processShape(s);
+                        return super.processShape(s, cached);
                     }
                 };
                 g2d.setGraphicContext(new GraphicContext());
@@ -1029,7 +1029,7 @@ public class Export {
                     }
 
                     @Override
-                    public int processShape(Shape s) throws IOException {
+                    public int processShape(Shape s, boolean cached) throws IOException {
                         if (s instanceof Ellipse2D.Double) {
                             Ellipse2D.Double ell = (Ellipse2D.Double) s;
                             if (ell.height == ell.width) {
@@ -1052,10 +1052,10 @@ public class Export {
                                     buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
                                     it.next();
                                 } else {
-                                    return super.processShape(s);
+                                    return super.processShape(s, cached);
                                 }
                             } else {
-                                return super.processShape(s);
+                                return super.processShape(s, cached);
                             }
 
                             for (; !it.isDone(); it.next()) {
@@ -1063,7 +1063,7 @@ public class Export {
                                 if (type == PathIterator.SEG_LINETO) {
                                     buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1]));
                                 } else {
-                                    return super.processShape(s);
+                                    return super.processShape(s, cached);
                                 }
                             }
                             buffer.append("] DP");
@@ -1071,7 +1071,7 @@ public class Export {
                             return PathIterator.WIND_NON_ZERO;
                         }
 
-                        return super.processShape(s);
+                        return super.processShape(s, cached);
                     }
 
                 };