Alexander Smorkalov
9eaa7bd566
Document parameters of multi-dimentional reshape.
2023-06-20 21:54:49 +03:00
Alexander Smorkalov
51702ffd92
pre: OpenCV 4.8.0 (version++)
2023-06-20 15:52:57 +03:00
Alexander Smorkalov
805946baaf
pre: OpenCV 3.4.20 (version++)
2023-06-20 14:10:08 +03:00
Alexander Smorkalov
004801f1c5
Merge remote-tracking branch 'origin/3.4' into merge-3.4
2023-06-20 09:56:57 +03:00
Pierre Chatelier
60b806f9b8
Merge pull request #22947 from chacha21:hasNonZero
...
Added cv::hasNonZero() #22947
`cv::hasNonZero()` is semantically equivalent to (`cv::countNonZero()>0`) but stops parsing the image when a non-zero value is found, for a performance gain
- [X] I agree to contribute to the project under Apache 2 License.
- [X] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [X] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
This pull request might be refused, but I submit it to know if further work is needed or if I just stop working on it.
The idea is only a performance gain vs `countNonZero()>0` at the cost of more code.
Reasons why it might be refused :
- this is just more code
- the execution time is "unfair"/"unpredictable" since it depends on the position of the first non-zero value
- the user must be aware that default search is from first row/col to last row/col and has no way to customize that, even if his use case lets him know where a non zero could be found
- the PR in its current state is using, for the ocl implementation, a mere `countNonZero()>0` ; there is not much sense in trying to break early the ocl kernel call when non-zero is encountered. So the ocl implementation does not bring any improvement.
- there is no IPP function that can help (`countNonZero()` is based in `ippCountInRange`)
- the PR in its current state might be slower than a call to `countNonZero()>0` in some cases (see "challenges" below)
Reasons why it might be accepted :
- the performance gain is huge on average, if we consider that "on average" means "non zero in the middle of the image"
- the "missing" IPP implementation is replaced by an "Open-CV universal intrinsics" implementation
- the PR in its current state is almost always faster than a call to `countNonZero()>0`, is only slightly slower in the worst cases, and not even for all matrices
**Challenges**
The worst case is either an all-zero matrix, or a non-zero at the very last position. In such a case, the `hasNonZero()` implementation will parse the whole matrix like `countNonZero()` would do. But we expect the performance to be the same in this case. And `ippCountInRange` is hard to beat !
There is also the case of very small matrices (<=32x32...) in 8b, where the SIMD can be hard to feed.
For all cases but the worse, my custom `hasNonZero()` performs better than `ippCountInRange()`
For the worst case, my custom `hasNonZero()` performs better than `ippCountInRange()` *except for large matrices of type CV_32S or CV_64F* (but surprisingly, not CV_32F).
The difference is small, but it exists (and I don't understand why).
For very small CV_8U matrices `ippCountInRange()` seems unbeatable.
Here is the code that I use to check timings
```
//test cv::hasNonZero() vs (cv::countNonZero()>0) for different matrices sizes, types, strides...
{
cv::setRNGSeed(1234);
const std::vector<cv::Size> sizes = {{32, 32}, {64, 64}, {128, 128}, {320, 240}, {512, 512}, {640, 480}, {1024, 768}, {2048, 2048}, {1031, 1000}};
const std::vector<int> types = {CV_8U, CV_16U, CV_32S, CV_32F, CV_64F};
const size_t iterations = 1000;
for(const cv::Size& size : sizes)
{
for(const int type : types)
{
for(int c = 0 ; c<2 ; ++c)
{
const bool continuous = !c;
for(int i = 0 ; i<4 ; ++i)
{
cv::Mat m = continuous ? cv::Mat::zeros(size, type) : cv::Mat(cv::Mat::zeros(cv::Size(2*size.width, size.height), type), cv::Rect(cv::Point(0, 0), size));
const bool nz = (i <= 2);
const unsigned int nzOffsetRange = 10;
const unsigned int nzOffset = cv::randu<unsigned int>()%nzOffsetRange;
const cv::Point pos =
(i == 0) ? cv::Point(nzOffset, 0) :
(i == 1) ? cv::Point(size.width/2-nzOffsetRange/2+nzOffset, size.height/2) :
(i == 2) ? cv::Point(size.width-1-nzOffset, size.height-1) :
cv::Point(0, 0);
std::cout << "============================================================" << std::endl;
std::cout << "size:" << size << " type:" << type << " continuous = " << (continuous ? "true" : "false") << " iterations:" << iterations << " nz=" << (nz ? "true" : "false");
std::cout << " pos=" << ((i == 0) ? "begin" : (i == 1) ? "middle" : (i == 2) ? "end" : "none");
std::cout << std::endl;
cv::Mat mask = cv::Mat::zeros(size, CV_8UC1);
mask.at<unsigned char>(pos) = 0xFF;
m.setTo(cv::Scalar::all(0));
m.setTo(cv::Scalar::all(nz ? 1 : 0), mask);
std::vector<bool> results;
std::vector<double> timings;
{
bool res = false;
auto ref = cv::getTickCount();
for(size_t k = 0 ; k<iterations ; ++k)
res = cv::hasNonZero(m);
auto now = cv::getTickCount();
const bool error = (res != nz);
if (error)
printf("!!ERROR!!\r\n");
results.push_back(res);
timings.push_back(1000.*(now-ref)/cv::getTickFrequency());
}
{
bool res = false;
auto ref = cv::getTickCount();
for(size_t k = 0 ; k<iterations ; ++k)
res = (cv::countNonZero(m)>0);
auto now = cv::getTickCount();
const bool error = (res != nz);
if (error)
printf("!!ERROR!!\r\n");
results.push_back(res);
timings.push_back(1000.*(now-ref)/cv::getTickFrequency());
}
const size_t bestTimingIndex = (std::min_element(timings.begin(), timings.end())-timings.begin());
if ((bestTimingIndex != 0) || (std::find_if_not(results.begin(), results.end(), [&](bool r) {return (r == nz);}) != results.end()))
{
std::cout << "cv::hasNonZero\t\t=>" << results[0] << ((results[0] != nz) ? " ERROR" : "") << " perf:" << timings[0] << "ms => " << (iterations/timings[0]*1000) << " im/s" << ((bestTimingIndex == 0) ? " * " : "") << std::endl;
std::cout << "cv::countNonZero\t=>" << results[1] << ((results[1] != nz) ? " ERROR" : "") << " perf:" << timings[1] << "ms => " << (iterations/timings[1]*1000) << " im/s" << ((bestTimingIndex == 1) ? " * " : "") << std::endl;
}
}
}
}
}
}
```
Here is a report of this benchmark (it only reports timings when `cv::countNonZero()` is faster)
My CPU is an Intel Core I7 4790 @ 3.60Ghz
```
============================================================
size:[32 x 32] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[32 x 32] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:0 continuous = false iterations:1000 nz=true pos=middle
cv::hasNonZero =>1 perf:0.353764ms => 2.82674e+06 im/s
cv::countNonZero =>1 perf:0.282044ms => 3.54555e+06 im/s *
============================================================
size:[32 x 32] type:0 continuous = false iterations:1000 nz=true pos=end
cv::hasNonZero =>1 perf:0.610478ms => 1.63806e+06 im/s
cv::countNonZero =>1 perf:0.283182ms => 3.5313e+06 im/s *
============================================================
size:[32 x 32] type:0 continuous = false iterations:1000 nz=false pos=none
cv::hasNonZero =>0 perf:0.630115ms => 1.58701e+06 im/s
cv::countNonZero =>0 perf:0.282044ms => 3.54555e+06 im/s *
============================================================
size:[32 x 32] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[32 x 32] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[32 x 32] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[32 x 32] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[32 x 32] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[32 x 32] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:5 continuous = false iterations:1000 nz=true pos=end
cv::hasNonZero =>1 perf:0.607347ms => 1.64651e+06 im/s
cv::countNonZero =>1 perf:0.467037ms => 2.14116e+06 im/s *
============================================================
size:[32 x 32] type:5 continuous = false iterations:1000 nz=false pos=none
cv::hasNonZero =>0 perf:0.618162ms => 1.6177e+06 im/s
cv::countNonZero =>0 perf:0.468175ms => 2.13595e+06 im/s *
============================================================
size:[32 x 32] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[32 x 32] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[32 x 32] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[32 x 32] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[32 x 32] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[64 x 64] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[64 x 64] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[64 x 64] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[64 x 64] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[128 x 128] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[128 x 128] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[128 x 128] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[128 x 128] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[320 x 240] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[320 x 240] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[320 x 240] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[320 x 240] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[512 x 512] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[512 x 512] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[512 x 512] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[512 x 512] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[640 x 480] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[640 x 480] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[640 x 480] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[640 x 480] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1024 x 768] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1024 x 768] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1024 x 768] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1024 x 768] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:4 continuous = true iterations:1000 nz=true pos=end
cv::hasNonZero =>1 perf:895.381ms => 1116.84 im/s
cv::countNonZero =>1 perf:882.569ms => 1133.06 im/s *
============================================================
size:[2048 x 2048] type:4 continuous = true iterations:1000 nz=false pos=none
cv::hasNonZero =>0 perf:899.53ms => 1111.69 im/s
cv::countNonZero =>0 perf:870.894ms => 1148.24 im/s *
============================================================
size:[2048 x 2048] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[2048 x 2048] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:6 continuous = true iterations:1000 nz=true pos=end
cv::hasNonZero =>1 perf:2018.92ms => 495.313 im/s
cv::countNonZero =>1 perf:1966.37ms => 508.552 im/s *
============================================================
size:[2048 x 2048] type:6 continuous = true iterations:1000 nz=false pos=none
cv::hasNonZero =>0 perf:2005.87ms => 498.537 im/s
cv::countNonZero =>0 perf:1992.78ms => 501.812 im/s *
============================================================
size:[2048 x 2048] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[2048 x 2048] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[2048 x 2048] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[2048 x 2048] type:6 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:0 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:0 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:0 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:0 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:0 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:0 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:0 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:0 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:2 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:2 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:2 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:2 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:2 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:2 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:2 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:2 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:4 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:4 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:4 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:4 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:4 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:4 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:4 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:4 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:5 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:5 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:5 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:5 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:5 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:5 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:5 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:5 continuous = false iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:6 continuous = true iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:6 continuous = true iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:6 continuous = true iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:6 continuous = true iterations:1000 nz=false pos=none
============================================================
size:[1031 x 1000] type:6 continuous = false iterations:1000 nz=true pos=begin
============================================================
size:[1031 x 1000] type:6 continuous = false iterations:1000 nz=true pos=middle
============================================================
size:[1031 x 1000] type:6 continuous = false iterations:1000 nz=true pos=end
============================================================
size:[1031 x 1000] type:6 continuous = false iterations:1000 nz=false pos=none
done
```
2023-06-09 13:37:20 +03:00
Alexander Smorkalov
d24ffe9a65
Merge pull request #23705 from asmorkalov:as/cxx-named-arguments
...
Re-implement named parameters bindings for Python #23705
Reverted named argument handling from #19156 .
Ported new solution from #23224
The port is required to harmonize 4.x -> 5.x merges.
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-05-30 17:41:41 +03:00
Alexander Smorkalov
65487946cc
Added final constrants check to solveLP to filter out flating-point numeric issues.
2023-05-25 17:29:01 +03:00
Alexander Smorkalov
d4861bfd1f
Merge remote-tracking branch 'origin/3.4' into merge-3.4
2023-05-24 14:37:48 +03:00
cudawarped
7539abecdb
cuda: add python bindings to allow GpuMat and Stream objects to be initialized from raw pointers
2023-05-22 11:02:04 +03:00
Alexander Smorkalov
4eec739624
Build warning fix on Windows for Eigen wrapper.
2023-05-17 10:12:02 +03:00
n0099
868787c364
Merge pull request #23342 from n0099:#23335
...
Improve document of cv::RotatedRect for #23335 #23342
fix #23335
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
2023-05-03 14:15:53 +03:00
Pierre Chatelier
6dd8a9b6ad
Merge pull request #13879 from chacha21:REDUCE_SUM2
...
add REDUCE_SUM2 #13879
proposal to add REDUCE_SUM2 to cv::reduce, an operation that sums up the square of elements
2023-04-28 20:42:52 +03:00
Laurent Berger
23b819efb8
Merge pull request #23555 from LaurentBerger:doc_format
...
don't ignore documentation for cv::format in doxygen #23555
Issue https://github.com/opencv/opencv/issues/23553
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work issue
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
2023-04-28 15:24:07 +03:00
Sean McBride
58e4a880a2
Deprecated convertTypeStr and made new variant that also takes the buffer size
...
This allows removing the unsafe sprintf.
2023-04-26 09:48:15 -04:00
Alexander Smorkalov
e4a29d93fe
Merge remote-tracking branch 'origin/3.4' into merge-3.4
2023-04-21 10:55:04 +03:00
Alexander Smorkalov
3f02c9d5b9
Merge pull request #23310 from hanliutong:fix_hal_compatibility
...
Fix HAL compatibility layer
2023-04-11 12:43:54 +03:00
Alexander Alekhin
daf9de7463
Merge pull request #23383 from mshabunin:rvv-scalable-gcc
2023-04-10 13:35:43 +00:00
Alexander Smorkalov
f5a92cb43f
Merge pull request #22889 from D-Alex:patch-1
...
core: improve doc for setNumThreads
2023-04-07 16:37:40 +03:00
Alexander Smorkalov
3bcc3e70f1
Extended setNumThreads documentation according to code review.
2023-04-07 13:56:57 +03:00
Maksim Shabunin
b12c14514a
RISC-V: allow building scalable RVV support with GCC, LLVM 16 support
2023-04-05 14:18:58 +03:00
HAN Liutong
a809ae4e88
Fix HAL compatibility layer and modify use cases.
2023-03-27 21:30:47 +08:00
unknown
ee302b063f
Typo in enum cv::QuatEnum::EulerAnglesType
2023-03-24 14:03:14 +01:00
Alexey Shtern
c6e5f60525
Merge pull request #23301 from shtern:fix_quaternion
...
Fixed strict type in slerp and spline; Fixed nlerp usage condition
Fixes #23293
The PR is fixing the issue described in [Issue #23293 ](https://github.com/opencv/opencv/issues/23293 )
- [X] I agree to contribute to the project under Apache 2 License.
- [X] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [X] The PR is proposed to the proper branch
- [X] There is a reference to the original bug report and related work
- [X] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [X] The feature is well documented and sample code can be built with the project CMake
2023-03-10 11:37:43 +03:00
Alexander Alekhin
fe59a5695f
core(simd): 64-bit integer EQ/NE without misused 64F guard
2023-02-27 19:51:55 +00:00
Maksim Shabunin
903ec0ec60
RISC-V: support RVV 0.7 in mainline RVV intrinsics
2023-02-17 18:17:11 +03:00
Alexander Alekhin
47293f28cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2023-02-11 18:35:00 +00:00
Yannis Guyon
56102737d7
Merge pull request #23131 from y-guyon:align_ptr_intrin_sse
...
Fix misaligned-pointer-use in intrin_sse.hpp
* Fix misaligned-pointer-use in intrin_sse.hpp
* Use _mm_loadu_si32() instead of memcpy()
* Use CV_DECL_ALIGNED instead of _mm_loadu_si32()
2023-02-10 22:46:21 +00:00
Alexander Alekhin
44290af516
Merge pull request #23224 from VadimLevin:dev/vlevin/cxx-named-arguments
2023-02-08 17:31:30 +00:00
Maksim Shabunin
e4acd74e87
Fix some clang 14 warnings
2023-02-07 01:19:00 +03:00
Vadim Levin
b07031b594
feat: named arguments handling in Python interface
2023-02-06 22:14:58 +03:00
Maksim Shabunin
9efaa3cce7
RISC-V/RVV 0.7: v_add/v_sub saturation and avoiding 64-bit register in v_check_
2023-01-30 23:25:53 +03:00
Alexander Alekhin
f33598f55e
Merge branch 4.x
2023-01-28 17:31:32 +00:00
Alexander Alekhin
18cbfa4a4f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2023-01-23 00:11:12 +00:00
Alexander Alekhin
a42d879925
Merge branch 4.x
2023-01-18 22:03:42 +00:00
Rostislav Vasilikhin
f3a03aefad
cvIsInf(double) fix + regression test
2023-01-17 23:06:39 +01:00
Maksim Shabunin
c1e5c16ff3
Backport C-API cleanup (imgproc) from 5.x
2023-01-16 23:29:50 +03:00
Xxfore
ef0fcb9238
Merge pull request #22938 from Xxfore:4.x
...
Use reinterpret instead of c-style casting for GCC
Co-authored-by: Xu Zhang <xu.zhang@hexintek.com>
Co-authored-by: Maksim Shabunin <maksim.shabunin@gmail.com>
2023-01-11 14:11:16 +00:00
Alexander Alekhin
593a376566
Merge branch 4.x
2023-01-09 11:08:02 +00:00
Alexander Alekhin
9208dcb07c
Merge tag '4.7.0'
2022-12-28 15:23:46 +00:00
Alexander Smorkalov
725e440d27
release: OpenCV 4.7.0
2022-12-28 17:31:52 +03:00
Alexander Alekhin
eab7faf536
Merge tag '3.4.19'
2022-12-27 08:41:49 +00:00
Alexander Alekhin
83391ac59d
release: OpenCV 3.4.19
2022-12-27 03:50:12 +00:00
cudawarped
692d6168b3
cuda: fix CUDA 12.0 build errors
2022-12-26 15:25:29 +02:00
Alexander Alekhin
b42c11de82
pre: OpenCV 4.7.0 (version++)
2022-12-25 17:00:22 +00:00
Alexander Alekhin
a494c75bfe
pre: OpenCV 3.4.19 (version++)
2022-12-25 16:59:47 +00:00
fengyuentau
34a0897f90
add cv::flipND; support onnx slice with negative steps via cv::flipND
2022-12-23 16:39:53 +08:00
cudawarped
9aa5ab7557
cv::cuda: Replace all instances of texture references/objects with texture objects using the existing updated cv::cudev::Texture class.
...
Fixes bugs in cv::cuda::demosaicing, cv::cuda::resize and cv::cuda::HoughSegmentDetector.
2022-12-19 19:28:15 +02:00
Alexander Alekhin
420db56ffd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-12-18 02:17:17 +00:00
Alexander Alekhin
eace6adb6d
Merge pull request #22934 from alalek:fix_filestorage_binding
2022-12-17 03:28:13 +00:00
Alexander Alekhin
6e3700593f
compatibility: keep Ptr<FileStorage> stubs till OpenCV 5.0
2022-12-16 00:47:44 +00:00
Alexander Alekhin
6a8c5a1d27
python: resolve Ptr<FileStorage> requirement issue
2022-12-16 00:47:44 +00:00
Sergei Shutov
8bd17163c7
Merge pull request #22939 from stopmosk:21826-python-bindings-for-videocapturewaitany
...
Add Python bindings for VideoCapture::waitAny #21826
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
2022-12-14 22:15:02 +03:00
Maksim Shabunin
8a62b03761
Merge pull request #22754 from mshabunin:c-cleanup
...
C-API cleanup for OpenCV 5.x (imgproc, highgui)
* imgproc: C-API cleanup
* imgproc: increase cvtColor test diff threshold
* imgproc: C-API cleanup pt.2
* imgproc: C-API cleanup pt.3
* imgproc: C-API cleanup pt.4
* imgproc: C-API cleanup pt.5
* imgproc: C-API cleanup pt.5
* imgproc: C-API cleanup pt.6
* highgui: C-API cleanup
* highgui: C-API cleanup pt.2
* highgui: C-API cleanup pt.3
* highgui: C-API cleanup pt.3
* imgproc: C-API cleanup pt.7
* fixup! highgui: C-API cleanup pt.3
* fixup! imgproc: C-API cleanup pt.6
* imgproc: C-API cleanup pt.8
* imgproc: C-API cleanup pt.9
* fixup! imgproc: C-API cleanup pt.9
* fixup! imgproc: C-API cleanup pt.9
* fixup! imgproc: C-API cleanup pt.9
* fixup! imgproc: C-API cleanup pt.9
* fixup! imgproc: C-API cleanup pt.9
* fixup! imgproc: C-API cleanup pt.9
2022-12-14 18:57:08 +00:00
Vadim Levin
3f5f09e730
fix: add _ suffix to properties having reserved keyword names
2022-12-13 20:56:39 +03:00
Alexander Alekhin
4203c903f8
Merge pull request #22928 from alalek:riscv_toolchains
2022-12-13 06:32:16 +00:00
Alexander Alekhin
c725771e11
build(riscv): suppress massive -Wignored-attributes warnings
2022-12-11 17:10:00 +00:00
Alexander Alekhin
be326ff752
build: fix/eliminate MSVC warnings
2022-12-10 12:19:31 +00:00
Alexander Alekhin
941d89e06d
cmake: fix RISC-V toolchains
...
- RVV options are moved to configuration scripts instead of toolchains
2022-12-09 12:02:28 +00:00
Alexander Alekhin
c5a4df30c6
risc-v: fix RVV backend on clang with undefined CV_RVV_SCALABLE
...
- v_interleave_quads
- v_pack_triplets
- v_signmask
2022-12-06 13:49:05 +00:00
Alexander Smorkalov
5696629b13
Merge pull request #22594 from ZhaoChuyang:pr_test_for_22253
...
add test for PR #22253
2022-12-01 13:47:32 +03:00
Vadim Levin
3a15152be5
refactor: rework test to be more specific
2022-11-30 18:31:03 +03:00
Alexander Duda
2eb7bf4cfa
core: improve doc for setNumThreads
...
The old documentation implies that the call is only valid for the next parallel region and must be called again if addtional regions should be affected as well.
2022-11-30 11:37:35 +01:00
HAN Liutong
a32f2cd24a
Merge pull request #22520 from hanliutong:hsv
...
Modify the SIMD loop in color_hsv.
* Modify the SIMD loops in color_hsv.
* Add FP supporting in bit logic.
* Add temporary compatibility code.
* Use max_nlanes instead of vlanes for array declaration.
* Use "CV_SIMD || CV_SIMD_SCALABLE".
* Revert the modify of the Universal Intrinsic API
* Fix warnings.
* Use v_select instead of bits manipulation.
2022-11-28 18:28:14 +00:00
Alexander Alekhin
5d14cc68b7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-11-16 16:54:11 +00:00
Alexander Alekhin
54531f8e3b
core: support CV_Check*() macros with 'bool' parameters
2022-11-15 11:47:16 +00:00
Alexander Smorkalov
778faddbd8
Merge pull request #22463 from hanliutong:rvv
...
Redesign the SIMD macro.
2022-10-27 14:16:03 +03:00
HAN Liutong
5462a6be6e
Update SIMD macro for RVV backend.
2022-10-26 13:02:03 +00:00
Alexander Smorkalov
a60496f9df
Merge pull request #22633 from cudawarped:fix_3361
...
Reset cuda runtime error code to cudasuccess on runtime failure.
2022-10-26 15:48:06 +03:00
Alexander Alekhin
762481411d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-10-15 16:44:47 +00:00
Hyunggi Chang
085fb78e85
fix typo (portatibility -> portability)
2022-10-13 21:39:52 +00:00
Alexander Alekhin
2763f988da
Merge pull request #22526 from paroj:pyrect
2022-10-13 11:46:28 +00:00
cudawarped
f89dee4f3e
Reset cuda error code to cudasuccess.
2022-10-13 10:15:40 +03:00
Pavel Rojtberg
35f43cc429
core: expose rectangle intersection to bindings
2022-10-12 14:08:12 +02:00
Alexander Alekhin
347246901e
Merge pull request #21745 from alalek:dnn_plugin_openvino
2022-10-08 22:32:25 +00:00
Alexander Alekhin
43b2bb2c25
dnn: plugin support for OpenVINO
2022-10-07 16:57:31 +00:00
Sean McBride
1829eba584
Fixed most clang -Wextra-semi warnings
2022-09-27 18:06:46 -04:00
HAN Liutong
df24bd295d
Fix v_signmask for RISC-V Vector.
2022-09-23 11:28:50 +00:00
Alexander Smorkalov
3857173845
Merge pull request #22287 from asenyaev:asen/disabled_compiling_warnings_5.x
...
Disabled compiling warnings in case of symbols in cmake for 5.x
2022-09-20 16:19:08 +03:00
Alexander Smorkalov
bfeeb0ad70
Merge pull request #22285 from asenyaev:asen/disabled_compiling_warnings_3.4
...
Disabled compiling warnings in case of symbols in cmake for 3.4
2022-09-20 15:14:36 +03:00
Alexander Smorkalov
2273af0166
Merge pull request #22286 from asenyaev:asen/disabled_compiling_warnings_4.x
...
Disabled compiling warnings in case of symbols in cmake for 4.x
2022-09-20 15:13:06 +03:00
Andrey Senyaev
752e5fdc26
Disabled compiling warnings in case of symbols in cmake for 5.x
2022-09-20 13:36:59 +03:00
Andrey Senyaev
ccfc34b13f
Disabled compiling warnings in case of symbols in cmake for 4.x
2022-09-20 13:35:48 +03:00
Andrey Senyaev
3f4abcb228
Disabled compiling warnings in case of symbols in cmake for 3.4
2022-09-20 13:34:17 +03:00
Alexander Alekhin
2e15582799
build: eliminate uninitialized warnings from GCC12
2022-09-14 11:58:43 +00:00
Hao Chen
fce8349c99
Optimize the cvCeil and cvFloor functions.
...
This patch optimizes the cvCeil and cvFloor functions on
the LoongArch platform.
Signed-off-by: Hao Chen <chenhao@loongson.cn>
2022-09-13 10:49:09 +03:00
wxsheng
4154bd0667
Add Loongson Advanced SIMD Extension support: -DCPU_BASELINE=LASX
...
* Add Loongson Advanced SIMD Extension support: -DCPU_BASELINE=LASX
* Add resize.lasx.cpp for Loongson SIMD acceleration
* Add imgwarp.lasx.cpp for Loongson SIMD acceleration
* Add LASX acceleration support for dnn/conv
* Add CV_PAUSE(v) for Loongarch
* Set LASX by default on Loongarch64
* LoongArch: tune test threshold for Core/HAL.mat_decomp/15
Co-authored-by: shengwenxue <shengwenxue@loongson.cn>
2022-09-10 09:39:43 +03:00
HAN Liutong
7e2c8cc9f4
Add remaining intrinsics.
2022-08-26 07:06:51 +00:00
Alexander Smorkalov
d10832074e
Merge pull request #22353 from hanliutong:more-rvv-intrin
...
[GSoC] Add more universal intrinsic implementations for RVV.
2022-08-23 12:50:01 +03:00
Alexander Alekhin
c25f776151
Merge branch 4.x
2022-08-21 15:27:31 +00:00
HAN Liutong
189f647264
Add implementation for zip, transpose, interleave, reverse and combine.
2022-08-17 14:38:38 +00:00
Alexander Alekhin
2ebdc04787
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-08-14 15:50:42 +00:00
HAN Liutong
e65ad44b32
Remove redundant intrinsics.
2022-08-12 14:12:52 +00:00
HAN Liutong
80c82e10aa
Update implementations on arithmetics.
2022-08-12 06:51:41 +00:00
HAN Liutong
f0d29cd33c
Add more universal intrinsic implementations for RVV.
2022-08-08 02:09:54 +00:00
HAN Liutong
2bd72af2ef
Merge pull request #22292 from hanliutong:fix
...
[GSoC] Fix compilation errors and warnings when using MSVC on Windows.
* Pass reference of the argument.
* Add some cast to suppress warnings.
2022-07-24 12:15:13 +03:00
HAN Liutong
3e3b53f815
Fix compile errors when all SIMD is disabled.
2022-07-21 08:14:32 +00:00
Tomoaki Teshima
b3269b08a1
neon: add dotprod dispatch implementation
...
* read vector at runtime
* add enum
2022-07-20 19:25:39 +09:00
HAN Liutong
0ef803950b
Merge pull request #22179 from hanliutong:new-rvv
...
[GSoC] New universal intrinsic backend for RVV
* Add new rvv backend (partially implemented).
* Modify the framework of Universal Intrinsic.
* Add CV_SIMD macro guards to current UI code.
* Use vlanes() instead of nlanes.
* Modify the UI test.
* Enable the new RVV (scalable) backend.
* Remove whitespace.
* Rename and some others modify.
* Update intrin.hpp but still not work on AVX/SSE
* Update conditional compilation macros.
* Use static variable for vlanes.
* Use max_nlanes for array defining.
2022-07-19 20:02:00 +03:00
Vadim Pisarevsky
b5adffd5c2
* cleaned cvRound(), cvFloor() and cvCeil() implementations, removed the old non-banking rounding branch completely
...
* enable the use of GCC/clang __builtin_*() functions more broadly
2022-06-24 14:58:32 +03:00
Alexander Alekhin
14754deb21
Merge tag '4.6.0'
2022-06-05 19:23:41 +00:00
Alexander Alekhin
b0dc474160
release: OpenCV 4.6.0
2022-06-05 15:32:44 +00:00
Alexander Alekhin
c103b63fe1
Merge tag '3.4.18'
2022-06-05 15:16:54 +00:00
Alexander Alekhin
a3d0882317
release: OpenCV 3.4.18
2022-06-05 07:52:44 +00:00
Namgoo Lee
24547f40ff
remove const from functions returning by value
2022-05-26 21:30:41 +09:00
Alexander Alekhin
e9428726ca
pre: OpenCV 4.6.0 (version++)
2022-05-23 19:25:16 +00:00
Alexander Alekhin
400906b433
pre: OpenCV 3.4.18 (version++)
2022-05-23 19:18:02 +00:00
OpenCV Developers
d9a444ca1a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-05-14 11:23:21 +00:00
OpenCV Pushbot
f35ec8c955
Merge pull request #21935 from Yulv-git:3.4-typos3
2022-05-13 17:30:57 +00:00
huangziqing
82ae9ef541
Wrap gpuMat::release to Python
2022-05-02 00:54:17 +08:00
Yulv-git
15ac54d5d6
Fix some typos in modules/.
2022-04-30 13:40:07 +08:00
Alexander Smorkalov
2402fa4824
Fix #21894 : Wrap constructor to Python to create initialized cuda::BufferPool object.
2022-04-28 12:18:26 +03:00
OpenCV Developers
0fbd58bef9
Merge branch 4.x
2022-04-23 22:07:14 +00:00
Qingnan Duan
2958142e31
Remove extra not in doc
2022-04-18 14:18:27 +08:00
Alexander Alekhin
13a995cc1d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-04-02 19:45:44 +00:00
shengwenxue
8b44ee2ce1
fix MSA sum overflow issue
2022-04-01 08:37:28 +00:00
HAN Liutong
3e4a566e46
Merge pull request #21351 from hanliutong:rvv-clang
...
* Update universal intrinsics of RVV back-end.
* Use array instead of malloc.
2022-03-30 20:04:34 +00:00
Alexander Alekhin
1339ebaa84
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-03-26 16:00:28 +00:00
pkubaj
f3699b5ac8
Fix build with LLVM 13 on ppc64le
...
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:352:12: warning: 'vec_permi' macro redefined [-Wmacro-redefined]
# define vec_permi(a, b, c) vec_xxpermdi(b, a, (3 ^ (((c) & 1) << 1 | (c) >> 1)))
^
/usr/lib/clang/13.0.0/include/altivec.h:13077:9: note: previous definition is here
#define vec_permi(__a, __b, __c) \
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:370:25: error: redefinition of 'vec_promote'
VSX_FINLINE(vec_dword2) vec_promote(long long a, int b)
^
/usr/lib/clang/13.0.0/include/altivec.h:14604:1: note: previous definition is here
vec_promote(signed long long __a, int __b) {
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:377:26: error: redefinition of 'vec_promote'
VSX_FINLINE(vec_udword2) vec_promote(unsigned long long a, int b)
^
/usr/lib/clang/13.0.0/include/altivec.h:14611:1: note: previous definition is here
vec_promote(unsigned long long __a, int __b) {
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/hal/intrin_vsx.hpp:1045:22: error: call to 'vec_rsqrt' is ambiguous
{ return v_float32x4(vec_rsqrt(x.val)); }
^~~~~~~~~
/usr/lib/clang/13.0.0/include/altivec.h:8472:34: note: candidate function
static vector float __ATTRS_o_ai vec_rsqrt(vector float __a) {
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:362:29: note: candidate function
VSX_FINLINE(vec_float4) vec_rsqrt(const vec_float4& a)
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/hal/intrin_vsx.hpp:1047:22: error: call to 'vec_rsqrt' is ambiguous
{ return v_float64x2(vec_rsqrt(x.val)); }
^~~~~~~~~
/usr/lib/clang/13.0.0/include/altivec.h:8477:35: note: candidate function
static vector double __ATTRS_o_ai vec_rsqrt(vector double __a) {
^
/wrkdirs/usr/ports/graphics/opencv/work/opencv-4.5.5/modules/core/include/opencv2/core/vsx_utils.hpp:365:30: note: candidate function
VSX_FINLINE(vec_double2) vec_rsqrt(const vec_double2& a)
^
1 warning and 4 errors generated.
The specific functions were added to altivec.h in LLVM's 1ff93618e58df210def48d26878c20a1b414d900, c3da07d216dd20fbdb7302fd085c0a59e189ae3d and 10cc5bcd868c433f9a781aef82178b04e98bd098.
2022-03-21 02:05:05 +00:00
rogday
e16cb8b4a2
Merge pull request #21703 from rogday:transpose
...
Add n-dimensional transpose to core
* add n-dimensional transpose to core
* add performance test, write sequentially and address review comments
2022-03-14 13:10:04 +00:00
Vincent Rabaud
057c3da82a
Allow Matx static function to work with Vec.
2022-03-04 14:06:20 +01:00
Vadim Levin
ccebbbc0ac
feature: submodule or a class scope for exported classes
...
All classes are registered in the scope that corresponds to C++
namespace or exported class.
Example:
`cv::ml::Boost` is exported as `cv.ml.Boost`
`cv::SimpleBlobDetector::Params` is exported as
`cv.SimpleBlobDetector.Params`
For backward compatibility all classes are registered in the global
module with their mangling name containing scope information.
Example:
`cv::ml::Boost` has `cv.ml_Boost` alias to `cv.ml.Boost` type
2022-03-02 14:30:52 +03:00
Tatsuro Shibamura
d354ad1c34
Merge pull request #21630 from shibayan:arm64-msvc-neon
...
* Added NEON support in builds for Windows on ARM
* Fixed `HAVE_CPU_NEON_SUPPORT` display broken during compiler test
* Fixed a build error prior to Visual Studio 2022
2022-02-26 17:35:03 +00:00
Vadim Levin
119d8b3aca
Merge pull request #21553 from VadimLevin:dev/vlevin/scope-for-classes-4x-port
...
4.x: submodule or a class scope for exported classes
* feature: submodule or a class scope for exported classes
All classes are registered in the scope that corresponds to C++
namespace or exported class.
Example:
`cv::ml::Boost` is exported as `cv.ml.Boost`
`cv::SimpleBlobDetector::Params` is exported as
`cv.SimpleBlobDetector.Params`
For backward compatibility all classes are registered in the global
module with their mangling name containing scope information.
Example:
`cv::ml::Boost` has `cv.ml_Boost` alias to `cv.ml.Boost` type
* refactor: remove redundant GAPI aliases
* fix: use explicit string literals in CVPY_TYPE macro
* fix: add handling for class aliases
2022-02-25 01:17:43 +03:00
Alexander Alekhin
899b4d1452
Merge branch 4.x
2022-02-22 19:55:26 +00:00
Alexander Alekhin
5a86592e93
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-02-19 21:04:35 +00:00
Yuriy Chernyshov
0898f372b1
Аix -Winvalid-noreturn under clang-cl
2022-02-18 17:57:46 +03:00
Alexander Alekhin
8d88bb06b2
core(vsx): update vec_absd() workaround condition
2022-02-15 07:26:40 +03:00
Alexander Alekhin
19926e2979
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-02-11 17:32:37 +00:00
Greg Fiumara
dae73938e8
Fix cv::FileStorage::Mode::Memory doxygen layout
2022-02-09 12:24:50 -05:00
Alexander Alekhin
d573472a86
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-01-31 12:53:45 +00:00
Vadim Levin
d88730685e
fix: submodules creation and registration
...
- Add special case handling when submodule has the same name as parent
- `PyDict_SetItemString` doesn't steal reference, so reference count
should be explicitly decremented to transfer object life-time
ownership
- Add sanity checks for module registration input
- Add Python 2 and Python 3 reference counting handling
2022-01-27 11:06:06 +03:00
Alexander Alekhin
83ce1de8e7
Merge pull request #21506 from alalek:core_fp_denormals
2022-01-26 08:52:27 +00:00
Alexander Alekhin
123519165d
core: FP denormals hints support
2022-01-26 05:19:02 +00:00
Yuriy Chernyshov
d1b533d399
Disable -Wreturn-type-c-linkage under clang-cl
...
clang-cl defines both __clang__ and _MSC_VER, yet uses `#pragma GCC` to disable certain diagnostics.
At the time `-Wreturn-type-c-linkage` was reported by clang-cl.
This PR fixes this behavior by reordering defines.
2022-01-24 11:42:02 +03:00
Vadim Levin
eca2d92791
fix: submodules creation and registration
...
- Add special case handling when submodule has the same name as parent
- `PyDict_SetItemString` doesn't steal reference, so reference count
should be explicitly decremented to transfer object life-time
ownership
- Add sanity checks for module registration input
2022-01-19 18:06:58 +03:00
Alexander Alekhin
aebb65e983
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-01-12 13:26:10 +00:00
cudawarped
ecfbaa267d
Merge pull request #21374 from cudawarped:fix_cuda_event_flags
...
Allow cv::cuda::Event to accept combinations of flags
2022-01-11 23:57:25 +03:00
Vincent Rabaud
bf5e09d5ab
Remove unnecessary use of ref-capture in code example.
2022-01-05 13:42:55 +01:00
Joe Howse
c2209ad5e4
Doc warnings about experimental UMatUsageFlags
2021-12-31 13:51:06 -04:00
Alexander Alekhin
a0d5277e0d
Merge branch 4.x
2021-12-30 21:43:45 +00:00
Rostislav Vasilikhin
9d6f388809
Merge pull request #21018 from savuor:levmarqfromscratch
...
New LevMarq implementation
* Hash TSDF fix: apply volume pose when fetching pose
* DualQuat minor fix
* Pose Graph: getEdgePose(), getEdgeInfo()
* debugging code for pose graph
* add edge to submap
* pose averaging: DualQuats instead of matrix averaging
* overlapping ratio: rise it up; minor comment
* remove `Submap::addEdgeToSubmap`
* test_pose_graph: minor
* SparseBlockMatrix: support 1xN as well as Nx1 for residual vector
* small changes to old LMSolver
* new LevMarq impl
* Pose Graph rewritten to use new impl
* solvePnP(), findHomography() and findExtrinsicCameraParams2() use new impl
* estimateAffine...2D() use new impl
* calibration and stereo calibration use new impl
* BundleAdjusterBase::estimate() uses new impl
* new LevMarq interface
* PoseGraph: changing opt interface
* findExtrinsicCameraParams2(): opt interface updated
* HomographyRefine: opt interface updated
* solvePnPRefine opt interface fixed
* Affine2DRefine opt interface fixed
* BundleAdjuster::estimate() opt interface fixed
* calibration: opt interface fixed + code refactored a little
* minor warning fixes
* geodesic acceleration, Impl -> Backend rename
* calcFunc() always uses probe vars
* solveDecomposed, fixing negation
* fixing geodesic acceleration + minors
* PoseGraph exposes its optimizer now + its tests updated to check better convegence
* Rosenbrock test added for LevMarq
* LevMarq params upgraded
* Rosenbrock can do better
* fixing stereo calibration
* old implementation removed (as well as debug code)
* more debugging code removed
* fix warnings
* fixing warnings
* fixing Eigen dependency
* trying to fix Eigen deps
* debugging code for submat is now temporary
* trying to fix Eigen dependency
* relax sanity check for solvePnP
* relaxing sanity check even more
* trying to fix Eigen dependency
* warning fix
* Quat<T>: fixing warnings
* more warning fixes
* fixed warning
* fixing *KinFu OCL tests
* algo params -> struct Settings
* Backend moved to details
* BaseLevMarq -> LevMarqBase
* detail/pose_graph.hpp -> detail/optimizer.hpp
* fixing include stuff for details/optimizer.hpp
* doc fix
* LevMarqBase rework: Settings, pImpl, Backend
* Impl::settings and ::backend fix
* HashTSDFGPU fix
* fixing compilation
* warning fix for OdometryFrameImplTMat
* docs fix + compile warnings
* remake: new class LevMarq with pImpl and enums, LevMarqBase => detail, no Backend class, Settings() => .cpp, Settings==() removed, Settings.set...() inlines
* fixing warnings & whitespace
2021-12-27 21:51:32 +00:00
Alexander Alekhin
db172d1053
Merge tag '4.5.5'
2021-12-25 11:22:16 +00:00
Alexander Alekhin
dad26339a9
release: OpenCV 4.5.5
2021-12-25 03:53:27 +00:00
Rostislav Vasilikhin
3048188b5b
Merge pull request #21319 from savuor:backport_levmarqfromscratch
...
Warning fixes for quaternion headers
* warning fixes for quaternion headers
* a/T(x) => a * T(1/x)
2021-12-24 23:00:21 +00:00
Alexander Alekhin
217fea9667
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-24 16:48:07 +00:00
Alexander Alekhin
523c3cd50b
Merge tag '3.4.17'
2021-12-24 16:45:05 +00:00
Alexander Alekhin
631126c77a
release: OpenCV 3.4.17
2021-12-24 16:39:15 +00:00
Alexander Alekhin
cdfa8a668b
python: use '((x,y), (w,h), angle)' in std::vector<RotatedRect>
2021-12-24 15:01:45 +00:00
Alexander Alekhin
c78a8dfd2d
fix 4.x links
2021-12-22 13:24:30 +00:00
Alexander Alekhin
07dca8cc03
pre: OpenCV 4.5.5 (version++)
2021-12-17 10:12:11 +00:00
Alexander Alekhin
60c093f086
pre: OpenCV 3.4.17 (version++)
2021-12-17 10:05:52 +00:00
Alexander Alekhin
d24befa0bc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-11 15:18:57 +00:00
Vincent Rabaud
6b4ea68bc7
Solve Rect overflow issues.
...
Fow now, it is possible to define valid rectangle for which some
functions overflow (e.g. br(), ares() ...).
This patch fixes the intersection operator so that it works with
any rectangle.
2021-12-09 12:04:26 +01:00
HAN Liutong
4935b14539
Merge pull request #21012 from hanliutong:rvv_clang
...
Update RVV backend for using Clang.
* Update cmake file of clang.
* Modify the RVV optimization on DNN to adapt to clang.
* Modify intrin_rvv: Disable some existing types.
* Modify intrin_rvv: Reinterpret instead of load&cast.
* Modify intrin_rvv: Update load&store without cast.
* Modify intrin_rvv: Rename vfredsum to fredosum.
* Modify intrin_rvv: Rewrite Check all/any by using vpopc.
* Modify intrin_rvv: Use reinterpret instead of c-style casting.
* Remove all macros which is not used in v_reinterpret
* Rename vpopc to vcpop according to spec.
2021-12-03 15:13:24 +00:00
rogday
f044037ec5
Merge pull request #20733 from rogday:argmaxnd
...
Implement ArgMax and ArgMin
* add reduceArgMax and reduceArgMin
* fix review comments
* address review concerns
2021-11-28 16:17:46 +00:00
Suleyman TURKMEN
4f0fe1de96
clean up c-api
2021-11-28 12:09:34 +03:00
yuki takehara
a6277370ca
Merge pull request #21107 from take1014:remove_assert_21038
...
resolves #21038
* remove C assert
* revert C header
* fix several points in review
* fix test_ds.cpp
2021-11-27 18:34:52 +00:00
Alexander Alekhin
d228c5459d
core: avoid using of 'check' identifier
2021-11-18 16:02:59 +00:00
Alexander Alekhin
827ff80c06
Merge pull request #20977 from JulieBar:remap_overflow
2021-11-11 22:06:16 +00:00
Alexander Alekhin
7842181b47
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-11-05 09:27:46 +00:00
Alexander Alekhin
2ce47fda88
Merge pull request #21011 from vrabaud:3.4
2021-11-05 09:25:50 +00:00
Vincent Rabaud
ffd010767f
Only use fma functions when CV_FMA3 is set.
...
In practice, processors offering AVX2/AVX512 also FMA, that is why it got unnoticed.
2021-11-04 23:15:49 +01:00
Alexander Alekhin
7b57df02a7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-30 14:26:17 +00:00
Julie Bareeva
69d0bc8fd5
Added overflow handling during conversion from float to int for LinearFilter
2021-10-29 19:46:11 +03:00
Alexander Alekhin
74cc63ba2f
Merge pull request #20969 from alalek:fix_msvc_clang_warning_noreturn
2021-10-28 23:00:49 +00:00
Alexander Alekhin
a49cda6523
core: eliminate Winvalid-noreturn in base.hpp
2021-10-28 21:33:20 +00:00
Alexander Alekhin
6bd143dd25
Merge pull request #20961 from alalek:fix_msvc_clang
2021-10-28 13:54:24 +00:00
Alexander Alekhin
75e2ba5af3
core(simd): fix compilation with MSVC-Clang
2021-10-28 11:25:00 +00:00
Alexander Alekhin
1726bb6c0d
build(icc): fix nodiscard attribute handling
2021-10-28 05:52:22 +00:00
Alexander Alekhin
6a2077cbd8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-23 15:33:31 +00:00
Alexander Alekhin
c0c71d6b3a
Merge pull request #20920 from alalek:hotfix_clang_abi
2021-10-21 11:35:58 +00:00
Alexander Alekhin
bac1c6d12f
hotfix: repair Clang ABI
2021-10-21 09:36:25 +00:00
Alexander Alekhin
fce4a19d0d
5.x: cleanup compatibility code (2021-10)
2021-10-20 17:40:04 +00:00
Alexander Alekhin
b1f422c1c5
Merge pull request #20894 from alalek:core_simd_int64_ctor_sse
2021-10-19 13:29:52 +00:00
Alexander Alekhin
b5fcb06a76
core(SIMD): update int64 SSE constructor
2021-10-18 18:59:40 +00:00
Sergiu Deitsch
f8f9f3c438
fixed AVX compile error
...
Some older compilers do not allow to pass a `const int` as an immediate. Use an unnamed enum instead.
2021-10-18 14:56:19 +02:00
Alexander Alekhin
7ba26ada12
Merge branch 4.x
2021-10-15 21:53:39 +00:00
Alexander Alekhin
31c40fa4cc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-15 13:35:03 +00:00
Alexander Alekhin
982503e9a8
core: ensure 'int' result from CV_POPCNT_U64(x)
2021-10-13 01:14:37 +00:00
Alexander Alekhin
8c7dc1f6b7
core: OPENCV_ABI_COMPATIBILITY=500
2021-10-12 12:07:12 +03:00
Alexander Alekhin
39c3334147
Merge tag '4.5.4'
2021-10-10 00:22:46 +00:00
Alexander Alekhin
4223495e6c
release: OpenCV 4.5.4
2021-10-09 15:48:26 +00:00
Alexander Alekhin
62252d157e
Merge tag '3.4.16'
2021-10-08 19:05:00 +00:00
Alexander Alekhin
b1cf550123
release: OpenCV 3.4.16
2021-10-08 18:31:56 +00:00
Alexander Alekhin
e75387f029
core: fix compilation of copy ctors/assignment operators with GCC 4.x
2021-10-08 00:49:30 +00:00
Alexander Alekhin
eab2b9dc09
core: ensure is_trivially_copyable for simple types
2021-10-06 21:39:53 +00:00
Alexander Alekhin
3e6f27522b
pre: OpenCV 4.5.4 (version++)
2021-10-04 22:35:47 +00:00
Alexander Alekhin
ebef84e9ea
pre: OpenCV 3.4.16 (version++)
2021-10-04 20:47:07 +00:00
Vadim Levin
3c89a28a06
Merge pull request #20611 from VadimLevin:dev/vlevin/pure-python-modules
...
* feat: OpenCV extension with pure Python modules
* feat: cv2 is now a Python package instead of extension module
Python package cv2 now can handle both Python and C extension modules
properly without additional "subfolders" like "_extra_py_code".
* feat: can call native function from its reimplementation in Python
2021-09-18 10:02:55 +03:00
Alexander Alekhin
c3ac834526
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-09-11 21:27:26 +00:00
Alexander Alekhin
5578ad5e14
dnn(ocl): fix automatic globalsize adjusting
...
- if kernel code doesn't support that
2021-09-06 03:11:29 +00:00
Alexander Alekhin
5aa7435d25
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-09-02 15:24:04 +00:00
Alexander Alekhin
6625810d2a
Merge pull request #20618 from VadimLevin:dev/vlevin/fix-vector-conversion
2021-09-01 10:52:37 +00:00
Vadim Levin
16b9514543
feat: update conversion logic for std::vector<T> in Python bindings
...
`PyObject*` to `std::vector<T>` conversion logic:
- If user passed Numpy Array
- If array is planar and T is a primitive type (doesn't require
constructor call) that matches with the element type of array, then
copy element one by one with the respect of the step between array
elements. If compiler is lucky (or brave enough) copy loop can be
vectorized.
For classes that require constructor calls this path is not
possible, because we can't begin an object lifetime without hacks.
- Otherwise fall-back to general case
- Otherwise - execute the general case:
If PyObject* corresponds to Sequence protocol - iterate over the
sequence elements and invoke the appropriate `pyopencv_to` function.
`std::vector<T>` to `PyObject*` conversion logic:
- If `std::vector<T>` is empty - return empty tuple.
- If `T` has a corresponding `Mat` `DataType` than return
Numpy array instance of the matching `dtype` e.g.
`std::vector<cv::Rect>` is returned as `np.ndarray` of shape `Nx4` and
`dtype=int`.
This branch helps to optimize further evaluations in user code.
- Otherwise - execute the general case:
Construct a tuple of length N = `std::vector::size` and insert
elements one by one.
Unnecessary functions were removed and code was rearranged to allow
compiler select the appropriate conversion function specialization.
2021-09-01 13:00:21 +03:00
Dale Phurrough
3995deaf76
fix opencv/opencv#20544 nodiscard for msvc/gcc
...
- includes workaround for preprocessor non-compliance
- enable attribute syntax checking in msvc
2021-08-28 20:22:47 +02:00
HAN Liutong
2f31763335
fix v_reduce_sum
2021-08-24 11:42:19 +08:00
Rostislav Vasilikhin
bae9cef0b5
Merge pull request #20013 from savuor:rgbd_to_3d
...
Moving RGBD parts to 3d
* files moved from rgbd module in contrib repo
* header paths fixed
* perf file added
* lapack compilation fixed
* Rodrigues fixed in tests
* rgbd namespace removed
* headers fixed
* initial: rgbd files moved to 3d module
* rgbd updated from latest contrib master; less file duplication
* "std::" for sin(), cos(), etc.
* KinFu family -> back to contrib
* paths & namespaces
* removed duplicates, file version updated
* namespace kinfu removed from 3d module
* forgot to move test_colored_kinfu.cpp to contrib
* tests fixed: Params removed
* kinfu namespace removed
* it works without objc bindings
* include headers fixed
* tests: data paths fixed
* headers moved to/from public API
* Intr -> Matx33f in public API
* from kinfu_frame.hpp to utils.hpp
* submap: Intr -> Matx33f, HashTSDFVolume -> Volume; no extra headers
* no RgbdFrame class, no Mat fields & arg -> InputArray & pImpl
* get/setPyramidAt() instead of lots of methods
* Mat -> InputArray, TMat
* prepareFrameCache: refactored
* FastICPOdometry: +truncate threshold, +depthFactor; Mat/UMat choose
* Mat/UMat choose
* minor stuff related to headers
* (un)signed int warnings; compilation minor issues
* minors: submap: pyramids -> OdometryFrame; tests fix; FastICP minor; CV_EXPORTS_W for kinfu_frame.hpp
* FastICPOdometry: caching, rgbCameraMatrix
* OdometryFrame: pyramid%s% -> pyramids[]
* drop: rgbCameraMatrix from FastICP, RGB cache mode, makeColoredFrameFrom depth and all color-functions it calls
* makeFrameFromDepth, buildPyramidPointsNormals -> from public to internal utils.hpp
* minors
* FastICPOdometry: caching updated, init fields
* OdometryFrameImpl<UMat> fixed
* matrix building fixed; minors
* returning linemode back to contrib
* params.pose is Mat now
* precomp headers reorganized
* minor fixes, header paths, extra header removed
* minors: intrinsics -> utils.hpp; whitespaces; empty namespace; warning fixed
* moving declarations from/to headers
* internal headers reorganized (once again)
* fix include
* extra var fix
* fix include, fix (un)singed warning
* calibration.cpp: reverting back
* headers fix
* workaround to fix bindings
* temporary removed wrappers
* VolumeType -> VolumeParams
* (temporarily) removing wrappers for Volume and VolumeParams
* pyopencv_linemod -> contrib
* try to fix test_rgbd.py
* headers fixed
* fixing wrappers for rgbd
* fixing docs
* fixing rgbdPlane
* RgbdNormals wrapped
* wrap Volume and VolumeParams, VolumeType from enum to int
* DepthCleaner wrapped
* header folder "rgbd" -> "3d"
* fixing header path
* VolumeParams referenced by Ptr to support Python wrappers
* render...() fixed
* Ptr<VolumeParams> fixed
* makeVolume(... resolution -> [X, Y, Z])
* fixing static declaration
* try to fix ios objc bindings
* OdometryFrame::release...() removed
* fix for Odometry algos not supporting UMats: prepareFrameCache<>()
* preparePyramidMask(): fix to compile with TMat = UMat
* fixing debug guards
* removing references back; adding makeOdometryFrame() instead
* fixing OpenCL ICP hanging (some threads exit before reaching the barrier -> the rest threads hang)
* try to fix objc wrapper warnings; rerun builders
* VolumeType -> VolumeKind
* try to fix OCL bug
* prints removed
* indentation fixed
* headers fixed
* license fix
* WillowGarage licence notion removed, since it's in OpenCV's COPYRIGHT already
* KinFu license notion shortened
* debugging code removed
* include guards fixed
* KinFu license left in contrib module
* isValidDepth() moved to private header
* indentation fix
* indentation fix in src files
* RgbdNormals rewritten to pImpl
* minor
* DepthCleaner removed due to low code quality, no depthScale provided, no depth images found to be successfully filtered; can be replaced by bilateral filtering
* minors, indentation
* no "private" in public headers
* depthTo3d test moved from separate file
* Normals: setDepth() is useless, removing it
* RgbdPlane => findPlanes()
* rescaleDepth(): minor
* warpFrame: minor
* minor TODO
* all Odometries (except base abstract class) rewritten to pImpl
* FastICPOdometry now supports maxRotation and maxTranslation
* minor
* Odometry's children: now checks are done in setters
* get rid of protected members in Odometry class
* get/set cameraMatrix, transformType, maxRot/Trans, iters, minGradients -> OdometryImpl
* cameraMatrix: from double to float
* matrix exponentiation: Eigen -> dual quaternions
* Odometry evaluation fixed to reuse existing code
* "small" macro fixed by undef
* pixNorm is calculated on CPU only now (and then uploads on GPU)
* test registration: no cvtest classes
* test RgbdNormals and findPlanes(): no cvtest classes
* test_rgbd.py: minor fix
* tests for Odometry: no cvtest classes; UMat tests; logging fixed
* more CV_OVERRIDE to overriden functions
* fixing nondependent names to dependent
* more to prev commit
* forgotten fixes: overriden functions, (non)dependent names
* FastICPOdometry: fix UMat support when OpenCL is off
* try to fix compilation: missing namespaces
* Odometry: static const-mimicking functions to internal constants
* forgotten change to prev commit
* more forgotten fixes
* do not expose "submap.hpp" by default
* in-class enums: give names, CamelCase, int=>enums; minors
* namespaces, underscores, String
* std::map is used by pose graph, adding it
* compute()'s signature fixed, computeImpl()'s too
* RgbdNormals: Mat -> InputArray
* depth.hpp: Mat -> InputArray
* cameraMatrix: Matx33f -> InputArray + default value + checks
* "details" headers are not visible by default
* TSDF tests: rearranging checks
* cameraMatrix: no (realistic) default value
* renderPointsNormals*(): no wrappers for them
* debug: assert on empty frame in TSDF tests
* debugging code for TSDF GPU
* debug from integrate to raycast
* no (non-zero) default camera matrix anymore
* drop debugging code (does not help)
* try to fix TSDF GPU: constant -> global const ptr
2021-08-22 13:18:45 +00:00
Daniel Playfair Cal
4d63a89fa6
Merge pull request #20536 from hedgepigdaniel:fix/ocl-context-create-ownership
...
docs(core/ocl): clarify ownership of arguments passed into OpenCL related functions
* docs(core/ocl): clarify ownership in OpenCLExecutionContext::create
Although it is technically true that OpenCLExecutionContext::create
calls `clRetainContext` on its context argument, it is misleading
because it does not increase the reference count overall. Clarify that
the ownership of one reference of the passed context and device is
taken.
* docs(core/ocl): document ownership transfer in ocl::Device::fromHandle
2021-08-11 20:58:08 +03:00
Alexander Alekhin
424eaba4c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-08-07 17:25:06 +00:00
Alexander Smorkalov
6a2e559222
Fixed memory access issue in v_rshr_pack_store intrinsic on RISC-V RVV.
2021-08-04 20:04:03 +03:00
Vadim Levin
531ea5b3a2
fix: convert arguments names that are keywords reserved by Python
2021-08-01 12:02:36 +03:00
Zhuo Zhang
bdd3930855
Fix typo in comment, OpenMP => TBB
2021-07-29 09:34:09 +08:00
ZhangYin
acc576658a
Merge pull request #20412 from joy2myself:rvv-0.10
...
bug fixes for universal intrinsics of RISC-V back-end
* Align universal intrinsic comparator behaviour with other platforms
Set all bits to one for return value of int and fp comparators.
* fix v_pack_triplets, v_pack_store and v_pack_u_store
* Remove redundant CV_DECL_ALIGNED statements
Co-authored-by: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
2021-07-23 17:08:43 +03:00
Alexander Alekhin
9103837228
Merge pull request #20278 from joy2myself:rvv-0.10
2021-07-09 22:42:29 +00:00
Francesco Petrogalli
b928ebdd53
Merge pull request #19985 from fpetrogalli:disable_threads
...
* [build][option] Introduce `OPENCV_DISABLE_THREAD_SUPPORT` option.
The option forces the library to build without thread support.
* update handling of OPENCV_DISABLE_THREAD_SUPPORT
- reduce amount of #if conditions
* [to squash] cmake: apply mode vars in toolchains too
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-07-08 20:21:21 +00:00
Alexander Alekhin
aaad1791d9
Merge tag '4.5.3'
2021-07-05 21:48:40 +00:00
Alexander Alekhin
ad6e82942b
release: OpenCV 4.5.3
2021-07-05 12:03:22 +00:00
Alexander Alekhin
9a9954a036
Merge tag '3.4.15'
2021-07-04 21:32:19 +00:00
Alexander Alekhin
591708903b
release: OpenCV 3.4.15
2021-07-04 21:10:13 +00:00
Alexander Alekhin
8fad85edda
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-01 10:52:31 +00:00
Alexander Alekhin
94c67faaea
Merge pull request #20336 from JoeHowse:refactor-cl_image-float16-conversions
2021-07-01 09:52:19 +00:00
Joe Howse
6a3d925a47
OpenCL: core support for FP16, more channel orders
...
* Support cl_image conversion for CL_HALF_FLOAT (float16)
* Support cl_image conversion for additional channel orders:
CL_A, CL_INTENSITY, CL_LUMINANCE, CL_RG, CL_RA
* Comment on why cl_image conversion is unsupported for CL_RGB
* Predict optimal vector width for float16
* ocl::kernelToStr: support float16
* ocl::Device::halfFPConfig: drop artificial requirement for OpenCL
version >= 1.2. Even OpenCL 1.0 supports the underlying config
property, CL_DEVICE_HALF_FP_CONFIG.
* dumpOpenCLInformation: provide info on OpenCL half-float support
and preferred half-float vector width
* randu: support default range [-1.0, 1.0] for float16
* TestBase::warmup: support float16
2021-06-30 14:14:37 -03:00
Dale Phurrough
8be86cbdfd
add usageFlags to UMat static factories
...
- add abi compatible overloads
- add test case
2021-06-23 18:50:33 +02:00
kikaxa
bb60cb0bf9
Reenable filesystem for ios builds
2021-06-20 16:33:25 +00:00
Zhang Yin
3a15a3821a
Update RISC-V back-end to RVV 0.10
2021-06-18 15:44:38 +08:00
Alexander Alekhin
7a5f554bc4
Merge branch 4.x
2021-06-13 10:27:44 +00:00
Alexander Alekhin
bc1af6227a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-09 10:58:37 +00:00
Alexander Alekhin
5f80f43ff5
core: fix nSize initialization in cvIplImage()
2021-06-09 07:31:38 +00:00
Alexander Alekhin
b57faa41c2
pre: OpenCV 4.5.3 (version++)
2021-06-08 08:52:20 +00:00
JoeHowse
34183237ce
Merge pull request #20203 from JoeHowse:clMath-patches
...
Fix dynamic loading of clBLAS and clFFT (formerly, clAmdBlas and clAmdFft)
* Fix dynamic loading of clBLAS and clFFT
* Update filenames and function names for clBLAS (formerly, clAmdBlas)
* Update filenames and function names for clFFT (formerly, clAmdFft)
* Uncomment teardown of clFFT; tear down clFFT in same way as clBLAS
* Fix generators for clBLAS and clFFT headers
* Update generators to parse recent clBLAS and clFFT library headers
* Update generators to be compatible with Python 3
* Re-generate OpenCV's clBLAS and clFFT headers
* Update function calls to match names in newly generated headers
* Disable (and comment on) teardown code for clBLAS and clFFT
* Renaming *clamd* files
* Renaming *clamdblas* files to *clblas*
* Renaming *clamdfft* files to *clfft*
* Update generator for CL headers
* Update generator to be compatible with Python 3
2021-06-07 20:24:27 +00:00
Alexander Alekhin
286ec92967
Merge pull request #20027 from diablodale:fix19807-UMat-usageFlags
2021-06-07 20:20:13 +00:00
Alexander Alekhin
43940f7ffc
pre: OpenCV 3.4.15 (version++)
2021-06-07 20:10:34 +00:00
Vadim Pisarevsky
958d3e8c60
Merge pull request #20225 from vpisarev:remove_c_3d
2021-06-07 16:55:15 +00:00
Vadim Pisarevsky
eff6d32337
* refactored the remaining old-style functions in 3d and calib modules to use the new C++ API.
...
* extended C++ version of Levenberg-Marquardt (LM) solver to accommodate all features of the C counterpart.
* removed C version of LM solver
* made a few other little changes to make the code compile and run smoothly
2021-06-07 20:55:25 +08:00
Alexander Alekhin
b91e0dca90
Merge branch 4.x
2021-06-04 15:18:51 +00:00
Alexander Alekhin
3e513ee6ab
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-03 16:23:36 +00:00
Dale Phurrough
c2ce3d927a
UMat usageFlags fixes opencv/opencv#19807
...
- corrects code to support non- USAGE_DEFAULT settings
- accuracy, regression, perf test cases
- not tested on the 3.x branch
2021-06-03 16:33:03 +02:00
Developer-Ecosystem-Engineering
814550d2a6
Merge pull request #20011 from Developer-Ecosystem-Engineering:3.4
...
Improve performance on Arm64
* Improve performance on Apple silicon
This patch will
- Enable dot product intrinsics for macOS arm64 builds
- Enable for macOS arm64 builds
- Improve HAL primitives
- reduction (sum, min, max, sad)
- signmask
- mul_expand
- check_any / check_all
Results on a M1 Macbook Pro
* Updates to #20011 based on feedback
- Removes Apple Silicon specific workarounds
- Makes #ifdef sections smaller for v_mul_expand cases
- Moves dot product optimization to compiler optimization check
- Adds 4x4 matrix transpose optimization
* Remove dotprod and fix v_transpose
Based on the latest, we've removed dotprod entirely and will revisit in a future PR.
Added explicit cats with v_transpose4x4()
This should resolve all opens with this PR
* Remove commented out lines
Remove two extraneous comments
2021-06-01 09:39:55 +03:00
HAN Liutong
8bd5405228
Fix RVV toolchain conflicts.
2021-05-30 16:00:18 +08:00
Alexander Alekhin
830cb5cad7
Merge pull request #20116 from alalek:highgui_backends
2021-05-26 08:32:14 +00:00
damonyu1989
5f637e5a02
Merge pull request #19778 from damonyu1989:master-riscv-0.7.1
...
* Add the support for riscv64 vector 0.7.1.
* fixed GCC warnings
* cleaned whitespaces
* Remove the worning by the use of internal API of compiler.
* Update the license header.
* removed trailing whitespaces
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@me.com>
Co-authored-by: yulj <linjie.ylj@alibaba-inc.com>
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
2021-05-25 20:15:12 +03:00
Alexander Alekhin
70f69cb265
highgui: backends and plugins
2021-05-24 16:12:02 +00:00
HattrickGenerator
115e471515
Merge pull request #19967 from HattrickGenerator:master
...
* Adding functions rbegin() and rend() functions to matrix class.
This is important to be more standard compliant with C++ and an ever increasing number of people using standard algorithms for better code readability- and maintainability.
The functions are copy pated from their counterparts (even though they should probably call the counterparts but this gave me some troube).
They return iterators using std::reverse_iterators
Follow up of an open feature request:
https://github.com/opencv/opencv/issues/4641
* Fix rbegin() and rend() and provide tests for them
* Removing unnecessary whitespaces
* Adding rbegin and rend to Mat_ class with the right parameters so we don't need to repeat the template argument.
An instantiating cv::Mat_<int> for example can call it's rbegin() function and doesn't need rbegin<int>() with this convience addition.
Follows what is done for forward iterators
* static cast the vector size (return size_t) to an int (that is required for opencv mat constructor)
Co-authored-by: Stefan <stefan.gerl@tum.de>
2021-05-20 19:21:34 +00:00
Alexander Alekhin
7d66f1e391
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-05-18 18:06:26 +00:00
Mikhail Nikolskii
a604d44d06
Merge pull request #19755 from mikhail-nikolskiy:ffmpeg-umat
...
cv::UMat output/input in VideoCapture/VideoWriter (data stays in GPU memory)
* FFMPEG with UMat input/output
* OpenCL_D3D* context
* fix Linux build
* cosmetic changes
* fix build if USE_AV_HW_CODECS=0
* simplify how child context pointer stored in parent context
* QSV interop with OpenCL on Windows
* detect_msdk.cmake via pkg-config
* fix av_buffer_ref() usage
* revert windows-decode-mfx whitelisting; remove debug msg
* address review comments
* rename property to HW_ACCELERATION_USE_OPENCL
* fix issue with "cl_khr_d3d11_sharing" extension not reported by OpenCL GPU+CPU platform
* core(ocl): add OpenCL stubs for configurations without OpenCL
* videoio(ffmpeg): update #if guards
* Put OpenCL related code under HAVE_OPENCL; simplify reuse of media context from OpenCL context
* videoio(test): skip unsupported tests
- plugins don't support OpenCL/UMat yet
- change handling of *_USE_OPENCL flag
* videoio(ffmpeg): OpenCL dependency
* videoio(ffmpeg): MediaSDK/oneVPL dependency
* cleanup, logging
* cmake: fix handling of 3rdparty interface targets
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-05-14 16:48:50 +00:00
berak
302c2354a3
core: add missing implementation for Mat::ptr(Vec)
2021-05-09 14:15:12 +02:00
Alexander Alekhin
170bf6d7af
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-05-01 09:44:24 +00:00
Zhuo Zhang
bf26050f7e
Fix missing return type for unsafe CV_XADD function
2021-04-26 20:08:45 +08:00
Alexander Alekhin
cfb77091ca
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-04-15 20:50:26 +00:00
Alexander Alekhin
fc628014bb
Merge branch 4.x
2021-04-10 18:03:01 +00:00
Suleyman TURKMEN
ec8b7c933a
Update Documentation
2021-04-08 22:29:45 +03:00
Alexander Alekhin
125b9f6057
Merge tag '4.5.2'
2021-04-02 17:30:52 +00:00
Alexander Alekhin
69357b1e88
release: OpenCV 4.5.2
2021-04-02 11:23:54 +00:00
Alexander Alekhin
2cf1a13755
Merge tag '3.4.14'
2021-04-02 09:31:32 +00:00
Alexander Alekhin
d0e3e638c3
release: OpenCV 3.4.14
2021-04-01 21:37:19 +00:00
Alexander Alekhin
3e1673e8b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-04-01 09:54:57 +00:00
Alexander Alekhin
b26f5b9468
core: backward compatibility for vx_store/vx_store_aligned calls
2021-04-01 02:17:47 +00:00
Vitaly Tuzov
aab62aa6dd
Merge pull request #18952 from terfendail:wui_doc
...
* Updated UI documentation to address WUI
* Added documentation for vx_ calls
* Removed vx_store operation overload
* Doxyfile updated to enable wide UI
* Enable doxygen documentation for vx_ WUI functions
* Wide intrinsics definition rework
* core: fix SIMD C++ emulator build (supports 128-bit only)
2021-03-30 16:18:03 +00:00
Alexander Alekhin
35eaacd1db
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-27 15:35:16 +00:00
Jonathan Deakin
29a289dfa1
Add v_expand for AArch64, fuse vmovl+vget_high into vmovl_high
2021-03-23 15:06:41 +00:00
