Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
ea3dc789
O
Opencv
项目概览
Greenplum
/
Opencv
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
ea3dc789
编写于
1月 28, 2019
作者:
M
Maksim Shabunin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed warnings produced by clang-9.0.0
上级
e2dbf054
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
15 deletion
+14
-15
modules/core/include/opencv2/core/persistence.hpp
modules/core/include/opencv2/core/persistence.hpp
+1
-1
modules/core/src/persistence.cpp
modules/core/src/persistence.cpp
+0
-8
modules/core/test/test_ptr.cpp
modules/core/test/test_ptr.cpp
+7
-0
modules/gapi/include/opencv2/gapi/gcompoundkernel.hpp
modules/gapi/include/opencv2/gapi/gcompoundkernel.hpp
+1
-1
modules/stitching/src/camera.cpp
modules/stitching/src/camera.cpp
+1
-1
modules/video/src/optical_flow_io.cpp
modules/video/src/optical_flow_io.cpp
+4
-4
未找到文件。
modules/core/include/opencv2/core/persistence.hpp
浏览文件 @
ea3dc789
...
...
@@ -320,7 +320,7 @@ public:
BASE64
=
64
,
//!< flag, write rawdata in Base64 by default. (consider using WRITE_BASE64)
WRITE_BASE64
=
BASE64
|
WRITE
,
//!< flag, enable both WRITE and BASE64
};
enum
enum
State
{
UNDEFINED
=
0
,
VALUE_EXPECTED
=
1
,
...
...
modules/core/src/persistence.cpp
浏览文件 @
ea3dc789
...
...
@@ -342,14 +342,6 @@ static inline void writeReal(uchar* p, double fval)
class
FileStorage
::
Impl
:
public
FileStorage_API
{
public:
enum
State
{
UNDEFINED
=
0
,
VALUE_EXPECTED
=
1
,
NAME_EXPECTED
=
2
,
INSIDE_MAP
=
4
};
void
init
()
{
flags
=
0
;
...
...
modules/core/test/test_ptr.cpp
浏览文件 @
ea3dc789
...
...
@@ -160,7 +160,14 @@ TEST(Core_Ptr, assignment)
{
Ptr
<
Reporter
>
p1
(
new
Reporter
(
&
deleted1
));
#if defined(__clang__) && (__clang_major__ >= 9) && !defined(__APPLE__)
CV_DO_PRAGMA
(
GCC
diagnostic
push
)
CV_DO_PRAGMA
(
GCC
diagnostic
ignored
"-Wself-assign-overloaded"
)
#endif
p1
=
p1
;
#if defined(__clang__) && (__clang_major__ >= 9) && !defined(__APPLE__)
CV_DO_PRAGMA
(
GCC
diagnostic
pop
)
#endif
EXPECT_FALSE
(
deleted1
);
}
...
...
modules/gapi/include/opencv2/gapi/gcompoundkernel.hpp
浏览文件 @
ea3dc789
...
...
@@ -78,7 +78,7 @@ template<typename T> struct tuple_wrap_helper
template
<
typename
...
Objs
>
struct
tuple_wrap_helper
<
std
::
tuple
<
Objs
...
>>
{
static
std
::
tuple
<
Objs
...
>
get
(
std
::
tuple
<
Objs
...
>&&
objs
)
{
return
objs
;
}
static
std
::
tuple
<
Objs
...
>
get
(
std
::
tuple
<
Objs
...
>&&
objs
)
{
return
std
::
forward
<
std
::
tuple
<
Objs
...
>>
(
objs
)
;
}
};
template
<
typename
,
typename
,
typename
>
...
...
modules/stitching/src/camera.cpp
浏览文件 @
ea3dc789
...
...
@@ -66,7 +66,7 @@ Mat CameraParams::K() const
Mat_
<
double
>
k
=
Mat
::
eye
(
3
,
3
,
CV_64F
);
k
(
0
,
0
)
=
focal
;
k
(
0
,
2
)
=
ppx
;
k
(
1
,
1
)
=
focal
*
aspect
;
k
(
1
,
2
)
=
ppy
;
return
k
;
return
std
::
move
(
k
)
;
}
}
// namespace detail
...
...
modules/video/src/optical_flow_io.cpp
浏览文件 @
ea3dc789
...
...
@@ -52,12 +52,12 @@ CV_EXPORTS_W Mat readOpticalFlow( const String& path )
Mat_
<
Point2f
>
flow
;
std
::
ifstream
file
(
path
.
c_str
(),
std
::
ios_base
::
binary
);
if
(
!
file
.
good
()
)
return
flow
;
// no file - return empty matrix
return
std
::
move
(
flow
)
;
// no file - return empty matrix
float
tag
;
file
.
read
((
char
*
)
&
tag
,
sizeof
(
float
));
if
(
tag
!=
FLOW_TAG_FLOAT
)
return
flow
;
return
std
::
move
(
flow
)
;
int
width
,
height
;
...
...
@@ -76,14 +76,14 @@ CV_EXPORTS_W Mat readOpticalFlow( const String& path )
if
(
!
file
.
good
()
)
{
flow
.
release
();
return
flow
;
return
std
::
move
(
flow
)
;
}
flow
(
i
,
j
)
=
u
;
}
}
file
.
close
();
return
flow
;
return
std
::
move
(
flow
)
;
}
CV_EXPORTS_W
bool
writeOpticalFlow
(
const
String
&
path
,
InputArray
flow
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录