diff --git a/README.md b/README.md index feb55fd..d861f7f 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ In progress June 30, 2017 * ~~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 * ~~background subtraction~~ * feature detector/descriptors - * ~~More mac~~ hine learning(?) ... ongoing! + * ~~More mac~~ machine learning(?) ... ongoing! * Some new stuff in opencv_contrib * Some DNN examples(?) * ~~Throw in some exercises~~ ... ongoing! diff --git a/example_12-01.cpp b/example_12-01.cpp index 6534378..3e8aa33 100644 --- a/example_12-01.cpp +++ b/example_12-01.cpp @@ -1,5 +1,6 @@ -// Using cv::dft() and cv::idft() to accelerate the computation of -// convolutions +// Example 12-1. Using cv::dft() and cv::idft() to accelerate the computation of +// convolutions + #include #include @@ -9,7 +10,9 @@ using namespace std; int main(int argc, char** argv) { if(argc != 2) { - cout << "Fourier Transform\nUsage: " <" << endl; + cout << "\nExample 12-1. Using cv::dft() and cv::idft() to accelerate the" + << "\n computation of convolutions" + << "\nFourier Transform\nUsage: " <\n" << endl; return -1; } diff --git a/example_12-02.cpp b/example_12-02.cpp index 435247e..934cb2b 100644 --- a/example_12-02.cpp +++ b/example_12-02.cpp @@ -11,7 +11,8 @@ using namespace std; int main(int argc, char** argv) { if(argc != 2) { - cout << "Hough Circle detect\nUsage: " <\n" << endl; + cout << "\nExample 12-1. Using cv::dft() and cv::idft() to accelerate the computation of convolutions" + << "\nHough Circle detect\nUsage: " <\n" << endl; return -1; } diff --git a/example_13-01.cpp b/example_13-01.cpp index d727222..a04685f 100644 --- a/example_13-01.cpp +++ b/example_13-01.cpp @@ -7,7 +7,8 @@ using namespace std; int main( int argc, char** argv ){ if(argc != 2) { - cout << "Computer Color Histogram\nUsage: " <" << endl; + cout << "\n// Example 13-1. Histogram computation and display" << endl; + cout << "\nComputer Color Histogram\nUsage: " <\n" << endl; return -1; } diff --git a/example_13-02.cpp b/example_13-02.cpp index 089ad89..0a7534d 100644 --- a/example_13-02.cpp +++ b/example_13-02.cpp @@ -8,12 +8,15 @@ using namespace std; void help( char** argv ){ + cout << "//\nExample 13-2. Creating signatures from histograms for EMD; note that this code is the" + << "\n// source of the data in Table 13-1, in which the hand histogram is compared in different" + << "\n// lighting conditions\n\n" << endl; cout << "\nCall is:\n" << argv[0] <<" modelImage0 testImage1 testImage2 badImage3\n\n" << "for example: " << argv[0] - << " HandIndoorColor.jpg HandOutdoorColor.jpg " - << "HandOutdoorSunColor.jpg fruits.jpg\n" - << "\n"; + << " ../HandIndoorColor.jpg ../HandOutdoorColor.jpg " + << "../HandOutdoorSunColor.jpg ../fruits.jpg\n" + << "\n" << endl; } // Compare 3 images' histograms diff --git a/example_13-03.cpp b/example_13-03.cpp index d6dedf3..f078ae6 100644 --- a/example_13-03.cpp +++ b/example_13-03.cpp @@ -7,9 +7,10 @@ using namespace std; void help( char** argv ){ cout << "\n" - <<"Example of using matchTemplate(). The call is:\n" + <<"\nExample 13-3: using matchTemplate(). The call is:\n" <<"\n" - <