Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ef092a1

Browse files
committed
2 parents f874303 + 698971a commit ef092a1

40 files changed

+33
-26
lines changed

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"python.pythonPath": "C:\\Users\\anuch\\miniconda3\\python.exe"
2+
"python.pythonPath": "C:\\Users\\anuch\\miniconda3\\python.exe",
3+
"svn.ignoreMissingSvnWarning": true
34
}

‎black.jpg‎

47.2 KB
Loading[フレーム]

‎ch04-Image/4.imread_imshow_imwrite.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import numpy as np
22
import cv2
33

4+
<<<<<<< HEAD:ch04-Image/4.imread_imshow_imwrite.py
45
img = cv2.imread('data/messi5.jpg', 0) #Edit path from missi5.jpg to data/missi5.jpg
6+
=======
7+
img = cv2.imread('data/messi5.jpg', 0) # edit by Anucha from messi5.jpg to data/messi5.jpg
8+
>>>>>>> 698971afc5b6779082ec6294047f15e525c2d03b:ch04-图片/4.imread_imshow_imwrite.py
59
cv2.imshow('image', img)
610

711
k = cv2.waitKey(0)
File renamed without changes.

‎ch05-视频/5.VideoPlay.py‎ renamed to ‎ch05-Video/5.VideoPlay.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22
import cv2
33

4-
cap = cv2.VideoCapture('../data/vtest.avi')
4+
cap = cv2.VideoCapture('data/vtest.avi')
55
# cap = cv2.VideoCapture('output.avi')
66
# cap = cv2.VideoCapture('Minions_banana.mp4')
77

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /