Skip to content

Commit 504a486

Browse files
twistedfalltwistedfall
committed
0.45.1 Regenerate bindings
1 parent c31da9d commit 504a486

File tree

154 files changed

+5654
-2595
lines changed

Some content is hidden

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

154 files changed

+5654
-2595
lines changed

‎CHANGES.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* 0.45.1
2+
* Internal improvements in const handling
3+
* Fix warnings in beta
4+
* Misc CI improvements
5+
16
* 0.45.0
27
* Add implementation of `From<Vec<T>>` for `Vector<T>` + misc vector improvements
38
* Enable OpenGL functions and classes from the `core` module

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repository = "https://github.com/twistedfall/opencv-rust"
66
readme = "README.md"
77
keywords = ["opencv", "vision"]
88
license = "MIT"
9-
version = "0.45.0"
9+
version = "0.45.1"
1010
edition = "2018"
1111
authors = ["Mathieu Poumeyrol <[email protected]>", "Pro <[email protected]>"]
1212
autoexamples = false # cuda example doesn't compile on just any system
@@ -57,7 +57,7 @@ contrib = []
5757
docs-only = []
5858

5959
[build-dependencies]
60-
binding-generator = { package = "opencv-binding-generator", version = "0.19.0", path = "binding-generator", optional = true }
60+
binding-generator = { package = "opencv-binding-generator", version = "0.20.0", path = "binding-generator", optional = true }
6161
cc = { version = "1.0", features = ["parallel"] }
6262
clang = { version = "1.0", features = ["clang_6_0"], optional = true }
6363
glob = "0.3"

‎binding-generator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "opencv-binding-generator"
33
description = "Binding generator for opencv crate"
44
repository = "https://github.com/twistedfall/opencv-rust"
5-
version = "0.19.0"
5+
version = "0.20.0"
66
license = "MIT"
77
authors = ["Pro <[email protected]>"]
88
edition = "2018"

‎bindings/cpp/opencv_32/aruco_types.hpp

+28-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
template struct Result<bool>;
2-
template struct Result<const cv::Ptr<cv::aruco::Board>*>;
3-
template struct Result<const cv::Ptr<cv::aruco::CharucoBoard>*>;
4-
template struct Result<const cv::Ptr<cv::aruco::DetectorParameters>*>;
5-
template struct Result<const cv::Ptr<cv::aruco::Dictionary>*>;
62
template struct Result<cv::Mat*>;
3+
template struct Result<cv::Point3_<float>>;
74
template struct Result<cv::Ptr<cv::aruco::Board>*>;
85
template struct Result<cv::Ptr<cv::aruco::CharucoBoard>*>;
96
template struct Result<cv::Ptr<cv::aruco::DetectorParameters>*>;
107
template struct Result<cv::Ptr<cv::aruco::Dictionary>*>;
118
template struct Result<cv::Ptr<cv::aruco::GridBoard>*>;
129
template struct Result<cv::Size_<int>>;
10+
template struct Result<cv::Vec<double, 3>>;
11+
template struct Result<cv::Vec<float, 3>>;
1312
template struct Result<cv::aruco::DetectorParameters*>;
1413
template struct Result<cv::aruco::Dictionary*>;
1514
template struct Result<double>;
1615
template struct Result<float>;
1716
template struct Result<int>;
1817
template struct Result<std::vector<cv::Point3_<float>>*>;
19-
template struct Result<std::vector<cv::Vec<double, 3>>*>;
20-
template struct Result<std::vector<cv::Vec<float, 3>>*>;
2118
template struct Result<std::vector<int>*>;
2219
template struct Result<std::vector<std::vector<cv::Point3_<float>>>*>;
2320
template struct Result<std::vector<std::vector<int>>*>;
@@ -30,7 +27,11 @@ extern "C" {
3027
delete instance;
3128
}
3229

33-
cv::aruco::Board* cv_PtrOfBoard_get_inner_ptr(cv::Ptr<cv::aruco::Board>* instance) {
30+
const cv::aruco::Board* cv_PtrOfBoard_get_inner_ptr(const cv::Ptr<cv::aruco::Board>* instance) {
31+
return instance->get();
32+
}
33+
34+
cv::aruco::Board* cv_PtrOfBoard_get_inner_ptr_mut(cv::Ptr<cv::aruco::Board>* instance) {
3435
return instance->get();
3536
}
3637
}
@@ -44,7 +45,11 @@ extern "C" {
4445
delete instance;
4546
}
4647

47-
cv::aruco::CharucoBoard* cv_PtrOfCharucoBoard_get_inner_ptr(cv::Ptr<cv::aruco::CharucoBoard>* instance) {
48+
const cv::aruco::CharucoBoard* cv_PtrOfCharucoBoard_get_inner_ptr(const cv::Ptr<cv::aruco::CharucoBoard>* instance) {
49+
return instance->get();
50+
}
51+
52+
cv::aruco::CharucoBoard* cv_PtrOfCharucoBoard_get_inner_ptr_mut(cv::Ptr<cv::aruco::CharucoBoard>* instance) {
4853
return instance->get();
4954
}
5055
}
@@ -58,7 +63,11 @@ extern "C" {
5863
delete instance;
5964
}
6065

61-
cv::aruco::DetectorParameters* cv_PtrOfDetectorParameters_get_inner_ptr(cv::Ptr<cv::aruco::DetectorParameters>* instance) {
66+
const cv::aruco::DetectorParameters* cv_PtrOfDetectorParameters_get_inner_ptr(const cv::Ptr<cv::aruco::DetectorParameters>* instance) {
67+
return instance->get();
68+
}
69+
70+
cv::aruco::DetectorParameters* cv_PtrOfDetectorParameters_get_inner_ptr_mut(cv::Ptr<cv::aruco::DetectorParameters>* instance) {
6271
return instance->get();
6372
}
6473
}
@@ -72,7 +81,11 @@ extern "C" {
7281
delete instance;
7382
}
7483

75-
cv::aruco::Dictionary* cv_PtrOfDictionary_get_inner_ptr(cv::Ptr<cv::aruco::Dictionary>* instance) {
84+
const cv::aruco::Dictionary* cv_PtrOfDictionary_get_inner_ptr(const cv::Ptr<cv::aruco::Dictionary>* instance) {
85+
return instance->get();
86+
}
87+
88+
cv::aruco::Dictionary* cv_PtrOfDictionary_get_inner_ptr_mut(cv::Ptr<cv::aruco::Dictionary>* instance) {
7689
return instance->get();
7790
}
7891
}
@@ -86,7 +99,11 @@ extern "C" {
8699
delete instance;
87100
}
88101

89-
cv::aruco::GridBoard* cv_PtrOfGridBoard_get_inner_ptr(cv::Ptr<cv::aruco::GridBoard>* instance) {
102+
const cv::aruco::GridBoard* cv_PtrOfGridBoard_get_inner_ptr(const cv::Ptr<cv::aruco::GridBoard>* instance) {
103+
return instance->get();
104+
}
105+
106+
cv::aruco::GridBoard* cv_PtrOfGridBoard_get_inner_ptr_mut(cv::Ptr<cv::aruco::GridBoard>* instance) {
90107
return instance->get();
91108
}
92109
}

‎bindings/cpp/opencv_32/bgsegm_types.hpp

+10-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ extern "C" {
88
delete instance;
99
}
1010

11-
cv::bgsegm::BackgroundSubtractorGMG* cv_PtrOfBackgroundSubtractorGMG_get_inner_ptr(cv::Ptr<cv::bgsegm::BackgroundSubtractorGMG>* instance) {
11+
const cv::bgsegm::BackgroundSubtractorGMG* cv_PtrOfBackgroundSubtractorGMG_get_inner_ptr(const cv::Ptr<cv::bgsegm::BackgroundSubtractorGMG>* instance) {
12+
return instance->get();
13+
}
14+
15+
cv::bgsegm::BackgroundSubtractorGMG* cv_PtrOfBackgroundSubtractorGMG_get_inner_ptr_mut(cv::Ptr<cv::bgsegm::BackgroundSubtractorGMG>* instance) {
1216
return instance->get();
1317
}
1418
}
@@ -18,7 +22,11 @@ extern "C" {
1822
delete instance;
1923
}
2024

21-
cv::bgsegm::BackgroundSubtractorMOG* cv_PtrOfBackgroundSubtractorMOG_get_inner_ptr(cv::Ptr<cv::bgsegm::BackgroundSubtractorMOG>* instance) {
25+
const cv::bgsegm::BackgroundSubtractorMOG* cv_PtrOfBackgroundSubtractorMOG_get_inner_ptr(const cv::Ptr<cv::bgsegm::BackgroundSubtractorMOG>* instance) {
26+
return instance->get();
27+
}
28+
29+
cv::bgsegm::BackgroundSubtractorMOG* cv_PtrOfBackgroundSubtractorMOG_get_inner_ptr_mut(cv::Ptr<cv::bgsegm::BackgroundSubtractorMOG>* instance) {
2230
return instance->get();
2331
}
2432
}

‎bindings/cpp/opencv_32/bioinspired_types.hpp

+15-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ extern "C" {
1515
delete instance;
1616
}
1717

18-
cv::bioinspired::Retina* cv_PtrOfRetina_get_inner_ptr(cv::Ptr<cv::bioinspired::Retina>* instance) {
18+
const cv::bioinspired::Retina* cv_PtrOfRetina_get_inner_ptr(const cv::Ptr<cv::bioinspired::Retina>* instance) {
19+
return instance->get();
20+
}
21+
22+
cv::bioinspired::Retina* cv_PtrOfRetina_get_inner_ptr_mut(cv::Ptr<cv::bioinspired::Retina>* instance) {
1923
return instance->get();
2024
}
2125
}
@@ -25,7 +29,11 @@ extern "C" {
2529
delete instance;
2630
}
2731

28-
cv::bioinspired::RetinaFastToneMapping* cv_PtrOfRetinaFastToneMapping_get_inner_ptr(cv::Ptr<cv::bioinspired::RetinaFastToneMapping>* instance) {
32+
const cv::bioinspired::RetinaFastToneMapping* cv_PtrOfRetinaFastToneMapping_get_inner_ptr(const cv::Ptr<cv::bioinspired::RetinaFastToneMapping>* instance) {
33+
return instance->get();
34+
}
35+
36+
cv::bioinspired::RetinaFastToneMapping* cv_PtrOfRetinaFastToneMapping_get_inner_ptr_mut(cv::Ptr<cv::bioinspired::RetinaFastToneMapping>* instance) {
2937
return instance->get();
3038
}
3139
}
@@ -35,7 +43,11 @@ extern "C" {
3543
delete instance;
3644
}
3745

38-
cv::bioinspired::TransientAreasSegmentationModule* cv_PtrOfTransientAreasSegmentationModule_get_inner_ptr(cv::Ptr<cv::bioinspired::TransientAreasSegmentationModule>* instance) {
46+
const cv::bioinspired::TransientAreasSegmentationModule* cv_PtrOfTransientAreasSegmentationModule_get_inner_ptr(const cv::Ptr<cv::bioinspired::TransientAreasSegmentationModule>* instance) {
47+
return instance->get();
48+
}
49+
50+
cv::bioinspired::TransientAreasSegmentationModule* cv_PtrOfTransientAreasSegmentationModule_get_inner_ptr_mut(cv::Ptr<cv::bioinspired::TransientAreasSegmentationModule>* instance) {
3951
return instance->get();
4052
}
4153
}

