generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied feature #3375 and fix of pull 1842 to avoid merging problems later

Browse Source
This commit is contained in:
StevenPuttemans
2013-11-21 16:45:48 +01:00
parent 70a4de20d7
commit 6f892b10ff
57 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/python/watershed.py
View File

@@ -27,7 +27,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
img0 = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else:
url = 'http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/c/fruits.jpg'
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/fruits.jpg'
filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata))