Merge pull request #3217 from avdmitry:samples_cpp_data

doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.rst

@@ -126,7 +126,7 @@ In this sample I'll show how to calculate and show the *magnitude* image of a Fo
 Result
 ======
 
-An application idea would be to determine the geometrical orientation present in the image. For example, let us find out if a text is horizontal or not? Looking at some text you'll notice that the text lines sort of form also horizontal lines and the letters form sort of vertical lines. These two main components of a text snippet may be also seen in case of the Fourier transform. Let us use :download:`this horizontal <../../../../samples/cpp/tutorial_code/images/imageTextN.png>` and :download:`this rotated<../../../../samples/cpp/tutorial_code/images/imageTextR.png>` image about a text.
+An application idea would be to determine the geometrical orientation present in the image. For example, let us find out if a text is horizontal or not? Looking at some text you'll notice that the text lines sort of form also horizontal lines and the letters form sort of vertical lines. These two main components of a text snippet may be also seen in case of the Fourier transform. Let us use :download:`this horizontal <../../../../samples/data/imageTextN.png>` and :download:`this rotated<../../../../samples/data/imageTextR.png>` image about a text.
 
 In case of the horizontal text:
 

doc/tutorials/introduction/display_image/display_image.rst

@@ -39,28 +39,28 @@ You'll almost always end up using the:
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
    :tab-width: 4
-   :lines:  1-4
+   :lines:  1-6
 
 We also include the *iostream* to facilitate console line output and input. To avoid data structure and function name conflicts with other libraries, OpenCV has its own namespace: *cv*. To avoid the need appending prior each of these the *cv::* keyword you can import the namespace in the whole file by using the lines:
 
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
    :tab-width: 4
-   :lines:  6-7
+   :lines:  8-9
 
-This is true for the STL library too (used for console I/O). Now, let's analyze the *main* function. We start up assuring that we acquire a valid image name argument from the command line.
+This is true for the STL library too (used for console I/O). Now, let's analyze the *main* function. We start up assuring that we acquire a valid image name argument from the command line. Otherwise take a picture by default: "HappyFish.jpg".
 
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
    :tab-width: 4
-   :lines: 11-15
+   :lines: 13-17
 
 Then create a *Mat* object that will store the data of the loaded image.
 
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
    :tab-width: 4
-   :lines: 17
+   :lines: 19
 
 Now we call the :imread:`imread <>` function which loads the image name specified by the first argument (*argv[1]*). The second argument specifies the format in what we want the image. This may be:
 
@@ -73,7 +73,7 @@ Now we call the :imread:`imread <>` function which loads the image name specifie
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
    :tab-width: 4
-   :lines: 18
+   :lines: 20
 
 .. note::
 
@@ -88,21 +88,21 @@ After checking that the image data was loaded correctly, we want to display our
 
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
-   :lines: 26
+   :lines: 28
    :tab-width: 4
 
 Finally, to update the content of the OpenCV window with a new image use the :imshow:`imshow <>` function. Specify the OpenCV window name to update and the image to use during this operation:
 
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
-   :lines: 27
+   :lines: 29
    :tab-width: 4
 
 Because we want our window to be displayed until the user presses a key (otherwise the program would end far too quickly), we use the :wait_key:`waitKey <>` function whose only parameter is just how long should it wait for a user input (measured in milliseconds). Zero means to wait forever.
 
 .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
    :language: cpp
-   :lines: 29
+   :lines: 31
    :tab-width: 4
 
 Result

doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst

@@ -160,7 +160,7 @@ You can start a Visual Studio build from two places. Either inside from the *IDE
 
 .. |voila| unicode:: voil U+00E1
 
-This is important to remember when you code inside the code open and save commands. You're resources will be saved ( and queried for at opening!!!) relatively to your working directory. This is unless you give a full, explicit path as parameter for the I/O functions. In the code above we open :download:`this OpenCV logo<../../../../samples/cpp/tutorial_code/images/opencv-logo.png>`. Before starting up the application make sure you place the image file in your current working directory. Modify the image file name inside the code to try it out on other images too. Run it and |voila|:
+This is important to remember when you code inside the code open and save commands. You're resources will be saved ( and queried for at opening!!!) relatively to your working directory. This is unless you give a full, explicit path as parameter for the I/O functions. In the code above we open :download:`this OpenCV logo<../../../../samples/data/opencv-logo.png>`. Before starting up the application make sure you place the image file in your current working directory. Modify the image file name inside the code to try it out on other images too. Run it and |voila|:
 
 .. image:: images/SuccessVisualStudioWindows.jpg
    :alt: You should have this.

samples/cpp/bgfg_segm.cpp

@@ -23,7 +23,7 @@ const char* keys =
     "{c  camera   |         | use camera or not}"
     "{m  method   |mog2     | method (knn or mog2) }"
     "{s  smooth   |         | smooth the mask }"
-    "{fn file_name|tree.avi | movie file        }"
+    "{fn file_name|../data/tree.avi | movie file        }"
 };
 
 //this is a sample for foreground detection functions

samples/cpp/connected_components.cpp

@@ -36,14 +36,14 @@ static void help()
 {
     cout << "\n This program demonstrates connected components and use of the trackbar\n"
              "Usage: \n"
-             "  ./connected_components <image(stuff.jpg as default)>\n"
+             "  ./connected_components <image(../data/stuff.jpg as default)>\n"
              "The image is converted to grayscale and displayed, another image has a trackbar\n"
              "that controls thresholding and thereby the extracted contours which are drawn in color\n";
 }
 
 const char* keys =
 {
-    "{@image|stuff.jpg|image for converting to a grayscale}"
+    "{@image|../data/stuff.jpg|image for converting to a grayscale}"
 };
 
 int main( int argc, const char** argv )

samples/cpp/demhist.cpp

