OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2026-01-15 12:15:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-05 19:11:22 +03:00
parent e329c84d5e 51631b90af
commit f3de2b4be7
155 changed files with 5856 additions and 1800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/python/tutorial_code/core/mat_mask_operations/mat_mask_operations.py
View File

@@ -69,7 +69,7 @@ def main(argv):
dst0 = sharpen(src)
t = (time.time() - t) / 1000
t = (time.time() - t)
print("Hand written function time passed in seconds: %s" % t)
cv.imshow("Output", dst0)
@@ -86,7 +86,7 @@ def main(argv):
# ddepth = -1, means destination image has depth same as input image
## [filter2D]
t = (time.time() - t) / 1000
t = (time.time() - t)
print("Built-in filter2D time passed in seconds: %s" % t)
cv.imshow("Output", dst1)