diff --git a/leptonica/cppbuild.sh b/leptonica/cppbuild.sh index 1d0830beda3..12f6febdede 100755 --- a/leptonica/cppbuild.sh +++ b/leptonica/cppbuild.sh @@ -44,10 +44,15 @@ tar --totals -xzf ../leptonica-$LEPTONICA_VERSION.tar.gz # https://sourceforge.net/p/giflib/feature-requests/6/ patch -Np1 -d $GIFLIB < ../../giflib.patch || true +sedinplace '/cmake_policy(SET CMP0054 NEW)/a\ +cmake_policy(SET CMP0057 NEW)\ +' leptonica-$LEPTONICA_VERSION/CMakeLists.txt + sedinplace 's/add_library(zlib SHARED/add_library(zlib STATIC/g' $ZLIB/CMakeLists.txt sedinplace 's/add_library(giflib SHARED/add_library(giflib STATIC/g' $GIFLIB/CMakeLists.txt sedinplace 's/if(WIN32)/if(FALSE)/g' $GIFLIB/CMakeLists.txt sedinplace 's/include(OpenGLChecks)/set(HAVE_OPENGL FALSE)/g' $LIBTIFF/CMakeLists.txt +sedinplace 's/-${PROJECT_VERSION}/-6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt sedinplace 's/SOVERSION 6..../SOVERSION 6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt sedinplace 's/VERSION ${VERSION_PLAIN}/VERSION 6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt sedinplace 's/leptonica-${VERSION_PLAIN}/leptonica-6/g' leptonica-$LEPTONICA_VERSION/src/CMakeLists.txt diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh index bff28c23352..ca38b4e5f9f 100755 --- a/opencv/cppbuild.sh +++ b/opencv/cppbuild.sh @@ -82,6 +82,8 @@ patch -Np1 < ../../../opencv-linux-ppc64le.patch #sedinplace '/include_directories/d' platforms/android/android.toolchain.cmake #sedinplace "s// ${ANDROID_LIBS:-}/g" platforms/android/android.toolchain.cmake +sedinplace 's/if(NOT MSVC)/if(FALSE)/g' cmake/OpenCVCompilerOptimizations.cmake + # https://github.com/opencv/opencv/issues/19846 sedinplace 's/dgeev_/OCV_LAPACK_FUNC(dgeev)/g' modules/calib3d/src/usac/dls_solver.cpp modules/calib3d/src/usac/essential_solver.cpp @@ -265,7 +267,7 @@ case $PLATFORM in sedinplace 's:/sdk/native/libs/x86_64/libopencv_:/lib/libopencv_:g' ../sdk/native/jni/abi-x86_64/OpenCVModules-release.cmake ;; ios-arm64) - $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=arm64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" . + IPHONEOS_DEPLOYMENT_TARGET=8.0 $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=arm64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" . # download files CMake failed to download if [[ -f download_with_curl.sh ]]; then bash download_with_curl.sh @@ -276,7 +278,7 @@ case $PLATFORM in cp ../share/java/opencv4/libopencv_java.a ../lib ;; ios-x86_64) - $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=x86_64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" . + IPHONEOS_DEPLOYMENT_TARGET=8.0 $CMAKE -GXcode -DCMAKE_TOOLCHAIN_FILE=platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake -DIPHONEOS_DEPLOYMENT_TARGET=8.0 -DIOS_ARCH=x86_64 -DAPPLE_FRAMEWORK=ON -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO -DCMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE=NO -DBUILD_opencv_world=OFF -DBUILD_SHARED_LIBS=OFF $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X -DWITH_OPENCL=OFF $GPU_FLAGS $BUILD_CONTRIB_X -DCMAKE_CXX_FLAGS="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" . # download files CMake failed to download if [[ -f download_with_curl.sh ]]; then bash download_with_curl.sh diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java index aa037753921..6ce4c94ccc4 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java +++ b/opencv/src/main/java/org/bytedeco/opencv/opencv_java.java @@ -52,9 +52,9 @@ opencv_wechat_qrcode.class, }, value = { - @Platform(preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", "opencv_cudaimgproc@.408", "opencv_java"}), + @Platform(preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409", "opencv_java"}), @Platform(value = "ios", preload = "libopencv_java"), - @Platform(value = "windows", preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", "opencv_cudaimgproc481", "opencv_java"}), + @Platform(value = "windows", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490", "opencv_java"}), } ) public class opencv_java { diff --git a/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java b/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java index 1e03714c0d2..65603803f72 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java +++ b/opencv/src/main/java/org/bytedeco/opencv/opencv_python3.java @@ -65,12 +65,12 @@ opencv_wechat_qrcode.class, }, value = { - @Platform(preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", "opencv_cudaimgproc@.408", - "opencv_cudacodec@.408", "opencv_cudaobjdetect@.408", "opencv_cudabgsegm@.408", "opencv_cudastereo@.408", - "opencv_cudaoptflow@.408", "opencv_cudawarping@.408", "opencv_cudalegacy@.408"}), - @Platform(value = "windows", preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", "opencv_cudaimgproc481", - "opencv_cudacodec481", "opencv_cudaobjdetect481", "opencv_cudabgsegm481", "opencv_cudastereo481", - "opencv_cudaoptflow481", "opencv_cudawarping481", "opencv_cudalegacy481"}), + @Platform(preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409", + "opencv_cudacodec@.409", "opencv_cudaobjdetect@.409", "opencv_cudabgsegm@.409", "opencv_cudastereo@.409", + "opencv_cudaoptflow@.409", "opencv_cudawarping@.409", "opencv_cudalegacy@.409"}), + @Platform(value = "windows", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490", + "opencv_cudacodec490", "opencv_cudaobjdetect490", "opencv_cudabgsegm490", "opencv_cudastereo490", + "opencv_cudaoptflow490", "opencv_cudawarping490", "opencv_cudalegacy490"}), } ) public class opencv_python3 { diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java index 52efb939093..67360eccded 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_aruco.java @@ -33,10 +33,10 @@ value = { @Platform( include = {/*"",*/ "", "", ""}, - link = "opencv_aruco@.408" + link = "opencv_aruco@.409" ), @Platform(value = "ios", preload = "libopencv_aruco"), - @Platform(value = "windows", link = "opencv_aruco481") + @Platform(value = "windows", link = "opencv_aruco490") }, target = "org.bytedeco.opencv.opencv_aruco", global = "org.bytedeco.opencv.global.opencv_aruco" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java index a074acf2ae7..546241beac3 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bgsegm.java @@ -33,10 +33,10 @@ value = { @Platform( include = "", - link = "opencv_bgsegm@.408" + link = "opencv_bgsegm@.409" ), @Platform(value = "ios", preload = "libopencv_bgsegm"), - @Platform(value = "windows", link = "opencv_bgsegm481") + @Platform(value = "windows", link = "opencv_bgsegm490") }, target = "org.bytedeco.opencv.opencv_bgsegm", global = "org.bytedeco.opencv.global.opencv_bgsegm" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java index bc1574390dc..1619e7fd6c3 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_bioinspired.java @@ -35,9 +35,9 @@ inherit = opencv_highgui.class, value = { @Platform(include = {"", "opencv2/bioinspired/bioinspired.hpp", "opencv2/bioinspired/retina.hpp", - "opencv2/bioinspired/retinafasttonemapping.hpp", "opencv2/bioinspired/transientareassegmentationmodule.hpp"}, link = "opencv_bioinspired@.408"), + "opencv2/bioinspired/retinafasttonemapping.hpp", "opencv2/bioinspired/transientareassegmentationmodule.hpp"}, link = "opencv_bioinspired@.409"), @Platform(value = "ios", preload = "libopencv_bioinspired"), - @Platform(value = "windows", link = "opencv_bioinspired481") + @Platform(value = "windows", link = "opencv_bioinspired490") }, target = "org.bytedeco.opencv.opencv_bioinspired", global = "org.bytedeco.opencv.global.opencv_bioinspired" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java index 4ea83be8408..45cd599f743 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_features2d.class, value = { - @Platform(include = {"", ""}, link = "opencv_calib3d@.408"), + @Platform(include = {"", ""}, link = "opencv_calib3d@.409"), @Platform(value = "ios", preload = "libopencv_calib3d"), - @Platform(value = "windows", link = "opencv_calib3d481") + @Platform(value = "windows", link = "opencv_calib3d490") }, target = "org.bytedeco.opencv.opencv_calib3d", global = "org.bytedeco.opencv.global.opencv_calib3d" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java index 1212f92200a..8cf6c51419a 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java @@ -57,9 +57,9 @@ "", "", "", "", "", "", "", "", "", "", "", "", - "", "", "", "opencv_adapters.h"}, link = {"opencv_core@.408", "opencv_imgproc@.408"}, + "", "", "", "opencv_adapters.h"}, link = {"opencv_core@.409", "opencv_imgproc@.409"}, resource = {"include", "lib", "sdk", "share", "x86", "x64", "OpenCVConfig.cmake", "OpenCVConfig-version.cmake", "python"}, linkresource = "lib", - preload = {"opencv_cudev@.408"}, compiler = "cpp11", define = "SHARED_PTR_NAMESPACE std"), + preload = {"opencv_cudev@.409"}, compiler = "cpp11", define = "SHARED_PTR_NAMESPACE std"), @Platform(value = "android", preload = ""), @Platform(value = "ios", preload = {"liblibjpeg", "liblibpng", "liblibprotobuf", "liblibwebp", "libzlib", "libopencv_core"}), @Platform(value = "linux", preloadpath = {"/usr/lib/", "/usr/lib32/", "/usr/lib64/"}), @@ -68,7 +68,7 @@ @Platform(value = "linux-x86", preloadpath = {"/usr/lib32/", "/usr/lib/"}), @Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}), @Platform(value = "linux-ppc64", preloadpath = {"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}), - @Platform(value = "windows", define = {"SHARED_PTR_NAMESPACE std", "_WIN32_WINNT 0x0502"}, link = {"opencv_core481", "opencv_imgproc481"}, preload = {"opencv_cudev481"}), + @Platform(value = "windows", define = {"SHARED_PTR_NAMESPACE std", "_WIN32_WINNT 0x0502"}, link = {"opencv_core490", "opencv_imgproc490"}, preload = {"opencv_cudev490"}), @Platform(value = {"linux-arm64", "linux-ppc64le", "linux-x86_64", "macosx-x86_64", "windows-x86_64"}, extension = "-gpu")}, target = "org.bytedeco.opencv.opencv_core", global = "org.bytedeco.opencv.global.opencv_core", diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java index cce5538602a..54ec00a50ea 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudaarithm@.408", + link = "opencv_cudaarithm@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaarithm481", + link = "opencv_cudaarithm490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java index 5a0175eb109..829e0ef1b59 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudabgsegm.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudabgsegm@.408", + link = "opencv_cudabgsegm@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudabgsegm481", + link = "opencv_cudabgsegm490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java index 2778bc1047c..a21e6fc8c65 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudacodec.java @@ -34,12 +34,12 @@ @Platform( not = "macosx", include = "", - link = "opencv_cudacodec@.408", + link = "opencv_cudacodec@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudacodec481", + link = "opencv_cudacodec490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java index 5bbe45e3526..e9dcb5476c7 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafeatures2d.java @@ -37,12 +37,12 @@ value = { @Platform( include = "", - link = "opencv_cudafeatures2d@.408", + link = "opencv_cudafeatures2d@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudafeatures2d481", + link = "opencv_cudafeatures2d490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java index 297e9ba1f07..2ac4530a5d2 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudafilters.java @@ -36,12 +36,12 @@ value = { @Platform( include = "", - link = "opencv_cudafilters@.408", + link = "opencv_cudafilters@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudafilters481", + link = "opencv_cudafilters490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java index 280cc14298c..ef7fc54d30c 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaimgproc.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudaimgproc@.408", + link = "opencv_cudaimgproc@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaimgproc481", + link = "opencv_cudaimgproc490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java index bc21836d5b2..a75a709d0df 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaobjdetect.java @@ -40,14 +40,14 @@ value = { @Platform( include = "", - link = "opencv_cudaobjdetect@.408", - preload = "opencv_cudalegacy@.408", + link = "opencv_cudaobjdetect@.409", + preload = "opencv_cudalegacy@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaobjdetect481", - preload = "opencv_cudalegacy481", + link = "opencv_cudaobjdetect490", + preload = "opencv_cudalegacy490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java index 1ea392b35c9..18223234f76 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaoptflow.java @@ -40,14 +40,14 @@ value = { @Platform( include = "", - link = "opencv_cudaoptflow@.408", - preload = "opencv_cudalegacy@.408", + link = "opencv_cudaoptflow@.409", + preload = "opencv_cudalegacy@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudaoptflow481", - preload = "opencv_cudalegacy481", + link = "opencv_cudaoptflow490", + preload = "opencv_cudalegacy490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java index e44a6ff6abf..78629404625 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudastereo.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudastereo@.408", + link = "opencv_cudastereo@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudastereo481", + link = "opencv_cudastereo490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java index 6fe04df6acc..5ab30e3074b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudawarping.java @@ -33,12 +33,12 @@ value = { @Platform( include = "", - link = "opencv_cudawarping@.408", + link = "opencv_cudawarping@.409", extension = "-gpu" ), @Platform( value = "windows", - link = "opencv_cudawarping481", + link = "opencv_cudawarping490", extension = "-gpu" ) }, diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java index 8159e904795..b2a14187e85 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn.java @@ -37,9 +37,9 @@ value = { @Platform(include = {"", "", "","", "", "", ""}, - link = "opencv_dnn@.408"), + link = "opencv_dnn@.409"), @Platform(value = "ios", preload = "libopencv_dnn"), - @Platform(value = "windows", link = "opencv_dnn481")}, + @Platform(value = "windows", link = "opencv_dnn490")}, target = "org.bytedeco.opencv.opencv_dnn", global = "org.bytedeco.opencv.global.opencv_dnn" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java index 4a51dcfebab..1ba10d5f936 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_dnn_superres.java @@ -35,9 +35,9 @@ @Properties( inherit = {opencv_dnn.class, opencv_quality.class}, value = { - @Platform(include = "", link = "opencv_dnn_superres@.408"), + @Platform(include = "", link = "opencv_dnn_superres@.409"), @Platform(value = "ios", preload = "libopencv_dnn_superres"), - @Platform(value = "windows", link = "opencv_dnn_superres481")}, + @Platform(value = "windows", link = "opencv_dnn_superres490")}, target = "org.bytedeco.opencv.opencv_dnn_superres", global = "org.bytedeco.opencv.global.opencv_dnn_superres" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java index 464b61e896a..d5edecc102a 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_face.java @@ -38,9 +38,9 @@ @Platform(include = {"", "", "", "", "", "", "", ""}, - link = "opencv_face@.408"), + link = "opencv_face@.409"), @Platform(value = "ios", preload = "libopencv_face"), - @Platform(value = "windows", link = "opencv_face481")}, + @Platform(value = "windows", link = "opencv_face490")}, target = "org.bytedeco.opencv.opencv_face", global = "org.bytedeco.opencv.global.opencv_face" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java index a21f04cbdb5..e9b3135d748 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_features2d.java @@ -35,9 +35,9 @@ @Properties( inherit = {opencv_highgui.class, opencv_flann.class}, value = { - @Platform(include = "", link = "opencv_features2d@.408"), + @Platform(include = "", link = "opencv_features2d@.409"), @Platform(value = "ios", preload = "libopencv_features2d"), - @Platform(value = "windows", link = "opencv_features2d481")}, + @Platform(value = "windows", link = "opencv_features2d490")}, target = "org.bytedeco.opencv.opencv_features2d", global = "org.bytedeco.opencv.global.opencv_features2d" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java index 96cac0f381c..5fdb2f14243 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_flann.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_core.class, value = { - @Platform(include = {"", ""}, link = "opencv_flann@.408"), + @Platform(include = {"", ""}, link = "opencv_flann@.409"), @Platform(value = "ios", preload = "libopencv_flann"), - @Platform(value = "windows", link = "opencv_flann481")}, + @Platform(value = "windows", link = "opencv_flann490")}, target = "org.bytedeco.opencv.opencv_flann", global = "org.bytedeco.opencv.global.opencv_flann" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java index 8b880ed12a8..0eca3fd38d4 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_highgui.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_videoio.class, value = { - @Platform(include = {"", ""}, link = "opencv_highgui@.408"), + @Platform(include = {"", ""}, link = "opencv_highgui@.409"), @Platform(value = "ios", preload = "libopencv_highgui"), - @Platform(value = "windows", link = "opencv_highgui481")}, + @Platform(value = "windows", link = "opencv_highgui490")}, target = "org.bytedeco.opencv.opencv_highgui", global = "org.bytedeco.opencv.global.opencv_highgui" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java index cec4d183805..2f84f246380 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_img_hash.java @@ -42,10 +42,10 @@ "", "", }, - link = "opencv_img_hash@.408" + link = "opencv_img_hash@.409" ), @Platform(value = "ios", preload = "libopencv_img_hash"), - @Platform(value = "windows", link = "opencv_img_hash481") + @Platform(value = "windows", link = "opencv_img_hash490") }, target = "org.bytedeco.opencv.opencv_img_hash", global = "org.bytedeco.opencv.global.opencv_img_hash" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java index e92a4f519a9..4d81f8f1be2 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgcodecs.java @@ -35,9 +35,9 @@ @Properties( inherit = opencv_imgproc.class, value = { - @Platform(include = {/*"",*/ ""}, link = "opencv_imgcodecs@.408"), + @Platform(include = {/*"",*/ ""}, link = "opencv_imgcodecs@.409"), @Platform(value = "ios", preload = "libopencv_imgcodecs"), - @Platform(value = "windows", link = "opencv_imgcodecs481")}, + @Platform(value = "windows", link = "opencv_imgcodecs490")}, global = "org.bytedeco.opencv.global.opencv_imgcodecs", helper = "org.bytedeco.opencv.helper.opencv_imgcodecs" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java index b39e3d589ab..333f328a716 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_imgproc.java @@ -36,9 +36,9 @@ inherit = opencv_core.class, value = { @Platform(include = {"", "", "", - ""}, link = "opencv_imgproc@.408"), + ""}, link = "opencv_imgproc@.409"), @Platform(value = "ios", preload = "libopencv_imgproc"), - @Platform(value = "windows", link = "opencv_imgproc481")}, + @Platform(value = "windows", link = "opencv_imgproc490")}, target = "org.bytedeco.opencv.opencv_imgproc", global = "org.bytedeco.opencv.global.opencv_imgproc", helper = "org.bytedeco.opencv.helper.opencv_imgproc" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java index 90a9de2d8aa..3e20eec1211 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_intensity_transform.java @@ -31,9 +31,9 @@ @Properties( inherit = opencv_core.class, value = { - @Platform(include = "", link = "opencv_intensity_transform@.408"), + @Platform(include = "", link = "opencv_intensity_transform@.409"), @Platform(value = "ios", preload = "libopencv_intensity_transform"), - @Platform(value = "windows", link = "opencv_intensity_transform481") + @Platform(value = "windows", link = "opencv_intensity_transform490") }, global = "org.bytedeco.opencv.global.opencv_intensity_transform" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java index 8f4a15ed18b..73e2c0dee05 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_mcc.java @@ -35,9 +35,9 @@ "", "", "", - ""}, link = "opencv_mcc@.408"), + ""}, link = "opencv_mcc@.409"), @Platform(value = "ios", preload = "libopencv_mcc"), - @Platform(value = "windows", link = "opencv_mcc481") + @Platform(value = "windows", link = "opencv_mcc490") }, target = "org.bytedeco.opencv.opencv_mcc", global = "org.bytedeco.opencv.global.opencv_mcc" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java index e687ef67398..04cdab94722 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ml.java @@ -34,9 +34,9 @@ @Properties( inherit = opencv_core.class, value = { - @Platform(include = "", link = "opencv_ml@.408"), + @Platform(include = "", link = "opencv_ml@.409"), @Platform(value = "ios", preload = "libopencv_ml"), - @Platform(value = "windows", link = "opencv_ml481")}, + @Platform(value = "windows", link = "opencv_ml490")}, target = "org.bytedeco.opencv.opencv_ml", global = "org.bytedeco.opencv.global.opencv_ml" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java index ee8dca1a051..863556af7df 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_objdetect.java @@ -39,9 +39,9 @@ "opencv2/objdetect/graphical_code_detector.hpp", "", "", "", "", "", - "", ""}, link = "opencv_objdetect@.408"), + "", ""}, link = "opencv_objdetect@.409"), @Platform(value = "ios", preload = "libopencv_objdetect"), - @Platform(value = "windows", link = "opencv_objdetect481")}, + @Platform(value = "windows", link = "opencv_objdetect490")}, target = "org.bytedeco.opencv.opencv_objdetect", global = "org.bytedeco.opencv.global.opencv_objdetect" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java index 3f8faaf50bf..942702f4c9b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_optflow.java @@ -34,9 +34,9 @@ @Properties( inherit = {opencv_ximgproc.class, opencv_video.class}, value = { - @Platform(include = {"", ""}, link = "opencv_optflow@.408"), + @Platform(include = {"", ""}, link = "opencv_optflow@.409"), @Platform(value = "ios", preload = "libopencv_optflow"), - @Platform(value = "windows", link = "opencv_optflow481")}, + @Platform(value = "windows", link = "opencv_optflow490")}, target = "org.bytedeco.opencv.opencv_optflow", global = "org.bytedeco.opencv.global.opencv_optflow" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java index 8fefce00b38..e3f8b7b1215 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_phase_unwrapping.java @@ -37,10 +37,10 @@ "", "", }, - link = "opencv_phase_unwrapping@.408" + link = "opencv_phase_unwrapping@.409" ), @Platform(value = "ios", preload = "libopencv_phase_unwrapping"), - @Platform(value = "windows", link = "opencv_phase_unwrapping481") + @Platform(value = "windows", link = "opencv_phase_unwrapping490") }, target = "org.bytedeco.opencv.opencv_phase_unwrapping", global = "org.bytedeco.opencv.global.opencv_phase_unwrapping" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java index 8965f68c436..448df73275c 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_photo.java @@ -35,11 +35,11 @@ inherit = opencv_imgproc.class, value = { @Platform(include = {/*"",*/ "", ""}, - link = "opencv_photo@.408", - preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", "opencv_cudaimgproc@.408"}), + link = "opencv_photo@.409", + preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", "opencv_cudaimgproc@.409"}), @Platform(value = "ios", preload = "libopencv_photo"), - @Platform(value = "windows", link = "opencv_photo481", - preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", "opencv_cudaimgproc481"})}, + @Platform(value = "windows", link = "opencv_photo490", + preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", "opencv_cudaimgproc490"})}, target = "org.bytedeco.opencv.opencv_photo", global = "org.bytedeco.opencv.global.opencv_photo" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java index ce6b0c5aefe..29be2f5d0cf 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_plot.java @@ -33,10 +33,10 @@ value = { @Platform( include = "opencv2/plot.hpp", - link = "opencv_plot@.408" + link = "opencv_plot@.409" ), @Platform(value = "ios", preload = "libopencv_plot"), - @Platform(value = "windows", link = "opencv_plot481") + @Platform(value = "windows", link = "opencv_plot490") }, target = "org.bytedeco.opencv.opencv_plot", global = "org.bytedeco.opencv.global.opencv_plot" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java index c51e66faac7..3d4a3d4fe03 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_quality.java @@ -42,10 +42,10 @@ "", "", }, - link = "opencv_quality@.408" + link = "opencv_quality@.409" ), @Platform(value = "ios", preload = "libopencv_quality"), - @Platform(value = "windows", link = "opencv_quality481") + @Platform(value = "windows", link = "opencv_quality490") }, target = "org.bytedeco.opencv.opencv_quality", global = "org.bytedeco.opencv.global.opencv_quality" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java index ea8adf7b9ba..d4f19d0d00d 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_rapid.java @@ -31,9 +31,9 @@ @Properties( inherit = opencv_calib3d.class, value = { - @Platform(include = "", link = "opencv_rapid@.408"), + @Platform(include = "", link = "opencv_rapid@.409"), @Platform(value = "ios", preload = "libopencv_rapid"), - @Platform(value = "windows", link = "opencv_rapid481") + @Platform(value = "windows", link = "opencv_rapid490") }, target = "org.bytedeco.opencv.opencv_rapid", global = "org.bytedeco.opencv.global.opencv_rapid" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java index e2eb4a7a49b..1274dcd328c 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_saliency.java @@ -37,10 +37,10 @@ "", "" }, - link = "opencv_saliency@.408" + link = "opencv_saliency@.409" ), @Platform(value = "ios", preload = "libopencv_saliency"), - @Platform(value = "windows", link = "opencv_saliency481") + @Platform(value = "windows", link = "opencv_saliency490") }, target = "org.bytedeco.opencv.opencv_saliency", global = "org.bytedeco.opencv.global.opencv_saliency" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java index a3dc826195e..ecd3b65f5bb 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_shape.java @@ -37,9 +37,9 @@ value = { @Platform(include = { "", "", "", - "", ""}, link = "opencv_shape@.408"), + "", ""}, link = "opencv_shape@.409"), @Platform(value = "ios", preload = "libopencv_shape"), - @Platform(value = "windows", link = "opencv_shape481")}, + @Platform(value = "windows", link = "opencv_shape490")}, target = "org.bytedeco.opencv.opencv_shape", global = "org.bytedeco.opencv.global.opencv_shape" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java index 8d6a6dc5345..fb403c42ab0 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_stitching.java @@ -40,11 +40,11 @@ "", "", "", "", "", "", "", "", ""}, - link = "opencv_stitching@.408", preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", - "opencv_cudaimgproc@.408", "opencv_cudawarping@.408", "opencv_cudafeatures2d@.408", "opencv_cudalegacy@.408"}), + link = "opencv_stitching@.409", preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", + "opencv_cudaimgproc@.409", "opencv_cudawarping@.409", "opencv_cudafeatures2d@.409", "opencv_cudalegacy@.409"}), @Platform(value = "ios", preload = "libopencv_stitching"), - @Platform(value = "windows", link = "opencv_stitching481", preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", - "opencv_cudaimgproc481", "opencv_cudawarping481", "opencv_cudafeatures2d481", "opencv_cudalegacy481"})}, + @Platform(value = "windows", link = "opencv_stitching490", preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", + "opencv_cudaimgproc490", "opencv_cudawarping490", "opencv_cudafeatures2d490", "opencv_cudalegacy490"})}, target = "org.bytedeco.opencv.opencv_stitching", global = "org.bytedeco.opencv.global.opencv_stitching" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java index 3a157883f68..16e98f77d18 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_structured_light.java @@ -38,10 +38,10 @@ "", "", }, - link = "opencv_structured_light@.408" + link = "opencv_structured_light@.409" ), @Platform(value = "ios", preload = "libopencv_structured_light"), - @Platform(value = "windows", link = "opencv_structured_light481") + @Platform(value = "windows", link = "opencv_structured_light490") }, target = "org.bytedeco.opencv.opencv_structured_light", global = "org.bytedeco.opencv.global.opencv_structured_light" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java index 3d9c186744c..75df34c122b 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_superres.java @@ -35,14 +35,14 @@ @Properties( inherit = {opencv_objdetect.class, opencv_optflow.class}, value = { - @Platform(not = "ios", include = {"", ""}, link = "opencv_superres@.408", - preload = {"opencv_cuda@.408", "opencv_cudacodec@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", - "opencv_cudaimgproc@.408", "opencv_cudafeatures2d@.408", "opencv_cudalegacy@.408", - "opencv_cudaoptflow@.408", "opencv_cudawarping@.408"}), - @Platform(value = "windows", link = "opencv_superres481", - preload = {"opencv_cuda481", "opencv_cudacodec481", "opencv_cudaarithm481", "opencv_cudafilters481", - "opencv_cudaimgproc481", "opencv_cudafeatures2d481", "opencv_cudalegacy481", - "opencv_cudaoptflow481", "opencv_cudawarping481"})}, + @Platform(not = "ios", include = {"", ""}, link = "opencv_superres@.409", + preload = {"opencv_cuda@.409", "opencv_cudacodec@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", + "opencv_cudaimgproc@.409", "opencv_cudafeatures2d@.409", "opencv_cudalegacy@.409", + "opencv_cudaoptflow@.409", "opencv_cudawarping@.409"}), + @Platform(value = "windows", link = "opencv_superres490", + preload = {"opencv_cuda490", "opencv_cudacodec490", "opencv_cudaarithm490", "opencv_cudafilters490", + "opencv_cudaimgproc490", "opencv_cudafeatures2d490", "opencv_cudalegacy490", + "opencv_cudaoptflow490", "opencv_cudawarping490"})}, target = "org.bytedeco.opencv.opencv_superres", global = "org.bytedeco.opencv.global.opencv_superres" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java index 6c5a79f95f9..94fefc89ecc 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_text.java @@ -37,9 +37,9 @@ inherit = {opencv_dnn.class, opencv_features2d.class, opencv_ml.class}, value = { @Platform(include = {"", "", "", "opencv2/text/textDetector.hpp"}, - link = "opencv_text@.408"), + link = "opencv_text@.409"), @Platform(value = "ios", preload = "libopencv_text"), - @Platform(value = "windows", link = "opencv_text481")}, + @Platform(value = "windows", link = "opencv_text490")}, target = "org.bytedeco.opencv.opencv_text", global = "org.bytedeco.opencv.global.opencv_text" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java index a339201665a..4e90822e224 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_tracking.java @@ -43,10 +43,10 @@ // "", // "", }, - link = "opencv_tracking@.408" + link = "opencv_tracking@.409" ), @Platform(value = "ios", preload = "libopencv_tracking"), - @Platform(value = "windows", link = "opencv_tracking481") + @Platform(value = "windows", link = "opencv_tracking490") }, target = "org.bytedeco.opencv.opencv_tracking", global = "org.bytedeco.opencv.global.opencv_tracking" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java index a6d05c3b190..1971734e349 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_video.java @@ -36,9 +36,9 @@ inherit = {opencv_calib3d.class, opencv_dnn.class}, value = { @Platform(include = {"", /*"",*/ "", - ""}, link = "opencv_video@.408"), + ""}, link = "opencv_video@.409"), @Platform(value = "ios", preload = "libopencv_video"), - @Platform(value = "windows", link = "opencv_video481")}, + @Platform(value = "windows", link = "opencv_video490")}, target = "org.bytedeco.opencv.opencv_video", global = "org.bytedeco.opencv.global.opencv_video" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java index 62b28da7872..6e981477b34 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videoio.java @@ -35,12 +35,12 @@ @Properties( inherit = opencv_imgcodecs.class, value = { - @Platform(include = {/*"",*/ ""}, link = "opencv_videoio@.408"), + @Platform(include = {/*"",*/ ""}, link = "opencv_videoio@.409"), @Platform(value = "android", preload = { "native_camera_r2.2.0", "native_camera_r2.3.4", "native_camera_r3.0.1", "native_camera_r4.0.0", "native_camera_r4.0.3", "native_camera_r4.1.1", "native_camera_r4.2.0", "native_camera_r4.3.0", "native_camera_r4.4.0"}), @Platform(value = "ios", preload = "libopencv_videoio"), - @Platform(value = "windows", link = "opencv_videoio481", preload = {"opencv_ffmpeg481", "opencv_ffmpeg481_64"})}, + @Platform(value = "windows", link = "opencv_videoio490", preload = {"opencv_ffmpeg490", "opencv_ffmpeg490_64"})}, target = "org.bytedeco.opencv.opencv_videoio", global = "org.bytedeco.opencv.global.opencv_videoio" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java index e0997c85374..c91545a7c45 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_videostab.java @@ -45,15 +45,15 @@ "", "", "", "", "", "", "", "", "", - "", ""}, link = "opencv_videostab@.408", - preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408", "opencv_cudafilters@.408", - "opencv_cudaimgproc@.408", "opencv_cudafeatures2d@.408", "opencv_cudalegacy@.408", - "opencv_cudaoptflow@.408", "opencv_cudawarping@.408"}), + "", ""}, link = "opencv_videostab@.409", + preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409", "opencv_cudafilters@.409", + "opencv_cudaimgproc@.409", "opencv_cudafeatures2d@.409", "opencv_cudalegacy@.409", + "opencv_cudaoptflow@.409", "opencv_cudawarping@.409"}), @Platform(value = "ios", preload = "libopencv_videostab"), - @Platform(value = "windows", link = "opencv_videostab481", - preload = {"opencv_cuda481", "opencv_cudaarithm481", "opencv_cudafilters481", - "opencv_cudaimgproc481", "opencv_cudafeatures2d481", "opencv_cudalegacy481", - "opencv_cudaoptflow481", "opencv_cudawarping481"})}, + @Platform(value = "windows", link = "opencv_videostab490", + preload = {"opencv_cuda490", "opencv_cudaarithm490", "opencv_cudafilters490", + "opencv_cudaimgproc490", "opencv_cudafeatures2d490", "opencv_cudalegacy490", + "opencv_cudaoptflow490", "opencv_cudawarping490"})}, target = "org.bytedeco.opencv.opencv_videostab", global = "org.bytedeco.opencv.global.opencv_videostab" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java index 2a0883b817c..6f415a55583 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_wechat_qrcode.java @@ -33,10 +33,10 @@ value = { @Platform( include = "", - link = "opencv_wechat_qrcode@.408" + link = "opencv_wechat_qrcode@.409" ), @Platform(value = "ios", preload = "libopencv_wechat_qrcode"), - @Platform(value = "windows", link = "opencv_wechat_qrcode481") + @Platform(value = "windows", link = "opencv_wechat_qrcode490") }, target = "org.bytedeco.opencv.opencv_wechat_qrcode", global = "org.bytedeco.opencv.global.opencv_wechat_qrcode" diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java index 5f178a333be..c07d9d565ab 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xfeatures2d.java @@ -36,11 +36,11 @@ @Properties( inherit = {opencv_ml.class, opencv_shape.class}, value = { - @Platform(include = {"", ""}, link = "opencv_xfeatures2d@.408", - preload = {"opencv_cuda@.408", "opencv_cudaarithm@.408"}), + @Platform(include = {"", ""}, link = "opencv_xfeatures2d@.409", + preload = {"opencv_cuda@.409", "opencv_cudaarithm@.409"}), @Platform(value = "ios", preload = "libopencv_xfeatures2d"), - @Platform(value = "windows", link = "opencv_xfeatures2d481", - preload = {"opencv_cuda481", "opencv_cudaarithm481"})}, + @Platform(value = "windows", link = "opencv_xfeatures2d490", + preload = {"opencv_cuda490", "opencv_cudaarithm490"})}, target = "org.bytedeco.opencv.opencv_xfeatures2d", global = "org.bytedeco.opencv.global.opencv_xfeatures2d" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java index 4d192198ddd..e8b6f96e7af 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_ximgproc.java @@ -41,9 +41,9 @@ "opencv2/ximgproc/slic.hpp", "opencv2/ximgproc/lsc.hpp", "opencv2/ximgproc/paillou_filter.hpp", "opencv2/ximgproc/fast_line_detector.hpp", "opencv2/ximgproc/deriche_filter.hpp", "opencv2/ximgproc/peilin.hpp", "opencv2/ximgproc/fourier_descriptors.hpp", "opencv2/ximgproc/ridgefilter.hpp", "opencv2/ximgproc/brightedges.hpp", "opencv2/ximgproc/run_length_morphology.hpp", "opencv2/ximgproc/edgepreserving_filter.hpp", - "opencv2/ximgproc/color_match.hpp", "opencv2/ximgproc/radon_transform.hpp", "opencv2/ximgproc/find_ellipses.hpp"}, link = "opencv_ximgproc@.408"), + "opencv2/ximgproc/color_match.hpp", "opencv2/ximgproc/radon_transform.hpp", "opencv2/ximgproc/find_ellipses.hpp"}, link = "opencv_ximgproc@.409"), @Platform(value = "ios", preload = "libopencv_ximgproc"), - @Platform(value = "windows", link = "opencv_ximgproc481")}, + @Platform(value = "windows", link = "opencv_ximgproc490")}, target = "org.bytedeco.opencv.opencv_ximgproc", global = "org.bytedeco.opencv.global.opencv_ximgproc" ) diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java index 008fc91b165..438f8be7d83 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_xphoto.java @@ -41,10 +41,10 @@ "", "", }, - link = "opencv_xphoto@.408" + link = "opencv_xphoto@.409" ), @Platform(value = "ios", preload = "libopencv_xphoto"), - @Platform(value = "windows", link = "opencv_xphoto481") + @Platform(value = "windows", link = "opencv_xphoto490") }, target = "org.bytedeco.opencv.opencv_xphoto", global = "org.bytedeco.opencv.global.opencv_xphoto"