diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a6f89c2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b0dbf4..9e4c6a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ +### April 11, 2019 version 1.5 + * Adjust code to support latest changes in JavaCV + ### January 11, 2019 version 1.4.4 * Remove no longer necessary workaround that would produce memory leaks * Upgrade support to OpenCV 4.0.x and FFmpeg 4.1.x diff --git a/README.md b/README.md index 82fdbdb..844ae6c 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,7 @@ More information at http://www.ok.sc.e.titech.ac.jp/res/PCS/research/procamcalib Downloads --------- - * ProCamCalib 1.4.4 binary archive [procamcalib-1.4.4-bin.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/procamcalib/1.4.4/procamcalib-1.4.4-bin.zip) (288 MB) - * ProCamCalib 1.4.4 source archive [procamcalib-1.4.4-src.zip](http://search.maven.org/remotecontent?filepath=org/bytedeco/procamcalib/1.4.4/procamcalib-1.4.4-src.zip) (50 KB) - -The binary archive contains builds for Linux, Mac OS X, and Windows. +Archives containing JAR files are available as [releases](https://github.com/bytedeco/procamcalib/releases). The binary archive contains builds for Linux, Mac OS X, and Windows. Required Software @@ -75,8 +72,8 @@ 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.4.4 https://github.com/bytedeco/javacpp - * JavaCV 1.4.4 https://github.com/bytedeco/javacv + * JavaCPP 1.5 https://github.com/bytedeco/javacpp + * JavaCV 1.5 https://github.com/bytedeco/javacv * OpenCV 4.0.x http://sourceforge.net/projects/opencvlibrary/files/ * FFmpeg 4.1.x http://ffmpeg.org/download.html * ARToolKitPlus 2.3.x https://launchpad.net/artoolkitplus diff --git a/pom.xml b/pom.xml index cf32302..55589f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.bytedeco procamcalib - 1.4.4 + 1.5 ProCamCalib A User-Friendly Method to Calibrate Cameras and Projector-Camera Systems @@ -31,10 +31,6 @@ scm:git:ssh://git@github.com/bytedeco/procamcalib.git - - 3.0 - - sonatype-nexus-snapshots @@ -170,7 +166,7 @@ maven-compiler-plugin - 3.7.0 + 3.8.0 1.7 1.7 @@ -225,6 +221,7 @@ maven-assembly-plugin 3.1.0 + false src/main/assembly/bin.xml src/main/assembly/src.xml diff --git a/src/main/java/org/bytedeco/procamcalib/CalibrationWorker.java b/src/main/java/org/bytedeco/procamcalib/CalibrationWorker.java index b4c73d8..7bcf9ed 100644 --- a/src/main/java/org/bytedeco/procamcalib/CalibrationWorker.java +++ b/src/main/java/org/bytedeco/procamcalib/CalibrationWorker.java @@ -50,8 +50,10 @@ import org.bytedeco.javacv.ProjectorSettings; import org.bytedeco.javacv.OpenCVFrameConverter; -import static org.bytedeco.javacpp.opencv_core.*; -import static org.bytedeco.javacpp.opencv_imgproc.*; +import org.bytedeco.opencv.opencv_core.*; +import org.bytedeco.opencv.opencv_imgproc.*; +import static org.bytedeco.opencv.global.opencv_core.*; +import static org.bytedeco.opencv.global.opencv_imgproc.*; /** * diff --git a/src/main/java/org/bytedeco/procamcalib/MainFrame.java b/src/main/java/org/bytedeco/procamcalib/MainFrame.java index ab8d173..e6547c1 100644 --- a/src/main/java/org/bytedeco/procamcalib/MainFrame.java +++ b/src/main/java/org/bytedeco/procamcalib/MainFrame.java @@ -93,9 +93,11 @@ import org.openide.nodes.Node; import org.openide.util.Lookup; -import static org.bytedeco.javacpp.opencv_core.*; -import static org.bytedeco.javacpp.opencv_imgcodecs.*; -import static org.bytedeco.javacpp.opencv_imgproc.*; +import org.bytedeco.opencv.opencv_core.*; +import org.bytedeco.opencv.opencv_imgproc.*; +import static org.bytedeco.opencv.global.opencv_core.*; +import static org.bytedeco.opencv.global.opencv_imgcodecs.*; +import static org.bytedeco.opencv.global.opencv_imgproc.*; /** *