Skip to content

Commit

Permalink
0.70.0 Regenerate bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
twistedfall committed Oct 8, 2022
1 parent 94b0d1e commit 007de72
Show file tree
Hide file tree
Showing 69 changed files with 348 additions and 280 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
@@ -1,3 +1,6 @@
* 0.70.0
* Internal improvements and reorganization

* 0.69.0
* Fix building with clang-15.
* Rename `distort_points` to `fisheye_distort_points` for consistency.
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Expand Up @@ -6,7 +6,7 @@ repository = "https://github.com/twistedfall/opencv-rust"
readme = "README.md"
keywords = ["opencv", "vision"]
license = "MIT"
version = "0.69.0"
version = "0.70.0"
edition = "2018"
authors = ["Pro <twisted.fall@gmail.com>", "Mathieu Poumeyrol <kali@zoy.org>"]
autoexamples = false # not all examples compile on just any system
Expand Down Expand Up @@ -60,7 +60,7 @@ once_cell = "1"
rgb = { version = "0.8.20", features = ["argb"], optional = true }

[build-dependencies]
binding-generator = { package = "opencv-binding-generator", version = "0.47.1", path = "binding-generator" }
binding-generator = { package = "opencv-binding-generator", version = "0.48.0", path = "binding-generator" }
cc = { version = "1", features = ["parallel"] }
clang = { version = "2", features = ["clang_6_0", "runtime"] }
dunce = "1"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -15,7 +15,7 @@ generation) are installed in your system.

Update your Cargo.toml
```toml
opencv = "0.68"
opencv = "0.70"
```

