diff --git a/apps/traincascade/imagestorage.cpp b/apps/traincascade/imagestorage.cpp index a32824c317..29680497b1 100644 --- a/apps/traincascade/imagestorage.cpp +++ b/apps/traincascade/imagestorage.cpp @@ -1,5 +1,4 @@ #include "opencv2/core.hpp" -#include "opencv2/core/core_c.h" #include "opencv2/imgproc.hpp" #include "opencv2/imgcodecs.hpp" diff --git a/modules/calib3d/src/upnp.h b/modules/calib3d/src/upnp.h index 513c6be7a1..c130135e31 100644 --- a/modules/calib3d/src/upnp.h +++ b/modules/calib3d/src/upnp.h @@ -49,7 +49,6 @@ #define OPENCV_CALIB3D_UPNP_H_ #include "precomp.hpp" -#include "opencv2/core/core_c.h" #include #if 0 // fix buffer overflow first (FIXIT mark in .cpp file) diff --git a/modules/calib3d/test/test_cameracalibration.cpp b/modules/calib3d/test/test_cameracalibration.cpp index 7668d74c48..e36ca3e1c4 100644 --- a/modules/calib3d/test/test_cameracalibration.cpp +++ b/modules/calib3d/test/test_cameracalibration.cpp @@ -40,7 +40,6 @@ //M*/ #include "test_precomp.hpp" -#include "opencv2/calib3d/calib3d_c.h" namespace opencv_test { namespace { @@ -754,7 +753,7 @@ void CV_CameraCalibrationTest_CPP::calibrate(Size imageSize, Mat(_objectPoints[i]).convertTo(objectPoints[i], CV_32F); } - size_t nstddev0 = CV_CALIB_NINTRINSIC + imageCount*6, nstddev1 = nstddev0 + _imagePoints[0].size()*3; + size_t nstddev0 = CALIB_NINTRINSIC + imageCount*6, nstddev1 = nstddev0 + _imagePoints[0].size()*3; for( i = nstddev0; i < nstddev1; i++ ) { stdDevs[i] = 0.0; @@ -1433,12 +1432,12 @@ void CV_StereoCalibrationTest::run( int ) double rmsErrorFromStereoCalib = calibrateStereoCamera(objpt, imgpt1, imgpt2, M1, D1, M2, D2, imgsize, R, T, E, F, rotMats1, transVecs1, rmsErrorPerView1, rmsErrorPerView2, TermCriteria(TermCriteria::MAX_ITER+TermCriteria::EPS, 30, 1e-6), - CV_CALIB_SAME_FOCAL_LENGTH - //+ CV_CALIB_FIX_ASPECT_RATIO - + CV_CALIB_FIX_PRINCIPAL_POINT - + CV_CALIB_ZERO_TANGENT_DIST - + CV_CALIB_FIX_K3 - + CV_CALIB_FIX_K4 + CV_CALIB_FIX_K5 //+ CV_CALIB_FIX_K6 + CALIB_SAME_FOCAL_LENGTH + //+ CALIB_FIX_ASPECT_RATIO + + CALIB_FIX_PRINCIPAL_POINT + + CALIB_ZERO_TANGENT_DIST + + CALIB_FIX_K3 + + CALIB_FIX_K4 + CALIB_FIX_K5 //+ CALIB_FIX_K6 ); /* rmsErrorFromStereoCalib /= nframes*npoints; */ if (rmsErrorFromStereoCalib > maxReprojErr) diff --git a/modules/calib3d/test/test_cameracalibration_badarg.cpp b/modules/calib3d/test/test_cameracalibration_badarg.cpp index 046fc1d530..d4d6df1869 100644 --- a/modules/calib3d/test/test_cameracalibration_badarg.cpp +++ b/modules/calib3d/test/test_cameracalibration_badarg.cpp @@ -41,7 +41,6 @@ #include "test_precomp.hpp" #include "test_chessboardgenerator.hpp" -#include "opencv2/core/types_c.h" namespace opencv_test { namespace { @@ -232,8 +231,6 @@ protected: void run(int /* start_from */ ) { - Mat zeros(1, sizeof(CvMat), CV_8U, Scalar(0)); - Mat src_cpp(3, 1, CV_32F); Mat dst_cpp(3, 3, CV_32F); diff --git a/modules/calib3d/test/test_chesscorners_badarg.cpp b/modules/calib3d/test/test_chesscorners_badarg.cpp index 85b2cb54da..f62cfc16c3 100644 --- a/modules/calib3d/test/test_chesscorners_badarg.cpp +++ b/modules/calib3d/test/test_chesscorners_badarg.cpp @@ -41,7 +41,6 @@ #include "test_precomp.hpp" #include "test_chessboardgenerator.hpp" -#include "opencv2/calib3d/calib3d_c.h" namespace opencv_test { namespace { @@ -89,7 +88,7 @@ void CV_ChessboardDetectorBadArgTest::run( int /*start_from */) /* /*//*/ */ int errors = 0; - flags = CV_CALIB_CB_ADAPTIVE_THRESH | CV_CALIB_CB_NORMALIZE_IMAGE; + flags = CALIB_CB_ADAPTIVE_THRESH | CALIB_CB_NORMALIZE_IMAGE; img = cb.clone(); initArgs(); diff --git a/modules/core/perf/perf_reduce.cpp b/modules/core/perf/perf_reduce.cpp index 844303aa7d..bcd10b18c5 100644 --- a/modules/core/perf/perf_reduce.cpp +++ b/modules/core/perf/perf_reduce.cpp @@ -1,5 +1,4 @@ #include "perf_precomp.hpp" -#include "opencv2/core/core_c.h" namespace opencv_test { diff --git a/modules/core/src/matrix_operations.cpp b/modules/core/src/matrix_operations.cpp index 2992f00e73..f1bdd52ae2 100644 --- a/modules/core/src/matrix_operations.cpp +++ b/modules/core/src/matrix_operations.cpp @@ -4,7 +4,6 @@ #include "precomp.hpp" #include "opencv2/core/mat.hpp" -#include "opencv2/core/types_c.h" #include "opencl_kernels_core.hpp" #undef HAVE_IPP diff --git a/modules/core/src/matrix_sparse.cpp b/modules/core/src/matrix_sparse.cpp index 2c9edf8b3a..f9b17d0c69 100644 --- a/modules/core/src/matrix_sparse.cpp +++ b/modules/core/src/matrix_sparse.cpp @@ -4,7 +4,6 @@ #include "precomp.hpp" #include "opencv2/core/mat.hpp" -#include "opencv2/core/types_c.h" namespace cv { diff --git a/modules/core/src/persistence.hpp b/modules/core/src/persistence.hpp index 2a1f73cba8..55ccd51254 100644 --- a/modules/core/src/persistence.hpp +++ b/modules/core/src/persistence.hpp @@ -6,7 +6,6 @@ #ifndef SRC_PERSISTENCE_HPP #define SRC_PERSISTENCE_HPP -#include "opencv2/core/types_c.h" #include #include #include diff --git a/modules/features2d/src/mser.cpp b/modules/features2d/src/mser.cpp index b7e7993449..10913ca1a1 100644 --- a/modules/features2d/src/mser.cpp +++ b/modules/features2d/src/mser.cpp @@ -44,7 +44,6 @@ */ #include "precomp.hpp" -#include "opencv2/imgproc/imgproc_c.h" #include #include "../3rdparty/mscr/chi_table.h" diff --git a/modules/features2d/test/test_keypoints.cpp b/modules/features2d/test/test_keypoints.cpp index c169c97163..696936af8e 100644 --- a/modules/features2d/test/test_keypoints.cpp +++ b/modules/features2d/test/test_keypoints.cpp @@ -40,7 +40,6 @@ //M*/ #include "test_precomp.hpp" -#include "opencv2/core/core_c.h" namespace opencv_test { namespace { diff --git a/modules/imgcodecs/test/test_precomp.hpp b/modules/imgcodecs/test/test_precomp.hpp index fab6606859..f5fb5c82e4 100644 --- a/modules/imgcodecs/test/test_precomp.hpp +++ b/modules/imgcodecs/test/test_precomp.hpp @@ -6,7 +6,6 @@ #include "opencv2/ts.hpp" #include "opencv2/imgcodecs.hpp" -#include "opencv2/imgproc/imgproc_c.h" namespace cv { diff --git a/modules/imgproc/perf/perf_houghcircles.cpp b/modules/imgproc/perf/perf_houghcircles.cpp index a5ca36dbc0..81b577636b 100644 --- a/modules/imgproc/perf/perf_houghcircles.cpp +++ b/modules/imgproc/perf/perf_houghcircles.cpp @@ -2,7 +2,6 @@ // It is subject to the license terms in the LICENSE file found in the top-level directory // of this distribution and at http://opencv.org/license.html. #include "perf_precomp.hpp" -#include "opencv2/imgproc/types_c.h" namespace opencv_test { diff --git a/modules/videoio/src/cap_android_mediandk.cpp b/modules/videoio/src/cap_android_mediandk.cpp index 5a434572dd..6dfb79843a 100644 --- a/modules/videoio/src/cap_android_mediandk.cpp +++ b/modules/videoio/src/cap_android_mediandk.cpp @@ -573,8 +573,8 @@ public: Mat bufferMat(image.rows, image.cols, CV_8UC4, buffer.bits, buffer.stride * 4); switch (image.type()) { case CV_8UC4: image.copyTo(bufferMat); break; - case CV_8UC3: cvtColor(image, bufferMat, CV_BGR2RGBA); break; - case CV_8UC1: cvtColor(image, bufferMat, CV_GRAY2RGBA); break; + case CV_8UC3: cvtColor(image, bufferMat, COLOR_BGR2RGBA); break; + case CV_8UC1: cvtColor(image, bufferMat, COLOR_GRAY2RGBA); break; } } else { LOGE("Unknown surface buffer format: 0x%x", buffer.format); @@ -585,8 +585,8 @@ public: //OpenCV doesn't support RGB to NV12 so we need to convert to YV12 and then manually changed it to NV12 Mat imageYV12; switch (image.type()) { - case CV_8UC4: cvtColor(image, imageYV12, CV_RGBA2YUV_YV12); break; - case CV_8UC3: cvtColor(image, imageYV12, CV_BGR2YUV_YV12); break; + case CV_8UC4: cvtColor(image, imageYV12, COLOR_RGBA2YUV_YV12); break; + case CV_8UC3: cvtColor(image, imageYV12, COLOR_BGR2YUV_YV12); break; case CV_8UC1: imageYV12.create(image.rows + image.rows/2, image.cols, CV_8UC1); image.copyTo(imageYV12.rowRange(0, image.rows)); imageYV12.rowRange(image.rows, imageYV12.rows) = 128; diff --git a/modules/videoio/src/precomp.hpp b/modules/videoio/src/precomp.hpp index 0ada79e1e2..8ebeec4a9e 100644 --- a/modules/videoio/src/precomp.hpp +++ b/modules/videoio/src/precomp.hpp @@ -73,7 +73,6 @@ #include "opencv2/imgcodecs.hpp" #include "opencv2/imgproc.hpp" -#include "opencv2/imgproc/imgproc_c.h" #include #include