Merged
Conversation
…esult between the Cpp, Java and Python
In case OPENCV_INCLUDE_INSTALL_PATH is absolute (i.e. starts with a "/"), the path ends up with a double "/". While this is mostly equivalent to a single slash, it may have a nasty side effect when: - OpenCV_INSTALL_PATH is empty - OPENCV_INCLUDE_INSTALL_PATH is "/usr/include" - the calling build script uses "-isystem" to specify the path to the headers of dependencies (to avoid warnings) Specifying "-isystem /usr/include" breaks the path ordering, and GCC can no longer find its "stdlib.h", thus CMake filters such statements. Unfortunately it fails to do so when using "//usr/include".
- builds with CMAKE_SKIP_RPATH=ON should properly find project .so files from <build>/lib directory - $ORIGIN doesn't work properly in cross-compilation mode
- make it configurable via OPENCV_TBB_RELEASE + OPENCV_TBB_RELEASE_MD5 - remove legacy support
Due to the explicitly declared copy constructor Vec<T, n>::Vec(Vec <T,n>&) GCC 9 warns if there is no assignment operator, as having one typically requires the other (rule-of-three, constructor/desctructor/assginment). As the values are just a plain array the default assignment operator does the right thing. Tell the compiler explicitly to default it. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
…operator_warning
Crosscorr cleanup (opencv#14936) * Simplify code for convolution destination type/size For the 2d filter code, destination size equals source size, and the crossCorr function even (re-)creates the output matrix with the given size. The number of channels also have to match. The destination type() is the one used to create the output matrix, so we can use its type() here. This is a preparatory patch. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> * Remove redundant destination size and type parameters from crossCorr All calling sites of crossCorr already use (..., mat, mat.size(), mat.type(), ...), so the parameters are redundant. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
* Avoid using v_signmask universal intrinsic and mark it as deprecated * Renamed v_find_negative to v_scan_forward
…SetRegistrator_getSubset_disaster_cleanup Parmen ransac point set registrator get subset disaster cleanup (opencv#14828)
…insertion_sort
Member
Author
|
👍 |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#14828 from armenpoghosov:parmen_RANSACPointSetRegistrator_getSubset_disaster_cleanup
#14837 from Cartucho:fix_laplace_operator_on_python
#14880 from dkurt:dnn_ie_tests
#14916 from terfendail:wsignmask_deprecated
#14925 from StefanBruens:handle_absolute_include_path
#14926 from alalek:tbb_version_2019u8
#14929 from alalek:cmake_rpath_link_support
#14934 from StefanBruens:silence_assignment_operator_warning
#14936 from StefanBruens:crosscorr_cleanup
#14953 from alalek:core_static_analysis_eval_expr
#14954 from rafagjordana:fix_blob_detection_insertion_sort
#14958 from tomoaki0705:fixArmFp16Behavior
#14963 from alalek:pr14925_fix
#14964 from arnaudbrejeon:bug_fix_14955
Previous "Merge 3.4": #14932