generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4220 from alalek:fix_gcc_warnings_2_4

Browse Source
This commit is contained in:
Maksim Shabunin 2015-07-24 13:09:44 +00:00
commit 3ed54b9008
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVCompilerOptions.cmake
View File

@ -95,6 +95,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_extra_compiler_option(-Wno-narrowing)
add_extra_compiler_option(-Wno-delete-non-virtual-dtor)
add_extra_compiler_option(-Wno-unnamed-type-template-args)
add_extra_compiler_option(-Wno-array-bounds)
add_extra_compiler_option(-Wno-aggressive-loop-optimizations)
endif()
add_extra_compiler_option(-fdiagnostics-show-option)

6
modules/imgproc/test/test_distancetransform.cpp
View File

@ -166,10 +166,10 @@ cvTsDistTransform( const CvMat* _src, CvMat* _dst, int dist_type,
int i, j, k;
int width = _src->cols, height = _src->rows;
const float init_val = 1e6;
float mask[3];
float mask[3] = { 0 };
CvMat* temp;
int ofs[16];
float delta[16];
int ofs[16] = { 0 };
float delta[16] = { 0 };
int tstep, count;
assert( mask_size == 3 || mask_size == 5 );