Merge pull request #9406 from Cartucho:update_core_tutorials

samples/cpp/tutorial_code/core/AddingImages/AddingImages.cpp

@@ -3,7 +3,6 @@
  * @brief Simple linear blender ( dst = alpha*src1 + beta*src2 )
  * @author OpenCV team
  */
-
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/highgui.hpp"
 #include <iostream>
@@ -24,7 +23,7 @@ int main( void )
    /// Ask the user enter alpha
    cout << " Simple Linear Blender " << endl;
    cout << "-----------------------" << endl;
-   cout << "* Enter alpha [0-1]: ";
+   cout << "* Enter alpha [0.0-1.0]: ";
    cin >> input;
 
    // We use the alpha provided by the user if it is between 0 and 1

samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp

@@ -1,8 +1,8 @@
 /**
  * @file Drawing_1.cpp
- * @brief Simple sample code
+ * @brief Simple geometric drawing
+ * @author OpenCV team
  */
-
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/highgui.hpp>
@@ -83,11 +83,11 @@ int main( void ){
 
 /// Function Declaration
 
-//![myellipse]
 /**
  * @function MyEllipse
  * @brief Draw a fixed-size ellipse with different angles
  */
+//![my_ellipse]
 void MyEllipse( Mat img, double angle )
 {
   int thickness = 2;
@@ -103,13 +103,13 @@ void MyEllipse( Mat img, double angle )
        thickness,
        lineType );
 }
-//![myellipse]
+//![my_ellipse]
 
-//![myfilledcircle]
 /**
  * @function MyFilledCircle
  * @brief Draw a fixed-size filled circle
  */
+//![my_filled_circle]
 void MyFilledCircle( Mat img, Point center )
 {
   circle( img,
@@ -119,13 +119,13 @@ void MyFilledCircle( Mat img, Point center )
       FILLED,
       LINE_8 );
 }
-//![myfilledcircle]
+//![my_filled_circle]
 
-//![mypolygon]
 /**
  * @function MyPolygon
  * @brief Draw a simple concave polygon (rook)
  */
+//![my_polygon]
 void MyPolygon( Mat img )
 {
   int lineType = LINE_8;
@@ -163,17 +163,18 @@ void MyPolygon( Mat img )
         Scalar( 255, 255, 255 ),
         lineType );
 }
-//![mypolygon]
+//![my_polygon]
 
-//![myline]
 /**
  * @function MyLine
  * @brief Draw a simple line
  */
+//![my_line]
 void MyLine( Mat img, Point start, Point end )
 {
   int thickness = 2;
   int lineType = LINE_8;
+
   line( img,
     start,
     end,
@@ -181,4 +182,4 @@ void MyLine( Mat img, Point start, Point end )
     thickness,
     lineType );
 }
-//![myline]
+//![my_line]

samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp

@@ -8,45 +8,58 @@
 using namespace cv;
 using namespace std;
 
-static void help(char* progName)
+static void help(void)
 {
     cout << endl
         <<  "This program demonstrated the use of the discrete Fourier transform (DFT). " << endl
         <<  "The dft of an image is taken and it's power spectrum is displayed."          << endl
         <<  "Usage:"                                                                      << endl
-        << progName << " [image_name -- default ../data/lena.jpg] "               << endl << endl;
+        <<  "./discrete_fourier_transform [image_name -- default ../data/lena.jpg]"       << endl;
 }
 
 int main(int argc, char ** argv)
 {
-    help(argv[0]);
+    help();
 
     const char* filename = argc >=2 ? argv[1] : "../data/lena.jpg";
 
     Mat I = imread(filename, IMREAD_GRAYSCALE);
-    if( I.empty())
+    if( I.empty()){
+        cout << "Error opening image" << endl;
         return -1;
+    }
 
+//! [expand]
     Mat padded;                            //expand input image to optimal size
     int m = getOptimalDFTSize( I.rows );
     int n = getOptimalDFTSize( I.cols ); // on the border add zero values
     copyMakeBorder(I, padded, 0, m - I.rows, 0, n - I.cols, BORDER_CONSTANT, Scalar::all(0));
+//! [expand]
 
+//! [complex_and_real]
     Mat planes[] = {Mat_<float>(padded), Mat::zeros(padded.size(), CV_32F)};
     Mat complexI;
     merge(planes, 2, complexI);         // Add to the expanded another plane with zeros
+//! [complex_and_real]
 
+//! [dft]
     dft(complexI, complexI);            // this way the result may fit in the source matrix
+//! [dft]
 
     // compute the magnitude and switch to logarithmic scale
     // => log(1 + sqrt(Re(DFT(I))^2 + Im(DFT(I))^2))
+//! [magnitude]
     split(complexI, planes);                   // planes[0] = Re(DFT(I), planes[1] = Im(DFT(I))
     magnitude(planes[0], planes[1], planes[0]);// planes[0] = magnitude
     Mat magI = planes[0];
+//! [magnitude]
 
+//! [log]
     magI += Scalar::all(1);                    // switch to logarithmic scale
     log(magI, magI);
+//! [log]
 
+//! [crop_rearrange]
     // crop the spectrum, if it has an odd number of rows or columns
     magI = magI(Rect(0, 0, magI.cols & -2, magI.rows & -2));
 
@@ -67,9 +80,12 @@ int main(int argc, char ** argv)
     q1.copyTo(tmp);                    // swap quadrant (Top-Right with Bottom-Left)
     q2.copyTo(q1);
     tmp.copyTo(q2);
+//! [crop_rearrange]
 
+//! [normalize]
     normalize(magI, magI, 0, 1, NORM_MINMAX); // Transform the matrix with float values into a
                                             // viewable image form (float between values 0 and 1).
+//! [normalize]
 
     imshow("Input Image"       , I   );    // Show the result
     imshow("spectrum magnitude", magI);