Skip to content

(4.x) Merge 3.4 #3061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2021
Merged

(4.x) Merge 3.4 #3061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b39461
cleanup old c
sturkmen72 Oct 7, 2021
02c2b56
Merge pull request #3058 from sturkmen72:cleanup-old-c
alalek Oct 8, 2021
2bc3e1a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
alalek Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions modules/optflow/src/sparse_matching_gpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@

#include "precomp.hpp"
#undef CV_FORCE_SIMD128_CPP // mixed HAL SIMD/SSE code
#include "opencv2/core/core_c.h"
#include "opencv2/core/private.hpp"
#include "opencv2/flann/miniflann.hpp"
#include "opencv2/imgcodecs.hpp"
Expand Down Expand Up @@ -450,7 +449,7 @@ void getTrainingSamples( const Mat &from, const Mat &to, const Mat &gt, GPCSampl
getTriplet( mag[k], gt, fromChInt, toChInt, samples, index, getWHTPatchDescriptor );
}
else
CV_Error( CV_StsBadArg, "Unknown descriptor type" );
CV_Error( Error::StsBadArg, "Unknown descriptor type" );
}

/* Sample random number from Cauchy distribution. */
Expand Down Expand Up @@ -511,7 +510,7 @@ void GPCDetails::getAllDescriptorsForImage( const Mat *imgCh, std::vector< GPCPa
else if ( type == GPC_DESCRIPTOR_WHT )
getAllWHTDescriptorsForImage( imgCh, descr, mp );
else
CV_Error( CV_StsBadArg, "Unknown descriptor type" );
CV_Error( Error::StsBadArg, "Unknown descriptor type" );
}

void GPCDetails::getCoordinatesFromIndex( size_t index, Size sz, int &x, int &y )
Expand Down Expand Up @@ -638,7 +637,7 @@ bool GPCTree::trainNode( size_t nodeId, SIter begin, SIter end, unsigned depth )
void GPCTree::train( GPCTrainingSamples &samples, const GPCTrainingParams _params )
{
if ( _params.descriptorType != samples.type() )
CV_Error( CV_StsBadArg, "Descriptor type mismatch! Check that samples are collected with the same descriptor type." );
CV_Error( Error::StsBadArg, "Descriptor type mismatch! Check that samples are collected with the same descriptor type." );
nodes.clear();
nodes.reserve( samples.size() * 2 - 1 ); // set upper bound for the possible number of nodes so all subsequent resize() will be no-op
params = _params;
Expand All @@ -649,7 +648,7 @@ void GPCTree::train( GPCTrainingSamples &samples, const GPCTrainingParams _param
void GPCTree::write( FileStorage &fs ) const
{
if ( nodes.empty() )
CV_Error( CV_StsBadArg, "Tree have not been trained" );
CV_Error( Error::StsBadArg, "Tree have not been trained" );
fs << "nodes" << nodes;
fs << "dtype" << (int)params.descriptorType;
}
Expand Down
3 changes: 1 addition & 2 deletions modules/xfeatures2d/src/pct_signatures/pct_clusterizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ Contributed by Gregor Kovalcik <gregor dot kovalcik at gmail dot com>

#include "../precomp.hpp"

#include "opencv2/core/core_c.h" // <- because CV_REDUCE_SUM was undeclared without it
#include "pct_clusterizer.hpp"

namespace cv
Expand Down Expand Up @@ -333,7 +332,7 @@ namespace cv
clusters.create(1, points.cols, CV_32FC1);

// Sum all points.
reduce(points, clusters, 0, CV_REDUCE_SUM, CV_32FC1);
reduce(points, clusters, 0, REDUCE_SUM, CV_32FC1);

// Sum all weights, all points have the same weight -> sum is the point count
clusters.at<float>(0, WEIGHT_IDX) = static_cast<float>(points.rows);
Expand Down
22 changes: 11 additions & 11 deletions modules/ximgproc/src/fast_hough_transform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ void fhtVo(Mat &img0,
fhtVoT<T, D, FHT_MIN>(img0, img1, isPositiveShift, aspl);
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown operation %d", operation));
CV_Error_(Error::StsNotImplemented, ("Unknown operation %d", operation));
break;
}
}
Expand Down Expand Up @@ -274,7 +274,7 @@ static void fhtVo(Mat &img0,
fhtVo<double, CV_64FC1>(img0, img1, isPositiveShift, operation, aspl);
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown depth %d", depth));
CV_Error_(Error::StsNotImplemented, ("Unknown depth %d", depth));
break;
}
}
Expand Down Expand Up @@ -345,7 +345,7 @@ static void calculateFHTQuadrant(Mat &dst,
aspl = 0.5;
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown quadrant %d", quadrant));
CV_Error_(Error::StsNotImplemented, ("Unknown quadrant %d", quadrant));
}

