Skip to content

Commit 51eacb4

Browse files
committed
switch to Java 8u74 which fixes JavaFX smoothing bug (processing#3795)
1 parent b4af01f commit 51eacb4

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

build/build.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,14 @@
6969
<!-- Switching to 8 because updates for 7 ended April 2015 -->
7070
<property name="jdk.version" value="8" />
7171
<!-- moving back to 8u51 because of Oracle bug in OS X and Linux smoothing
72-
https://github.com/processing/processing/issues/3795 -->
72+
https://github.com/processing/processing/issues/3795
73+
https://bugs.openjdk.java.net/browse/JDK-8136495 -->
74+
<property name="jdk.update" value="74" />
75+
<property name="jdk.build" value="2" />
76+
<!--
7377
<property name="jdk.update" value="51" />
7478
<property name="jdk.build" value="16" />
79+
-->
7580
<!--
7681
<property name="jdk.update" value="60" />
7782
<property name="jdk.build" value="27" />
@@ -499,7 +504,7 @@
499504
<!-- Require that a JDK be installed, but call this on build, so that
500505
the download-jdk-macosx target can be called. -->
501506
<fail unless="macosx_jdk_found"
502-
message="JDK ${jdk.short} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.short} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Note that only ${jdk.short} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again.${line.separator}Or... type 'ant download-jdk-macosx' to download it to your Desktop." />
507+
message="JDK ${jdk.short} required.${line.separator}To build on OS X, you must install Oracle's JDK ${jdk.short} from${line.separator}http://www.oracle.com/technetwork/java/javase/downloads${line.separator}Or... type 'ant download-jdk-macosx' to download it to your Desktop.${line.separator}Note that only ${jdk.short} (not a later or earlier version) will work. ${line.separator}And it must be the JDK, not the JRE. And do not try to defy me again." />
503508

504509
<mkdir dir="macosx/work" />
505510

core/src/processing/core/PApplet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11138,9 +11138,9 @@ public void filter(PShader shader) {
1113811138
/**
1113911139
* ( begin auto-generated from clip.xml )
1114011140
*
11141-
* Limits the rendering to the boundaries of a rectangle defined
11142-
* by the parameters. The boundaries are drawn based on the state
11143-
* of the <b>imageMode()</b> fuction, either CORNER, CORNERS, or CENTER.
11141+
* Limits the rendering to the boundaries of a rectangle defined
11142+
* by the parameters. The boundaries are drawn based on the state
11143+
* of the <b>imageMode()</b> fuction, either CORNER, CORNERS, or CENTER.
1114411144
*
1114511145
* ( end auto-generated )
1114611146
*

core/src/processing/javafx/PSurfaceFX.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ public void start(final Stage stage) {
313313
// https://github.com/processing/processing/issues/3823
314314
if ((PApplet.platform == PConstants.MACOSX ||
315315
PApplet.platform == PConstants.LINUX) &&
316-
PApplet.javaVersionName.compareTo("1.8.0_60") >= 0) {
316+
PApplet.javaVersionName.compareTo("1.8.0_60") >= 0 &&
317+
PApplet.javaVersionName.compareTo("1.8.0_72") < 0) {
317318
System.err.println("smooth() disabled for JavaFX with this Java version due to Oracle bug");
318319
System.err.println("https://github.com/processing/processing/issues/3795");
319320
smooth = 0;

core/todo.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ X Fix another "Zero length string passed to TextLayout constructor" error
33
X Ambiguity on where to call smooth()
44
X https://github.com/processing/processing/issues/4211
55
X add additional clarification for Eclipse users
6+
X Flipped Y-axis in JavaFX is now done (JDK bug)
7+
X https://github.com/processing/processing/issues/3795
68

79
_ textAlign(CENTER) and pixelDensity(2) aligning incorrectly with Java2D
810
_ https://github.com/processing/processing/issues/4020

todo.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
0248 (3.0.2)
2+
X move to Java 8u74, also fixes JavaFX issue
23

34
contribs
45
X add "full screen" option to the Editor on OS X
@@ -33,6 +34,10 @@ X https://github.com/processing/processing/issues/4098
3334
X https://github.com/processing/processing/pull/4103
3435
X message when reference is find out on nothing selected
3536
X https://github.com/processing/processing/pull/4296
37+
X better handling of quotes in command line args
38+
X https://github.com/processing/processing/pull/4145
39+
X https://github.com/processing/processing/issues/3996
40+
X https://github.com/processing/processing/issues/4119
3641

3742
jakub
3843
X Workaround for JRE bug freezing the PDE during code completion

0 commit comments

Comments
 (0)