Skip to content
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

Jump to bottom

Update OpenCV paths and version to 4.9.0 #109

Merged
merged 1 commit into from
Dec 28, 2023
Merged

Update OpenCV paths and version to 4.9.0 #109

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
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.8.1-0</version>
<version>4.9.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_java481.so";
location = "/nu/pattern/opencv/linux/x86_64/libopencv_java490.so";
break;
case ARMv7:
location = "/nu/pattern/opencv/linux/ARMv7/libopencv_java481.so";
location = "/nu/pattern/opencv/linux/ARMv7/libopencv_java490.so";
break;
case ARMv8:
location = "/nu/pattern/opencv/linux/ARMv8/libopencv_java481.so";
location = "/nu/pattern/opencv/linux/ARMv8/libopencv_java490.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_java481.dylib";
location = "/nu/pattern/opencv/osx/x86_64/libopencv_java490.dylib";
break;
case ARMv8:
location = "/nu/pattern/opencv/osx/ARMv8/libopencv_java481.dylib";
location = "/nu/pattern/opencv/osx/ARMv8/libopencv_java490.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_java481.dll";
location = "/nu/pattern/opencv/windows/x86_32/opencv_java490.dll";
break;
case X86_64:
location = "/nu/pattern/opencv/windows/x86_64/opencv_java481.dll";
location = "/nu/pattern/opencv/windows/x86_64/opencv_java490.dll";
break;
default:
throw new UnsupportedPlatformException(os, arch);
Expand Down
Loading