Skip to content

Commit 69a6c8e

Browse files
committed
Make sure every sample compiles under OpenCV 3.4.x
1 parent 4ead392 commit 69a6c8e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3183
-3075
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,8 @@
1111
*.lai
1212
*.la
1313
*.a
14+
15+
bin/
16+
gmake/
17+
vs*/
18+
xcode*/

Chapter 01/main1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
int main() {
2222

2323
// read an image
24-
cv::Mat image= cv::imread("img.jpg");
24+
cv::Mat image= cv::imread("../images/image.jpg");
2525
// create image window named "My Image"
2626
cv::namedWindow("My Image");
2727
// show the image on window

Chapter 01/main2.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ int main() {
3636
std::cout << "size: " << image.size().height << " , "
3737
<< image.size().width << std::endl;
3838
// open image
39-
image= cv::imread("img.jpg");
39+
image= cv::imread("../images/image.jpg");
4040
// check if image has been successfully read
4141
if (!image.data) {
42-
// no image has been created
42+
// no image has been created?
4343
return 0;
4444
}
4545
// print image size

Chapter 02/addImages.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ int main()
2626
cv::Mat image1;
2727
cv::Mat image2;
2828

29-
image1= cv::imread("boldt.jpg");
30-
image2= cv::imread("rain.jpg");
29+
image1= cv::imread("../images/boldt.jpg");
30+
image2= cv::imread("../images/rain.jpg");
3131
if (!image1.data)
3232
return 0;
3333
if (!image2.data)
@@ -50,7 +50,7 @@ int main()
5050
cv::namedWindow("result with operators");
5151
cv::imshow("result with operators",result);
5252

53-
image2= cv::imread("rain.jpg",0);
53+
image2= cv::imread("../images/rain.jpg",0);
5454

5555
// create vector of 3 images
5656
std::vector<cv::Mat> planes;
@@ -65,8 +65,8 @@ int main()
6565
cv::imshow("Result on blue channel",result);
6666

6767
// read images
68-
cv::Mat image= cv::imread("boldt.jpg");
69-
cv::Mat logo= cv::imread("logo.bmp");
68+
cv::Mat image= cv::imread("../images/boldt.jpg");
69+
cv::Mat logo= cv::imread("../images/logo.bmp");
7070

7171
// define image ROI
7272
cv::Mat imageROI;
@@ -80,14 +80,14 @@ int main()
8080
cv::imshow("with logo",image);
8181

8282
// read images
83-
image= cv::imread("boldt.jpg");
84-
logo= cv::imread("logo.bmp");
83+
image= cv::imread("../images/boldt.jpg");
84+
logo= cv::imread("../images/logo.bmp");
8585

8686
// define ROI
8787
imageROI= image(cv::Rect(385,270,logo.cols,logo.rows));
8888

8989
// load the mask (must be gray-level)
90-
cv::Mat mask= cv::imread("logo.bmp",0);
90+
cv::Mat mask= cv::imread("../images/logo.bmp",0);
9191

9292
// copy to ROI with mask
9393
logo.copyTo(imageROI,mask);
@@ -97,8 +97,8 @@ int main()
9797
cv::imshow("with logo 2",image);
9898

9999
// read images
100-
logo= cv::imread("logo.bmp",0);
101-
image1= cv::imread("boldt.jpg");
100+
logo= cv::imread("../images/logo.bmp",0);
101+
image1= cv::imread("../images/boldt.jpg");
102102

103103
// split 3-channel image into 3 1-channel images
104104
std::vector<cv::Mat> channels;

0 commit comments

Comments
 (0)