PatternConsulting · tech-consortium · May 20, 2014 · Oct 15, 2015 · Oct 15, 2015 · Oct 15, 2015
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,10 @@
 .idea
 settings.xml
 target
+.classpath
+.project
+.settings/org.eclipse.core.resources.prefs
+.settings/org.eclipse.jdt.core.prefs
+.settings/org.eclipse.m2e.core.prefs
+opencv/**
+.metadata/
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 branches:
   only:
     - master
-    - stable
+    - develop
 
 language: java
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,22 @@
+# Issues, Bug Reports, and Feature Requests
+
+* When creating a new Issue, first search to see if it has already been filed.
+* Bug reports must include the following or will be deleted:
+    * Steps to reproduce.
+    * Expected result.
+    * Actual result.
+    * A Short, Self Contained, Correct, Example: http://sscce.org/
+    * Notes, log files, screen captures, videos, etc. to show the problem.
+
+# Code Contributions and Pull Requests
+
+Before starting work on a pull request, please read: https://github.com/openpnp/openpnp/wiki/Developers-Guide#contributing
+
+Summary of guidelines:
+
+* One pull request per issue, bug or feature.
+* Describe the change in detail and why it is needed.
+* Follow the coding style.
+* Include tests and documentation.
+* Run and pass the tests.
+* Think of how this affects other users.
diff --git a/README.md b/README.md
@@ -1,14 +1,38 @@
-# OpenCV 2.4.9 (packaged by [Pattern](http://pattern.nu))
-
-[![Build Status](https://travis-ci.org/PatternConsulting/opencv.svg?branch=master)](https://travis-ci.org/PatternConsulting/opencv)
+# OpenCV 4.3.0 (packaged by [OpenPnP](http://openpnp.org))
 
 [OpenCV](http://opencv.org) Java bindings packaged with native libraries, seamlessly delivered as a turn-key Maven dependency.
 
+## Fork Notes
+
+### Soft Fork
+
+This is a soft fork of Pattern's OpenCV package at https://github.com/PatternConsulting/opencv.
+That package has not been maintained in quite some time and I needed updated OpenCV
+binaries for OpenPnP. I intend to maintain this fork for the foreseeable future
+or until Pattern resumes maintenance of their package.
+
+### Backwards Compatibility
+
+I have left the source code packages and directories the same (nu.pattern)
+and only changed the Maven coordinates in the pom.xml. This way the package
+remains backwards compatible and it is very easy to switch between the
+OpenPnP version and the Pattern version.
+
+### Maven
+
+To use this fork in your project, instead of the Pattern one, simply add
+the same dependency but with the groupId org.openpnp instead of nu.pattern.
+
+### Scala
+
+I'm not uploading Scala artifacts as I don't know or use Scala. If someone
+wants to maintain that portion of the package, let me know.
+
 ## Usage
 
 ### Project
 
-Pattern's OpenCV package is added to your project as any other dependency.
+OpenPnP's OpenCV package is added to your project as any other dependency.
 
 #### [Maven](http://maven.apache.org/)
 
@@ -22,9 +46,9 @@ Pattern's OpenCV package is added to your project as any other dependency.
     <!-- ... -->
 
     <dependency>
-      <groupId>nu.pattern</groupId>
+      <groupId>org.openpnp</groupId>
       <artifactId>opencv</artifactId>
-      <version>2.4.9-7</version>
+      <version>4.3.0-0</version>
     </dependency>
 
     <!-- ... -->
@@ -36,16 +60,6 @@ Pattern's OpenCV package is added to your project as any other dependency.
 </project>
 ```
 
-#### [SBT](http://scala-sbt.org)
-
-```scala
-// ...
-
-libraryDependencies += "nu.pattern" % "opencv" % "2.4.9-7"
-
-// ...
-```
-
 ### API
 
 Typically, using the upstream [OpenCV Java bindings involves loading the native library](http://docs.opencv.org/doc/tutorials/introduction/desktop_java/java_dev_intro.html#java-sample-with-ant) as follows:
@@ -62,7 +76,7 @@ This call will—exactly once per class loader—first attempt to load from the
 
 This approach keeps most clients decoupled from Pattern's package and loader. As long as this is done sufficiently early in execution, any library using the OpenCV Java bindings can use the usual load call as documented by the OpenCV project.
 
-There are, however, cases where Java class loaders are frequently changing (_e.g._, application servers, SBT projects, Scala worksheets), and [spurious attempts to load the native library will result in JNI errors](https://github.com/PatternConsulting/opencv/issues/7). As a partial work-around, this package offers an alternative API, [`nu.pattern.OpenCV.loadLocal()`](https://github.com/PatternConsulting/opencv/blob/master/src/main/java/nu/pattern/OpenCV.java), which—also exactly once per class loader—extracts the binary appropriate for the runtime platform, and passes it to `System#load(String)`. Ultimately, this may eventually load the library redundantly in the same JVM, which could be unsafe in production. Use with caution and understand the implications.
+There are, however, cases where Java class loaders are frequently changing (_e.g._, application servers, SBT projects, Scala worksheets), and [spurious attempts to load the native library will result in JNI errors](https://github.com/PatternConsulting/opencv/issues/7). As a partial work-around, this package offers an alternative API, [`nu.pattern.OpenCV.loadLocally()`](https://github.com/PatternConsulting/opencv/blob/master/src/main/java/nu/pattern/OpenCV.java), which—also exactly once per class loader—extracts the binary appropriate for the runtime platform, and passes it to `System#load(String)`. Ultimately, this may eventually load the library redundantly in the same JVM, which could be unsafe in production. Use with caution and understand the implications.
 
 It's recommended developers using any JNI library read further:
 
@@ -87,20 +101,25 @@ Producing native binaries is the most cumbersome process in maintaining this pac
 
 The following platforms are supported by this package:
 
+**IMPORTANT NOTE**: On Windows the Desktop Experience Feature is required because the opencv DLL is linked against several of the libraries provided by the Desktop Experience Feature.  If the Desktop Experience Feature is not installed the opencv DLL will fail to load.
+
 OS | Architecture
 --- | ---
 OS X | x86_32
 OS X | x86_64
 Linux | x86_64
 Linux | x86_32
+Windows | x86_32 (w/ Desktop Experience Feature)
+Windows | x86_64 (w/ Desktop Experience Feature)
 
 If you can help create binaries for additional platforms, please see notes under [_Contributing_](#contributing).
 
 ## Credits
 
-This package is maintained by [Michael Ahlers](http://github.com/michaelahlers).
+This package is maintained by [Jason von Nieda](http://github.com/vonnieda).
 
 ## Acknowledgements
 
-- [Greg Borenstein](https://github.com/atduskgreg), who's advice and [OpenCV for Processing](https://github.com/atduskgreg/opencv-processing) project informed this package's development. 
+- [Michael Ahlers](http://github.com/michaelahlers), for originally creating and maintaining this project.
+- [Greg Borenstein](https://github.com/atduskgreg), whose advice and [OpenCV for Processing](https://github.com/atduskgreg/opencv-processing) project informed this package's development. 
 - [Alex Osborne](https://github.com/ato), for helpful [utility class producing temporary directories with Java NIO that are properly garbage-collected on shutdown](https://gist.github.com/ato/6774390).
diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,88 @@
+# Releasing a New Version
+
+## Prepare
+
+1. Download OpenCV Linux/OSX source and Windows binary release to opencv/. Should be a ZIP and a EXE.
+2. Unzip source ZIP to create opencv/opencv-VERSION.
+3. Run ./create-targets.sh VERSION (e.g. ./create-targets 3.0.0) to create all of the target directories under opencv/opencv-VERSION/target.
+4. Update pom.xml, OpenCV.java and README.md with new versions.
+
+## Build OSX and Java Targets
+
+1. Make sure Java is 1.7: `java -version`, `export JAVA_HOME=$(/usr/libexec/java_home -v1.7)` 
+2. `cd opencv/opencv-VERSION/target/osx/x86_64`
+3. `cmake -D BUILD_SHARED_LIBS=OFF -D WITH_EIGEN=OFF -D WITH_FFMPEG=OFF -D WITH_JAVA=ON ../../.. > cmake.log`
+4. `make -j8`
+5. `./copy-resources VERSION`. It won't finish, but it should get far enough.
+6. `mvn clean test`.
+
+## Build Linux Targets
+
+```
+sudo apt update -y
+sudo apt full-upgrade -y
+sudo reboot
+sudo apt install default-jdk ant maven git cmake g++ open-vm-tools open-vm-tools-desktop -y
+sudo reboot
+sudo vmhgfs-fuse .host:/ /mnt/ -o allow_other -o uid=1000
+cd /mnt/opencv/opencv/opencv-VERSION/target/linux/x86_64
+cmake -D BUILD_SHARED_LIBS=OFF -D WITH_EIGEN=OFF -D WITH_FFMPEG=OFF -D WITH_JAVA=ON ../../.. > cmake.log
+make -j8
+```
+
+## Linux/Arm for Raspberry Pi
+
+* Install packages:
+```
+sudo apt-get update && sudo apt-get install oracle-java8-jdk cmake ant
+sudo apt-get install build-essential cmake pkg-config libpng12-0 libpng12-dev libpng++-dev libpng3 libpnglite-dev zlib1g-dbg zlib1g zlib1g-dev pngtools  libtiff4 libtiffxx0c2 libtiff-tools libjpeg8 libjpeg8-dev libjpeg8-dbg libjpeg-progs libavcodec-dev   libavformat-dev libgstreamer0.10-0-dbg libgstreamer0.10-0 libgstreamer0.10-dev  libunicap2 libunicap2-dev libdc1394-22-dev libdc1394-22 libdc1394-utils swig libv4l-0 libv4l-dev
+```
+* Change .bashrc to set JAVA_HOME, ANT_HOME and paths:
+
+```
+export ANT_HOME=/usr/share/ant/
+export PATH=${PATH}:${ANT_HOME}/bin
+export JAVA_HOME=/usr/lib/jvm/jdk-8-oracle-arm32-vfp-hflt/
+export PATH=$PATH:$JAVA_HOME/bin
+```
+
+* Download opencv:
+
+```
+wget https://github.com/opencv/opencv/archive/3.2.0.zip
+mv 3.2.0 opencv.zip
+unzip opencv.zip 
+cd opencv-3.2.0/
+```
+
+* Finally build using cmake:
+```
+mkdir build
+cd build
+cmake -D BUILD_SHARED_LIBS=OFF -D WITH_EIGEN=OFF -D WITH_FFMPEG=OFF -D WITH_JAVA=ON -D WITH_OPENCL=OFF -D BUILD_PERF_TESTS=OFF -D JAVA_INCLUDE_PATH=$JAVA_HOME/include -D JAVA_AWT_LIBRARY=$JAVA_HOME/jre/lib/amd64/libawt.so -D JAVA_JVM_LIBRARY=$JAVA_HOME/jre/lib/arm/server/libjvm.so -D CMAKE_INSTALL_PREFIX=/usr/local ..
+make
+make install
+```
+
+* libopencv_java320.so can now be found in build/libs 
+
+## Unpack Windows Binaries
+
+1. In a Windows VM, double click the Windows EXE downloaded previously. It will
+ask where to extract. Choose opencv/opencv-VERSION/target/windows.
+2. In the host OS, `./copy-resources VERSION`.
+3. Back in the VM, `mvn clean test`
+
+## Finish
+
+1. Commit the updates to develop.
+2. Merge develop into master.
+3. Push to Sonatype:
+	1. Read http://central.sonatype.org/pages/apache-maven.html
+	2. `export GPG_TTY=$(tty)`
+	3. `mvn clean deploy -P release-sign-artifacts`
+	4. Check it's good at https://oss.sonatype.org/
+	5. Release with `mvn nexus-staging:release`
+	6. Or reset with `mvn nexus-staging:drop` 
+4. `git tag vVERSION-RELEASE` (e.g. `git tag v3.0.0-1`)
+
diff --git a/copy-resources.sh b/copy-resources.sh
@@ -0,0 +1,46 @@
+VERSION=$1
+SHORT_VERSION=`echo $VERSION | tr -d .`
+BASE_DIR=opencv/opencv-$VERSION
+
+echo "Version: $VERSION"
+echo "Short Version: $SHORT_VERSION"
+echo "Base Dir: $BASE_DIR"
+
+# Java
+echo "Cleaning up Java..."
+rm -f upstream/*.jar
+rm -rf upstream/res/*
+echo "Copying Java..."
+cp $BASE_DIR/target/osx/x86_64/bin/opencv-$SHORT_VERSION.jar upstream
+cp $BASE_DIR/target/osx/x86_64/java_test/build/jar/opencv-test.jar upstream
+cp -r $BASE_DIR/target/osx/x86_64/java_test/res/* upstream/res
+
+# OSX
+echo "Cleaning up OSX..."
+rm -f src/main/resources/nu/pattern/opencv/osx/x86_64/cmake.log
+rm -f src/main/resources/nu/pattern/opencv/osx/x86_64/*.dylib
+echo "Copying OSX..."
+cp $BASE_DIR/target/osx/x86_64/cmake.log src/main/resources/nu/pattern/opencv/osx/x86_64
+cp $BASE_DIR/target/osx/x86_64/lib/libopencv_java$SHORT_VERSION.dylib src/main/resources/nu/pattern/opencv/osx/x86_64
+
+# Linux
+echo "Cleaning up Linux x86_64..."
+rm -f src/main/resources/nu/pattern/opencv/linux/x86_64/cmake.log
+rm -f src/main/resources/nu/pattern/opencv/linux/x86_64/*.so
+echo "Copying Linux x86_64..."
+cp $BASE_DIR/target/linux/x86_64/cmake.log src/main/resources/nu/pattern/opencv/linux/x86_64
+cp $BASE_DIR/target/linux/x86_64/lib/libopencv_java$SHORT_VERSION.so src/main/resources/nu/pattern/opencv/linux/x86_64
+
+echo "Cleaning up Linux ARMv8..."
+rm -f src/main/resources/nu/pattern/opencv/linux/ARMv8/*.so
+echo "Copying Linux ARMv8..."
+cp $BASE_DIR/target/linux/ARMv8/lib/libopencv_java$SHORT_VERSION.so src/main/resources/nu/pattern/opencv/linux/ARMv8
+
+# Windows
+echo "Cleaning up Windows..."
+rm -f src/main/resources/nu/pattern/opencv/windows/x86_32/*.dll
+rm -f src/main/resources/nu/pattern/opencv/windows/x86_64/*.dll
+echo "Copying Windows..."
+cp $BASE_DIR/target/windows/opencv/build/java/x86/opencv_java$SHORT_VERSION.dll src/main/resources/nu/pattern/opencv/windows/x86_32
+cp $BASE_DIR/target/windows/opencv/build/java/x64/opencv_java$SHORT_VERSION.dll src/main/resources/nu/pattern/opencv/windows/x86_64
+
diff --git a/create-targets.sh b/create-targets.sh
@@ -0,0 +1,15 @@
+VERSION=$1
+SHORT_VERSION=`echo $VERSION | tr -d .`
+BASE_DIR=opencv/opencv-$VERSION
+
+echo "Version: $VERSION"
+echo "Short Version: $SHORT_VERSION"
+echo "Base Dir: $BASE_DIR"
+
+mkdir $BASE_DIR/target
+mkdir $BASE_DIR/target/linux
+mkdir $BASE_DIR/target/linux/x86_64
+mkdir $BASE_DIR/target/linux/ARMv8
+mkdir $BASE_DIR/target/osx
+mkdir $BASE_DIR/target/osx/x86_64
+mkdir $BASE_DIR/target/windows