comments ilya-lavrenov

Author: LaurentBerger

modules/ximgproc/include/opencv2/ximgproc/deriche_filter.hpp

@@ -51,14 +51,15 @@ namespace ximgproc {
 *
 * For more details about this implementation, please see http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.476.5736&rep=rep1&type=pdf
 *
-* @param   op          Source 8-bit or 16bit image, 1-channel or 3-channel image.
+* @param   _op         Source 8-bit or 16bit image, 1-channel or 3-channel image.
+* @param   _dst        result CV_32FC image with same number of channel than _op.
 * @param   alphaDerive double see paper
 * @param   alphaMean   double see paper
 *
 * @sa GradientDericheX, GradientDericheY
 */
-CV_EXPORTS UMat GradientDericheY(UMat op, double alphaDerive,double alphaMean);
-CV_EXPORTS UMat GradientDericheX(UMat op, double alphaDerive,double alphaMean);
+CV_EXPORTS void GradientDericheY(InputArray _op, OutputArray _dst, double alphaDerive,double alphaMean);
+CV_EXPORTS void GradientDericheX(InputArray _op, OutputArray _dst, double alphaDerive,double alphaMean);
 
 }
 }

modules/ximgproc/samples/deriche_demo.cpp

@@ -46,21 +46,17 @@ using namespace cv::ximgproc;
 #include <iostream>
 using namespace std;
 
-int lowThreshold=20;
-int maxThreshold=20;
-int const max_lowThreshold = 500;
 int alDerive=100;
 int alMean=100;
-Mat dx, dy;
-UMat img;
-const char* window_name = "Gradient Modulus";
+Mat img;
+const string & winName = "Gradient Modulus";
 
-static void DisplayImage(UMat x,string s)
+static void DisplayImage(Mat x,string s)
 {
 	vector<Mat> sx;
 	split(x, sx);
 	vector<double> minVal(3), maxVal(3);
-	for (int i = 0; i < static_cast<int>(sx.size()); i++)
+	for (size_t i = 0; i < sx.size(); i++)
 	{
 		minMaxLoc(sx[i], &minVal[i], &maxVal[i]);
 	}
@@ -78,32 +74,47 @@ static void DisplayImage(UMat x,string s)
  */
 static void DericheFilter(int, void*)
 {
-    UMat dst;
+    Mat dst;
     double d=alDerive/100.0,m=alMean/100.0;
-    UMat rx=  GradientDericheX(img,d,m);
-    UMat ry=  GradientDericheY(img,d,m);
+    Mat rx,ry;
+    GradientDericheX(img,rx,d,m);
+    GradientDericheY(img,ry,d,m);
     DisplayImage(rx, "Gx");
     DisplayImage(ry, "Gy");
     add(rx.mul(rx),ry.mul(ry),dst);
     sqrt(dst,dst);
-    DisplayImage(dst, window_name );
+    DisplayImage(dst, winName );
 }
 
 
 int main(int argc, char* argv[])
 {
+    cv::CommandLineParser parser(argc, argv, "{help h | | show help message}{@input | | input image}");
+    if (parser.has("help"))
+    {
+        parser.printMessage();
+        return 0;
+    }
+    string input_image = parser.get<string>("@input");
+    if (input_image.empty())
+    {
+        parser.printMessage();
+        parser.printErrors();
+        return 0;
+    }
     if (argc==2)
-        imread(argv[1]).copyTo(img);
+        img = imread(input_image);
     if (img.empty())
     {
         cout << "File not found or empty image\n";
+        return -1;
     }
     imshow("Original",img);
-    namedWindow( window_name, WINDOW_AUTOSIZE );
+    namedWindow( winName, WINDOW_AUTOSIZE );
 
     /// Create a Trackbar for user to enter threshold
-    createTrackbar( "Derive:",window_name, &alDerive, 400, DericheFilter );
-    createTrackbar( "Mean:", window_name, &alMean, 400, DericheFilter );
+    createTrackbar( "Derive:",winName, &alDerive, 400, DericheFilter );
+    createTrackbar( "Mean:", winName, &alMean, 400, DericheFilter );
     DericheFilter(0,NULL);
     waitKey();
     return 0;