Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
10828884
Commit
10828884
authored
Nov 14, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2347 from alalek:build_gcc_9
parents
6ae9809b
4c5f0612
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
10 deletions
+7
-10
sparse_matching_gpc.hpp
...s/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp
+0
-7
CMakeLists.txt
modules/sfm/src/libmv_light/CMakeLists.txt
+4
-0
ppf_match_3d.cpp
modules/surface_matching/src/ppf_match_3d.cpp
+3
-3
No files found.
modules/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp
View file @
10828884
...
...
@@ -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
;
}
};
...
...
modules/sfm/src/libmv_light/CMakeLists.txt
View file @
10828884
...
...
@@ -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
modules/surface_matching/src/ppf_match_3d.cpp
View file @
10828884
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment