Skip to content

Commit 1082888

Browse files
committed
Merge pull request #2347 from alalek:build_gcc_9
2 parents 6ae9809 + 4c5f061 commit 1082888

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

modules/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,6 @@ struct GPCTrainingParams
135135
CV_Assert( check() );
136136
}
137137

138-
GPCTrainingParams( const GPCTrainingParams &params )
139-
: maxTreeDepth( params.maxTreeDepth ), minNumberOfSamples( params.minNumberOfSamples ), descriptorType( params.descriptorType ),
140-
printProgress( params.printProgress )
141-
{
142-
CV_Assert( check() );
143-
}
144-
145138
bool check() const { return maxTreeDepth > 1 && minNumberOfSamples > 1; }
146139
};
147140

modules/sfm/src/libmv_light/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-o
77
if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
88
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess)
99
endif()
10+
if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0)
11+
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wdeprecated-copy)
12+
endif()
1013

1114
add_subdirectory(libmv)

modules/surface_matching/src/ppf_match_3d.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ static KeyType hashPPF(const Vec4d& f, const double AngleStep, const double Dist
8282
(int)(f[1] / AngleStep),
8383
(int)(f[2] / AngleStep),
8484
(int)(f[3] / DistanceStep));
85-
KeyType hashKey = 0;
85+
KeyType hashKey[2] = {0, 0}; // hashMurmurx64() fills two values
8686

87-
murmurHash(key.val, 4*sizeof(int), 42, &hashKey);
88-
return hashKey;
87+
murmurHash(key.val, 4*sizeof(int), 42, &hashKey[0]);
88+
return hashKey[0];
8989
}
9090

9191
/*static size_t hashMurmur(uint key)

0 commit comments

Comments
 (0)