Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
70bc268c
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
70bc268c
编写于
4月 11, 2016
作者:
M
Maksim Shabunin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed problem with nonfree python test: could not find local test images
上级
52ba3778
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
109 addition
and
109 deletion
+109
-109
modules/python/test/nonfree_tests/nonfree_surf.py
modules/python/test/nonfree_tests/nonfree_surf.py
+1
-1
modules/python/test/test.py
modules/python/test/test.py
+2
-107
modules/python/test/tests_common.py
modules/python/test/tests_common.py
+106
-1
未找到文件。
modules/python/test/nonfree_tests/nonfree_surf.py
浏览文件 @
70bc268c
...
...
@@ -6,7 +6,7 @@ import numpy as np
import
cv2
import
cv2.cv
as
cv
from
test
import
OpenCVTests
from
test
s_common
import
OpenCVTests
class
NonFreeFunctionTests
(
OpenCVTests
):
...
...
modules/python/test/test.py
浏览文件 @
70bc268c
...
...
@@ -17,119 +17,14 @@ import argparse
import
cv2.cv
as
cv
from
test2
import
*
class
OpenCVTests
(
unittest
.
TestCase
):
# path to local repository folder containing 'samples' folder
repoPath
=
None
# github repository url
repoUrl
=
'https://raw.github.com/Itseez/opencv/2.4'
# path to local folder containing 'camera_calibration.tar.gz'
dataPath
=
None
# data url
dataUrl
=
'http://docs.opencv.org/data'
depths
=
[
cv
.
IPL_DEPTH_8U
,
cv
.
IPL_DEPTH_8S
,
cv
.
IPL_DEPTH_16U
,
cv
.
IPL_DEPTH_16S
,
cv
.
IPL_DEPTH_32S
,
cv
.
IPL_DEPTH_32F
,
cv
.
IPL_DEPTH_64F
]
mat_types
=
[
cv
.
CV_8UC1
,
cv
.
CV_8UC2
,
cv
.
CV_8UC3
,
cv
.
CV_8UC4
,
cv
.
CV_8SC1
,
cv
.
CV_8SC2
,
cv
.
CV_8SC3
,
cv
.
CV_8SC4
,
cv
.
CV_16UC1
,
cv
.
CV_16UC2
,
cv
.
CV_16UC3
,
cv
.
CV_16UC4
,
cv
.
CV_16SC1
,
cv
.
CV_16SC2
,
cv
.
CV_16SC3
,
cv
.
CV_16SC4
,
cv
.
CV_32SC1
,
cv
.
CV_32SC2
,
cv
.
CV_32SC3
,
cv
.
CV_32SC4
,
cv
.
CV_32FC1
,
cv
.
CV_32FC2
,
cv
.
CV_32FC3
,
cv
.
CV_32FC4
,
cv
.
CV_64FC1
,
cv
.
CV_64FC2
,
cv
.
CV_64FC3
,
cv
.
CV_64FC4
,
]
mat_types_single
=
[
cv
.
CV_8UC1
,
cv
.
CV_8SC1
,
cv
.
CV_16UC1
,
cv
.
CV_16SC1
,
cv
.
CV_32SC1
,
cv
.
CV_32FC1
,
cv
.
CV_64FC1
,
]
def
depthsize
(
self
,
d
):
return
{
cv
.
IPL_DEPTH_8U
:
1
,
cv
.
IPL_DEPTH_8S
:
1
,
cv
.
IPL_DEPTH_16U
:
2
,
cv
.
IPL_DEPTH_16S
:
2
,
cv
.
IPL_DEPTH_32S
:
4
,
cv
.
IPL_DEPTH_32F
:
4
,
cv
.
IPL_DEPTH_64F
:
8
}[
d
]
def
get_sample
(
self
,
filename
,
iscolor
=
cv
.
CV_LOAD_IMAGE_COLOR
):
if
not
filename
in
self
.
image_cache
:
filedata
=
None
if
OpenCVTests
.
repoPath
is
not
None
:
candidate
=
OpenCVTests
.
repoPath
+
'/'
+
filename
if
os
.
path
.
isfile
(
candidate
):
with
open
(
candidate
,
'rb'
)
as
f
:
filedata
=
f
.
read
()
if
filedata
is
None
:
filedata
=
urllib
.
urlopen
(
OpenCVTests
.
repoUrl
+
'/'
+
filename
).
read
()
imagefiledata
=
cv
.
CreateMatHeader
(
1
,
len
(
filedata
),
cv
.
CV_8UC1
)
cv
.
SetData
(
imagefiledata
,
filedata
,
len
(
filedata
))
self
.
image_cache
[
filename
]
=
cv
.
DecodeImageM
(
imagefiledata
,
iscolor
)
return
self
.
image_cache
[
filename
]
def
get_data
(
self
,
filename
,
urlbase
):
if
(
not
os
.
path
.
isfile
(
filename
)):
if
OpenCVTests
.
dataPath
is
not
None
:
candidate
=
OpenCVTests
.
dataPath
+
'/'
+
filename
if
os
.
path
.
isfile
(
candidate
):
return
candidate
urllib
.
urlretrieve
(
urlbase
+
'/'
+
filename
,
filename
)
return
filename
def
setUp
(
self
):
self
.
image_cache
=
{}
def
snap
(
self
,
img
):
self
.
snapL
([
img
])
def
snapL
(
self
,
L
):
for
i
,
img
in
enumerate
(
L
):
cv
.
NamedWindow
(
"snap-%d"
%
i
,
1
)
cv
.
ShowImage
(
"snap-%d"
%
i
,
img
)
cv
.
WaitKey
()
cv
.
DestroyAllWindows
()
def
hashimg
(
self
,
im
):
""" Compute a hash for an image, useful for image comparisons """
return
hashlib
.
md5
(
im
.
tostring
()).
digest
()
#import new OpenCV tests(do we really need old ones in this case)
from
tests_common
import
NewOpenCVTests
from
tests_common
import
OpenCVTests
,
NewOpenCVTests
basedir
=
os
.
path
.
abspath
(
os
.
path
.
dirname
(
__file__
))
def
load_tests
(
loader
,
tests
,
pattern
):
tests
.
addTests
(
loader
.
discover
(
basedir
,
pattern
=
'nonfree_*.py'
))
tests
.
addTests
(
loader
.
discover
(
basedir
,
pattern
=
'test_*.py'
))
tests
.
addTests
(
loader
.
discover
(
basedir
,
pattern
=
'test2.py'
))
return
tests
# Tests to run first; check the handful of basic operations that the later tests rely on
...
...
modules/python/test/tests_common.py
浏览文件 @
70bc268c
...
...
@@ -8,6 +8,7 @@ import hashlib
import
os
import
numpy
as
np
import
cv2
import
cv2.cv
as
cv
# Python 3 moved urlopen to urllib.requests
try
:
...
...
@@ -15,6 +16,110 @@ try:
except
ImportError
:
from
urllib
import
urlopen
class
OpenCVTests
(
unittest
.
TestCase
):
# path to local repository folder containing 'samples' folder
repoPath
=
None
# github repository url
repoUrl
=
'https://raw.github.com/Itseez/opencv/2.4'
# path to local folder containing 'camera_calibration.tar.gz'
dataPath
=
None
# data url
dataUrl
=
'http://docs.opencv.org/data'
depths
=
[
cv
.
IPL_DEPTH_8U
,
cv
.
IPL_DEPTH_8S
,
cv
.
IPL_DEPTH_16U
,
cv
.
IPL_DEPTH_16S
,
cv
.
IPL_DEPTH_32S
,
cv
.
IPL_DEPTH_32F
,
cv
.
IPL_DEPTH_64F
]
mat_types
=
[
cv
.
CV_8UC1
,
cv
.
CV_8UC2
,
cv
.
CV_8UC3
,
cv
.
CV_8UC4
,
cv
.
CV_8SC1
,
cv
.
CV_8SC2
,
cv
.
CV_8SC3
,
cv
.
CV_8SC4
,
cv
.
CV_16UC1
,
cv
.
CV_16UC2
,
cv
.
CV_16UC3
,
cv
.
CV_16UC4
,
cv
.
CV_16SC1
,
cv
.
CV_16SC2
,
cv
.
CV_16SC3
,
cv
.
CV_16SC4
,
cv
.
CV_32SC1
,
cv
.
CV_32SC2
,
cv
.
CV_32SC3
,
cv
.
CV_32SC4
,
cv
.
CV_32FC1
,
cv
.
CV_32FC2
,
cv
.
CV_32FC3
,
cv
.
CV_32FC4
,
cv
.
CV_64FC1
,
cv
.
CV_64FC2
,
cv
.
CV_64FC3
,
cv
.
CV_64FC4
,
]
mat_types_single
=
[
cv
.
CV_8UC1
,
cv
.
CV_8SC1
,
cv
.
CV_16UC1
,
cv
.
CV_16SC1
,
cv
.
CV_32SC1
,
cv
.
CV_32FC1
,
cv
.
CV_64FC1
,
]
def
depthsize
(
self
,
d
):
return
{
cv
.
IPL_DEPTH_8U
:
1
,
cv
.
IPL_DEPTH_8S
:
1
,
cv
.
IPL_DEPTH_16U
:
2
,
cv
.
IPL_DEPTH_16S
:
2
,
cv
.
IPL_DEPTH_32S
:
4
,
cv
.
IPL_DEPTH_32F
:
4
,
cv
.
IPL_DEPTH_64F
:
8
}[
d
]
def
get_sample
(
self
,
filename
,
iscolor
=
cv
.
CV_LOAD_IMAGE_COLOR
):
if
not
filename
in
self
.
image_cache
:
filedata
=
None
if
OpenCVTests
.
repoPath
is
not
None
:
candidate
=
OpenCVTests
.
repoPath
+
'/'
+
filename
if
os
.
path
.
isfile
(
candidate
):
with
open
(
candidate
,
'rb'
)
as
f
:
filedata
=
f
.
read
()
if
filedata
is
None
:
filedata
=
urllib
.
urlopen
(
OpenCVTests
.
repoUrl
+
'/'
+
filename
).
read
()
imagefiledata
=
cv
.
CreateMatHeader
(
1
,
len
(
filedata
),
cv
.
CV_8UC1
)
cv
.
SetData
(
imagefiledata
,
filedata
,
len
(
filedata
))
self
.
image_cache
[
filename
]
=
cv
.
DecodeImageM
(
imagefiledata
,
iscolor
)
return
self
.
image_cache
[
filename
]
def
get_data
(
self
,
filename
,
urlbase
):
if
(
not
os
.
path
.
isfile
(
filename
)):
if
OpenCVTests
.
dataPath
is
not
None
:
candidate
=
OpenCVTests
.
dataPath
+
'/'
+
filename
if
os
.
path
.
isfile
(
candidate
):
return
candidate
urllib
.
urlretrieve
(
urlbase
+
'/'
+
filename
,
filename
)
return
filename
def
setUp
(
self
):
self
.
image_cache
=
{}
def
snap
(
self
,
img
):
self
.
snapL
([
img
])
def
snapL
(
self
,
L
):
for
i
,
img
in
enumerate
(
L
):
cv
.
NamedWindow
(
"snap-%d"
%
i
,
1
)
cv
.
ShowImage
(
"snap-%d"
%
i
,
img
)
cv
.
WaitKey
()
cv
.
DestroyAllWindows
()
def
hashimg
(
self
,
im
):
""" Compute a hash for an image, useful for image comparisons """
return
hashlib
.
md5
(
im
.
tostring
()).
digest
()
class
NewOpenCVTests
(
unittest
.
TestCase
):
# path to local repository folder containing 'samples' folder
...
...
@@ -77,4 +182,4 @@ def isPointInRect(p, rect):
if
rect
[
0
]
<=
p
[
0
]
and
rect
[
1
]
<=
p
[
1
]
and
p
[
0
]
<=
rect
[
2
]
and
p
[
1
]
<=
rect
[
3
]:
return
True
else
:
return
False
\ No newline at end of file
return
False
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录