Import prelude
Expand Down
2 changes: 1 addition & 1 deletion binding-generator/Cargo.toml
Expand Up @@ -2,7 +2,7 @@
name = "opencv-binding-generator"
description = "Binding generator for opencv crate"
repository = "https://github.com/twistedfall/opencv-rust"
version = "0.47.1"
version = "0.48.0"
license = "MIT"
authors = ["Pro <twisted.fall@gmail.com>"]
edition = "2018"
Expand Down
3 changes: 2 additions & 1 deletion src/opencv/hub/alphamat.rs
Expand Up @@ -2,10 +2,11 @@
unused_parens,
clippy::excessive_precision,
clippy::missing_safety_doc,
clippy::not_unsafe_ptr_arg_deref,
clippy::should_implement_trait,
clippy::too_many_arguments,
clippy::unused_unit,
clippy::let_unit_value,
clippy::derive_partial_eq_without_eq,
)]
//! # Alpha Matting
//! Alpha matting is used to extract a foreground object with soft boundaries from a background image.
Expand Down
9 changes: 5 additions & 4 deletions src/opencv/hub/aruco.rs
Expand Up @@ -2,10 +2,11 @@
unused_parens,
clippy::excessive_precision,
clippy::missing_safety_doc,
clippy::not_unsafe_ptr_arg_deref,
clippy::should_implement_trait,
clippy::too_many_arguments,
clippy::unused_unit,
clippy::let_unit_value,
clippy::derive_partial_eq_without_eq,
)]
//! # ArUco Marker Detection
//! This module is dedicated to square fiducial markers (also known as Augmented Reality Markers)
Expand Down Expand Up @@ -103,7 +104,7 @@ pub const DICT_APRILTAG_36h11: i32 = 20;
/// 6x6 bits, minimum hamming distance between any two codes = 3, 1024 codes
pub const DICT_ARUCO_ORIGINAL: i32 = 16;
#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum CornerRefineMethod {
/// Tag and corners detection based on the ArUco approach
CORNER_REFINE_NONE = 0,
Expand All @@ -122,7 +123,7 @@ opencv_type_enum! { crate::aruco::CornerRefineMethod }
/// - DICT_ARUCO_ORIGINAL: standard ArUco Library Markers. 1024 markers, 5x5 bits, 0 minimum
/// distance
#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum PREDEFINED_DICTIONARY_NAME {
/// 4x4 bits, minimum hamming distance between any two codes = 4, 50 codes
DICT_4X4_50 = 0,
Expand Down Expand Up @@ -178,7 +179,7 @@ opencv_type_enum! { crate::aruco::PREDEFINED_DICTIONARY_NAME }
/// ## See also
/// estimatePoseSingleMarkers(), @ref tutorial_aruco_detection
#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum PatternPos {
/// The marker coordinate system is centered on the middle of the marker.
/// The coordinates of the four corners (CCW order) of the marker in its own coordinate system are:
Expand Down
5 changes: 3 additions & 2 deletions src/opencv/hub/barcode.rs
Expand Up @@ -2,10 +2,11 @@
unused_parens,
clippy::excessive_precision,
clippy::missing_safety_doc,
clippy::not_unsafe_ptr_arg_deref,
clippy::should_implement_trait,
clippy::too_many_arguments,
clippy::unused_unit,
clippy::let_unit_value,
clippy::derive_partial_eq_without_eq,
)]
//! # Barcode detecting and decoding methods
use crate::{mod_prelude::*, core, sys, types};
Expand All @@ -20,7 +21,7 @@ pub const UPC_A: i32 = 3;
pub const UPC_E: i32 = 4;
pub const UPC_EAN_EXTENSION: i32 = 5;
#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum BarcodeType {
NONE = 0,
EAN_8 = 1,
Expand Down
5 changes: 3 additions & 2 deletions src/opencv/hub/bgsegm.rs
Expand Up @@ -2,10 +2,11 @@
unused_parens,
clippy::excessive_precision,
clippy::missing_safety_doc,
clippy::not_unsafe_ptr_arg_deref,
clippy::should_implement_trait,
clippy::too_many_arguments,
clippy::unused_unit,
clippy::let_unit_value,
clippy::derive_partial_eq_without_eq,
)]
//! # Improved Background-Foreground Segmentation Methods
use crate::{mod_prelude::*, core, sys, types};
Expand All @@ -16,7 +17,7 @@ pub mod prelude {
pub const LSBP_CAMERA_MOTION_COMPENSATION_LK: i32 = 1;
pub const LSBP_CAMERA_MOTION_COMPENSATION_NONE: i32 = 0;
#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum LSBPCameraMotionCompensation {
LSBP_CAMERA_MOTION_COMPENSATION_NONE = 0,
LSBP_CAMERA_MOTION_COMPENSATION_LK = 1,
Expand Down
3 changes: 2 additions & 1 deletion src/opencv/hub/bioinspired.rs
Expand Up @@ -2,10 +2,11 @@
unused_parens,
clippy::excessive_precision,
clippy::missing_safety_doc,
clippy::not_unsafe_ptr_arg_deref,
clippy::should_implement_trait,
clippy::too_many_arguments,
clippy::unused_unit,
clippy::let_unit_value,
clippy::derive_partial_eq_without_eq,
)]
//! # Biologically inspired vision models and derivated tools
//!
Expand Down
21 changes: 11 additions & 10 deletions src/opencv/hub/calib3d.rs
Expand Up @@ -2,10 +2,11 @@
unused_parens,
clippy::excessive_precision,
clippy::missing_safety_doc,
clippy::not_unsafe_ptr_arg_deref,
clippy::should_implement_trait,
clippy::too_many_arguments,
clippy::unused_unit,
clippy::let_unit_value,
clippy::derive_partial_eq_without_eq,
)]
//! # Camera Calibration and 3D Reconstruction
//!
Expand Down Expand Up @@ -413,7 +414,7 @@ pub const USAC_PARALLEL: i32 = 33;
/// USAC, sorted points, runs PROSAC
pub const USAC_PROSAC: i32 = 37;
#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum CirclesGridFinderParameters_GridType {
SYMMETRIC_GRID = 0,
ASYMMETRIC_GRID = 1,
Expand All @@ -422,7 +423,7 @@ pub enum CirclesGridFinderParameters_GridType {
opencv_type_enum! { crate::calib3d::CirclesGridFinderParameters_GridType }

#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum HandEyeCalibrationMethod {
/// A New Technique for Fully Autonomous and Efficient 3D Robotics Hand/Eye Calibration [Tsai89](https://docs.opencv.org/4.6.0/d0/de3/citelist.html#CITEREF_Tsai89)
CALIB_HAND_EYE_TSAI = 0,
Expand All @@ -439,7 +440,7 @@ pub enum HandEyeCalibrationMethod {
opencv_type_enum! { crate::calib3d::HandEyeCalibrationMethod }

#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum LocalOptimMethod {
LOCAL_OPTIM_NULL = 0,
LOCAL_OPTIM_INNER_LO = 1,
Expand All @@ -451,7 +452,7 @@ pub enum LocalOptimMethod {
opencv_type_enum! { crate::calib3d::LocalOptimMethod }

#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum NeighborSearchMethod {
NEIGH_FLANN_KNN = 0,
NEIGH_GRID = 1,
Expand All @@ -461,7 +462,7 @@ pub enum NeighborSearchMethod {
opencv_type_enum! { crate::calib3d::NeighborSearchMethod }

#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum RobotWorldHandEyeCalibrationMethod {
/// Solving the robot-world/hand-eye calibration problem using the kronecker product [Shah2013SolvingTR](https://docs.opencv.org/4.6.0/d0/de3/citelist.html#CITEREF_Shah2013SolvingTR)
CALIB_ROBOT_WORLD_HAND_EYE_SHAH = 0,
Expand All @@ -472,7 +473,7 @@ pub enum RobotWorldHandEyeCalibrationMethod {
opencv_type_enum! { crate::calib3d::RobotWorldHandEyeCalibrationMethod }

#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum SamplingMethod {
SAMPLING_UNIFORM = 0,
SAMPLING_PROGRESSIVE_NAPSAC = 1,
Expand All @@ -483,7 +484,7 @@ pub enum SamplingMethod {
opencv_type_enum! { crate::calib3d::SamplingMethod }

#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum ScoreMethod {
SCORE_METHOD_RANSAC = 0,
SCORE_METHOD_MSAC = 1,
Expand All @@ -494,7 +495,7 @@ pub enum ScoreMethod {
opencv_type_enum! { crate::calib3d::ScoreMethod }

#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum SolvePnPMethod {
/// Pose refinement using non-linear Levenberg-Marquardt minimization scheme [Madsen04](https://docs.opencv.org/4.6.0/d0/de3/citelist.html#CITEREF_Madsen04) [Eade13](https://docs.opencv.org/4.6.0/d0/de3/citelist.html#CITEREF_Eade13)
///
Expand Down Expand Up @@ -540,7 +541,7 @@ opencv_type_enum! { crate::calib3d::SolvePnPMethod }

/// cv::undistort mode
#[repr(C)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum UndistortTypes {
PROJ_SPHERICAL_ORTHO = 0,
PROJ_SPHERICAL_EQRECT = 1,
Expand Down
3 changes: 2 additions & 1 deletion src/opencv/hub/ccalib.rs
Expand Up @@ -2,10 +2,11 @@
unused_parens,
clippy::excessive_precision,
clippy::missing_safety_doc,
clippy::not_unsafe_ptr_arg_deref,
clippy::should_implement_trait,
clippy::too_many_arguments,
clippy::unused_unit,
clippy::let_unit_value,
clippy::derive_partial_eq_without_eq,
)]
//! # Custom Calibration Pattern for 3D reconstruction
use crate::{mod_prelude::*, core, sys, types};
Expand Down

0 comments on commit 007de72

Please sign in to comment.