Anancha
diff --git a/‎.vscode/settings.json‎
Lines changed: 2 additions & 1 deletion b/‎.vscode/settings.json‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎black.jpg‎
47.2 KB b/‎black.jpg‎
47.2 KB
diff --git a/‎ch04-Image/4.imread_imshow_imwrite.py‎
Lines changed: 4 additions & 0 deletions b/‎ch04-Image/4.imread_imshow_imwrite.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎ch05-视频/5.VideoCapture.py‎ renamed to ‎ch05-Video/5.VideoCapture.py‎ b/‎ch05-视频/5.VideoCapture.py‎ renamed to ‎ch05-Video/5.VideoCapture.py‎
diff --git a/‎ch05-视频/5.VideoPlay.py‎ renamed to ‎ch05-Video/5.VideoPlay.py‎
Lines changed: 1 addition & 1 deletion b/‎ch05-视频/5.VideoPlay.py‎ renamed to ‎ch05-Video/5.VideoPlay.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎ch05-视频/5.VideoWriter.py‎ renamed to ‎ch05-Video/5.VideoWriter.py‎ b/‎ch05-视频/5.VideoWriter.py‎ renamed to ‎ch05-Video/5.VideoWriter.py‎
diff --git a/‎ch05-视频/相机_相片相似度/camera_compare1.py‎ renamed to ‎ch05-Video/Camera_Photo_similarity/camera_compare1.py‎ b/‎ch05-视频/相机_相片相似度/camera_compare1.py‎ renamed to ‎ch05-Video/Camera_Photo_similarity/camera_compare1.py‎
diff --git a/‎ch05-视频/相机_相片相似度/utils.py‎ renamed to ‎ch05-Video/Camera_Photo_similarity/utils.py‎ b/‎ch05-视频/相机_相片相似度/utils.py‎ renamed to ‎ch05-Video/Camera_Photo_similarity/utils.py‎
diff --git a/‎ch05-视频/Minions_banana.mp4‎ renamed to ‎ch05-Video/Minions_banana.mp4‎ b/‎ch05-视频/Minions_banana.mp4‎ renamed to ‎ch05-Video/Minions_banana.mp4‎
diff --git a/‎ch05-视频/VideoCaptureOnePicture.py‎ renamed to ‎ch05-Video/VideoCaptureOnePicture.py‎ b/‎ch05-视频/VideoCaptureOnePicture.py‎ renamed to ‎ch05-Video/VideoCaptureOnePicture.py‎
@@ -1,3 +1,4 @@
 {
-    "python.pythonPath": "C:\\Users\\anuch\\miniconda3\\python.exe"
+    "python.pythonPath": "C:\\Users\\anuch\\miniconda3\\python.exe",
+    "svn.ignoreMissingSvnWarning": true
 }
@@ -1,7 +1,11 @@
 import numpy as np
 import cv2
 
+<<<<<<< HEAD:ch04-Image/4.imread_imshow_imwrite.py
 img = cv2.imread('data/messi5.jpg', 0)   #Edit path from missi5.jpg to data/missi5.jpg
+=======
+img = cv2.imread('data/messi5.jpg', 0)  # edit by Anucha from messi5.jpg to data/messi5.jpg 
+>>>>>>> 698971afc5b6779082ec6294047f15e525c2d03b:ch04-图片/4.imread_imshow_imwrite.py
 cv2.imshow('image', img)
 
 k = cv2.waitKey(0)
 
@@ -1,7 +1,7 @@
 import numpy as np
 import cv2
 
-cap = cv2.VideoCapture('../data/vtest.avi')
+cap = cv2.VideoCapture('data/vtest.avi')
 # cap = cv2.VideoCapture('output.avi')
 # cap = cv2.VideoCapture('Minions_banana.mp4')
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- "python.pythonPath": "C:\\Users\\anuch\\miniconda3\\python.exe"`
	`2`	`+ "python.pythonPath": "C:\\Users\\anuch\\miniconda3\\python.exe",`
	`3`	`+ "svn.ignoreMissingSvnWarning": true`
`3`	`4`	`}`