Skip to content

Commit dd5aac8

Browse files
twistedfalltwistedfall
committed
Update changelog and regen docs
1 parent af28836 commit dd5aac8

File tree

4 files changed

+26
-20
lines changed

4 files changed

+26
-20
lines changed

‎CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
* 0.93.0
2+
* Improve automatic slice detection, e.g. `CommandParser::new()` now calculates `argc` automatically.
3+
* `find_circles_grid` now can take `None` the `blob_detector` argument.
4+
* Rework the handling of static library linkage.
5+
* Allow passing custom clang args via `OPENCV_CLANG_ARGS` environment variable.
6+
17
* 0.92.3
28
* Add an irreversible conversion from `BoxedRefMut` to `BoxedMut`.
39
* Fix handling of arrays of strings, fixes `CommandLineParser` (kudos to niemeyer).

‎docs/calib3d.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3508,11 +3508,11 @@ pub mod calib3d {
35083508
/// * flags: CALIB_CB_SYMMETRIC_GRID
35093509
/// * blob_detector: SimpleBlobDetector::create()
35103510
#[inline]
3511-
pub fn find_circles_grid_1(image: &impl ToInputArray, pattern_size: core::Size, centers: &mut impl ToOutputArray, flags: i32, blob_detector: &core::Ptr<crate::features2d::Feature2D>) -> Result<bool> {
3511+
pub fn find_circles_grid_1(image: &impl ToInputArray, pattern_size: core::Size, centers: &mut impl ToOutputArray, flags: i32, blob_detector: Option<&core::Ptr<crate::features2d::Feature2D>>) -> Result<bool> {
35123512
input_array_arg!(image);
35133513
output_array_arg!(centers);
35143514
return_send!(via ocvrs_return);
3515-
unsafe { sys::cv_findCirclesGrid_const__InputArrayR_Size_const__OutputArrayR_int_const_PtrLFeature2DGR(image.as_raw__InputArray(), &pattern_size, centers.as_raw__OutputArray(), flags, blob_detector.as_raw_PtrOfFeature2D(), ocvrs_return.as_mut_ptr()) };
3515+
unsafe { sys::cv_findCirclesGrid_const__InputArrayR_Size_const__OutputArrayR_int_const_PtrLFeature2DGR(image.as_raw__InputArray(), &pattern_size, centers.as_raw__OutputArray(), flags, blob_detector.map_or(::core::ptr::null(), |blob_detector| blob_detector.as_raw_PtrOfFeature2D()), ocvrs_return.as_mut_ptr()) };
35163516
return_receive!(unsafe ocvrs_return => ret);
35173517
let ret = ret.into_result()?;
35183518
Ok(ret)
@@ -3554,11 +3554,11 @@ pub mod calib3d {
35543554
/// Note: The function requires white space (like a square-thick border, the wider the better) around
35553555
/// the board to make the detection more robust in various environments.
35563556
#[inline]
3557-
pub fn find_circles_grid(image: &impl ToInputArray, pattern_size: core::Size, centers: &mut impl ToOutputArray, flags: i32, blob_detector: &core::Ptr<crate::features2d::Feature2D>, parameters: crate::calib3d::CirclesGridFinderParameters) -> Result<bool> {
3557+
pub fn find_circles_grid(image: &impl ToInputArray, pattern_size: core::Size, centers: &mut impl ToOutputArray, flags: i32, blob_detector: Option<&core::Ptr<crate::features2d::Feature2D>>, parameters: crate::calib3d::CirclesGridFinderParameters) -> Result<bool> {
35583558
input_array_arg!(image);
35593559
output_array_arg!(centers);
35603560
return_send!(via ocvrs_return);
3561-
unsafe { sys::cv_findCirclesGrid_const__InputArrayR_Size_const__OutputArrayR_int_const_PtrLFeature2DGR_const_CirclesGridFinderParametersR(image.as_raw__InputArray(), &pattern_size, centers.as_raw__OutputArray(), flags, blob_detector.as_raw_PtrOfFeature2D(), &parameters, ocvrs_return.as_mut_ptr()) };
3561+
unsafe { sys::cv_findCirclesGrid_const__InputArrayR_Size_const__OutputArrayR_int_const_PtrLFeature2DGR_const_CirclesGridFinderParametersR(image.as_raw__InputArray(), &pattern_size, centers.as_raw__OutputArray(), flags, blob_detector.map_or(::core::ptr::null(), |blob_detector| blob_detector.as_raw_PtrOfFeature2D()), &parameters, ocvrs_return.as_mut_ptr()) };
35623562
return_receive!(unsafe ocvrs_return => ret);
35633563
let ret = ret.into_result()?;
35643564
Ok(ret)

‎docs/core.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13820,11 +13820,11 @@ pub mod core {
1382013820
/// * argv: array of command line arguments (from main())
1382113821
/// * keys: string describing acceptable command line parameters (see class description for syntax)
1382213822
#[inline]
13823-
pub fn new(argc: i32, argv: &[&str], keys: &str) -> Result<core::CommandLineParser> {
13823+
pub fn new(argv: &[&str], keys: &str) -> Result<core::CommandLineParser> {
1382413824
string_array_arg!(argv);
1382513825
extern_container_arg!(keys);
1382613826
return_send!(via ocvrs_return);
13827-
unsafe { sys::cv_CommandLineParser_CommandLineParser_int_const_charXX_const_StringR(argc, argv.as_ptr(), keys.opencv_as_extern(), ocvrs_return.as_mut_ptr()) };
13827+
unsafe { sys::cv_CommandLineParser_CommandLineParser_int_const_charXX_const_StringR(argv.len().try_into()?, argv.as_ptr(), keys.opencv_as_extern(), ocvrs_return.as_mut_ptr()) };
1382813828
return_receive!(unsafe ocvrs_return => ret);
1382913829
let ret = ret.into_result()?;
1383013830
let ret = unsafe { core::CommandLineParser::opencv_from_extern(ret) };
@@ -36015,9 +36015,9 @@ pub mod core {
3601536015
/// ## C++ default parameters
3601636016
/// * q: Queue()
3601736017
#[inline]
36018-
fn run(&mut self, dims: i32, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool, q: &impl core::QueueTraitConst) -> Result<bool> {
36018+
fn run(&mut self, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool, q: &impl core::QueueTraitConst) -> Result<bool> {
3601936019
return_send!(via ocvrs_return);
36020-
unsafe { sys::cv_ocl_Kernel_run_int_size_tX_size_tX_bool_const_QueueR(self.as_raw_mut_Kernel(), dims, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, q.as_raw_Queue(), ocvrs_return.as_mut_ptr()) };
36020+
unsafe { sys::cv_ocl_Kernel_run_int_size_tX_size_tX_bool_const_QueueR(self.as_raw_mut_Kernel(), globalsize.len().min(localsize.len()).try_into()?, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, q.as_raw_Queue(), ocvrs_return.as_mut_ptr()) };
3602136021
return_receive!(unsafe ocvrs_return => ret);
3602236022
let ret = ret.into_result()?;
3602336023
Ok(ret)
@@ -36042,9 +36042,9 @@ pub mod core {
3604236042
/// This alternative version of [KernelTrait::run] function uses the following default values for its arguments:
3604336043
/// * q: Queue()
3604436044
#[inline]
36045-
fn run_def(&mut self, dims: i32, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool) -> Result<bool> {
36045+
fn run_def(&mut self, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool) -> Result<bool> {
3604636046
return_send!(via ocvrs_return);
36047-
unsafe { sys::cv_ocl_Kernel_run_int_size_tX_size_tX_bool(self.as_raw_mut_Kernel(), dims, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, ocvrs_return.as_mut_ptr()) };
36047+
unsafe { sys::cv_ocl_Kernel_run_int_size_tX_size_tX_bool(self.as_raw_mut_Kernel(), globalsize.len().min(localsize.len()).try_into()?, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, ocvrs_return.as_mut_ptr()) };
3604836048
return_receive!(unsafe ocvrs_return => ret);
3604936049
let ret = ret.into_result()?;
3605036050
Ok(ret)
@@ -36062,9 +36062,9 @@ pub mod core {
3606236062
/// ## C++ default parameters
3606336063
/// * q: Queue()
3606436064
#[inline]
36065-
fn run_(&mut self, dims: i32, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool, q: &impl core::QueueTraitConst) -> Result<bool> {
36065+
fn run_(&mut self, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool, q: &impl core::QueueTraitConst) -> Result<bool> {
3606636066
return_send!(via ocvrs_return);
36067-
unsafe { sys::cv_ocl_Kernel_run__int_size_tX_size_tX_bool_const_QueueR(self.as_raw_mut_Kernel(), dims, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, q.as_raw_Queue(), ocvrs_return.as_mut_ptr()) };
36067+
unsafe { sys::cv_ocl_Kernel_run__int_size_tX_size_tX_bool_const_QueueR(self.as_raw_mut_Kernel(), globalsize.len().min(localsize.len()).try_into()?, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, q.as_raw_Queue(), ocvrs_return.as_mut_ptr()) };
3606836068
return_receive!(unsafe ocvrs_return => ret);
3606936069
let ret = ret.into_result()?;
3607036070
Ok(ret)
@@ -36083,9 +36083,9 @@ pub mod core {
3608336083
/// This alternative version of [KernelTrait::run_] function uses the following default values for its arguments:
3608436084
/// * q: Queue()
3608536085
#[inline]
36086-
fn run__def(&mut self, dims: i32, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool) -> Result<bool> {
36086+
fn run__def(&mut self, globalsize: &mut [size_t], localsize: &mut [size_t], sync: bool) -> Result<bool> {
3608736087
return_send!(via ocvrs_return);
36088-
unsafe { sys::cv_ocl_Kernel_run__int_size_tX_size_tX_bool(self.as_raw_mut_Kernel(), dims, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, ocvrs_return.as_mut_ptr()) };
36088+
unsafe { sys::cv_ocl_Kernel_run__int_size_tX_size_tX_bool(self.as_raw_mut_Kernel(), globalsize.len().min(localsize.len()).try_into()?, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), sync, ocvrs_return.as_mut_ptr()) };
3608936089
return_receive!(unsafe ocvrs_return => ret);
3609036090
let ret = ret.into_result()?;
3609136091
Ok(ret)
@@ -36123,9 +36123,9 @@ pub mod core {
3612336123
/// ## C++ default parameters
3612436124
/// * q: Queue()
3612536125
#[inline]
36126-
fn run_profiling(&mut self, dims: i32, globalsize: &mut [size_t], localsize: &mut [size_t], q: &impl core::QueueTraitConst) -> Result<i64> {
36126+
fn run_profiling(&mut self, globalsize: &mut [size_t], localsize: &mut [size_t], q: &impl core::QueueTraitConst) -> Result<i64> {
3612736127
return_send!(via ocvrs_return);
36128-
unsafe { sys::cv_ocl_Kernel_runProfiling_int_size_tX_size_tX_const_QueueR(self.as_raw_mut_Kernel(), dims, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), q.as_raw_Queue(), ocvrs_return.as_mut_ptr()) };
36128+
unsafe { sys::cv_ocl_Kernel_runProfiling_int_size_tX_size_tX_const_QueueR(self.as_raw_mut_Kernel(), globalsize.len().min(localsize.len()).try_into()?, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), q.as_raw_Queue(), ocvrs_return.as_mut_ptr()) };
3612936129
return_receive!(unsafe ocvrs_return => ret);
3613036130
let ret = ret.into_result()?;
3613136131
Ok(ret)
@@ -36141,9 +36141,9 @@ pub mod core {
3614136141
/// This alternative version of [KernelTrait::run_profiling] function uses the following default values for its arguments:
3614236142
/// * q: Queue()
3614336143
#[inline]
36144-
fn run_profiling_def(&mut self, dims: i32, globalsize: &mut [size_t], localsize: &mut [size_t]) -> Result<i64> {
36144+
fn run_profiling_def(&mut self, globalsize: &mut [size_t], localsize: &mut [size_t]) -> Result<i64> {
3614536145
return_send!(via ocvrs_return);
36146-
unsafe { sys::cv_ocl_Kernel_runProfiling_int_size_tX_size_tX(self.as_raw_mut_Kernel(), dims, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), ocvrs_return.as_mut_ptr()) };
36146+
unsafe { sys::cv_ocl_Kernel_runProfiling_int_size_tX_size_tX(self.as_raw_mut_Kernel(), globalsize.len().min(localsize.len()).try_into()?, globalsize.as_mut_ptr(), localsize.as_mut_ptr(), ocvrs_return.as_mut_ptr()) };
3614736147
return_receive!(unsafe ocvrs_return => ret);
3614836148
let ret = ret.into_result()?;
3614936149
Ok(ret)

‎docs/highgui.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,10 +1631,10 @@ pub mod highgui {
16311631
}
16321632

16331633
#[inline]
1634-
pub fn start_loop(pt2_func: Option<unsafe extern "C" fn(i32, *mut *mut c_char) -> i32>, argc: i32, argv: &mut [&str]) -> Result<i32> {
1634+
pub fn start_loop(pt2_func: Option<unsafe extern "C" fn(i32, *mut *mut c_char) -> i32>, argv: &mut [&str]) -> Result<i32> {
16351635
string_array_arg_mut!(argv);
16361636
return_send!(via ocvrs_return);
1637-
unsafe { sys::cv_startLoop_int__X__int__charXX__int_charXX(pt2_func, argc, argv.as_mut_ptr(), ocvrs_return.as_mut_ptr()) };
1637+
unsafe { sys::cv_startLoop_int__X__int__charXX__int_charXX(pt2_func, argv.len().try_into()?, argv.as_mut_ptr(), ocvrs_return.as_mut_ptr()) };
16381638
return_receive!(unsafe ocvrs_return => ret);
16391639
let ret = ret.into_result()?;
16401640
Ok(ret)

0 commit comments

Comments
 (0)