Adjust to OpenCV 4.5.4 and 3.4.16
MODIFY
.github/workflows/opencv-rust.yml
.github/workflows/opencv-rust.yml
@@ -22,13 +22,13 @@ jobs:
- stable
- beta
version:
- - opencv: 3.4.15
- - opencv: 4.5.3
+ - opencv: 3.4.16
+ - opencv: 4.5.4
exclude:
- os:
family: osx
version:
- opencv: 3.4.15
+ opencv: 3.4.16
runs-on: ${{ matrix.os.image }}
env:
OS_FAMILY: ${{ matrix.os.family }}
@@ -84,6 +84,7 @@ jobs:
OS_FAMILY: ${{ matrix.os.family }}
RUST_TOOLCHAIN: ${{ matrix.rust }}
VCPKG_OPENCV_VERSION: ${{ matrix.version.vcpkg }}
+ VCPKG_TREE_COMMIT: 28af86cc15b53c09de6c0457e0ac737795e497e2
steps:
- uses: actions/checkout@v2
@@ -133,10 +134,10 @@ jobs:
opencv: 3.2.0
brew: "excluded"
- branch: 3.4
- opencv: 3.4.14
+ opencv: 3.4.15
brew: "@3"
- branch: 4
- opencv: 4.5.2
+ opencv: 4.5.3
brew: "@4"
exclude:
- os:

MODIFY
binding-generator/src/settings.rs
binding-generator/src/settings.rs
@@ -37,8 +37,9 @@ pub static FUNC_RENAME: Lazy<HashMap<&str, &str>> = Lazy::new(|| hashmap! {
"cv_fisheye_stereoRectify_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const_SizeR_const__InputArrayR_const__InputArrayR_const__OutputArrayR_const__OutputArrayR_const__OutputArrayR_const__OutputArrayR_const__OutputArrayR_int_const_SizeR_double_double" => "fisheye_+",
"cv_fisheye_undistortImage_const__InputArrayR_const__OutputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const_SizeR" => "fisheye_+",
"cv_fisheye_undistortPoints_const__InputArrayR_const__OutputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR" => "fisheye_+",
- "cv_recoverPose_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__OutputArrayR_const__OutputArrayR_const__InputOutputArrayR" => "+_camera",
- "cv_recoverPose_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__OutputArrayR_const__OutputArrayR_double_const__InputOutputArrayR_const__OutputArrayR" => "+_camera_with_points",
+ "cv_recoverPose_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__OutputArrayR_const__OutputArrayR_const__InputOutputArrayR" => "+_estimated",
+ "cv_recoverPose_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__OutputArrayR_const__OutputArrayR_double_const__InputOutputArrayR_const__OutputArrayR" => "+_triangulated",
+ "cv_recoverPose_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__InputArrayR_const__OutputArrayR_const__OutputArrayR_const__OutputArrayR_int_double_double_const__InputOutputArrayR" => "+_2_cameras",
// ### core ###
"cv_Algorithm_write_const_const_Ptr_FileStorage_R_const_StringR" => "+_with_name",
@@ -350,6 +351,8 @@ pub static FUNC_RENAME: Lazy<HashMap<&str, &str>> = Lazy::new(|| hashmap! {
"cv_dnn_Layer_finalize_const_vector_Mat_R_vector_Mat_R" => "+_mat_to",
"cv_dnn_Layer_forward_vector_MatX_R_vector_Mat_R_vector_Mat_R" => "+_mat",
"cv_dnn_NMSBoxes_const_vector_Rect2d_R_const_vector_float_R_const_float_const_float_vector_int_R_const_float_const_int" => "+_f64",
+ "cv_dnn_Net_addLayerToPrev_const_StringR_const_StringR_const_intR_LayerParamsR" => "+_type",
+ "cv_dnn_Net_addLayer_const_StringR_const_StringR_const_intR_LayerParamsR" => "+_type",
"cv_dnn_Net_connect_String_String" => "+_first_second",
"cv_dnn_Net_forward_const_StringR" => "+_single",
"cv_dnn_Net_forward_const__OutputArrayR_const_StringR" => "+_layer",

MODIFY
ci/install-bionic-vcpkg.sh
ci/install-bionic-vcpkg.sh
@@ -12,7 +12,7 @@ fi
pushd "$VCPKG_ROOT"
git fetch --all --prune --tags
git checkout .
-git checkout 409c1c4a05f853e3204b5914e693221576525cd6
+git checkout "$VCPKG_TREE_COMMIT"
./bootstrap-vcpkg.sh -disableMetrics
#./vcpkg integrate install
echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-linux.cmake

MODIFY
ci/install-windows-chocolatey.sh
ci/install-windows-chocolatey.sh
set -vex
-choco install -y llvm --version 12.0.1
+choco install -y llvm --version 13.0.0
choco install -y opencv --version "$CHOCO_OPENCV_VERSION"

MODIFY
ci/install-windows-vcpkg.sh
ci/install-windows-vcpkg.sh
@@ -13,7 +13,7 @@ fi
pushd "$VCPKG_ROOT"
git fetch --all --prune --tags
git checkout .
-git checkout 409c1c4a05f853e3204b5914e693221576525cd6
+git checkout "$VCPKG_TREE_COMMIT"
./bootstrap-vcpkg.sh -disableMetrics
#./vcpkg integrate install
echo "set(VCPKG_BUILD_TYPE release)" >> "$VCPKG_ROOT/triplets/x64-windows.cmake"
@@ -21,7 +21,7 @@ echo "set(VCPKG_BUILD_TYPE release)" >> "$VCPKG_ROOT/triplets/x64-windows-static
echo "set(VCPKG_BUILD_TYPE release)" >> "$VCPKG_ROOT/triplets/x86-windows.cmake"
export VCPKG_DEFAULT_TRIPLET=x64-windows
#./vcpkg install llvm # takes very long time
-choco install -y llvm --version 12.0.1
+choco install -y llvm --version 13.0.0
"$VCPKG_ROOT/vcpkg" upgrade --no-dry-run
"$VCPKG_ROOT/vcpkg" install --recurse "opencv${VCPKG_OPENCV_VERSION}[contrib,nonfree]"
popd

Adjust to OpenCV 4.5.4 and 3.4.16