Unverified Commit 43002c0c authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub

Merge pull request #13188 from alalek:samples_rename

* samples: rename starter_imagelist.cpp

* samples: rename intelperc_capture.cpp => videocapture_intelperc.cpp

* samples: rename openni_capture.cpp => videocapture_openni.cpp

* samples: rename image_sequence.cpp => videocapture_image_sequence.cpp

* samples: rename gstreamer_pipeline.cpp => videocapture_gstreamer_pipeline.cpp

* samples: rename autofocus.cpp => videocapture_gphoto2_autofocus.cpp

* samples: rename live_detect_qrcode.cpp => qrcode.cpp
parent e580061b
...@@ -78,5 +78,5 @@ there are two flags that should be used to set/get property of the needed genera ...@@ -78,5 +78,5 @@ there are two flags that should be used to set/get property of the needed genera
flag value is assumed by default if neither of the two possible values of the property is set. flag value is assumed by default if neither of the two possible values of the property is set.
For more information please refer to the example of usage For more information please refer to the example of usage
[intelperc_capture.cpp](https://github.com/opencv/opencv/tree/3.4/samples/cpp/intelperc_capture.cpp) [videocapture_intelperc.cpp](https://github.com/opencv/opencv/tree/3.4/samples/cpp/videocapture_intelperc.cpp)
in opencv/samples/cpp folder. in opencv/samples/cpp folder.
...@@ -134,5 +134,5 @@ property. The following properties of cameras available through OpenNI interface ...@@ -134,5 +134,5 @@ property. The following properties of cameras available through OpenNI interface
- CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION = CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_REGISTRATION - CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION = CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_REGISTRATION
For more information please refer to the example of usage For more information please refer to the example of usage
[openni_capture.cpp](https://github.com/opencv/opencv/tree/3.4/samples/cpp/openni_capture.cpp) in [videocapture_openni.cpp](https://github.com/opencv/opencv/tree/3.4/samples/cpp/videocapture_openni.cpp) in
opencv/samples/cpp folder. opencv/samples/cpp folder.
/* /*
* starter_imagelist.cpp
*
* Created on: Nov 23, 2010 * Created on: Nov 23, 2010
* Author: Ethan Rublee * Author: Ethan Rublee
* *
...@@ -16,10 +14,7 @@ ...@@ -16,10 +14,7 @@
using namespace cv; using namespace cv;
using namespace std; using namespace std;
//hide the local functions in an unnamed namespace static void help(char** av)
namespace
{
void help(char** av)
{ {
cout << "\nThis program gets you started being able to read images from a list in a file\n" cout << "\nThis program gets you started being able to read images from a list in a file\n"
"Usage:\n./" << av[0] << " image_list.yaml\n" "Usage:\n./" << av[0] << " image_list.yaml\n"
...@@ -30,7 +25,7 @@ void help(char** av) ...@@ -30,7 +25,7 @@ void help(char** av)
"Using OpenCV version %s\n" << CV_VERSION << "\n" << endl; "Using OpenCV version %s\n" << CV_VERSION << "\n" << endl;
} }
bool readStringList(const string& filename, vector<string>& l) static bool readStringList(const string& filename, vector<string>& l)
{ {
l.resize(0); l.resize(0);
FileStorage fs(filename, FileStorage::READ); FileStorage fs(filename, FileStorage::READ);
...@@ -45,7 +40,7 @@ bool readStringList(const string& filename, vector<string>& l) ...@@ -45,7 +40,7 @@ bool readStringList(const string& filename, vector<string>& l)
return true; return true;
} }
int process(vector<string> images) static int process(const vector<string>& images)
{ {
namedWindow("image", WINDOW_KEEPRATIO); //resizable window; namedWindow("image", WINDOW_KEEPRATIO); //resizable window;
for (size_t i = 0; i < images.size(); i++) for (size_t i = 0; i < images.size(); i++)
...@@ -53,13 +48,11 @@ int process(vector<string> images) ...@@ -53,13 +48,11 @@ int process(vector<string> images)
Mat image = imread(images[i], IMREAD_GRAYSCALE); // do grayscale processing? Mat image = imread(images[i], IMREAD_GRAYSCALE); // do grayscale processing?
imshow("image",image); imshow("image",image);
cout << "Press a key to see the next image in the list." << endl; cout << "Press a key to see the next image in the list." << endl;
waitKey(); // wait indefinitely for a key to be pressed waitKey(); // wait infinitely for a key to be pressed
} }
return 0; return 0;
} }
}
int main(int ac, char** av) int main(int ac, char** av)
{ {
cv::CommandLineParser parser(ac, av, "{help h||}{@input||}"); cv::CommandLineParser parser(ac, av, "{help h||}{@input||}");
......
// testOpenCVCam.cpp : Defines the entry point for the console application.
//
#include "opencv2/videoio.hpp" #include "opencv2/videoio.hpp"
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment