Commit b6c5809

committed

Commit

1 parent d47409f commit b6c5809Copy full SHA for b6c5809

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`import numpy as np`
`2`	`2`	`import cv2`
`3`	`3`
`4`		`-<<<<<<<HEAD:ch04-Image/4.imread_imshow_imwrite.py`
	`4`	`+`
`5`	`5`	`img = cv2.imread('data/messi5.jpg', 0) #Edit path from missi5.jpg to data/missi5.jpg`
`6`		`-=======`
`7`	`6`	`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`
	`7`	`+`
`9`	`8`	`cv2.imshow('image', img)`
`10`	`9`
`11`	`10`	`k = cv2.waitKey(0)`

Comments

(0)