FHT(dst, src, operation, bVert, bClock, aspl);
Expand Down Expand Up @@ -385,7 +385,7 @@ static void createDstFhtMat(OutputArray dst,
ht = 2 * (cols + rows) - 3;
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown angleRange %d", angleRange));
CV_Error_(Error::StsNotImplemented, ("Unknown angleRange %d", angleRange));
}

dst.create(ht, wd, CV_MAKETYPE(depth, channels));
Expand All @@ -411,7 +411,7 @@ static void createFHTSrc(Mat &srcFull,
verticalTiling = true;
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown angleRange %d", angleRange));
CV_Error_(Error::StsNotImplemented, ("Unknown angleRange %d", angleRange));
}

int wd = verticalTiling ? src.cols : src.cols + src.rows;
Expand Down Expand Up @@ -454,7 +454,7 @@ static void setFHTDstRegion(Mat &dstRegion,
base = 3;
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown angleRange %d", angleRange));
CV_Error_(Error::StsNotImplemented, ("Unknown angleRange %d", angleRange));
}

int quad = -1;
Expand All @@ -473,7 +473,7 @@ static void setFHTDstRegion(Mat &dstRegion,
quad = 3;
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown quadrant %d", quadrant));
CV_Error_(Error::StsNotImplemented, ("Unknown quadrant %d", quadrant));
}

if (quad < base)
Expand Down Expand Up @@ -532,7 +532,7 @@ static void skewQuadrant(Mat &quad,
start = wd * .5 - 0.5;
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown quadrant %d", quadrant));
CV_Error_(Error::StsNotImplemented, ("Unknown quadrant %d", quadrant));
}

const int pixlen = static_cast<int>(quad.elemSize());
Expand Down Expand Up @@ -664,7 +664,7 @@ void FastHoughTransform(InputArray src,
skewQuadrant(dstMat, imgSrc, buf, angleRange);
return;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown angleRange %d", angleRange));
CV_Error_(Error::StsNotImplemented, ("Unknown angleRange %d", angleRange));
}
}

Expand Down Expand Up @@ -704,7 +704,7 @@ static void getRawPoint(Point &rawHoughPoint,
base = 3;
break;
default:
CV_Error_(CV_StsNotImplemented, ("Unknown angleRange %d", angleRange));
CV_Error_(Error::StsNotImplemented, ("Unknown angleRange %d", angleRange));
}

int const cols = srcImgInfo.cols;
Expand All @@ -720,7 +720,7 @@ static void getRawPoint(Point &rawHoughPoint,
rawHoughPoint.y -= qsize;
}
if (quad >= 4)
CV_Error(CV_StsInternal, "");
CV_Error(Error::StsInternal, "");

quadRawPoint = quad;

Expand Down
4 changes: 2 additions & 2 deletions modules/ximgproc/src/niblack_thresholding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void niBlackThreshold( InputArray _src, OutputArray _dst, double maxValue,
thresh = mean + static_cast<float>(k) * sqrtVarianceMeanSum;
break;
default:
CV_Error(CV_StsBadArg, "Unknown binarization method");
CV_Error( Error::StsBadArg, "Unknown binarization method" );
break;
}
thresh.convertTo(thresh, src.depth());
Expand Down Expand Up @@ -124,7 +124,7 @@ void niBlackThreshold( InputArray _src, OutputArray _dst, double maxValue,
src.copyTo(dst, mask);
break;
default:
CV_Error( CV_StsBadArg, "Unknown threshold type" );
CV_Error( Error::StsBadArg, "Unknown threshold type" );
break;
}
}
Expand Down
2 changes: 0 additions & 2 deletions modules/ximgproc/src/precomp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
#include <opencv2/core/ocl.hpp>
#include <opencv2/core/base.hpp>
#include <opencv2/core/utility.hpp>
#include <opencv2/core/cvdef.h>
#include <opencv2/core/core_c.h>
#include <opencv2/core/private.hpp>
#include <opencv2/imgproc.hpp>

Expand Down
2 changes: 1 addition & 1 deletion modules/ximgproc/src/sparse_match_interpolators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ struct MinHeap
{
if (m_validSize >= m_size)
{
CV_Error(CV_StsOutOfRange, " m_validSize >= m_size this problem can be resolved my decreasig k parameter");
CV_Error(Error::StsOutOfRange, " m_validSize >= m_size this problem can be resolved my decreasig k parameter");
}
m_index[m_validSize] = index;
m_weight[m_validSize] = weight;
Expand Down
2 changes: 1 addition & 1 deletion modules/ximgproc/src/structured_edge_detection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ class StructuredEdgeDetectionImpl : public StructuredEdgeDetection
);
#endif

cv::reduce( dstM.reshape(1, int( dstM.total() ) ), dstM, 2, CV_REDUCE_SUM);
cv::reduce( dstM.reshape(1, int( dstM.total() ) ), dstM, 2, REDUCE_SUM);
imsmooth( dstM.reshape(1, dst.rows), 1 ).copyTo(dst);
}

Expand Down
2 changes: 1 addition & 1 deletion modules/ximgproc/src/weighted_median_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ void featureIndexing(Mat &F, float **&wMap, int &nF, float sigmaI, int weightTyp
//do K-means
Mat labels;
Mat centers;
kmeans(samples, nF, labels, TermCriteria(CV_TERMCRIT_ITER|CV_TERMCRIT_EPS, 0, 10000), KmeansAttempts, KMEANS_PP_CENTERS, centers );
kmeans(samples, nF, labels, TermCriteria(TermCriteria::MAX_ITER| TermCriteria::EPS, 0, 10000), KmeansAttempts, KMEANS_PP_CENTERS, centers );

//make connection (i,j,k) <-> index
top = 0;
Expand Down
11 changes: 2 additions & 9 deletions modules/xphoto/src/inpainting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,9 @@
#include <tuple>

#include "opencv2/xphoto.hpp"

#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/imgproc_c.h"

#include "opencv2/core.hpp"
#include "opencv2/core/core_c.h"

#include "opencv2/core/types.hpp"
#include "opencv2/core/types_c.h"

#include "photomontage.hpp"
#include "annf.hpp"
#include "advanced_types.hpp"
Expand Down Expand Up @@ -305,7 +298,7 @@ namespace xphoto
shiftMapInpaint <Tp, cn>(src, mask, dst);
break;
default:
CV_Error_( CV_StsNotImplemented,
CV_Error_( Error::StsNotImplemented,
("Unsupported algorithm type (=%d)", algorithmType) );
break;
}
Expand Down Expand Up @@ -401,7 +394,7 @@ namespace xphoto
inpaint <double, 4>( src, mask, dst, algorithmType );
break;
default:
CV_Error_( CV_StsNotImplemented,
CV_Error_( Error::StsNotImplemented,
("Unsupported source image format (=%d)",
src.type()) );
}
Expand Down