1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
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/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
+++ b/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);
}
};
|
GitWeb