‎bindings/cpp/opencv_32/calib3d_types.hpp

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
template struct Result<bool>;
2-
template struct Result<const cv::Ptr<cv::Feature2D>*>;
32
template struct Result<cv::Mat*>;
3+
template struct Result<cv::Point3_<double>>;
4+
template struct Result<cv::Point3_<int>>;
45
template struct Result<cv::Ptr<cv::StereoBM>*>;
56
template struct Result<cv::Ptr<cv::StereoSGBM>*>;
67
template struct Result<cv::Rect_<int>>;
@@ -10,14 +11,16 @@ template struct Result<float>;
1011
template struct Result<int>;
1112
template struct Result<std::vector<cv::Point3_<double>>*>;
1213
template struct Result<std::vector<cv::Point3_<int>>*>;
13-
template struct Result<std::vector<std::vector<cv::Point3_<double>>>*>;
14-
template struct Result<std::vector<std::vector<cv::Point3_<int>>>*>;
1514
extern "C" {
1615
void cv_PtrOfStereoBM_delete(cv::Ptr<cv::StereoBM>* instance) {
1716
delete instance;
1817
}
1918

20-
cv::StereoBM* cv_PtrOfStereoBM_get_inner_ptr(cv::Ptr<cv::StereoBM>* instance) {
19+
const cv::StereoBM* cv_PtrOfStereoBM_get_inner_ptr(const cv::Ptr<cv::StereoBM>* instance) {
20+
return instance->get();
21+
}
22+
23+
cv::StereoBM* cv_PtrOfStereoBM_get_inner_ptr_mut(cv::Ptr<cv::StereoBM>* instance) {
2124
return instance->get();
2225
}
2326
}
@@ -27,7 +30,11 @@ extern "C" {
2730
delete instance;
2831
}
2932

30-
cv::StereoMatcher* cv_PtrOfStereoMatcher_get_inner_ptr(cv::Ptr<cv::StereoMatcher>* instance) {
33+
const cv::StereoMatcher* cv_PtrOfStereoMatcher_get_inner_ptr(const cv::Ptr<cv::StereoMatcher>* instance) {
34+
return instance->get();
35+
}
36+
37+
cv::StereoMatcher* cv_PtrOfStereoMatcher_get_inner_ptr_mut(cv::Ptr<cv::StereoMatcher>* instance) {
3138
return instance->get();
3239
}
3340
}
@@ -37,7 +44,11 @@ extern "C" {
3744
delete instance;
3845
}
3946

40-
cv::StereoSGBM* cv_PtrOfStereoSGBM_get_inner_ptr(cv::Ptr<cv::StereoSGBM>* instance) {
47+
const cv::StereoSGBM* cv_PtrOfStereoSGBM_get_inner_ptr(const cv::Ptr<cv::StereoSGBM>* instance) {
48+
return instance->get();
49+
}
50+
51+
cv::StereoSGBM* cv_PtrOfStereoSGBM_get_inner_ptr_mut(cv::Ptr<cv::StereoSGBM>* instance) {
4152
return instance->get();
4253
}
4354
}

‎bindings/cpp/opencv_32/core_types.hpp

+26-21
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,13 @@ template struct Result<bool>;
22
template struct Result<char>;
33
template struct Result<const cv::MatOp*>;
44
template struct Result<const cv::Mat**>;
5-
template struct Result<const cv::Ptr<cv::MinProblemSolver::Function>*>;
65
template struct Result<const cv::SparseMat**>;
76
template struct Result<const cv::SparseMat::Node**>;
87
template struct Result<const cv::_InputOutputArray*>;
98
template struct Result<const cv::ocl::Device*>;
109
template struct Result<const cv::ocl::ProgramSource*>;
1110
template struct Result<const int>;
1211
template struct Result<const int*>;
13-
template struct Result<const std::vector<bool>*>;
14-
template struct Result<const std::vector<cv::DMatch>*>;
15-
template struct Result<const std::vector<cv::KeyPoint>*>;
16-
template struct Result<const std::vector<cv::Mat>*>;
17-
template struct Result<const std::vector<cv::Point_<float>>*>;
18-
template struct Result<const std::vector<cv::Range>*>;
19-
template struct Result<const std::vector<cv::UMat>*>;
20-
template struct Result<const std::vector<cv::cuda::GpuMat>*>;
21-
template struct Result<const std::vector<int>*>;
2212
template struct Result<const unsigned char*>;
2313
template struct Result<const unsigned long>;
2414
template struct Result<const void*>;
@@ -122,22 +112,17 @@ template struct Result<long>;
122112
template struct Result<short>;
123113
template struct Result<signed char>;
124114
template struct Result<signed char*>;
125-
template struct Result<std::vector<bool>*>;
126115
template struct Result<std::vector<char>*>;
127116
template struct Result<std::vector<cv::DMatch>*>;
128117
template struct Result<std::vector<cv::KeyPoint>*>;
129-
template struct Result<std::vector<cv::Mat>*>;
130118
template struct Result<std::vector<cv::Point3_<double>>*>;
131119
template struct Result<std::vector<cv::Point3_<float>>*>;
132120
template struct Result<std::vector<cv::Point3_<int>>*>;
133121
template struct Result<std::vector<cv::Point_<float>>*>;
134122
template struct Result<std::vector<cv::Point_<int>>*>;
135123
template struct Result<std::vector<cv::Rect_<int>>*>;
136-
template struct Result<std::vector<cv::String>*>;
137-
template struct Result<std::vector<cv::UMat>*>;
138124
template struct Result<std::vector<cv::Vec<int, 2>>*>;
139125
template struct Result<std::vector<cv::cuda::GpuMat>*>;
140-
template struct Result<std::vector<cv::ocl::PlatformInfo>*>;
141126
template struct Result<std::vector<double>*>;
142127
template struct Result<std::vector<int>*>;
143128
template struct Result<std::vector<unsigned char>*>;
@@ -155,7 +140,11 @@ extern "C" {
155140
delete instance;
156141
}
157142

158-
cv::ConjGradSolver* cv_PtrOfConjGradSolver_get_inner_ptr(cv::Ptr<cv::ConjGradSolver>* instance) {
143+
const cv::ConjGradSolver* cv_PtrOfConjGradSolver_get_inner_ptr(const cv::Ptr<cv::ConjGradSolver>* instance) {
144+
return instance->get();
145+
}
146+
147+
cv::ConjGradSolver* cv_PtrOfConjGradSolver_get_inner_ptr_mut(cv::Ptr<cv::ConjGradSolver>* instance) {
159148
return instance->get();
160149
}
161150
}
@@ -165,7 +154,11 @@ extern "C" {
165154
delete instance;
166155
}
167156

168-
cv::DownhillSolver* cv_PtrOfDownhillSolver_get_inner_ptr(cv::Ptr<cv::DownhillSolver>* instance) {
157+
const cv::DownhillSolver* cv_PtrOfDownhillSolver_get_inner_ptr(const cv::Ptr<cv::DownhillSolver>* instance) {
158+
return instance->get();
159+
}
160+
161+
cv::DownhillSolver* cv_PtrOfDownhillSolver_get_inner_ptr_mut(cv::Ptr<cv::DownhillSolver>* instance) {
169162
return instance->get();
170163
}
171164
}
@@ -175,7 +168,11 @@ extern "C" {
175168
delete instance;
176169
}
177170

178-
cv::Formatted* cv_PtrOfFormatted_get_inner_ptr(cv::Ptr<cv::Formatted>* instance) {
171+
const cv::Formatted* cv_PtrOfFormatted_get_inner_ptr(const cv::Ptr<cv::Formatted>* instance) {
172+
return instance->get();
173+
}
174+
175+
cv::Formatted* cv_PtrOfFormatted_get_inner_ptr_mut(cv::Ptr<cv::Formatted>* instance) {
179176
return instance->get();
180177
}
181178
}
@@ -185,7 +182,11 @@ extern "C" {
185182
delete instance;
186183
}
187184

188-
cv::Formatter* cv_PtrOfFormatter_get_inner_ptr(cv::Ptr<cv::Formatter>* instance) {
185+
const cv::Formatter* cv_PtrOfFormatter_get_inner_ptr(const cv::Ptr<cv::Formatter>* instance) {
186+
return instance->get();
187+
}
188+
189+
cv::Formatter* cv_PtrOfFormatter_get_inner_ptr_mut(cv::Ptr<cv::Formatter>* instance) {
189190
return instance->get();
190191
}
191192
}
@@ -195,7 +196,11 @@ extern "C" {
195196
delete instance;
196197
}
197198

198-
cv::MinProblemSolver::Function* cv_PtrOfMinProblemSolver_Function_get_inner_ptr(cv::Ptr<cv::MinProblemSolver::Function>* instance) {
199+
const cv::MinProblemSolver::Function* cv_PtrOfMinProblemSolver_Function_get_inner_ptr(const cv::Ptr<cv::MinProblemSolver::Function>* instance) {
200+
return instance->get();
201+
}
202+
203+
cv::MinProblemSolver::Function* cv_PtrOfMinProblemSolver_Function_get_inner_ptr_mut(cv::Ptr<cv::MinProblemSolver::Function>* instance) {
199204
return instance->get();
200205
}
201206
}
@@ -3156,7 +3161,7 @@ extern "C" {
31563161
}
31573162

31583163
void cv_VectorOfbool_swap(std::vector<bool>* instance, size_t index1, size_t index2) {
3159-
std::swap((*instance)[index1], (*instance)[index2]);
3164+
instance->swap((*instance)[index1], (*instance)[index2]);
31603165
}
31613166

31623167
void cv_VectorOfbool_clear(std::vector<bool>* instance) {

‎bindings/cpp/opencv_32/cvv_types.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
template struct Result<bool>;
22
template struct Result<const bool>;
33
template struct Result<const unsigned long>;
4+
template struct Result<cv::DMatch>;
5+
template struct Result<cv::KeyPoint>;
46
template struct Result<cvv::impl::CallMetaData*>;
5-
template struct Result<std::vector<cv::DMatch>*>;
6-
template struct Result<std::vector<cv::KeyPoint>*>;
77
template struct Result<void*>;

0 commit comments

Comments
 (0)