Skip to content

Commit

Permalink
Merge pull request #56 from oreillymedia/gary
Browse files Browse the repository at this point in the history
Gary
  • Loading branch information
garybradski authored Jul 4, 2017
2 parents 1d669f6 + f71c068 commit 5522217
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ This is the example code that accompanies Learning OpenCV 3 by Adrian Kaehler an
* ~~In progress June 20, 2017~~
* ~~In progress June 22, 2017~~
* ~~In progress July 02, 2017~~
* In progress July 03, 2017

**To do:**
* ~~Chapter 15~~
Expand All @@ -20,7 +21,7 @@ This is the example code that accompanies Learning OpenCV 3 by Adrian Kaehler an
* ~~Chapter 22~~

Checking Chapters
~~2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15~~ 16 17 18 19 20 ~~21 22 23~~
~~2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,~~ 19, 20, ~~21 22 23~~

* Submit associated errata for ~~15 16~~ 17 18 19 20 21 22
* Throw in some bonus material
Expand Down
6 changes: 4 additions & 2 deletions example_16-01.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ using namespace std;
static const int MAX_CORNERS = 1000;

void help( char** argv ) {
cout << "Call: " <<argv[0] <<" [image1] [image2]" << endl;
cout << "Demonstrates Pyramid Lucas-Kanade optical flow." << endl;
cout << "\nExample 16-1: Pyramid L-K optical flow example.\n" << endl;
cout << "Call: " <<argv[0] <<" [image1] [image2]\n" << endl;
cout << "\nExample:\n" << argv[0] << " ../example_16-01-imgA.png ../example_16-01-imgB.png\n" << endl;
cout << "Demonstrates Pyramid Lucas-Kanade optical flow.\n" << endl;
}

int main(int argc, char** argv) {
Expand Down
2 changes: 1 addition & 1 deletion example_17-01.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using std::endl;

void help(char** argv ) {
cout << "\n"
<< "Example code for using cv::KalmanFilter\n"
<< "Example 17-1: code for using cv::KalmanFilter\n"
<< argv[0] << "\n\n"
<< "For example:\n"
<< argv[0] <<"\n\n"
Expand Down
6 changes: 4 additions & 2 deletions example_17-02.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ int main(int argc, char** argv) {
// Program expects at least one argument that is path to video file
//
if (argc < 2) {
cerr << "Use:\n" << argv[0] << " <video_file>\n"
<< "to run this demo\n";
cerr << "\nExample 17-2: Farnback optical flow example\n"
<< "Use:\n" << argv[0] << " <path/video_file>\n"
<< "Example:\n" << argv[0] << " ../test.avi\n"
<< std::endl;
exit(1);
}

Expand Down
2 changes: 1 addition & 1 deletion example_18-01.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ void help(char **argv) { // todo rewrite this
<< " reading and collecting the requested number of views,\n"
<< " and calibrating the camera\n\n"
<< "Call:\n" << argv[0] << " <board_width> <board_height> <number_of_boards> <if_video,_delay_between_framee_capture> <image_scaling_factor>\n\n"
<< "Example:\n./example_18-01 9 6 15 500 0.5\n"
<< "Example:\n" << argv[0] << " 9 6 15 500 0.5\n"
<< "-- to use the checkerboard9x6.png provided\n\n"
<< " * First it reads in checker boards and calibrates itself\n"
<< " * Then it saves and reloads the calibration matricies\n"
Expand Down

0 comments on commit 5522217

Please sign in to comment.