Skip to content

Merge 3.4#14966

Merged
alalek merged 26 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 2, 2019
Merged

Merge 3.4#14966
alalek merged 26 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 2, 2019

#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

ci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2
docker_image:Docs=docs-js
#docker_image:Custom=javascript
#docker_image:Custom=powerpc64le
#docker_image:Custom=ubuntu-openvino:16.04
#buildworker:Custom=linux-2
#docker_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
docker_image:Custom=fedora:28
#docker_image:Custom=ubuntu-cuda:16.04
build_image:Custom Mac=openvino-2019r1
build_image:Custom Win=openvino-2019r1
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

Cartucho and others added 26 commits June 23, 2019 18:03
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>
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)
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jul 2, 2019

👍

@alalek alalek merged commit 097d813 into opencv:master Jul 2, 2019
@alalek alalek mentioned this pull request Jul 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants