cleanup: imgproc_c.h usage and old constants (error codes)

Author: mshabunin

modules/ccalib/src/multicalib.cpp

@@ -225,7 +225,7 @@ void MultiCameraCalibration::loadImages()
         _xi[camera].convertTo(_xi[camera], CV_32F);
         //else
         //{
-        //    CV_Error_(CV_StsOutOfRange, "Unknown camera type, use PINHOLE or OMNIDIRECTIONAL");
+        //    CV_Error_(cv::Error::StsOutOfRange, "Unknown camera type, use PINHOLE or OMNIDIRECTIONAL");
         //}
 
         for (int i = 0; i < (int)_omEachCamera[camera].size(); ++i)

modules/cudalegacy/src/fgd.cpp

@@ -54,7 +54,6 @@ Ptr<cuda::BackgroundSubtractorFGD> cv::cuda::createBackgroundSubtractorFGD(const
 #else
 
 #include "cuda/fgd.hpp"
-#include "opencv2/imgproc/imgproc_c.h"
 
 /////////////////////////////////////////////////////////////////////////
 // FGDParams

modules/cvv/samples/cvv_demo.cpp

@@ -4,7 +4,6 @@
 // library includes
 #include <opencv2/imgproc.hpp>
 #include <opencv2/features2d.hpp>
-#include <opencv2/imgproc/types_c.h>
 #include <opencv2/videoio.hpp>
 #include <opencv2/videoio/videoio_c.h>
 
@@ -33,8 +32,6 @@ template<class T> std::string toString(const T& p_arg)
 int
 main(int argc, char** argv)
 {
-  cv::Size* resolution = nullptr;
-
   // parser keys
   const char *keys =
       "{ help h usage ?  |   | show this message }"

modules/cvv/src/qtutil/filter/sobelfilterwidget.cpp

@@ -1,7 +1,6 @@
 #include "sobelfilterwidget.hpp"
 
 #include "opencv2/imgproc.hpp"
-#include "opencv2/imgproc/types_c.h"
 
 #include <QVBoxLayout>
 #include <QLabel>

modules/cvv/test/test_reference.cpp

@@ -6,12 +6,12 @@ namespace opencv_test { namespace {
 
 /**
  * Makes sure that
- * - creating, reassigning and comparing `cvv::util::Reference<int>`s (from /src/util/util.hpp) works, 
+ * - creating, reassigning and comparing `cvv::util::Reference<int>`s (from /src/util/util.hpp) works,
  * 	as well as the
  * - `makeRef()` and `getPtr()` functions; that
  * - `Reference<const int>`s can be created with `makeRef(const int)`, `{const int}` initializer list
- * 	and via `Reference<const int>{int}` and, finally, that 
- * - `cvv::util::Reference`s of super classes can be constructed with derived classes and 
+ * 	and via `Reference<const int>{int}` and, finally, that
+ * - `cvv::util::Reference`s of super classes can be constructed with derived classes and
  * - `Reference`s to base classes can be `castTo()` `References` to the derived classes, but not the other way.
  */
 
@@ -71,7 +71,7 @@ TEST(ReferenceTest, ConstRefs)
 
 TEST(ReferenceTest, ConstRefsFromMutable)
 {
-	int i;
+	int i = 100;
 	Reference<const int> ref{ i };
 	EXPECT_EQ(ref.getPtr(), &i);
 }

modules/dpm/src/dpm_cascade.cpp

@@ -62,7 +62,7 @@ void DPMCascade::loadCascadeModel(const string &modelPath)
     if (!is_success)
     {
         string errorMessage = format("Unable to parse the model: %s", modelPath.c_str());
-        CV_Error(CV_StsBadArg, errorMessage);
+        CV_Error(cv::Error::StsBadArg, errorMessage);
     }
 
     model.initModel();

modules/dpm/src/dpm_feature.cpp

@@ -81,7 +81,7 @@ void ParalComputePyramid::initialize()
 
     if (params.maxScale < params.interval)
     {
-        CV_Error(CV_StsBadArg, "The image is too small to create a pyramid");
+        CV_Error(cv::Error::StsBadArg, "The image is too small to create a pyramid");
         return;
     }
 

modules/img_hash/src/precomp.hpp

@@ -8,7 +8,6 @@
 #include "opencv2/core.hpp"
 #include "opencv2/core/base.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/imgproc/types_c.h"
 #include "opencv2/img_hash.hpp"
 
 #include <bitset>

modules/rgbd/samples/linemod.cpp

@@ -1,6 +1,6 @@
 #include <opencv2/core.hpp>
 #include <opencv2/core/utility.hpp>
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/core/core_c.h>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/rgbd.hpp>
 #include <opencv2/videoio.hpp>

modules/saliency/src/BING/kyheader.hpp

@@ -109,7 +109,7 @@ enum
     if(!(expr)) {\
     String msg = cv::format args; \
     printf("%s in %s:%d\n", msg.c_str(), __FILE__, __LINE__); \
-    cv::error(cv::Exception(CV_StsAssert, msg, __FUNCTION__, __FILE__, __LINE__) ); }\
+    cv::error(cv::Exception(cv::Error::StsAssert, msg, __FUNCTION__, __FILE__, __LINE__) ); }\
 }
 
 

modules/sfm/src/numeric.cpp

@@ -162,7 +162,7 @@ skew( InputArray _x )
   }
   else
   {
-    //CV_Error(CV_StsBadArg, "The DataType must be CV_32F or CV_64F");
+    //CV_Error(cv::Error::StsBadArg, "The DataType must be CV_32F or CV_64F");
   }
 
   return skewMatrix;

modules/tracking/src/TrackingFunctionPF.hpp

@@ -1,5 +1,4 @@
 #include <cmath>
-#include <opencv2/imgproc/imgproc_c.h>
 #define CLIP(x,a,b) MIN(MAX((x),(a)),(b))
 #define HIST_SIZE 50
 

modules/xfeatures2d/src/affine_feature2d.cpp

@@ -8,7 +8,6 @@
 
 #include "precomp.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/imgproc/types_c.h"
 
 namespace {
 

modules/xphoto/samples/dct_image_denoising.cpp

@@ -4,7 +4,6 @@
 #include "opencv2/highgui.hpp"
 
 #include "opencv2/core/utility.hpp"
-#include "opencv2/imgproc/types_c.h"
 
 const char* keys =
 {
@@ -67,4 +66,4 @@ int main( int argc, const char** argv )
         cv::imwrite(outFilename, res);
 
     return 0;
-}
+}

modules/xphoto/src/dct_image_denoising.cpp

@@ -175,7 +175,7 @@ namespace xphoto
         else if ( img.type() == CV_32FC1 )
             grayDctDenoising( img, img, sigma, psize );
         else
-            CV_Error_( CV_StsNotImplemented,
+            CV_Error_( cv::Error::StsNotImplemented,
             ("Unsupported source image format (=%d)", img.type()) );
 
         img.convertTo( dst, src.type() );