Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
bfeeb0ad
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,发现更多精彩内容 >>
未验证
提交
bfeeb0ad
编写于
9月 20, 2022
作者:
A
Alexander Smorkalov
提交者:
GitHub
9月 20, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22285 from asenyaev:asen/disabled_compiling_warnings_3.4
Disabled compiling warnings in case of symbols in cmake for 3.4
上级
f2ccce23
3f4abcb2
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
92 addition
and
2 deletion
+92
-2
3rdparty/openexr/CMakeLists.txt
3rdparty/openexr/CMakeLists.txt
+1
-0
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+1
-0
modules/core/include/opencv2/core/cuda.hpp
modules/core/include/opencv2/core/cuda.hpp
+8
-0
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
+40
-0
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/matx.hpp
+8
-0
modules/core/include/opencv2/core/opengl.hpp
modules/core/include/opencv2/core/opengl.hpp
+8
-0
modules/core/include/opencv2/core/utils/filesystem.private.hpp
...es/core/include/opencv2/core/utils/filesystem.private.hpp
+1
-1
modules/features2d/src/affine_feature.cpp
modules/features2d/src/affine_feature.cpp
+1
-1
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
...es/stitching/include/opencv2/stitching/detail/warpers.hpp
+24
-0
未找到文件。
3rdparty/openexr/CMakeLists.txt
浏览文件 @
bfeeb0ad
...
...
@@ -119,6 +119,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4334) # vs2005 Win64
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4244
)
# vs2008
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4267
)
# vs2008 Win64
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4456
)
# vs2015
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4819
)
# vs2019 Win64
if
(
MSVC AND CV_ICC
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/Qrestrict"
)
...
...
cmake/OpenCVCompilerOptions.cmake
浏览文件 @
bfeeb0ad
...
...
@@ -426,6 +426,7 @@ if(MSVC)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4275
)
# non dll-interface class 'std::exception' used as base for dll-interface class 'cv::Exception'
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4512
)
# Assignment operator could not be generated
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4589
)
# Constructor of abstract class 'cv::ORB' ignores initializer for virtual base class 'cv::Algorithm'
ocv_warnings_disable
(
CMAKE_CXX_FLAGS /wd4819
)
# Symbols like delta or epsilon cannot be represented
endif
()
if
(
CV_ICC AND NOT ENABLE_NOISY_WARNINGS
)
...
...
modules/core/include/opencv2/core/cuda.hpp
浏览文件 @
bfeeb0ad
...
...
@@ -488,8 +488,16 @@ public:
//! Allocates a new GpuMat of given size and type.
GpuMat
getBuffer
(
int
rows
,
int
cols
,
int
type
);
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
//! Allocates a new GpuMat of given size and type.
GpuMat
getBuffer
(
Size
size
,
int
type
)
{
return
getBuffer
(
size
.
height
,
size
.
width
,
type
);
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
//! Returns the allocator associated with the stream.
Ptr
<
GpuMat
::
Allocator
>
getAllocator
()
const
{
return
allocator_
;
}
...
...
modules/core/include/opencv2/core/cuda.inl.hpp
浏览文件 @
bfeeb0ad
...
...
@@ -75,6 +75,11 @@ GpuMat::GpuMat(Size size_, int type_, Allocator* allocator_)
create
(
size_
.
height
,
size_
.
width
,
type_
);
}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline
GpuMat
::
GpuMat
(
int
rows_
,
int
cols_
,
int
type_
,
Scalar
s_
,
Allocator
*
allocator_
)
:
flags
(
0
),
rows
(
0
),
cols
(
0
),
step
(
0
),
data
(
0
),
refcount
(
0
),
datastart
(
0
),
dataend
(
0
),
allocator
(
allocator_
)
...
...
@@ -96,6 +101,9 @@ GpuMat::GpuMat(Size size_, int type_, Scalar s_, Allocator* allocator_)
setTo
(
s_
);
}
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline
GpuMat
::
GpuMat
(
const
GpuMat
&
m
)
...
...
@@ -158,11 +166,19 @@ GpuMat GpuMat::clone() const
return
m
;
}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline
void
GpuMat
::
copyTo
(
OutputArray
dst
,
InputArray
mask
)
const
{
copyTo
(
dst
,
mask
,
Stream
::
Null
());
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline
GpuMat
&
GpuMat
::
setTo
(
Scalar
s
)
...
...
@@ -176,6 +192,11 @@ GpuMat& GpuMat::setTo(Scalar s, InputArray mask)
return
setTo
(
s
,
mask
,
Stream
::
Null
());
}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline
void
GpuMat
::
convertTo
(
OutputArray
dst
,
int
rtype
)
const
{
...
...
@@ -187,6 +208,9 @@ void GpuMat::convertTo(OutputArray dst, int rtype, double alpha, double beta) co
{
convertTo
(
dst
,
rtype
,
alpha
,
beta
,
Stream
::
Null
());
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline
void
GpuMat
::
convertTo
(
OutputArray
dst
,
int
rtype
,
double
alpha
,
Stream
&
stream
)
const
...
...
@@ -554,6 +578,11 @@ Event::Event(const Ptr<Impl>& impl)
// Initialization & Info
//===================================================================================
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline
bool
TargetArchs
::
has
(
int
major
,
int
minor
)
{
...
...
@@ -571,6 +600,9 @@ DeviceInfo::DeviceInfo()
{
device_id_
=
getDevice
();
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline
DeviceInfo
::
DeviceInfo
(
int
device_id
)
...
...
@@ -579,6 +611,11 @@ DeviceInfo::DeviceInfo(int device_id)
device_id_
=
device_id
;
}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline
int
DeviceInfo
::
deviceID
()
const
{
...
...
@@ -607,6 +644,9 @@ bool DeviceInfo::supports(FeatureSet feature_set) const
int
version
=
majorVersion
()
*
10
+
minorVersion
();
return
version
>=
feature_set
;
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
}}
// namespace cv { namespace cuda {
...
...
modules/core/include/opencv2/core/matx.hpp
浏览文件 @
bfeeb0ad
...
...
@@ -681,11 +681,19 @@ Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp
for
(
int
i
=
16
;
i
<
channels
;
i
++
)
val
[
i
]
=
_Tp
(
0
);
}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
template
<
typename
_Tp
,
int
m
,
int
n
>
inline
Matx
<
_Tp
,
m
,
n
>::
Matx
(
const
_Tp
*
values
)
{
for
(
int
i
=
0
;
i
<
channels
;
i
++
)
val
[
i
]
=
values
[
i
];
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
#ifdef CV_CXX11
template
<
typename
_Tp
,
int
m
,
int
n
>
inline
...
...
modules/core/include/opencv2/core/opengl.hpp
浏览文件 @
bfeeb0ad
...
...
@@ -703,10 +703,18 @@ cv::ogl::Texture2D::Format cv::ogl::Texture2D::format() const
///////
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
inline
cv
::
ogl
::
Arrays
::
Arrays
()
:
size_
(
0
)
{
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
inline
int
cv
::
ogl
::
Arrays
::
size
()
const
...
...
modules/core/include/opencv2/core/utils/filesystem.private.hpp
浏览文件 @
bfeeb0ad
...
...
@@ -36,7 +36,7 @@ namespace cv { namespace utils { namespace fs {
* Provides interprocess synchronization mechanism.
* Platform dependent.
*
* Supports multiple readers / single writer access pattern (RW / readers
–
writer / shared-exclusive lock).
* Supports multiple readers / single writer access pattern (RW / readers
-
writer / shared-exclusive lock).
*
* File must exist.
* File can't be re-used (for example, I/O operations via std::fstream is not safe)
...
...
modules/features2d/src/affine_feature.cpp
浏览文件 @
bfeeb0ad
...
...
@@ -41,7 +41,7 @@
/*
Guoshen Yu, Jean-Michel Morel, ASIFT: An Algorithm for Fully Affine
Invariant Comparison, Image Processing On Line, 1 (2011), pp. 11
–
38.
Invariant Comparison, Image Processing On Line, 1 (2011), pp. 11
-
38.
https://doi.org/10.5201/ipol.2011.my-asift
*/
...
...
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
浏览文件 @
bfeeb0ad
...
...
@@ -472,6 +472,11 @@ class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
public:
PlaneWarperGpu
(
float
scale
=
1.
f
)
:
PlaneWarper
(
scale
)
{}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
Rect
buildMaps
(
Size
src_size
,
InputArray
K
,
InputArray
R
,
OutputArray
xmap
,
OutputArray
ymap
)
CV_OVERRIDE
{
Rect
result
=
buildMaps
(
src_size
,
K
,
R
,
d_xmap_
,
d_ymap_
);
...
...
@@ -505,6 +510,9 @@ public:
d_dst_
.
download
(
dst
);
return
result
;
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
Rect
buildMaps
(
Size
src_size
,
InputArray
K
,
InputArray
R
,
cuda
::
GpuMat
&
xmap
,
cuda
::
GpuMat
&
ymap
);
...
...
@@ -526,6 +534,11 @@ class CV_EXPORTS SphericalWarperGpu : public SphericalWarper
public:
SphericalWarperGpu
(
float
scale
)
:
SphericalWarper
(
scale
)
{}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
Rect
buildMaps
(
Size
src_size
,
InputArray
K
,
InputArray
R
,
OutputArray
xmap
,
OutputArray
ymap
)
CV_OVERRIDE
{
Rect
result
=
buildMaps
(
src_size
,
K
,
R
,
d_xmap_
,
d_ymap_
);
...
...
@@ -542,6 +555,9 @@ public:
d_dst_
.
download
(
dst
);
return
result
;
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
Rect
buildMaps
(
Size
src_size
,
InputArray
K
,
InputArray
R
,
cuda
::
GpuMat
&
xmap
,
cuda
::
GpuMat
&
ymap
);
...
...
@@ -558,6 +574,11 @@ class CV_EXPORTS CylindricalWarperGpu : public CylindricalWarper
public:
CylindricalWarperGpu
(
float
scale
)
:
CylindricalWarper
(
scale
)
{}
// WARNING: unreachable code using Ninja
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
Rect
buildMaps
(
Size
src_size
,
InputArray
K
,
InputArray
R
,
OutputArray
xmap
,
OutputArray
ymap
)
CV_OVERRIDE
{
Rect
result
=
buildMaps
(
src_size
,
K
,
R
,
d_xmap_
,
d_ymap_
);
...
...
@@ -574,6 +595,9 @@ public:
d_dst_
.
download
(
dst
);
return
result
;
}
#if defined _MSC_VER && _MSC_VER >= 1920
#pragma warning(pop)
#endif
Rect
buildMaps
(
Size
src_size
,
InputArray
K
,
InputArray
R
,
cuda
::
GpuMat
&
xmap
,
cuda
::
GpuMat
&
ymap
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录