@@ -59,12 +59,12 @@ static void updateBrightnessContrast( int /*arg*/, void* )
 static void help()
 {
     std::cout << "\nThis program demonstrates the use of calcHist() -- histogram creation.\n"
-              << "Usage: \n" << "demhist [image_name -- Defaults to baboon.jpg]" << std::endl;
+              << "Usage: \n" << "demhist [image_name -- Defaults to ../data/baboon.jpg]" << std::endl;
 }
 
 const char* keys =
 {
-    "{@image|baboon.jpg|input image file}"
+    "{@image|../data/baboon.jpg|input image file}"
 };
 
 int main( int argc, const char** argv )

samples/cpp/dft.cpp

@@ -14,12 +14,12 @@ static void help()
     printf("\nThis program demonstrated the use of the discrete Fourier transform (dft)\n"
            "The dft of an image is taken and it's power spectrum is displayed.\n"
            "Usage:\n"
-            "./dft [image_name -- default lena.jpg]\n");
+            "./dft [image_name -- default ../data/lena.jpg]\n");
 }
 
 const char* keys =
 {
-    "{@image|lena.jpg|input image file}"
+    "{@image|../data/lena.jpg|input image file}"
 };
 
 int main(int argc, const char ** argv)

samples/cpp/distrans.cpp

@@ -91,7 +91,7 @@ static void help()
 {
     printf("\nProgram to demonstrate the use of the distance transform function between edge images.\n"
             "Usage:\n"
-            "./distrans [image_name -- default image is stuff.jpg]\n"
+            "./distrans [image_name -- default image is ../data/stuff.jpg]\n"
             "\nHot keys: \n"
             "\tESC - quit the program\n"
             "\tC - use C/Inf metric\n"
@@ -107,7 +107,7 @@ static void help()
 
 const char* keys =
 {
-    "{@image |stuff.jpg|input image file}"
+    "{@image |../data/stuff.jpg|input image file}"
 };
 
 int main( int argc, const char** argv )

samples/cpp/edge.cpp

@@ -28,12 +28,12 @@ static void help()
 {
     printf("\nThis sample demonstrates Canny edge detection\n"
            "Call:\n"
-           "    /.edge [image_name -- Default is fruits.jpg]\n\n");
+           "    /.edge [image_name -- Default is ../data/fruits.jpg]\n\n");
 }
 
 const char* keys =
 {
-    "{@image |fruits.jpg|input image name}"
+    "{@image |../data/fruits.jpg|input image name}"
 };
 
 int main( int argc, const char** argv )

samples/cpp/facedetect.cpp

@@ -118,8 +118,8 @@ int main( int argc, const char** argv )
     }
     else
     {
-        image = imread( "lena.jpg", 1 );
-        if(image.empty()) cout << "Couldn't read lena.jpg" << endl;
+        image = imread( "../data/lena.jpg", 1 );
+        if(image.empty()) cout << "Couldn't read ../data/lena.jpg" << endl;
     }
 
     cvNamedWindow( "result", 1 );

samples/cpp/ffilldemo.cpp

@@ -12,7 +12,7 @@ static void help()
 {
     cout << "\nThis program demonstrated the floodFill() function\n"
             "Call:\n"
-            "./ffilldemo [image_name -- Default: fruits.jpg]\n" << endl;
+            "./ffilldemo [image_name -- Default: ../data/fruits.jpg]\n" << endl;
 
     cout << "Hot keys: \n"
             "\tESC - quit the program\n"
@@ -73,7 +73,7 @@ static void onMouse( int event, int x, int y, int, void* )
 
 int main( int argc, char** argv )
 {
-    char* filename = argc >= 2 ? argv[1] : (char*)"fruits.jpg";
+    char* filename = argc >= 2 ? argv[1] : (char*)"../data/fruits.jpg";
     image0 = imread(filename, 1);
 
     if( image0.empty() )

samples/cpp/filestorage.cpp

@@ -85,8 +85,8 @@ int main(int ac, char** av)
     cout << "writing images\n";
     fs << "images" << "[";
 
-    fs << "image1.jpg" << "myfi.png" << "baboon.jpg";
-    cout << "image1.jpg" << " myfi.png" << " baboon.jpg" << endl;
+    fs << "image1.jpg" << "myfi.png" << "../data/baboon.jpg";
+    cout << "image1.jpg" << " myfi.png" << " ../data/baboon.jpg" << endl;
 
     fs << "]";
 

samples/cpp/fitellipse.cpp

@@ -27,7 +27,7 @@ using namespace std;
 //             "\nThis program is demonstration for ellipse fitting. The program finds\n"
 //             "contours and approximate it by ellipses.\n"
 //             "Call:\n"
-//             "./fitellipse [image_name -- Default stuff.jpg]\n" << endl;
+//             "./fitellipse [image_name -- Default ../data/stuff.jpg]\n" << endl;
 // }
 
 int sliderPos = 70;
@@ -38,7 +38,7 @@ void processImage(int, void*);
 
 int main( int argc, char** argv )
 {
-    const char* filename = argc == 2 ? argv[1] : (char*)"stuff.jpg";
+    const char* filename = argc == 2 ? argv[1] : (char*)"../data/stuff.jpg";
     image = imread(filename, 0);
     if( image.empty() )
     {

samples/cpp/houghcircles.cpp

@@ -11,12 +11,12 @@ static void help()
 {
     cout << "\nThis program demonstrates circle finding with the Hough transform.\n"
             "Usage:\n"
-            "./houghcircles <image_name>, Default is pic1.png\n" << endl;
+            "./houghcircles <image_name>, Default is ../data/board.jpg\n" << endl;
 }
 
 int main(int argc, char** argv)
 {
-    const char* filename = argc >= 2 ? argv[1] : "board.jpg";
+    const char* filename = argc >= 2 ? argv[1] : "../data/board.jpg";
 
     Mat img = imread(filename, 0);
     if(img.empty())

samples/cpp/houghlines.cpp

@@ -11,12 +11,12 @@ static void help()
 {
     cout << "\nThis program demonstrates line finding with the Hough transform.\n"
             "Usage:\n"
-            "./houghlines <image_name>, Default is pic1.png\n" << endl;
+            "./houghlines <image_name>, Default is ../data/pic1.png\n" << endl;
 }
 
 int main(int argc, char** argv)
 {
-    const char* filename = argc >= 2 ? argv[1] : "pic1.png";
+    const char* filename = argc >= 2 ? argv[1] : "../data/pic1.png";
 
     Mat src = imread(filename, 0);
     if(src.empty())

samples/cpp/image.cpp

@@ -14,7 +14,7 @@ static void help()
     "It shows reading of images, converting to planes and merging back, color conversion\n"
     "and also iterating through pixels.\n"
     "Call:\n"
-    "./image [image-name Default: lena.jpg]\n" << endl;
+    "./image [image-name Default: ../data/lena.jpg]\n" << endl;
 }
 
 // enable/disable use of mixed API in the code below.
@@ -28,7 +28,7 @@ static void help()
 int main( int argc, char** argv )
 {
     help();
-    const char* imagename = argc > 1 ? argv[1] : "lena.jpg";
+    const char* imagename = argc > 1 ? argv[1] : "../data/lena.jpg";
 #if DEMO_MIXED_API_USE
     Ptr<IplImage> iplimg(cvLoadImage(imagename)); // Ptr<T> is safe ref-counting pointer class
     if(!iplimg)

samples/cpp/image_alignment.cpp

@@ -3,7 +3,7 @@
 * findTransformECC that implements the image alignment ECC algorithm
 *
 *
-* The demo loads an image (defaults to fruits.jpg) and it artificially creates
+* The demo loads an image (defaults to ../data/fruits.jpg) and it artificially creates
 * a template image based on the given motion type. When two images are given,
 * the first image is the input image and the second one defines the template image.
 * In the latter case, you can also parse the warp's initialization.
@@ -44,7 +44,7 @@ static void draw_warped_roi(Mat& image, const int width, const int height, Mat&
 
 
 const std::string keys =
-    "{@inputImage    | fruits.jpg    | input image filename }"
+    "{@inputImage    | ../data/fruits.jpg | input image filename }"
     "{@templateImage |               | template image filename (optional)}"
     "{@inputWarp     |               | input warp (matrix) filename (optional)}"
     "{n numOfIter    | 50            | ECC's iterations }"
@@ -64,7 +64,7 @@ static void help(void)
         " are given, the initialization of the warp by command line parsing is possible. "
         "If inputWarp is missing, the identity transformation initializes the algorithm. \n" << endl;
 
-    cout << "\nUsage example (one image): \n./ecc fruits.jpg -o=outWarp.ecc "
+    cout << "\nUsage example (one image): \n./ecc ../data/fruits.jpg -o=outWarp.ecc "
         "-m=euclidean -e=1e-6 -N=70 -v=1 \n" << endl;
 
     cout << "\nUsage example (two images with initialization): \n./ecc yourInput.png yourTemplate.png "

samples/cpp/inpaint.cpp

@@ -14,7 +14,7 @@ static void help()
             << "with surrounding image areas.\n"
             "Using OpenCV version %s\n" << CV_VERSION << "\n"
     "Usage:\n"
-        "./inpaint [image_name -- Default fruits.jpg]\n" << endl;
+        "./inpaint [image_name -- Default ../data/fruits.jpg]\n" << endl;
 
     cout << "Hot keys: \n"
         "\tESC - quit the program\n"
@@ -47,7 +47,7 @@ static void onMouse( int event, int x, int y, int flags, void* )
 
 int main( int argc, char** argv )
 {
-    char* filename = argc >= 2 ? argv[1] : (char*)"fruits.jpg";
+    char* filename = argc >= 2 ? argv[1] : (char*)"../data/fruits.jpg";
     Mat img0 = imread(filename, -1);
     if(img0.empty())
     {

samples/cpp/letter_recog.cpp

@@ -489,7 +489,7 @@ int main( int argc, char *argv[] )
 {
     string filename_to_save = "";
     string filename_to_load = "";
-    string data_filename = "./letter-recognition.data";
+    string data_filename = "../data/letter-recognition.data";
     int method = 0;
 
     int i;

samples/cpp/logistic_regression.cpp

@@ -83,7 +83,7 @@ static float calculateAccuracyPercent(const Mat &original, const Mat &predicted)
 
 int main()
 {
-    const String filename = "data01.xml";
+    const String filename = "../data/data01.xml";
     cout << "**********************************************************************" << endl;
     cout << filename
          << " contains digits 0 and 1 of 20 samples each, collected on an Android device" << endl;

samples/cpp/lsd_lines.cpp

@@ -15,8 +15,8 @@ int main(int argc, char** argv)
     std::string in;
     if (argc != 2)
     {
-        std::cout << "Usage: lsd_lines [input image]. Now loading building.jpg" << std::endl;
-        in = "building.jpg";
+        std::cout << "Usage: lsd_lines [input image]. Now loading ../data/building.jpg" << std::endl;
+        in = "../data/building.jpg";
     }
     else
     {

samples/cpp/morphology2.cpp

@@ -58,7 +58,7 @@ static void ErodeDilate(int, void*)
 
 int main( int argc, char** argv )
 {
-    char* filename = argc == 2 ? argv[1] : (char*)"baboon.jpg";
+    char* filename = argc == 2 ? argv[1] : (char*)"../data/baboon.jpg";
     if( (src = imread(filename,1)).empty() )
         return -1;
 

samples/cpp/shape_example.cpp

@@ -17,7 +17,7 @@ static void help()
 {
     printf("\n"
             "This program demonstrates a method for shape comparisson based on Shape Context\n"
-            "You should run the program providing a number between 1 and 20 for selecting an image in the folder shape_sample.\n"
+            "You should run the program providing a number between 1 and 20 for selecting an image in the folder ../data/shape_sample.\n"
             "Call\n"
             "./shape_example [number between 1 and 20]\n\n");
 }
@@ -55,7 +55,7 @@ static vector<Point> simpleContour( const Mat& currentQuery, int n=300 )
 int main(int argc, char** argv)
 {
     help();
-    string path = "./shape_sample/";
+    string path = "../data/shape_sample/";
     int indexQuery = 1;
     if( argc < 2 )
     {

samples/cpp/squares.cpp

@@ -142,8 +142,8 @@ static void drawSquares( Mat& image, const vector<vector<Point> >& squares )
 
 int main(int /*argc*/, char** /*argv*/)
 {
-    static const char* names[] = { "pic1.png", "pic2.png", "pic3.png",
-        "pic4.png", "pic5.png", "pic6.png", 0 };
+    static const char* names[] = { "../data/pic1.png", "../data/pic2.png", "../data/pic3.png",
+        "../data/pic4.png", "../data/pic5.png", "../data/pic6.png", 0 };
     help();
     namedWindow( wndname, 1 );
     vector<vector<Point> > squares;

samples/cpp/stereo_calib.cpp

@@ -212,7 +212,7 @@ StereoCalib(const vector<string>& imagelist, Size boardSize, bool useCalibrated=
     cout << "average reprojection err = " <<  err/npoints << endl;
 
     // save intrinsic parameters
-    FileStorage fs("intrinsics.yml", FileStorage::WRITE);
+    FileStorage fs("../data/intrinsics.yml", FileStorage::WRITE);
     if( fs.isOpened() )
     {
         fs << "M1" << cameraMatrix[0] << "D1" << distCoeffs[0] <<
@@ -382,7 +382,7 @@ int main(int argc, char** argv)
 
     if( imagelistfn == "" )
     {
-        imagelistfn = "stereo_calib.xml";
+        imagelistfn = "../data/stereo_calib.xml";
         boardSize = Size(9, 6);
     }
     else if( boardSize.width <= 0 || boardSize.height <= 0 )

samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp

@@ -44,8 +44,8 @@ static void on_trackbar( int, void* )
 int main( void )
 {
    /// Read image ( same size, same type )
-   src1 = imread("../images/LinuxLogo.jpg");
-   src2 = imread("../images/WindowsLogo.jpg");
+   src1 = imread("../data/LinuxLogo.jpg");
+   src2 = imread("../data/WindowsLogo.jpg");
 
    if( src1.empty() ) { printf("Error loading src1 \n"); return -1; }
    if( src2.empty() ) { printf("Error loading src2 \n"); return -1; }

samples/cpp/tutorial_code/ImgProc/AddingImages.cpp

@@ -32,8 +32,8 @@ int main( void )
      { alpha = input; }
 
    /// Read image ( same size, same type )
-   src1 = imread("../images/LinuxLogo.jpg");
-   src2 = imread("../images/WindowsLogo.jpg");
+   src1 = imread("../data/LinuxLogo.jpg");
+   src2 = imread("../data/WindowsLogo.jpg");
 
    if( src1.empty() ) { std::cout<< "Error loading src1"<<std::endl; return -1; }
    if( src2.empty() ) { std::cout<< "Error loading src2"<<std::endl; return -1; }

samples/cpp/tutorial_code/ImgProc/Pyramids.cpp

@@ -32,7 +32,7 @@ int main( void )
   printf( " * [ESC] -> Close program \n \n" );
 
   /// Test image - Make sure it s divisible by 2^{n}
-  src = imread( "../images/chicky_512.png" );
+  src = imread( "../data/chicky_512.png" );
   if( src.empty() )
     { printf(" No data! -- Exiting the program \n");
       return -1; }

samples/cpp/tutorial_code/ImgProc/Smoothing.cpp

@@ -35,7 +35,7 @@ int main( void )
   namedWindow( window_name, WINDOW_AUTOSIZE );
 
   /// Load the source image
-  src = imread( "../images/lena.png", 1 );
+  src = imread( "../data/lena.jpg", 1 );
 
   if( display_caption( "Original Image" ) != 0 ) { return 0; }
 

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

@@ -14,14 +14,14 @@ static void help(char* progName)
         <<  "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 lena.jpg] "                       << endl << endl;
+        << progName << " [image_name -- default ../data/lena.jpg] "               << endl << endl;
 }
 
 int main(int argc, char ** argv)
 {
     help(argv[0]);
 
-    const char* filename = argc >=2 ? argv[1] : "lena.jpg";
+    const char* filename = argc >=2 ? argv[1] : "../data/lena.jpg";
 
     Mat I = imread(filename, IMREAD_GRAYSCALE);
     if( I.empty())

samples/cpp/tutorial_code/core/file_input_output/file_input_output.cpp

@@ -80,7 +80,7 @@ int main(int ac, char** av)
 
         fs << "iterationNr" << 100;
         fs << "strings" << "[";                              // text - string sequence
-        fs << "image1.jpg" << "Awesomeness" << "baboon.jpg";
+        fs << "image1.jpg" << "Awesomeness" << "../data/baboon.jpg";
         fs << "]";                                           // close sequence
 
         fs << "Mapping";                              // text - mapping

samples/cpp/tutorial_code/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.cpp

@@ -17,7 +17,7 @@ static void help( char* progName)
         << "Also contains example for image read, spliting the planes, merging back and "  << endl
         << " color conversion, plus iterating through pixels. "                            << endl
         << "Usage:" << endl
-        << progName << " [image-name Default: lena.jpg]"                           << endl << endl;
+        << progName << " [image-name Default: ../data/lena.jpg]"                   << endl << endl;
 }
 
 // comment out the define to use only the latest C++ API
@@ -31,7 +31,7 @@ static void help( char* progName)
 int main( int argc, char** argv )
 {
     help(argv[0]);
-    const char* imagename = argc > 1 ? argv[1] : "lena.jpg";
+    const char* imagename = argc > 1 ? argv[1] : "../data/lena.jpg";
 
 #ifdef DEMO_MIXED_API_USE
     Ptr<IplImage> IplI(cvLoadImage(imagename));      // Ptr<T> is a safe ref-counting pointer class

samples/cpp/tutorial_code/core/ippasync/ippasync_sample.cpp

@@ -36,7 +36,7 @@ static void help()
 const char* keys =
 {
     "{c  camera   |           | use camera or not}"
-    "{fn file_name|baboon.jpg | image file       }"
+    "{fn file_name|../data/baboon.jpg | image file       }"
     "{a accel     |auto       | accelerator type: auto (default), cpu, gpu}"
 };
 

samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp

@@ -14,7 +14,7 @@ static void help(char* progName)
         <<  "This program shows how to filter images with mask: the write it yourself and the"
         << "filter2d way. " << endl
         <<  "Usage:"                                                                        << endl
-        << progName << " [image_name -- default lena.jpg] [G -- grayscale] "        << endl << endl;
+        << progName << " [image_name -- default ../data/lena.jpg] [G -- grayscale] "        << endl << endl;
 }
 
 
@@ -23,7 +23,7 @@ void Sharpen(const Mat& myImage,Mat& Result);
 int main( int argc, char* argv[])
 {
     help(argv[0]);
-    const char* filename = argc >=2 ? argv[1] : "lena.jpg";
+    const char* filename = argc >=2 ? argv[1] : "../data/lena.jpg";
 
     Mat I, J, K;
 

samples/cpp/tutorial_code/features2D/AKAZE_match.cpp

@@ -12,11 +12,11 @@ const float nn_match_ratio = 0.8f;   // Nearest neighbor matching ratio
 
 int main(void)
 {
-    Mat img1 = imread("graf1.png", IMREAD_GRAYSCALE);
-    Mat img2 = imread("graf3.png", IMREAD_GRAYSCALE);
+    Mat img1 = imread("../data/graf1.png", IMREAD_GRAYSCALE);
+    Mat img2 = imread("../data/graf3.png", IMREAD_GRAYSCALE);
 
     Mat homography;
-    FileStorage fs("H1to3p.xml", FileStorage::READ);
+    FileStorage fs("../data/H1to3p.xml", FileStorage::READ);
     fs.getFirstTopLevelNode() >> homography;
 
     vector<KeyPoint> kpts1, kpts2;

samples/cpp/tutorial_code/introduction/display_image/display_image.cpp

 #include <opencv2/core/core.hpp>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/highgui/highgui.hpp>
+
 #include <iostream>
+#include <string>
 
 using namespace cv;
 using namespace std;
 
 int main( int argc, char** argv )
 {
-    if( argc != 2)
+    string imageName("../data/HappyFish.jpg"); // by default
+    if( argc > 1)
     {
-     cout <<" Usage: display_image ImageToLoadAndDisplay" << endl;
-     return -1;
+        imageName = argv[1];
     }
 
     Mat image;
-    image = imread(argv[1], IMREAD_COLOR); // Read the file
+    image = imread(imageName.c_str(), IMREAD_COLOR); // Read the file
 
     if( image.empty() )                      // Check for invalid input
     {

samples/cpp/ufacedetect.cpp

@@ -111,7 +111,7 @@ int main( int argc, const char** argv )
     else
     {
         if( inputName.empty() )
-            inputName = "lena.jpg";
+            inputName = "../data/lena.jpg";
         image = imread( inputName, 1 ).getUMat(ACCESS_READ);
         if( image.empty() )
         {

samples/cpp/watershed.cpp

@@ -13,7 +13,7 @@ static void help()
 {
     cout << "\nThis program demonstrates the famous watershed segmentation algorithm in OpenCV: watershed()\n"
             "Usage:\n"
-            "./watershed [image_name -- default is fruits.jpg]\n" << endl;
+            "./watershed [image_name -- default is ../data/fruits.jpg]\n" << endl;
 
 
     cout << "Hot keys: \n"
@@ -48,7 +48,7 @@ static void onMouse( int event, int x, int y, int flags, void* )
 
 int main( int argc, char** argv )
 {
-    char* filename = argc >= 2 ? argv[1] : (char*)"fruits.jpg";
+    char* filename = argc >= 2 ? argv[1] : (char*)"../data/fruits.jpg";
     Mat img0 = imread(filename, 1), imgGray;
 
     if( img0.empty() )

samples/cpp/stereo_calib.xml → samples/data/stereo_calib.xml

@@ -29,4 +29,3 @@
 "right14.jpg"
 </imagelist>
 </opencv_storage>
-

samples/gpu/bgfg_segm.cpp

@@ -23,7 +23,7 @@ int main(int argc, const char** argv)
 {
     cv::CommandLineParser cmd(argc, argv,
         "{ c camera |             | use camera }"
-        "{ f file   | 768x576.avi | input video file }"
+        "{ f file   | ../data/768x576.avi | input video file }"
         "{ m method | mog         | method (mog, mog2, gmg, fgd) }"
         "{ h help   |             | print help message }");
 

samples/gpu/generalized_hough.cpp

@@ -27,7 +27,7 @@ static Mat loadImage(const string& name)
 int main(int argc, const char* argv[])
 {
     CommandLineParser cmd(argc, argv,
-        "{ image i        | pic1.png  | input image }"
+        "{ image i        | ../data/pic1.png  | input image }"
         "{ template t     | templ.png | template image }"
         "{ full           |           | estimate scale and rotation }"
         "{ gpu            |           | use gpu version }"

samples/gpu/houghlines.cpp

@@ -15,12 +15,12 @@ static void help()
 {
     cout << "This program demonstrates line finding with the Hough transform." << endl;
     cout << "Usage:" << endl;
-    cout << "./gpu-example-houghlines <image_name>, Default is pic1.png\n" << endl;
+    cout << "./gpu-example-houghlines <image_name>, Default is ../data/pic1.png\n" << endl;
 }
 
 int main(int argc, const char* argv[])
 {
-    const string filename = argc >= 2 ? argv[1] : "pic1.png";
+    const string filename = argc >= 2 ? argv[1] : "../data/pic1.png";
 
     Mat src = imread(filename, IMREAD_GRAYSCALE);
     if (src.empty())

samples/gpu/morphology.cpp

@@ -44,7 +44,7 @@ App::App(int argc, const char* argv[])
         exit(0);
     }
 
-    String filename = argc == 2 ? argv[1] : "baboon.jpg";
+    String filename = argc == 2 ? argv[1] : "../data/baboon.jpg";
 
     Mat img = imread(filename);
     if (img.empty())

samples/gpu/performance/tests.cpp

@@ -281,8 +281,8 @@ TEST(meanShift)
 
 TEST(SURF)
 {
-    Mat src = imread(abspath("aloeL.jpg"), IMREAD_GRAYSCALE);
-    if (src.empty()) throw runtime_error("can't open aloeL.jpg");
+    Mat src = imread(abspath("../data/aloeL.jpg"), IMREAD_GRAYSCALE);
+    if (src.empty()) throw runtime_error("can't open ../data/aloeL.jpg");
 
     xfeatures2d::SURF surf;
     vector<KeyPoint> keypoints;
@@ -311,8 +311,8 @@ TEST(SURF)
 
 TEST(FAST)
 {
-    Mat src = imread(abspath("aloeL.jpg"), IMREAD_GRAYSCALE);
-    if (src.empty()) throw runtime_error("can't open aloeL.jpg");
+    Mat src = imread(abspath("../data/aloeL.jpg"), IMREAD_GRAYSCALE);
+    if (src.empty()) throw runtime_error("can't open ../data/aloeL.jpg");
 
     vector<KeyPoint> keypoints;
 
@@ -336,8 +336,8 @@ TEST(FAST)
 
 TEST(ORB)
 {
-    Mat src = imread(abspath("aloeL.jpg"), IMREAD_GRAYSCALE);
-    if (src.empty()) throw runtime_error("can't open aloeL.jpg");
+    Mat src = imread(abspath("../data/aloeL.jpg"), IMREAD_GRAYSCALE);
+    if (src.empty()) throw runtime_error("can't open ../data/aloeL.jpg");
 
     ORB orb(4000);
     vector<KeyPoint> keypoints;
@@ -1065,9 +1065,9 @@ TEST(equalizeHist)
 
 TEST(Canny)
 {
-    Mat img = imread(abspath("aloeL.jpg"), IMREAD_GRAYSCALE);
+    Mat img = imread(abspath("../data/aloeL.jpg"), IMREAD_GRAYSCALE);
 
-    if (img.empty()) throw runtime_error("can't open aloeL.jpg");
+    if (img.empty()) throw runtime_error("can't open ../data/aloeL.jpg");
 
     Mat edges(img.size(), CV_8UC1);
 
@@ -1166,8 +1166,8 @@ TEST(gemm)
 
 TEST(GoodFeaturesToTrack)
 {
-    Mat src = imread(abspath("aloeL.jpg"), IMREAD_GRAYSCALE);
-    if (src.empty()) throw runtime_error("can't open aloeL.jpg");
+    Mat src = imread(abspath("../data/aloeL.jpg"), IMREAD_GRAYSCALE);
+    if (src.empty()) throw runtime_error("can't open ../data/aloeL.jpg");
 
     vector<Point2f> pts;
 
@@ -1191,11 +1191,11 @@ TEST(GoodFeaturesToTrack)
 
 TEST(PyrLKOpticalFlow)
 {
-    Mat frame0 = imread(abspath("rubberwhale1.png"));
-    if (frame0.empty()) throw runtime_error("can't open rubberwhale1.png");
+    Mat frame0 = imread(abspath("../data/rubberwhale1.png"));
+    if (frame0.empty()) throw runtime_error("can't open ../data/rubberwhale1.png");
 
-    Mat frame1 = imread(abspath("rubberwhale2.png"));
-    if (frame1.empty()) throw runtime_error("can't open rubberwhale2.png");
+    Mat frame1 = imread(abspath("../data/rubberwhale2.png"));
+    if (frame1.empty()) throw runtime_error("can't open ../data/rubberwhale2.png");
 
     Mat gray_frame;
     cvtColor(frame0, gray_frame, COLOR_BGR2GRAY);
@@ -1242,7 +1242,7 @@ TEST(PyrLKOpticalFlow)
 
 TEST(FarnebackOpticalFlow)
 {
-    const string datasets[] = {"rubberwhale", "basketball"};
+    const string datasets[] = {"../data/rubberwhale", "../data/basketball"};
     for (size_t i = 0; i < sizeof(datasets)/sizeof(*datasets); ++i) {
     for (int fastPyramids = 0; fastPyramids < 2; ++fastPyramids) {
     for (int useGaussianBlur = 0; useGaussianBlur < 2; ++useGaussianBlur) {
@@ -1274,10 +1274,10 @@ TEST(FarnebackOpticalFlow)
 
 TEST(MOG)
 {
-    const std::string inputFile = abspath("768x576.avi");
+    const std::string inputFile = abspath("../data/768x576.avi");
 
     cv::VideoCapture cap(inputFile);
-    if (!cap.isOpened()) throw runtime_error("can't open 768x576.avi");
+    if (!cap.isOpened()) throw runtime_error("can't open ../data/768x576.avi");
 
     cv::Mat frame;
     cap >> frame;
@@ -1327,10 +1327,10 @@ TEST(MOG)
 
 TEST(MOG2)
 {
-    const std::string inputFile = abspath("768x576.avi");
+    const std::string inputFile = abspath("../data/768x576.avi");
 
     cv::VideoCapture cap(inputFile);
-    if (!cap.isOpened()) throw runtime_error("can't open 768x576.avi");
+    if (!cap.isOpened()) throw runtime_error("can't open ../data/768x576.avi");
 
     cv::Mat frame;
     cap >> frame;

samples/python2/asift.py

@@ -113,8 +113,8 @@ if __name__ == '__main__':
     try:
         fn1, fn2 = args
     except:
-        fn1 = 'data/aero1.jpg'
-        fn2 = 'data/aero3.jpg'
+        fn1 = '../data/aero1.jpg'
+        fn2 = '../data/aero3.jpg'
 
     img1 = cv2.imread(fn1, 0)
     img2 = cv2.imread(fn2, 0)

samples/python2/coherence.py

@@ -43,7 +43,7 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = '../cpp/baboon.jpg'
+        fn = '../data/baboon.jpg'
 
     src = cv2.imread(fn)
 

samples/python2/color_histogram.py

@@ -31,7 +31,7 @@ if __name__ == '__main__':
         fn = sys.argv[1]
     except:
         fn = 0
-    cam = video.create_capture(fn, fallback='synth:bg=../cpp/baboon.jpg:class=chess:noise=0.05')
+    cam = video.create_capture(fn, fallback='synth:bg=../data/baboon.jpg:class=chess:noise=0.05')
 
     while True:
         flag, frame = cam.read()

samples/python2/deconvolution.py

@@ -19,11 +19,11 @@ Usage:
     ESC   - exit
 
 Examples:
-  deconvolution.py --angle 135 --d 22  data/licenseplate_motion.jpg
+  deconvolution.py --angle 135 --d 22  ../data/licenseplate_motion.jpg
     (image source: http://www.topazlabs.com/infocus/_images/licenseplate_compare.jpg)
 
-  deconvolution.py --angle 86 --d 31  data/text_motion.jpg
-  deconvolution.py --circle --d 19  data/text_defocus.jpg
+  deconvolution.py --angle 86 --d 31  ../data/text_motion.jpg
+  deconvolution.py --circle --d 19  ../data/text_defocus.jpg
     (image source: compact digital photo camera, no artificial distortion)
 
 
@@ -70,7 +70,7 @@ if __name__ == '__main__':
     try:
         fn = args[0]
     except:
-        fn = 'data/licenseplate_motion.jpg'
+        fn = '../data/licenseplate_motion.jpg'
 
     win = 'deconvolution'
 

samples/python2/dft.py

@@ -56,7 +56,7 @@ if __name__ == "__main__":
     if len(sys.argv)>1:
         im = cv2.imread(sys.argv[1])
     else :
-        im = cv2.imread('../c/baboon.jpg')
+        im = cv2.imread('../data/baboon.jpg')
         print "usage : python dft.py <image_file>"
 
     # convert to grayscale

samples/python2/digits.py

@@ -3,7 +3,7 @@
 '''
 SVM and KNearest digit recognition.
 
-Sample loads a dataset of handwritten digits from 'digits.png'.
+Sample loads a dataset of handwritten digits from '../data/digits.png'.
 Then it trains a SVM and KNearest classifiers on it and evaluates
 their accuracy.
 
@@ -38,7 +38,7 @@ from common import clock, mosaic
 
 SZ = 20 # size of each digit is SZ x SZ
 CLASS_N = 10
-DIGITS_FN = 'data/digits.png'
+DIGITS_FN = '../data/digits.png'
 
 def split2d(img, cell_size, flatten=True):
     h, w = img.shape[:2]

samples/python2/distrans.py

@@ -22,7 +22,7 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = '../cpp/fruits.jpg'
+        fn = '../data/fruits.jpg'
     print __doc__
 
     img = cv2.imread(fn, 0)

samples/python2/facedetect.py

@@ -38,7 +38,7 @@ if __name__ == '__main__':
     cascade = cv2.CascadeClassifier(cascade_fn)
     nested = cv2.CascadeClassifier(nested_fn)
 
-    cam = create_capture(video_src, fallback='synth:bg=../cpp/lena.jpg:noise=0.05')
+    cam = create_capture(video_src, fallback='synth:bg=../data/lena.jpg:noise=0.05')
 
     while True:
         ret, img = cam.read()

samples/python2/find_obj.py

@@ -139,8 +139,8 @@ if __name__ == '__main__':
     try:
         fn1, fn2 = args
     except:
-        fn1 = '../cpp/box.png'
-        fn2 = '../cpp/box_in_scene.png'
+        fn1 = '../data/box.png'
+        fn2 = '../data/box_in_scene.png'
 
     img1 = cv2.imread(fn1, 0)
     img2 = cv2.imread(fn2, 0)

samples/python2/floodfill.py

@@ -22,7 +22,7 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = '../cpp/fruits.jpg'
+        fn = '../data/fruits.jpg'
     print __doc__
 
     img = cv2.imread(fn, True)

samples/python2/gabor_threads.py

@@ -52,7 +52,7 @@ if __name__ == '__main__':
     try:
         img_fn = sys.argv[1]
     except:
-        img_fn = '../cpp/baboon.jpg'
+        img_fn = '../data/baboon.jpg'
 
     img = cv2.imread(img_fn)
     if img is None:

samples/python2/grabcut.py

@@ -102,9 +102,9 @@ print __doc__
 if len(sys.argv) == 2:
     filename = sys.argv[1] # for drawing purposes
 else:
-    print "No input image given, so loading default image, lena.jpg \n"
+    print "No input image given, so loading default image, ../data/lena.jpg \n"
     print "Correct Usage: python grabcut.py <filename> \n"
-    filename = '../cpp/lena.jpg'
+    filename = '../data/lena.jpg'
 
 img = cv2.imread(filename)
 img2 = img.copy()                               # a copy of original image

samples/python2/hist.py

@@ -57,7 +57,7 @@ if __name__ == '__main__':
     if len(sys.argv)>1:
         fname = sys.argv[1]
     else :
-        fname = '../cpp/lena.jpg'
+        fname = '../data/lena.jpg'
         print "usage : python hist.py <image_file>"
 
     im = cv2.imread(fname)

samples/python2/houghcircles.py

@@ -3,7 +3,7 @@
 '''
 This example illustrates how to use cv2.HoughCircles() function.
 Usage: ./houghcircles.py [<image_name>]
-image argument defaults to ../cpp/board.jpg
+image argument defaults to ../data/board.jpg
 '''
 
 import cv2
@@ -15,7 +15,7 @@ print __doc__
 try:
     fn = sys.argv[1]
 except:
-    fn = "../cpp/board.jpg"
+    fn = "../data/board.jpg"
 
 src = cv2.imread(fn, 1)
 img = cv2.cvtColor(src, cv2.COLOR_BGR2GRAY)

samples/python2/houghlines.py

@@ -2,7 +2,7 @@
 '''
 This example illustrates how to use Hough Transform to find lines
 Usage: ./houghlines.py [<image_name>]
-image argument defaults to ../cpp/pic1.png
+image argument defaults to ../data/pic1.png
 '''
 import cv2
 import numpy as np
@@ -12,7 +12,7 @@ import math
 try:
     fn = sys.argv[1]
 except:
-    fn = "../cpp/pic1.png"
+    fn = "../data/pic1.png"
 print __doc__
 src = cv2.imread(fn)
 dst = cv2.Canny(src, 50, 200)

samples/python2/inpaint.py

@@ -24,7 +24,7 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = '../cpp/fruits.jpg'
+        fn = '../data/fruits.jpg'
 
     print __doc__
 

samples/python2/letter_recog.py

@@ -153,7 +153,7 @@ if __name__ == '__main__':
     args, dummy = getopt.getopt(sys.argv[1:], '', ['model=', 'data=', 'load=', 'save='])
     args = dict(args)
     args.setdefault('--model', 'rtrees')
-    args.setdefault('--data', '../cpp/letter-recognition.data')
+    args.setdefault('--data', '../data/letter-recognition.data')
 
     print 'loading data %s ...' % args['--data']
     samples, responses = load_base(args['--data'])

samples/python2/logpolar.py

@@ -6,7 +6,7 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = '../cpp/fruits.jpg'
+        fn = '../data/fruits.jpg'
 
     img = cv2.imread(fn)
     if img is None:

samples/python2/morphology.py

@@ -26,7 +26,7 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = '../cpp/baboon.jpg'
+        fn = '../data/baboon.jpg'
 
     img = cv2.imread(fn)
 

samples/python2/stereo_match.py

@@ -32,8 +32,8 @@ def write_ply(fn, verts, colors):
 
 if __name__ == '__main__':
     print 'loading images...'
-    imgL = cv2.pyrDown( cv2.imread('../gpu/aloeL.jpg') )  # downscale images for faster processing
-    imgR = cv2.pyrDown( cv2.imread('../gpu/aloeR.jpg') )
+    imgL = cv2.pyrDown( cv2.imread('../data/aloeL.jpg') )  # downscale images for faster processing
+    imgR = cv2.pyrDown( cv2.imread('../data/aloeR.jpg') )
 
     # disparity range is tuned for 'aloe' image pair
     window_size = 3

samples/python2/texture_flow.py

@@ -18,7 +18,7 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = 'data/starry_night.jpg'
+        fn = '../data/starry_night.jpg'
 
     img = cv2.imread(fn)
     if img is None:

samples/python2/video.py

@@ -20,8 +20,8 @@ Usage:
      - synth:<params> for procedural video
 
 Synth examples:
-    synth:bg=../cpp/lena.jpg:noise=0.1
-    synth:class=chess:bg=../cpp/lena.jpg:noise=0.1:size=640x480
+    synth:bg=../data/lena.jpg:noise=0.1
+    synth:class=chess:bg=../data/lena.jpg:noise=0.1:size=640x480
 
 Keys:
     ESC    - exit
@@ -130,8 +130,8 @@ classes = dict(chess=Chess)
 
 presets = dict(
     empty = 'synth:',
-    lena = 'synth:bg=../cpp/lena.jpg:noise=0.1',
-    chess = 'synth:class=chess:bg=../cpp/lena.jpg:noise=0.1:size=640x480'
+    lena = 'synth:bg=../data/lena.jpg:noise=0.1',
+    chess = 'synth:class=chess:bg=../data/lena.jpg:noise=0.1:size=640x480'
 )
 
 

samples/python2/watershed.py

@@ -79,6 +79,6 @@ if __name__ == '__main__':
     try:
         fn = sys.argv[1]
     except:
-        fn = '../cpp/fruits.jpg'
+        fn = '../data/fruits.jpg'
     print __doc__
     App(fn).run()

samples/tapi/bgfg_segm.cpp

@@ -18,7 +18,7 @@ int main(int argc, const char** argv)
 {
     CommandLineParser cmd(argc, argv,
         "{ c camera   | false       | use camera }"
-        "{ f file     | 768x576.avi | input video file }"
+        "{ f file     | ../data/768x576.avi | input video file }"
         "{ t type     | mog2        | method's type (knn, mog2) }"
         "{ h help     | false       | print help message }"
         "{ m cpu_mode | false       | press 'm' to switch OpenCL<->CPU}");

samples/tapi/hog.cpp

@@ -71,7 +71,7 @@ int main(int argc, char** argv)
         "{ h help      | false          | print help message }"
         "{ i input     |                | specify input image}"
         "{ c camera    | -1             | enable camera capturing }"
-        "{ v video     | 768x576.avi    | use video as input }"
+        "{ v video     | ../data/768x576.avi | use video as input }"
         "{ g gray      | false          | convert image to gray one or not}"
         "{ s scale     | 1.0            | resize the image before detect}"
         "{ o output    |                | specify output path when input is images}";

samples/tapi/squares.cpp

@@ -141,7 +141,7 @@ static UMat drawSquaresBoth( const UMat& image,
 int main(int argc, char** argv)
 {
     const char* keys =
-        "{ i input    | pic1.png           | specify input image }"
+        "{ i input    | ../data/pic1.png   | specify input image }"
         "{ o output   | squares_output.jpg | specify output save path}"
         "{ h help     | false              | print help message }"
         "{ m cpu_mode | false              | run without OpenCL }";