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

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

View File

@@ -15,7 +15,7 @@ if __name__ == "__main__":
im = cv.LoadImageM(fileName, False)
im3 = cv.LoadImageM(fileName, True)
except: # if local copy cannot be opened, try downloading it
url = 'http://code.opencv.org/projects/opencv/repository/revisions/master/raw/samples/cpp/left01.jpg'
url = 'https://raw.github.com/Itseez/opencv/master/samples/cpp/left01.jpg'
filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata))