Adjust to the OpenCV 4.11.0

Author: twistedfall

.github/workflows/opencv-rust.yml

@@ -15,12 +15,12 @@ jobs:
           - ubuntu-22.04
           - macos-14
         opencv-version:
-          - 4.10.0
+          - 4.11.0
         linkage:
           - dynamic
         include:
           - os-image: ubuntu-22.04
-            opencv-version: 4.10.0
+            opencv-version: 4.11.0
             linkage: static
           - os-image: ubuntu-22.04
             opencv-version: 3.4.20
@@ -142,7 +142,7 @@ jobs:
   msrv:
     runs-on: ubuntu-20.04
     env:
-      OPENCV_VERSION: 4.10.0
+      OPENCV_VERSION: 4.11.0
       SCCACHE_GHA_ENABLED: "true"
       RUSTC_WRAPPER: "sccache"
       CMAKE_C_COMPILER_LAUNCHER: "sccache"

ci/script.sh

@@ -50,7 +50,7 @@ elif [[ "$os_family" == "macOS" ]]; then
 			export OPENCV_LINK_LIBS="framework=opencv2,framework=OpenCL,framework=Cocoa,framework=Accelerate,framework=AVFoundation,framework=CoreGraphics,framework=CoreMedia,framework=CoreVideo,framework=QuartzCore,clang_rt.osx"
 		else
 			export OPENCV_LINK_PATHS="$opencv_build_path,$clang_dir/lib/darwin,$opencv_build_path/build/build-$(uname -m)-macosx/install/lib/"
-			export OPENCV_LINK_LIBS="framework=opencv2,framework=OpenCL,framework=Cocoa,framework=Accelerate,framework=AVFoundation,framework=CoreGraphics,framework=CoreMedia,framework=CoreVideo,framework=QuartzCore,clang_rt.osx,OrbbecSDK"
+			export OPENCV_LINK_LIBS="framework=opencv2,framework=OpenCL,framework=Cocoa,framework=Accelerate,framework=AVFoundation,framework=CoreGraphics,framework=CoreMedia,framework=CoreVideo,framework=QuartzCore,clang_rt.osx"
 		fi
 		export OPENCV_INCLUDE_PATHS="$opencv_build_path"
 	fi
@@ -71,9 +71,9 @@ elif [[ "$os_family" == "Linux" ]]; then
 fi
 
 # remove tests and examples that require the latest OpenCV version so that they don't fail due to missing modules
-if [[ "${OPENCV_VERSION:-}" != "4.10.0" ]]; then
+if [[ "${OPENCV_VERSION:-}" != "4.11.0" ]]; then
 	rm -vf tests/*_only_latest_opencv.rs
-	rm -vf examples/dnn_face_detect.rs examples/text_detection.rs examples/camera_calibration.rs
+	rm -vf examples/dnn_face_detect.rs examples/text_detection.rs examples/camera_calibration.rs examples/hough_circle.rs
 fi
 
 echo "=== Current directory: $(pwd)"

examples/hough_circle.rs

@@ -4,7 +4,7 @@ use std::env::args;
 use std::sync::atomic::{AtomicI32, Ordering};
 use std::sync::Arc;
 
-use opencv::core::{find_file, Point, Point2i, Size2i, Vec3f, Vector, BORDER_DEFAULT};
+use opencv::core::{find_file, AlgorithmHint, Point, Point2i, Size2i, Vec3f, Vector, BORDER_DEFAULT};
 use opencv::highgui::{create_trackbar, imshow, named_window, wait_key, WINDOW_AUTOSIZE};
 use opencv::imgcodecs::{imread, IMREAD_COLOR};
 use opencv::imgproc::{circle, cvt_color_def, gaussian_blur, hough_circles, COLOR_BGR2GRAY, HOUGH_GRADIENT};
@@ -89,7 +89,15 @@ fn main() -> Result<()> {
 
 	// Reduce the noise so we avoid false circle detection
 	let mut src_gray_blur = Mat::default();
-	gaussian_blur(&src_gray, &mut src_gray_blur, Size2i::new(9, 9), 2.0, 2.0, BORDER_DEFAULT)?;
+	gaussian_blur(
+		&src_gray,
+		&mut src_gray_blur,
+		Size2i::new(9, 9),
+		2.0,
+		2.0,
+		BORDER_DEFAULT,
+		AlgorithmHint::ALGO_HINT_DEFAULT,
+	)?;
 
 	// Declare and initialize both parameters that are subjects to change
 	let canny_threshold: Arc<AtomicI32> = Arc::new(AtomicI32::new(CANNY_THRESHOLD_INIT_VAL));

examples/text_detection.rs

@@ -104,7 +104,7 @@ pub fn main() -> Result<()> {
 			// Text Recognition
 			let rec_input = if !imread_rgb {
 				let mut rec_input = Mat::default();
-				imgproc::cvt_color(&frame, &mut rec_input, imgproc::COLOR_BGR2GRAY, 0)?;
+				imgproc::cvt_color_def(&frame, &mut rec_input, imgproc::COLOR_BGR2GRAY)?;
 				Some(rec_input)
 			} else {
 				None