Commit 10828884 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #2347 from alalek:build_gcc_9

parents 6ae9809b 4c5f0612
......@@ -135,13 +135,6 @@ struct GPCTrainingParams
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; }
};
......
......@@ -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)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess)
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)
\ No newline at end of file
......@@ -82,10 +82,10 @@ static KeyType hashPPF(const Vec4d& f, const double AngleStep, const double Dist
(int)(f[1] / AngleStep),
(int)(f[2] / AngleStep),
(int)(f[3] / DistanceStep));
KeyType hashKey = 0;
KeyType hashKey[2] = {0, 0}; // hashMurmurx64() fills two values
murmurHash(key.val, 4*sizeof(int), 42, &hashKey);
return hashKey;
murmurHash(key.val, 4*sizeof(int), 42, &hashKey[0]);
return hashKey[0];
}
/*static size_t hashMurmur(uint key)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment