Remove useless C headers

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)

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);
 

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();