Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
11c3fa52
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,发现更多精彩内容 >>
提交
11c3fa52
编写于
7月 23, 2015
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4222 from mshabunin:fix-android-warnings
上级
6d3bc7c8
46e457d3
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
27 deletion
+11
-27
3rdparty/libwebp/CMakeLists.txt
3rdparty/libwebp/CMakeLists.txt
+1
-1
modules/imgcodecs/src/grfmt_jpeg.cpp
modules/imgcodecs/src/grfmt_jpeg.cpp
+2
-2
modules/imgcodecs/src/grfmt_png.cpp
modules/imgcodecs/src/grfmt_png.cpp
+3
-3
modules/imgproc/test/test_convhull.cpp
modules/imgproc/test/test_convhull.cpp
+3
-19
modules/imgproc/test/test_distancetransform.cpp
modules/imgproc/test/test_distancetransform.cpp
+1
-1
modules/videoio/test/test_positioning.cpp
modules/videoio/test/test_positioning.cpp
+1
-1
未找到文件。
3rdparty/libwebp/CMakeLists.txt
浏览文件 @
11c3fa52
...
...
@@ -40,7 +40,7 @@ if(UNIX)
endif
()
endif
()
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wunused-variable -Wshadow -Wmaybe-uninitialized
)
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wunused-variable -W
unused-function -W
shadow -Wmaybe-uninitialized
)
ocv_warnings_disable
(
CMAKE_C_FLAGS /wd4244 /wd4267
)
# vs2005
set_target_properties
(
${
WEBP_LIBRARY
}
...
...
modules/imgcodecs/src/grfmt_jpeg.cpp
浏览文件 @
11c3fa52
...
...
@@ -395,7 +395,7 @@ int my_jpeg_load_dht (struct jpeg_decompress_struct *info, unsigned char *dht,
bool
JpegDecoder
::
readData
(
Mat
&
img
)
{
bool
result
=
false
;
volatile
bool
result
=
false
;
int
step
=
(
int
)
img
.
step
;
bool
color
=
img
.
channels
()
>
1
;
...
...
@@ -557,7 +557,7 @@ bool JpegEncoder::write( const Mat& img, const std::vector<int>& params )
fileWrapper
()
:
f
(
0
)
{}
~
fileWrapper
()
{
if
(
f
)
fclose
(
f
);
}
};
bool
result
=
false
;
volatile
bool
result
=
false
;
fileWrapper
fw
;
int
width
=
img
.
cols
,
height
=
img
.
rows
;
...
...
modules/imgcodecs/src/grfmt_png.cpp
浏览文件 @
11c3fa52
...
...
@@ -224,7 +224,7 @@ bool PngDecoder::readHeader()
bool
PngDecoder
::
readData
(
Mat
&
img
)
{
bool
result
=
false
;
volatile
bool
result
=
false
;
AutoBuffer
<
uchar
*>
_buffer
(
m_height
);
uchar
**
buffer
=
_buffer
;
int
color
=
img
.
channels
()
>
1
;
...
...
@@ -342,10 +342,10 @@ bool PngEncoder::write( const Mat& img, const std::vector<int>& params )
{
png_structp
png_ptr
=
png_create_write_struct
(
PNG_LIBPNG_VER_STRING
,
0
,
0
,
0
);
png_infop
info_ptr
=
0
;
FILE
*
f
=
0
;
FILE
*
volatile
f
=
0
;
int
y
,
width
=
img
.
cols
,
height
=
img
.
rows
;
int
depth
=
img
.
depth
(),
channels
=
img
.
channels
();
bool
result
=
false
;
volatile
bool
result
=
false
;
AutoBuffer
<
uchar
*>
buffer
;
if
(
depth
!=
CV_8U
&&
depth
!=
CV_16U
)
...
...
modules/imgproc/test/test_convhull.cpp
浏览文件 @
11c3fa52
...
...
@@ -1426,7 +1426,7 @@ protected:
void
run_func
(
void
);
int
validate_test_results
(
int
test_case_idx
);
double
max_noise
;
float
line
[
6
],
line0
[
6
]
;
AutoBuffer
<
float
>
line
,
line0
;
int
dist_type
;
double
reps
,
aeps
;
};
...
...
@@ -1439,11 +1439,6 @@ CV_FitLineTest::CV_FitLineTest()
max_noise
=
0.05
;
}
#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Warray-bounds"
#endif
void
CV_FitLineTest
::
generate_point_set
(
void
*
pointsSet
)
{
RNG
&
rng
=
ts
->
get_rng
();
...
...
@@ -1515,14 +1510,12 @@ void CV_FitLineTest::generate_point_set( void* pointsSet )
}
}
#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic pop
#endif
int
CV_FitLineTest
::
prepare_test_case
(
int
test_case_idx
)
{
RNG
&
rng
=
ts
->
get_rng
();
dims
=
cvtest
::
randInt
(
rng
)
%
2
+
2
;
line
.
allocate
(
dims
*
2
);
line0
.
allocate
(
dims
*
2
);
min_log_size
=
MAX
(
min_log_size
,
5
);
max_log_size
=
MAX
(
min_log_size
,
max_log_size
);
int
code
=
CV_BaseShapeDescrTest
::
prepare_test_case
(
test_case_idx
);
...
...
@@ -1543,11 +1536,6 @@ void CV_FitLineTest::run_func()
cv
::
fitLine
(
cv
::
cvarrToMat
(
points
),
(
cv
::
Vec6f
&
)
line
[
0
],
dist_type
,
0
,
reps
,
aeps
);
}
#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Warray-bounds"
#endif
int
CV_FitLineTest
::
validate_test_results
(
int
test_case_idx
)
{
int
code
=
CV_BaseShapeDescrTest
::
validate_test_results
(
test_case_idx
);
...
...
@@ -1626,10 +1614,6 @@ _exit_:
return
code
;
}
#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic pop
#endif
/****************************************************************************************\
* ContourMoments Test *
\****************************************************************************************/
...
...
modules/imgproc/test/test_distancetransform.cpp
浏览文件 @
11c3fa52
...
...
@@ -158,7 +158,7 @@ cvTsDistTransform( const CvMat* _src, CvMat* _dst, int dist_type,
const
float
init_val
=
1e6
;
float
mask
[
3
];
CvMat
*
temp
;
int
ofs
[
16
];
int
ofs
[
16
]
=
{
0
}
;
float
delta
[
16
];
int
tstep
,
count
;
...
...
modules/videoio/test/test_positioning.cpp
浏览文件 @
11c3fa52
...
...
@@ -106,7 +106,7 @@ void CV_VideoPositioningTest::generate_idx_seq(CvCapture* cap, int method)
{
RNG
rng
(
N
);
idx
.
clear
();
for
(
int
i
=
0
;
i
<
N
-
1
;
i
++
)
for
(
int
i
=
0
;
i
>=
0
&&
i
<
N
-
1
;
i
++
)
idx
.
push_back
(
rng
.
uniform
(
0
,
N
));
idx
.
push_back
(
N
-
1
);
std
::
swap
(
idx
.
at
(
rng
.
uniform
(
0
,
N
-
1
)),
idx
.
at
(
N
-
1
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录