Skip to content

Bump opencv to 4.7.0 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Bump opencv to 4.7.0 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,10 @@ jobs:
echo "OPENCV_VERSION_SHORT=$(mvn build-helper:parse-version org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=opencv.version.short -q -DforceStdout)" >> $GITHUB_ENV

- name: Download Windows Distribution
run: wget -O opencv-${{ env.OPENCV_VERSION }}-vc14_vc15.exe https://sourceforge.net/projects/opencvlibrary/files/${{ env.OPENCV_VERSION }}/opencv-${{ env.OPENCV_VERSION }}-vc14_vc15.exe/download
run: wget -O opencv-${{ env.OPENCV_VERSION }}.exe https://github.com/opencv/opencv/releases/download/${{ env.OPENCV_VERSION }}/opencv-${{ env.OPENCV_VERSION }}-windows.exe

- name: Extract Windows Distribution
run: 7z x opencv-${{ env.OPENCV_VERSION }}-vc14_vc15.exe
run: 7z x opencv-${{ env.OPENCV_VERSION }}.exe

- name: Upload Libraries
uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<packaging>bundle</packaging>
<groupId>org.openpnp</groupId>
<artifactId>opencv</artifactId>
<version>4.6.0-0</version>
<version>4.7.0-0</version>
<name>OpenPnP OpenCV</name>
<description>OpenCV packaged with native libraries and loader for multiple platforms.</description>
<url>http://github.com/openpnp/opencv</url>
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/nu/pattern/OpenCV.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,13 @@ private static Path extractNativeBinary(final OS os, final Arch arch) {
case LINUX:
switch (arch) {
case X86_64:
location = "/nu/pattern/opencv/linux/x86_64/libopencv_java460.so";
location = "/nu/pattern/opencv/linux/x86_64/libopencv_java470.so";
break;
case ARMv7:
location = "/nu/pattern/opencv/linux/ARMv7/libopencv_java460.so";
location = "/nu/pattern/opencv/linux/ARMv7/libopencv_java470.so";
break;
case ARMv8:
location = "/nu/pattern/opencv/linux/ARMv8/libopencv_java460.so";
location = "/nu/pattern/opencv/linux/ARMv8/libopencv_java470.so";
break;
default:
throw new UnsupportedPlatformException(os, arch);
Expand All @@ -375,10 +375,10 @@ private static Path extractNativeBinary(final OS os, final Arch arch) {
case OSX:
switch (arch) {
case X86_64:
location = "/nu/pattern/opencv/osx/x86_64/libopencv_java460.dylib";
location = "/nu/pattern/opencv/osx/x86_64/libopencv_java470.dylib";
break;
case ARMv8:
location = "/nu/pattern/opencv/osx/ARMv8/libopencv_java460.dylib";
location = "/nu/pattern/opencv/osx/ARMv8/libopencv_java470.dylib";
break;
default:
throw new UnsupportedPlatformException(os, arch);
Expand All @@ -387,10 +387,10 @@ private static Path extractNativeBinary(final OS os, final Arch arch) {
case WINDOWS:
switch (arch) {
case X86_32:
location = "/nu/pattern/opencv/windows/x86_32/opencv_java460.dll";
location = "/nu/pattern/opencv/windows/x86_32/opencv_java470.dll";
break;
case X86_64:
location = "/nu/pattern/opencv/windows/x86_64/opencv_java460.dll";
location = "/nu/pattern/opencv/windows/x86_64/opencv_java470.dll";
break;
default:
throw new UnsupportedPlatformException(os, arch);
Expand Down