0.9.0 regenerate bindings
MODIFY
Cargo.toml
Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/twistedfall/opencv-rust"
readme = "README.md"
keywords = [ "opencv", "vision" ]
license = "MIT"
-version = "0.8.0"
+version = "0.9.0"
edition = "2018"
authors = ["Mathieu Poumeyrol <kali@zoy.org>"]
build = "build.rs"

MODIFY
src/hub/calib3d.rs
src/hub/calib3d.rs
@@ -897,7 +897,7 @@ pub fn draw_frame_axes(image: &mut core::Mat, camera_matrix: &core::Mat, dist_co
/// * max_iters: 2000
/// * confidence: 0.99
/// * refine_iters: 10
-pub fn estimate_affine2_d(from: &core::Mat, to: &core::Mat, inliers: &mut core::Mat, method: i32, ransac_reproj_threshold: f64, max_iters: size_t, confidence: f64, refine_iters: size_t) -> Result<core::Mat> {
+pub fn estimate_affine_2d(from: &core::Mat, to: &core::Mat, inliers: &mut core::Mat, method: i32, ransac_reproj_threshold: f64, max_iters: size_t, confidence: f64, refine_iters: size_t) -> Result<core::Mat> {
unsafe { sys::cv_estimateAffine2D_Mat_Mat_Mat_int_double_size_t_double_size_t(from.as_raw_Mat(), to.as_raw_Mat(), inliers.as_raw_Mat(), method, ransac_reproj_threshold, max_iters, confidence, refine_iters) }.into_result().map(|x| core::Mat { ptr: x })
}
@@ -1011,7 +1011,7 @@ pub fn estimate_affine_3d(src: &core::Mat, dst: &core::Mat, out: &mut core::Mat,
/// * max_iters: 2000
/// * confidence: 0.99
/// * refine_iters: 10
-pub fn estimate_affine_partial2_d(from: &core::Mat, to: &core::Mat, inliers: &mut core::Mat, method: i32, ransac_reproj_threshold: f64, max_iters: size_t, confidence: f64, refine_iters: size_t) -> Result<core::Mat> {
+pub fn estimate_affine_partial_2d(from: &core::Mat, to: &core::Mat, inliers: &mut core::Mat, method: i32, ransac_reproj_threshold: f64, max_iters: size_t, confidence: f64, refine_iters: size_t) -> Result<core::Mat> {
unsafe { sys::cv_estimateAffinePartial2D_Mat_Mat_Mat_int_double_size_t_double_size_t(from.as_raw_Mat(), to.as_raw_Mat(), inliers.as_raw_Mat(), method, ransac_reproj_threshold, max_iters, confidence, refine_iters) }.into_result().map(|x| core::Mat { ptr: x })
}
@@ -1815,7 +1815,7 @@ pub fn get_valid_disparity_roi(roi1: core::Rect, roi2: core::Rect, min_disparity
///
/// ## C++ default parameters
/// * aspect_ratio: 1.0
-pub fn init_camera_matrix2_d(object_points: &types::VectorOfMat, image_points: &types::VectorOfMat, image_size: core::Size, aspect_ratio: f64) -> Result<core::Mat> {
+pub fn init_camera_matrix_2d(object_points: &types::VectorOfMat, image_points: &types::VectorOfMat, image_size: core::Size, aspect_ratio: f64) -> Result<core::Mat> {
unsafe { sys::cv_initCameraMatrix2D_VectorOfMat_VectorOfMat_Size_double(object_points.as_raw_VectorOfMat(), image_points.as_raw_VectorOfMat(), image_size, aspect_ratio) }.into_result().map(|x| core::Mat { ptr: x })
}

MODIFY
src/hub/core.rs
src/hub/core.rs
@@ -1903,9 +1903,7 @@ pub fn have_open_vx() -> Result<bool> {
/// * nsrc: number of matrices in src.
/// * dst: output array. It has the same number of rows and depth as the src, and the sum of cols of the src.
/// ## See also
-/// cv::vconcat(const Mat*, size_t, OutputArray), ## See also
-/// cv::vconcat(InputArrayOfArrays, OutputArray) and ## See also
-/// cv::vconcat(InputArray, InputArray, OutputArray)
+/// cv::vconcat(const Mat*, size_t, OutputArray), cv::vconcat(InputArrayOfArrays, OutputArray) and cv::vconcat(InputArray, InputArray, OutputArray)
///
/// ## Overloaded parameters
///
@@ -1954,9 +1952,7 @@ pub fn hconcat_2(src1: &core::Mat, src2: &core::Mat, dst: &mut core::Mat) -> Res
/// * nsrc: number of matrices in src.
/// * dst: output array. It has the same number of rows and depth as the src, and the sum of cols of the src.
/// ## See also
-/// cv::vconcat(const Mat*, size_t, OutputArray), ## See also
-/// cv::vconcat(InputArrayOfArrays, OutputArray) and ## See also
-/// cv::vconcat(InputArray, InputArray, OutputArray)
+/// cv::vconcat(const Mat*, size_t, OutputArray), cv::vconcat(InputArrayOfArrays, OutputArray) and cv::vconcat(InputArray, InputArray, OutputArray)
///
/// ## Overloaded parameters
///
@@ -3480,9 +3476,7 @@ pub fn convert_to_va_surface(display: &mut c_void, src: &core::Mat, surface: u32
/// * nsrc: number of matrices in src.
/// * dst: output array. It has the same number of cols and depth as the src, and the sum of rows of the src.
/// ## See also
-/// cv::hconcat(const Mat*, size_t, OutputArray), ## See also
-/// cv::hconcat(InputArrayOfArrays, OutputArray) and ## See also
-/// cv::hconcat(InputArray, InputArray, OutputArray)
+/// cv::hconcat(const Mat*, size_t, OutputArray), cv::hconcat(InputArrayOfArrays, OutputArray) and cv::hconcat(InputArray, InputArray, OutputArray)
///
/// ## Overloaded parameters
///
@@ -3533,9 +3527,7 @@ pub fn vconcat_2(src1: &core::Mat, src2: &core::Mat, dst: &mut core::Mat) -> Res
/// * nsrc: number of matrices in src.
/// * dst: output array. It has the same number of cols and depth as the src, and the sum of rows of the src.
/// ## See also
-/// cv::hconcat(const Mat*, size_t, OutputArray), ## See also
-/// cv::hconcat(InputArrayOfArrays, OutputArray) and ## See also
-/// cv::hconcat(InputArray, InputArray, OutputArray)
+/// cv::hconcat(const Mat*, size_t, OutputArray), cv::hconcat(InputArrayOfArrays, OutputArray) and cv::hconcat(InputArray, InputArray, OutputArray)
///
/// ## Overloaded parameters
///
@@ -4471,8 +4463,8 @@ impl Mat {
/// * cols: Number of columns in a 2D array.
/// * type: Array type. Use CV_8UC1, ..., CV_64FC4 to create 1-4 channel matrices, or
/// CV_8UC(n), ..., CV_64FC(n) to create multi-channel (up to CV_CN_MAX channels) matrices.
- pub fn new_rows_cols(rows: i32, cols: i32, _type: i32) -> Result<core::Mat> {
- unsafe { sys::cv_Mat_Mat_int_int_int(rows, cols, _type) }.into_result().map(|x| core::Mat { ptr: x })
+ pub unsafe fn new_rows_cols(rows: i32, cols: i32, _type: i32) -> Result<core::Mat> {
+ { sys::cv_Mat_Mat_int_int_int(rows, cols, _type) }.into_result().map(|x| core::Mat { ptr: x })
}
/// ## Parameters
@@ -4480,8 +4472,8 @@ impl Mat {
/// number of columns go in the reverse order.
/// * type: Array type. Use CV_8UC1, ..., CV_64FC4 to create 1-4 channel matrices, or
/// CV_8UC(n), ..., CV_64FC(n) to create multi-channel (up to CV_CN_MAX channels) matrices.
- pub fn new_size(size: core::Size, _type: i32) -> Result<core::Mat> {
- unsafe { sys::cv_Mat_Mat_Size_int(size, _type) }.into_result().map(|x| core::Mat { ptr: x })
+ pub unsafe fn new_size(size: core::Size, _type: i32) -> Result<core::Mat> {
+ { sys::cv_Mat_Mat_Size_int(size, _type) }.into_result().map(|x| core::Mat { ptr: x })
}
/// ## Parameters
@@ -4512,8 +4504,8 @@ impl Mat {
/// * sizes: Array of integers specifying an n-dimensional array shape.
/// * type: Array type. Use CV_8UC1, ..., CV_64FC4 to create 1-4 channel matrices, or
/// CV_8UC(n), ..., CV_64FC(n) to create multi-channel (up to CV_CN_MAX channels) matrices.
- pub fn new_nd(sizes: &types::VectorOfint, _type: i32) -> Result<core::Mat> {
- unsafe { sys::cv_Mat_Mat_VectorOfint_int(sizes.as_raw_VectorOfint(), _type) }.into_result().map(|x| core::Mat { ptr: x })
+ pub unsafe fn new_nd(sizes: &types::VectorOfint, _type: i32) -> Result<core::Mat> {
+ { sys::cv_Mat_Mat_VectorOfint_int(sizes.as_raw_VectorOfint(), _type) }.into_result().map(|x| core::Mat { ptr: x })
}
/// ## Parameters

MODIFY
src/hub/imgproc.rs
src/hub/imgproc.rs
@@ -2479,7 +2479,7 @@ pub fn fill_poly(img: &mut core::Mat, pts: &types::VectorOfMat, color: core::Sca
/// * anchor: Point(-1,-1)
/// * delta: 0
/// * border_type: BORDER_DEFAULT
-pub fn filter2_d(src: &core::Mat, dst: &mut core::Mat, ddepth: i32, kernel: &core::Mat, anchor: core::Point, delta: f64, border_type: i32) -> Result<()> {
+pub fn filter_2d(src: &core::Mat, dst: &mut core::Mat, ddepth: i32, kernel: &core::Mat, anchor: core::Point, delta: f64, border_type: i32) -> Result<()> {
unsafe { sys::cv_filter2D_Mat_Mat_int_Mat_Point_double_int(src.as_raw_Mat(), dst.as_raw_Mat(), ddepth, kernel.as_raw_Mat(), anchor, delta, border_type) }.into_result()
}
@@ -3075,7 +3075,7 @@ pub fn get_rect_sub_pix(image: &core::Mat, patch_size: core::Size, center: core:
///
/// ## See also
/// getAffineTransform, warpAffine, transform
-pub fn get_rotation_matrix2_d(center: core::Point2f, angle: f64, scale: f64) -> Result<core::Mat> {
+pub fn get_rotation_matrix_2d(center: core::Point2f, angle: f64, scale: f64) -> Result<core::Mat> {
unsafe { sys::cv_getRotationMatrix2D_Point2f_double_double(center, angle, scale) }.into_result().map(|x| core::Mat { ptr: x })
}

MODIFY
src/hub/sys.rs
src/hub/sys.rs
@@ -86,7 +86,7 @@ pub type cv_return_value_unsigned_long_long = cv_return_value<u64>;
// void
pub type cv_return_value_void = cv_return_value<crate::types::Unit, ()>;
-// cv::QtFont
+// cv::Mat
pub type cv_return_value_void_X = cv_return_value<*mut c_void>;
extern "C" {

0.9.0 regenerate bindings