1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2025-11-17 12:30:39 +03:00
64 changed files with 988 additions and 384 deletions
+12
View File
@@ -1165,6 +1165,10 @@ void cv::add( InputArray src1, InputArray src2, OutputArray dst,
if (src1.empty() && src2.empty())
{
dst.release();
if (dtype >= 0)
{
dst.create(0, 0, dtype);
}
return;
}
@@ -1192,6 +1196,10 @@ void cv::subtract( InputArray _src1, InputArray _src2, OutputArray _dst,
if (_src1.empty() && _src2.empty())
{
_dst.release();
if (dtype >= 0)
{
_dst.create(0, 0, dtype);
}
return;
}
@@ -1409,6 +1417,10 @@ void cv::addWeighted( InputArray src1, double alpha, InputArray src2,
if (src1.empty() && src2.empty())
{
dst.release();
if (dtype >= 0)
{
dst.create(0, 0, dtype);
}
return;
}