Skip to content

Merge 3.4#15771

Merged
alalek merged 49 commits intoopencv:masterfrom
alalek:merge-3.4
Oct 24, 2019
Merged

Merge 3.4#15771
alalek merged 49 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Oct 24, 2019

#14518 from SSteve:intersectConvexConvex-example
#15180 from terfendail:wintr_stereobm
#15527 from everton1984:faster_acc
#15662 from ChipKerchner:addVReverseIntrinsic
#15685 from pmur:cnz64f-simd
#15688 from JamesNewton:3.4
#15700 from alalek:issue_12943
#15701 from alalek:issue_15691
#15708 from alalek:js_simd_support_1.38.48
#15709 from alalek:js_simd_reverse
#15715 from adamrankin:patch-1 (moved to opencv_contrib)
#15716 from alalek:javadoc_fix
#15718 from alalek:pylint_warnings
#15720 from alalek:cmake_fix_uwp
#15722 from jasjuang:3.4
#15737 from alalek:issue_15705
#15738 from ChipKerchner:bugInt64x2Comparison
#15739 from dkurt:darknet_shortcut_asymm
#15740 from xerus:fix_typo
#15741 from mipsopen-fwu:issue_15730
#15743 from collinbrake:feature_grammar_fixes_2
#15752 from dkurt:fix_15750
#15754 from float13:patch-1
#15756 from dankamongmen:dankamongmen/stitching_surf_default
#15770 from terfendail:stereobm_fix

and dnn version bump 20191024

Previous "Merge 3.4": #15678

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1
build_image:Docs=docs-js
#build_image:Custom=javascript-simd
#build_image:Custom=powerpc64le
build_image:Custom=mips64el
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#buildworker:Custom=linux-2
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
build_image:Custom Mac=openvino-2019r3.0
build_image:Custom Win=openvino-2019r3.0
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

terfendail and others added 30 commits September 25, 2019 14:37
Improves performance a bit. 2.2x on P9 and 2 - 3x on coffee lake
x86-64.
* Adding support for vectorized masking for uchar/ushort.

* Fixing bug where mask was zeroing the dst. Improved the way to calculate
the mask and tweaked for further performance improvements.

* Fixing mask comparison test.

* Restricting to one channel.

* Adding support for 3 channels, switch old approach to start using HAL's
v_select.
* New v_reverse HAL intrinsic for reversing the ordering of a vector

* Fix conflict.

* Try to resolve conflict again.

* Try one more time.

* Add _MM_SHUFFLE. Remove non-vectorize code in SSE2. Fix copy and paste issue with NEON.

* Change v_uint16x8 SSE2 version to use shuffles
- IPP/SSE4.2 works well
VTK_MAJOR_VERSION not found unless header is included
pylint 1.8.3
alalek and others added 19 commits October 18, 2019 18:40
The usage function states that the default for match_conf is
0.65 if the default SURF feature finder is used, and 0.3 for
orbs. Indeed, if --feature orbs is used, match_conf is set
to 0.3f. This is a NOP, because the real default is also set
to 0.3f. Change it to 0.65f when SURF is in play.
Fixing bug with comparison of v_int64x2 or v_uint64x2

* Casting v_uint64x2 to v_float64x2 and comparing does NOT work in all cases.  Rewrite using epi64 instructions - faster too.

* Fix bad merge.

* Fix equal comparsion for non-SSE4.1. Add test cases for v_int64x2 comparisons.

* Try to fix merge conflict.

* Only test v_int64x2 comparisons if CV_SIMD_64F

* Fix compiler warning.
I think it would help to change all 3 of the the input file arguments to be "positional" for consistency with the other tutorials. This also simplifies the command line input to run this tutorial by reducing typing, and helpfully prints the "usage" info if any of the 3 required inputs are missing.

I'm new to OpenCV and working through the tutorials. I kept getting runtime errors with this one until I realized that the arguments weren't positional, and I was missing the "--input1", "--input2, "--input3" flags preceding the filenames. All of the previous tutorials had required filenames as positional arguments and didn't require this.

The original code would require each input to be specified like this:
./compareHist_Demo --input1 filename1 --input2 filename2 --input3 filename3 

But with this change, the above command is simplified to:
./compareHist_Demo  filename1 filename2 filename3

This avoids a confusing runtime error to make things simpler for newcomers like me :)
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Oct 24, 2019

👍

@alalek alalek merged commit 055ffc0 into opencv:master Oct 24, 2019
@alalek alalek mentioned this pull request Oct 29, 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.