From e0e853e0b708459972953c0204e833c4deea33e7 Mon Sep 17 00:00:00 2001
From: Samuel Audet <samuel.audet@gmail.com>
Date: Wed, 2 Nov 2022 17:23:04 +0900
Subject: [PATCH] Release version 1.5.8

---
 CHANGELOG.md               | 5 +++++
 README.md                  | 8 ++++----
 pom.xml                    | 2 +-
 procamcalib-nativelook     | 3 +++
 procamcalib-nativelook.cmd | 3 +++
 procamcalib-oceanlook      | 3 +++
 procamcalib-oceanlook.cmd  | 3 +++
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea23baa..33c66d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+### November 2, 2022 version 1.5.8
+ * Add workaround options for JDK 17+ in launch scripts ([issue #28](https://github.com/bytedeco/procamcalib/issues/28))
+ * Upgrade support to OpenCV 4.6.x
+ * Upgrade support to FFmpeg 5.1.x
+
 ### February 11, 2022 version 1.5.7
  * Upgrade support to FFmpeg 5.0.x
 
diff --git a/README.md b/README.md
index c85bb23..036d9da 100644
--- a/README.md
+++ b/README.md
@@ -72,10 +72,10 @@ Source Code
 I make all the source code available on GitHub at https://github.com/bytedeco/procamcalib . You will also need the following to modify and build the application:
 
  * A C/C++ compiler
- * JavaCPP 1.5.7  https://github.com/bytedeco/javacpp
- * JavaCV  1.5.7  https://github.com/bytedeco/javacv
- * OpenCV 4.5.x  http://sourceforge.net/projects/opencvlibrary/files/
- * FFmpeg 5.0.x  http://ffmpeg.org/download.html
+ * JavaCPP 1.5.8  https://github.com/bytedeco/javacpp
+ * JavaCV  1.5.8  https://github.com/bytedeco/javacv
+ * OpenCV 4.6.x  http://sourceforge.net/projects/opencvlibrary/files/
+ * FFmpeg 5.1.x  http://ffmpeg.org/download.html
  * ARToolKitPlus 2.3.x  https://launchpad.net/artoolkitplus
  * NetBeans 12.x  https://netbeans.apache.org/download/
  * Maven 3.x  http://maven.apache.org/download.html
diff --git a/pom.xml b/pom.xml
index 5d68ad7..da5c715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bytedeco</groupId>
   <artifactId>procamcalib</artifactId>
-  <version>1.5.7</version>
+  <version>1.5.8</version>
 
   <name>ProCamCalib</name>
   <description>A User-Friendly Method to Calibrate Cameras and Projector-Camera Systems</description>
diff --git a/procamcalib-nativelook b/procamcalib-nativelook
index 6f8c0f2..24d9b86 100755
--- a/procamcalib-nativelook
+++ b/procamcalib-nativelook
@@ -12,6 +12,9 @@ OPTIONS=-Dapple.awt.fullscreencapturealldisplays=false
 # by default, but you can try to enable it here to get lower latency.
 #OPTIONS="-Dapple.awt.fullscreencapturealldisplays=false -Dsun.java2d.opengl=True"
 
+# Required options for JDK 17+ since not yet supported by NetBeans
+#OPTIONS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED"
+
 java -d64 -server -version
 if [ $? -eq 0 ]
 then
diff --git a/procamcalib-nativelook.cmd b/procamcalib-nativelook.cmd
index e3d3001..9a4411c 100644
--- a/procamcalib-nativelook.cmd
+++ b/procamcalib-nativelook.cmd
@@ -8,6 +8,9 @@ rem Under Windows, Java uses DirectX by default, but your video driver
 rem might work better with OpenGL than DirectX. Try to use this option...
 rem set OPTIONS=-Dsun.java2d.opengl=True
 
+rem Required options for JDK 17+ since not yet supported by NetBeans
+rem set "OPTIONS=--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED"
+
 set JAVA=%SystemRoot%\system32\java
 if exist %JAVA%.exe goto CHECKSERVER
 set JAVA=java
diff --git a/procamcalib-oceanlook b/procamcalib-oceanlook
index bd1a771..53237b3 100755
--- a/procamcalib-oceanlook
+++ b/procamcalib-oceanlook
@@ -12,6 +12,9 @@ OPTIONS=-Dapple.awt.fullscreencapturealldisplays=false
 # by default, but you can try to enable it here to get lower latency.
 #OPTIONS="-Dapple.awt.fullscreencapturealldisplays=false -Dsun.java2d.opengl=True"
 
+# Required options for JDK 17+ since not yet supported by NetBeans
+#OPTIONS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED"
+
 java -d64 -server -version
 if [ $? -eq 0 ]
 then
diff --git a/procamcalib-oceanlook.cmd b/procamcalib-oceanlook.cmd
index e705520..337edac 100644
--- a/procamcalib-oceanlook.cmd
+++ b/procamcalib-oceanlook.cmd
@@ -8,6 +8,9 @@ rem Under Windows, Java uses DirectX by default, but your video driver
 rem might work better with OpenGL than DirectX. Try to use this option...
 rem set OPTIONS=-Dsun.java2d.opengl=True
 
+rem Required options for JDK 17+ since not yet supported by NetBeans
+rem set "OPTIONS=--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED"
+
 set JAVA=%SystemRoot%\system32\java
 if exist %JAVA%.exe goto CHECKSERVER
 set JAVA=java