opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-19 02:16:34 +08:00
Code Issues Releases Wiki Activity

build: GCC9 compilation

Browse Source
This commit is contained in:
Alexander Alekhin
2019-11-12 18:50:43 +03:00
parent 6ae9809b2e
commit 4c5f06128b
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp
View File

@@ -135,13 +135,6 @@ struct GPCTrainingParams
CV_Assert( check() ); CV_Assert( check() );
} }
GPCTrainingParams( const GPCTrainingParams &params )
: maxTreeDepth( params.maxTreeDepth ), minNumberOfSamples( params.minNumberOfSamples ), descriptorType( params.descriptorType ),
printProgress( params.printProgress )
{
CV_Assert( check() );
}
bool check() const { return maxTreeDepth > 1 && minNumberOfSamples > 1; } bool check() const { return maxTreeDepth > 1 && minNumberOfSamples > 1; }
}; };

3
modules/sfm/src/libmv_light/CMakeLists.txt
View File

@@ -7,5 +7,8 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-o
if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0) if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess)
endif() endif()
if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wdeprecated-copy)
endif()
add_subdirectory(libmv) add_subdirectory(libmv)

6
modules/surface_matching/src/ppf_match_3d.cpp
View File

@@ -82,10 +82,10 @@ static KeyType hashPPF(const Vec4d& f, const double AngleStep, const double Dist
(int)(f[1] / AngleStep), (int)(f[1] / AngleStep),
(int)(f[2] / AngleStep), (int)(f[2] / AngleStep),
(int)(f[3] / DistanceStep)); (int)(f[3] / DistanceStep));
KeyType hashKey = 0; KeyType hashKey[2] = {0, 0}; // hashMurmurx64() fills two values
murmurHash(key.val, 4*sizeof(int), 42, &hashKey); murmurHash(key.val, 4*sizeof(int), 42, &hashKey[0]);
return hashKey; return hashKey[0];
} }
/*static size_t hashMurmur(uint key) /*static size_t hashMurmur(uint key)