Skip to content

Merge 3.4#17476

Merged
alalek merged 33 commits intoopencv:masterfrom
alalek:merge-3.4
Jun 4, 2020
Merged

Merge 3.4#17476
alalek merged 33 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jun 4, 2020

#17338 from hunter-college-ossd-spr-2020:contours-toc
#17369 from themightyoarfish:doc-essential-matrix-different-cameras
#17403 from wangmengHB:master
#17417 from vpisarev:fix_fitellipse
#17419 from YourButterfly:fix_divide_zero_in_darknet_3_4
#17420 from nosajthenitram:fix_cascadedetect_convert_bug_for_old_cascade
#17424 from berak:dnn_sample_human_parsing
#17428 from asmorkalov:as/java_smart_constructors
#17430 from alalek:issue_17257
#17432 from tomoaki0705:automaticCC
#17436 from vpisarev:fix_python_io
#17438 from alalek:fix_eigen_builds
#17439 from alalek:fix_dnn_test_required_file
#17447 from alalek:dnn_ie_extract_layers
#17455 from mshabunin:check-count-non-zero
#17466 from alalek:build_opencv_winpack_dldt_2020.3.0
#17469 from l-bat:fix_virtual_try_on
#17473 from f3rm4rf3r:fixingFourCCDocBrokenLink

Previous "Merge 3.4": #17418

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.1.0:16.04
#build_image:Custom=ubuntu-openvino-2020.2.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=ubuntu:20.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
#build_image:Custom Mac=openvino-2020.2.0
build_image:Custom Mac=openvino-2020.2.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.1.0
build_image:Custom Win=openvino-2020.2.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

boubascript and others added 30 commits May 21, 2020 07:16
decoder should be properly flushed after that
Fix Test Case: in latest version, window.cv is a promise instance that makes most test case failed.

* Fix Browser Test Case: In latest version, window.cv is a promise instance

In latest version of opencv.js, window.cv is promise instance.
So that most of the test cases is run failed.
This commit is to fix browser test case.

* Add comment for backward compatible

Add comments for backward compatible
* fixed opencv#17044
1. fixed Python part of the tutorial about using OpenCV XML-YAML-JSON I/O functionality from C++ and Python.
2. added startWriteStruct() and endWriteStruct() methods to FileStorage
3. modifed FileStorage::write() methods to make them work well inside sequences, not only mappings.

* try to fix the doc builder

* added Python regression test for FileStorage I/O API ([TODO] iterating through long sequences can be very slow)

* fixed yaml testing
* improved fitEllipse and fitEllipseDirect accuracy in singular or close-to-singular cases (see issue opencv#9923)

* scale points using double precision

* added normalization to fitEllipseAMS as well; fixed Java test case by raising the tolerance (it's unclear what is the correct result in this case).

* improved point perturbation a bit. make the code a little bit more clear

* trying to fix Java fitEllipseTest by slightly raising the tolerance threshold

* synchronized C++ version of Java's fitEllipse test

* removed trailing whitespaces
  * cache the result
  * DRY
  * brush up based on review
* - Fixing broken URL to mp4ra website

* - Fixing broken URL to mp4ra website (in C videoio API)
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jun 4, 2020

@tomoaki0705 Could you please check CUDA patch merge? (some changes on master are not backported to 3.4)

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jun 4, 2020

👍

@alalek alalek merged commit 7722a2b into opencv:master Jun 4, 2020
@tomoaki0705
Copy link
Copy Markdown
Contributor

@alalek I can confirm that both automatic feature works on master branch

  • filtering out the not-supported CC
  • choosing native CC

@alalek alalek mentioned this pull request Jun 8, 2020
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.