Skip to content

Merge 3.4#16068

Merged
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4
Dec 5, 2019
Merged

Merge 3.4#16068
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Dec 5, 2019 •
edited
Loading

#16014 from dkurt:dnn_ie_pooling_with_indices
#16024 from alalek:issue_15953
#16028 from catree:improve_calib3d_doc
#16036 from dkurt:dnn_backport_15203
#16046 from alalek:issue_15990
#16052 from alalek:issue_16040
#16055 from alalek:issue_16041
#16061 from alalek:bindings_parser_support_simple_if

Previous "Merge 3.4": #16035

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
#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
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
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

alalek and others added 14 commits November 30, 2019 23:37
@alalek
calib3d: revert stereoRectify() changes from PRs: 6836, 6972, 6955
9a44042 
(1/4) Revert "Correct image borders and principal point computation in cv::stereoRectify"

This reverts commit 93ff1fb.

(2/4) Revert "fix calib3d changes in 6836 plus some others"

This reverts commit fa42a1c.

(3/4) Revert "fix compiler warning"

This reverts commit b3d5548.

(4/4) Revert "add test for 6836"

This reverts commit d06b8c4.
@catree
Improve calib3d documentation:
43d58aa 
  - add reference to Rodrigues Jacobian
  - add references to SE(3) and Lie Groups topics
  - update some conventions and pinhole figure
@dkurt
Backport for dnn input shape estimation
ca1ba7a
@alalek
Merge pull request opencv#16028 from catree:improve_calib3d_doc
eb44e0a
@alalek
core(tls): unblock TlsAbstraction destructor call
818585f 
- required to unregister callbacks from system
@alalek
bindings: basic support for #if preprocessor directives
4dfa0a0 
- #if 0
- #ifdef __OPENCV_BUILD
@dkurt
Enable MaxPooling with indices in Inference Engine
d8e10f3
@alalek
Merge pull request opencv#16061 from alalek:bindings_parser_support_s…
36c9f7c 
…imple_if
@alalek
Merge pull request opencv#16055 from alalek:issue_16041
95e36fd
@alalek
Merge pull request opencv#16014 from dkurt:dnn_ie_pooling_with_indices
38180c2
@alalek
Merge pull request opencv#16036 from dkurt:dnn_backport_15203
986c508
@alalek
Merge pull request opencv#16046 from alalek:issue_15990
f21bde4 
* core: disable invalid constructors in C API by default

- C API objects will lose their default initializers through constructors

* samples: stop using of C API
@alalek
Merge pull request opencv#16052 from alalek:issue_16040
72f35e0 
* calib3d: use normalized input in solvePnPGeneric()

* calib3d: java regression test for solvePnPGeneric

* calib3d: python regression test for solvePnPGeneric
@alalek
Merge pull request opencv#16024 from alalek:issue_15953
c790779
@alalek alalek mentioned this pull request Dec 5, 2019
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 5, 2019

Reverted changes in dnn.cpp from #16036 due failure of Test_Model.DetectRegion/0 test:

[ RUN      ] Test_Model.DetectRegion/0, where GetParam() = OCV/CPU
unknown file: Failure
C++ exception with description "OpenCV(4.1.2-dev) /build/precommit_linux64/opencv/modules/dnn/src/dnn.cpp:3042: error: (-215:Assertion failed) total(os[i]) > 0 in function 'getLayerShapesRecursively'
" thrown in the test body.
[  FAILED  ] Test_Model.DetectRegion/0, where GetParam() = OCV/CPU (76 ms)

@dkurt @l-bat Please take a look

@dkurt dkurt mentioned this pull request Dec 5, 2019
Merged
@dkurt
Copy link
Copy Markdown
Member

dkurt commented Dec 5, 2019

@alalek, opened a PR #16070

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 5, 2019

👍

@alalek alalek merged commit 8108fb0 into opencv:master Dec 5, 2019
@alalek alalek mentioned this pull request Dec 11, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@alalek @dkurt @catree