Skip to content

Commit 89d136e

Browse files
committed
Regenerate docs with OpenCV 4.13
1 parent 698d97d commit 89d136e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2815
-1144
lines changed

CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* 0.98.1
2+
* Regenerated docs with OpenCV 4.13
3+
14
* 0.98.0
25
* Fix linking issue when using `video` module without `tracking`, this also moved some of the symbols from `video` to `tracking`.
36
* Fix how multiarch include dir is calculated, should help with the building issues in cross-compilation scenarios.

docs/alphamat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub mod alphamat {
44
//!
55
//! This module is dedicated to computing alpha matte of objects in images from a given input image and a greyscale trimap image that contains information about the foreground, background and unknown pixels. The unknown pixels are assumed to be a combination of foreground and background pixels. The algorithm uses a combination of multiple carefully defined pixels affinities to estimate the opacity of the foreground pixels in the unkown region.
66
//!
7-
//! The implementation is based on [aksoy2017designing](https://docs.opencv.org/4.12.0/d0/de3/citelist.html#CITEREF_aksoy2017designing).
7+
//! The implementation is based on [aksoy2017designing](https://docs.opencv.org/4.13.0/d0/de3/citelist.html#CITEREF_aksoy2017designing).
88
//!
99
//! This module was developed by Muskaan Kularia and Sunita Nayak as a project
1010
//! for Google Summer of Code 2019 (GSoC 19).

docs/bgsegm.rs

Lines changed: 287 additions & 13 deletions
Large diffs are not rendered by default.

docs/calib3d.rs

Lines changed: 272 additions & 140 deletions
Large diffs are not rendered by default.

docs/core.rs

Lines changed: 203 additions & 56 deletions
Large diffs are not rendered by default.

docs/cudabgsegm.rs

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ pub mod cudabgsegm {
108108
///
109109
/// The class discriminates between foreground and background pixels by building and maintaining a model
110110
/// of the background. Any pixel which does not fit this model is then deemed to be foreground. The
111-
/// class implements algorithm described in [MOG2001](https://docs.opencv.org/4.12.0/d0/de3/citelist.html#CITEREF_MOG2001) .
111+
/// class implements algorithm described in [MOG2001](https://docs.opencv.org/4.13.0/d0/de3/citelist.html#CITEREF_MOG2001) .
112112
/// ## See also
113113
/// BackgroundSubtractorMOG
114114
///
@@ -198,6 +198,18 @@ pub mod cudabgsegm {
198198
Ok(ret)
199199
}
200200

201+
#[inline]
202+
fn apply_1(&mut self, image: &impl ToInputArray, known_foreground_mask: &impl ToInputArray, fgmask: &mut impl ToOutputArray, learning_rate: f64, stream: &mut impl core::StreamTrait) -> Result<()> {
203+
input_array_arg!(image);
204+
input_array_arg!(known_foreground_mask);
205+
output_array_arg!(fgmask);
206+
return_send!(via ocvrs_return);
207+
unsafe { sys::cv_cuda_BackgroundSubtractorMOG_apply_const__InputArrayR_const__InputArrayR_const__OutputArrayR_double_StreamR(self.as_raw_mut_CUDA_BackgroundSubtractorMOG(), image.as_raw__InputArray(), known_foreground_mask.as_raw__InputArray(), fgmask.as_raw__OutputArray(), learning_rate, stream.as_raw_mut_Stream(), ocvrs_return.as_mut_ptr()) };
208+
return_receive!(ocvrs_return => ret);
209+
let ret = ret.into_result()?;
210+
Ok(ret)
211+
}
212+
201213
#[inline]
202214
fn get_background_image_1(&mut self, background_image: &mut impl core::GpuMatTrait, stream: &mut impl core::StreamTrait) -> Result<()> {
203215
return_send!(via ocvrs_return);
@@ -291,7 +303,7 @@ pub mod cudabgsegm {
291303
///
292304
/// The class discriminates between foreground and background pixels by building and maintaining a model
293305
/// of the background. Any pixel which does not fit this model is then deemed to be foreground. The
294-
/// class implements algorithm described in [Zivkovic2004](https://docs.opencv.org/4.12.0/d0/de3/citelist.html#CITEREF_Zivkovic2004) .
306+
/// class implements algorithm described in [Zivkovic2004](https://docs.opencv.org/4.13.0/d0/de3/citelist.html#CITEREF_Zivkovic2004) .
295307
/// ## See also
296308
/// BackgroundSubtractorMOG2
297309
pub struct CUDA_BackgroundSubtractorMOG2 {
@@ -340,6 +352,18 @@ pub mod cudabgsegm {
340352
Ok(ret)
341353
}
342354

355+
#[inline]
356+
fn apply_1(&mut self, image: &impl ToInputArray, known_foreground_mask: &impl ToInputArray, fgmask: &mut impl ToOutputArray, learning_rate: f64, stream: &mut impl core::StreamTrait) -> Result<()> {
357+
input_array_arg!(image);
358+
input_array_arg!(known_foreground_mask);
359+
output_array_arg!(fgmask);
360+
return_send!(via ocvrs_return);
361+
unsafe { sys::cv_cuda_BackgroundSubtractorMOG2_apply_const__InputArrayR_const__InputArrayR_const__OutputArrayR_double_StreamR(self.as_raw_mut_CUDA_BackgroundSubtractorMOG2(), image.as_raw__InputArray(), known_foreground_mask.as_raw__InputArray(), fgmask.as_raw__OutputArray(), learning_rate, stream.as_raw_mut_Stream(), ocvrs_return.as_mut_ptr()) };
362+
return_receive!(ocvrs_return => ret);
363+
let ret = ret.into_result()?;
364+
Ok(ret)
365+
}
366+
343367
#[inline]
344368
fn get_background_image_1(&mut self, background_image: &mut impl core::GpuMatTrait, stream: &mut impl core::StreamTrait) -> Result<()> {
345369
return_send!(via ocvrs_return);

docs/cudacodec.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -952,20 +952,18 @@ pub mod cudacodec {
952952
/// * outputFormat: The requested output color format.
953953
/// * bitDepth: The requested bit depth of the output frame.
954954
/// * planar: Request seperate planes for each color plane.
955-
/// * videoFullRangeFlag: Indicates if the black level, luma and chroma of the source are represented using the full or limited range (AKA TV or "analogue" range) of values as defined in Annex E of the ITU-T Specification.
956955
/// * stream: Stream for the asynchronous version.
957956
///
958957
/// ## C++ default parameters
959958
/// * bit_depth: BitDepth::UNCHANGED
960959
/// * planar: false
961-
/// * video_full_range_flag: false
962960
/// * stream: cuda::Stream::Null()
963961
#[inline]
964-
fn convert(&mut self, yuv: &impl ToInputArray, color: &mut impl ToOutputArray, surface_format: crate::cudacodec::CUDA_SurfaceFormat, output_format: crate::cudacodec::CUDA_ColorFormat, bit_depth: crate::cudacodec::CUDA_BitDepth, planar: bool, video_full_range_flag: bool, stream: &mut impl core::StreamTrait) -> Result<bool> {
962+
fn convert(&mut self, yuv: &impl ToInputArray, color: &mut impl ToOutputArray, surface_format: crate::cudacodec::CUDA_SurfaceFormat, output_format: crate::cudacodec::CUDA_ColorFormat, bit_depth: crate::cudacodec::CUDA_BitDepth, planar: bool, stream: &mut impl core::StreamTrait) -> Result<bool> {
965963
input_array_arg!(yuv);
966964
output_array_arg!(color);
967965
return_send!(via ocvrs_return);
968-
unsafe { sys::cv_cudacodec_NVSurfaceToColorConverter_convert_const__InputArrayR_const__OutputArrayR_const_SurfaceFormat_const_ColorFormat_const_BitDepth_const_bool_const_bool_StreamR(self.as_raw_mut_CUDA_NVSurfaceToColorConverter(), yuv.as_raw__InputArray(), color.as_raw__OutputArray(), surface_format, output_format, bit_depth, planar, video_full_range_flag, stream.as_raw_mut_Stream(), ocvrs_return.as_mut_ptr()) };
966+
unsafe { sys::cv_cudacodec_NVSurfaceToColorConverter_convert_const__InputArrayR_const__OutputArrayR_const_SurfaceFormat_const_ColorFormat_const_BitDepth_const_bool_StreamR(self.as_raw_mut_CUDA_NVSurfaceToColorConverter(), yuv.as_raw__InputArray(), color.as_raw__OutputArray(), surface_format, output_format, bit_depth, planar, stream.as_raw_mut_Stream(), ocvrs_return.as_mut_ptr()) };
969967
return_receive!(ocvrs_return => ret);
970968
let ret = ret.into_result()?;
971969
Ok(ret)
@@ -979,14 +977,12 @@ pub mod cudacodec {
979977
/// * outputFormat: The requested output color format.
980978
/// * bitDepth: The requested bit depth of the output frame.
981979
/// * planar: Request seperate planes for each color plane.
982-
/// * videoFullRangeFlag: Indicates if the black level, luma and chroma of the source are represented using the full or limited range (AKA TV or "analogue" range) of values as defined in Annex E of the ITU-T Specification.
983980
/// * stream: Stream for the asynchronous version.
984981
///
985982
/// ## Note
986983
/// This alternative version of [CUDA_NVSurfaceToColorConverterTrait::convert] function uses the following default values for its arguments:
987984
/// * bit_depth: BitDepth::UNCHANGED
988985
/// * planar: false
989-
/// * video_full_range_flag: false
990986
/// * stream: cuda::Stream::Null()
991987
#[inline]
992988
fn convert_def(&mut self, yuv: &impl ToInputArray, color: &mut impl ToOutputArray, surface_format: crate::cudacodec::CUDA_SurfaceFormat, output_format: crate::cudacodec::CUDA_ColorFormat) -> Result<bool> {

0 commit comments

Comments
 (0)