mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
Merge pull request #25075 from mshabunin:cleanup-imgproc-1
C-API cleanup: apps, imgproc_c and some constants #25075 Merge with https://github.com/opencv/opencv_contrib/pull/3642 * Removed obsolete apps - traincascade and createsamples (please use older OpenCV versions if you need them). These apps relied heavily on C-API * removed all mentions of imgproc C-API headers (imgproc_c.h, types_c.h) - they were empty, included core C-API headers * replaced usage of several C constants with C++ ones (error codes, norm modes, RNG modes, PCA modes, ...) - most part of this PR (split into two parts - all modules and calib+3d - for easier backporting) * removed imgproc C-API headers (as separate commit, so that other changes could be backported to 4.x) Most of these changes can be backported to 4.x.
This commit is contained in:
@@ -48,7 +48,6 @@
|
||||
#include "opencv2/videoio.hpp"
|
||||
#include "opencv2/highgui.hpp"
|
||||
#include "opencv2/imgproc.hpp"
|
||||
#include "opencv2/imgproc/types_c.h"
|
||||
#include "opencv2/core/ocl.hpp"
|
||||
|
||||
namespace cvtest {
|
||||
|
||||
@@ -643,7 +643,7 @@ void TS::update_context( BaseTest* test, int test_case_idx, bool update_ts_conte
|
||||
current_test_info.test = test;
|
||||
current_test_info.test_case_idx = test_case_idx;
|
||||
current_test_info.code = 0;
|
||||
cvSetErrStatus( CV_StsOk );
|
||||
cvSetErrStatus( cv::Error::StsOk );
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#include "precomp.hpp"
|
||||
#include <float.h>
|
||||
#include <limits.h>
|
||||
#include "opencv2/imgproc/types_c.h"
|
||||
|
||||
using namespace cv;
|
||||
|
||||
@@ -407,7 +406,7 @@ void convert(const Mat& src, cv::OutputArray _dst,
|
||||
convertTo((const cv::bfloat16_t*)sptr, dptr, dtype, total, alpha, beta);
|
||||
break;
|
||||
default:
|
||||
CV_Error(CV_StsNotImplemented, "unknown/unsupported depth");
|
||||
CV_Error(cv::Error::StsNotImplemented, "unknown/unsupported depth");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user