Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b2ea15da
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
b2ea15da
编写于
12月 18, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19137 from VadimLevin:dev/vlevin/safe-string-conversion
上级
97331770
7b0d7d0c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
2 deletion
+38
-2
modules/core/include/opencv2/core/bindings_utils.hpp
modules/core/include/opencv2/core/bindings_utils.hpp
+6
-0
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cpp
+17
-1
modules/python/test/test_misc.py
modules/python/test/test_misc.py
+15
-1
未找到文件。
modules/core/include/opencv2/core/bindings_utils.hpp
浏览文件 @
b2ea15da
...
...
@@ -58,6 +58,12 @@ String dumpCString(const char* argument)
return
cv
::
format
(
"String: %s"
,
argument
);
}
CV_WRAP
static
inline
String
dumpString
(
const
String
&
argument
)
{
return
cv
::
format
(
"String: %s"
,
argument
.
c_str
());
}
CV_WRAP
static
inline
AsyncArray
testAsyncArray
(
InputArray
argument
)
{
...
...
modules/python/src2/cv2.cpp
浏览文件 @
b2ea15da
...
...
@@ -963,15 +963,31 @@ PyObject* pyopencv_from(const std::string& value)
template
<
>
bool
pyopencv_to
(
PyObject
*
obj
,
String
&
value
,
const
ArgInfo
&
info
)
{
CV_UNUSED
(
info
);
if
(
!
obj
||
obj
==
Py_None
)
{
return
true
;
}
std
::
string
str
;
if
(
getUnicodeString
(
obj
,
str
))
{
value
=
str
;
return
true
;
}
else
{
// If error hasn't been already set by Python conversion functions
if
(
!
PyErr_Occurred
())
{
// Direct access to underlying slots of PyObjectType is not allowed
// when limited API is enabled
#ifdef Py_LIMITED_API
failmsg
(
"Can't convert object to 'str' for '%s'"
,
info
.
name
);
#else
failmsg
(
"Can't convert object of type '%s' to 'str' for '%s'"
,
obj
->
ob_type
->
tp_name
,
info
.
name
);
#endif
}
}
return
false
;
}
...
...
modules/python/test/test_misc.py
浏览文件 @
b2ea15da
...
...
@@ -314,7 +314,7 @@ class Arguments(NewOpenCVTests):
def
test_parse_to_cstring_convertible
(
self
):
try_to_convert
=
partial
(
self
.
_try_to_convert
,
cv
.
utils
.
dumpCString
)
for
convertible
in
(
's'
,
'str'
,
str
(
123
),
(
'char'
),
np
.
str
(
'test1'
),
np
.
str_
(
'test2'
)):
for
convertible
in
(
'
'
,
'
s'
,
'str'
,
str
(
123
),
(
'char'
),
np
.
str
(
'test1'
),
np
.
str_
(
'test2'
)):
expected
=
'string: '
+
convertible
actual
=
try_to_convert
(
convertible
)
self
.
assertEqual
(
expected
,
actual
,
...
...
@@ -326,6 +326,20 @@ class Arguments(NewOpenCVTests):
with
self
.
assertRaises
((
TypeError
),
msg
=
get_no_exception_msg
(
not_convertible
)):
_
=
cv
.
utils
.
dumpCString
(
not_convertible
)
def
test_parse_to_string_convertible
(
self
):
try_to_convert
=
partial
(
self
.
_try_to_convert
,
cv
.
utils
.
dumpString
)
for
convertible
in
(
None
,
''
,
's'
,
'str'
,
str
(
123
),
np
.
str
(
'test1'
),
np
.
str_
(
'test2'
)):
expected
=
'string: '
+
(
convertible
if
convertible
else
''
)
actual
=
try_to_convert
(
convertible
)
self
.
assertEqual
(
expected
,
actual
,
msg
=
get_conversion_error_msg
(
convertible
,
expected
,
actual
))
def
test_parse_to_string_not_convertible
(
self
):
for
not_convertible
in
((
12
,),
(
't'
,
'e'
,
's'
,
't'
),
np
.
array
([
'123'
,
]),
np
.
array
([
't'
,
'e'
,
's'
,
't'
]),
1
,
True
,
False
):
with
self
.
assertRaises
((
TypeError
),
msg
=
get_no_exception_msg
(
not_convertible
)):
_
=
cv
.
utils
.
dumpString
(
not_convertible
)
class
SamplesFindFile
(
NewOpenCVTests
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录