From 1b39461321213123ab7bbc34cca8e64484ef3e2d Mon Sep 17 00:00:00 2001 From: Suleyman TURKMEN Date: Fri, 8 Oct 2021 00:55:46 +0300 Subject: [PATCH] cleanup old c --- modules/optflow/src/sparse_matching_gpc.cpp | 11 +++++----- .../src/pct_signatures/pct_clusterizer.cpp | 3 +-- modules/ximgproc/src/fast_hough_transform.cpp | 22 +++++++++---------- modules/ximgproc/src/niblack_thresholding.cpp | 4 ++-- modules/ximgproc/src/precomp.hpp | 2 -- .../src/structured_edge_detection.cpp | 2 +- .../ximgproc/src/weighted_median_filter.cpp | 2 +- modules/xphoto/src/inpainting.cpp | 11 ++-------- 8 files changed, 23 insertions(+), 34 deletions(-) diff --git a/modules/optflow/src/sparse_matching_gpc.cpp b/modules/optflow/src/sparse_matching_gpc.cpp index 249985485..73ef85cd0 100644 --- a/modules/optflow/src/sparse_matching_gpc.cpp +++ b/modules/optflow/src/sparse_matching_gpc.cpp @@ -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" @@ -450,7 +449,7 @@ void getTrainingSamples( const Mat &from, const Mat &to, const Mat >, 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. */ @@ -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 ) @@ -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; @@ -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; } @@ -770,7 +769,7 @@ void GPCDetails::dropOutliers( std::vector< std::pair< Point2i, Point2i > > &cor void write( FileStorage &fs, const String &name, const optflow::GPCTree::Node &node ) { - cv::internal::WriteStructContext ws( fs, name, CV_NODE_SEQ + CV_NODE_FLOW ); + cv::internal::WriteStructContext ws( fs, name, FileNode::SEQ + FileNode::FLOW ); for ( unsigned i = 0; i < optflow::GPCPatchDescriptor::nFeatures; ++i ) write( fs, node.coef[i] ); write( fs, node.rhs ); diff --git a/modules/xfeatures2d/src/pct_signatures/pct_clusterizer.cpp b/modules/xfeatures2d/src/pct_signatures/pct_clusterizer.cpp index 0478dbf5a..aecdd7b62 100644 --- a/modules/xfeatures2d/src/pct_signatures/pct_clusterizer.cpp +++ b/modules/xfeatures2d/src/pct_signatures/pct_clusterizer.cpp @@ -59,7 +59,6 @@ References: #include "../precomp.hpp" -#include "opencv2/core/core_c.h" // <- because CV_REDUCE_SUM was undeclared without it #include "pct_clusterizer.hpp" namespace cv @@ -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(0, WEIGHT_IDX) = static_cast(points.rows); diff --git a/modules/ximgproc/src/fast_hough_transform.cpp b/modules/ximgproc/src/fast_hough_transform.cpp index f38fcf4a4..391d3fa49 100644 --- a/modules/ximgproc/src/fast_hough_transform.cpp +++ b/modules/ximgproc/src/fast_hough_transform.cpp @@ -238,7 +238,7 @@ void fhtVo(Mat &img0, fhtVoT(img0, img1, isPositiveShift, aspl); break; default: - CV_Error_(CV_StsNotImplemented, ("Unknown operation %d", operation)); + CV_Error_(Error::StsNotImplemented, ("Unknown operation %d", operation)); break; } } @@ -274,7 +274,7 @@ static void fhtVo(Mat &img0, fhtVo(img0, img1, isPositiveShift, operation, aspl); break; default: - CV_Error_(CV_StsNotImplemented, ("Unknown depth %d", depth)); + CV_Error_(Error::StsNotImplemented, ("Unknown depth %d", depth)); break; } } @@ -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); @@ -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)); @@ -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; @@ -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; @@ -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) @@ -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(quad.elemSize()); @@ -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)); } } @@ -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; @@ -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; diff --git a/modules/ximgproc/src/niblack_thresholding.cpp b/modules/ximgproc/src/niblack_thresholding.cpp index 58716f39d..0ec90c84b 100644 --- a/modules/ximgproc/src/niblack_thresholding.cpp +++ b/modules/ximgproc/src/niblack_thresholding.cpp @@ -90,7 +90,7 @@ void niBlackThreshold( InputArray _src, OutputArray _dst, double maxValue, thresh = mean + static_cast(k) * sqrtVarianceMeanSum; break; default: - CV_Error( CV_StsBadArg, "Unknown binarization method" ); + CV_Error( Error::StsBadArg, "Unknown binarization method" ); break; } thresh.convertTo(thresh, src.depth()); @@ -123,7 +123,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; } } diff --git a/modules/ximgproc/src/precomp.hpp b/modules/ximgproc/src/precomp.hpp index 29af094ce..29e77d0ae 100644 --- a/modules/ximgproc/src/precomp.hpp +++ b/modules/ximgproc/src/precomp.hpp @@ -41,8 +41,6 @@ #include #include #include -#include -#include #include #include diff --git a/modules/ximgproc/src/structured_edge_detection.cpp b/modules/ximgproc/src/structured_edge_detection.cpp index 9c3044fbf..ece318447 100644 --- a/modules/ximgproc/src/structured_edge_detection.cpp +++ b/modules/ximgproc/src/structured_edge_detection.cpp @@ -828,7 +828,7 @@ protected: ); #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); } diff --git a/modules/ximgproc/src/weighted_median_filter.cpp b/modules/ximgproc/src/weighted_median_filter.cpp index aba58496f..c29b77b15 100644 --- a/modules/ximgproc/src/weighted_median_filter.cpp +++ b/modules/ximgproc/src/weighted_median_filter.cpp @@ -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; diff --git a/modules/xphoto/src/inpainting.cpp b/modules/xphoto/src/inpainting.cpp index ce4bc0654..ead5eb009 100644 --- a/modules/xphoto/src/inpainting.cpp +++ b/modules/xphoto/src/inpainting.cpp @@ -48,16 +48,9 @@ #include #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" @@ -292,7 +285,7 @@ namespace xphoto shiftMapInpaint (src, mask, dst); break; default: - CV_Error_( CV_StsNotImplemented, + CV_Error_( Error::StsNotImplemented, ("Unsupported algorithm type (=%d)", algorithmType) ); break; } @@ -396,7 +389,7 @@ namespace xphoto inpaint ( src, mask, dst, algorithmType ); break; default: - CV_Error_( CV_StsNotImplemented, + CV_Error_( Error::StsNotImplemented, ("Unsupported source image format (=%d)", src.type()) ); break;