Skip to content

Merge 3.4#16450

Merged
alalek merged 55 commits intoopencv:masterfrom
alalek:merge-3.4
Jan 28, 2020
Merged

Merge 3.4#16450
alalek merged 55 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 28, 2020

#15338 from rayonnant14:my_detect_and_decode_3.4
#16170 from themechanicalcoder:tutorial_1
#16190 from pletessier:videocapture_skip_frames
#16223 from l-bat:lip_jppnet
#16356 from alalek:dnn_ie_prevent_plugins_unloading
#16374 from alalek:imgproc_dispatch_sumpixels
#16375 from ChipKerchner:vectorizeMultTranspose
#16396 from miguelps:android_modules
#16405 from ganesh-k13:bugfix/solvepnp-crash
#16413 from l-bat:ngraph_deconv
#16414 from alalek:samples_fix_async
#16418 from l-bat:ngraph_logsoftmax
#16423 from alalek:issue_16321
#16434 from alalek:fix_build_i386
#16441 from alalek:abi_checker_exclude_modules_3.4

Previous "Merge 3.4": #16406

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

ganesh-k13 and others added 24 commits January 23, 2020 15:23
Added type check for solvePnPGeneric | Issue: opencv#16049

* Added type check

* Added checks before type fix

* Tests for 16049

* calib3d: update solvePnP regression check (16049)
- use carotene if NEON available only
* Reduce LLC loads, stores and multiplies on MulTransposed - 8% faster on VSX

* Add is_same method so c++11 is not required

* Remove trailing whitespaces.

* Change is_same to DataType depth check
Videocapture skip frames

* enable skipping frames

* update videoio_skip test
…_3.4

QR-Code detector : multiple detection

* change in qr-codes detection

* change in qr-codes detection

* change in test

* change in test

* add multiple detection

* multiple detection

* multiple detect

* add parallel implementation

* add functional for performance tests

* change in test

* add perftest

* returned implementation for 1 qr-code, added support for vector<Mat> and vector<vector<Point2f>> in MultipleDetectAndDecode

* deleted all lambda expressions

* changing in triangle sort

* fixed warnings

* fixed errors

* add java and python tests

* change in java tests

* change in java and python tests

* change in perf test

* change in qrcode.cpp

* add spaces

* change in qrcode.cpp

* change in qrcode.cpp

* change in qrcode.cpp

* change in java tests

* change in java tests

* solved problems

* solved problems

* change in java and python tests

* change in python tests

* change in python tests

* change in python tests

* change in methods name

* deleted sample qrcode_multi, change in qrcode.cpp

* change in perf tests

* change in objdetect.hpp

* deleted code duplication in sample qrcode.cpp

* returned spaces

* added spaces

* deleted draw function

* change in qrcode.cpp

* change in qrcode.cpp

* deleted all draw functions

* objdetect(QR): extractVerticalLines

* objdetect(QR): whitespaces

* objdetect(QR): simplify operations, avoid duplicated code

* change in interface, additional checks in java and python tests, added new key in sample for saving original image from camera

* fix warnings and errors in python test

* fix

* write in file with space key

* solved error with empty mat check in python test

* correct path to test image

* deleted spaces

* solved error with check empty mat in python tests

* added check of empty vector of points

* samples: rework qrcode.cpp

* objdetect(QR): fix API, input parameters must be first

* objdetect(QR): test/fix points layout
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 28, 2020

👍

@alalek alalek merged commit 560f85f into opencv:master Jan 28, 2020
@alalek alalek mentioned this pull request Feb 1, 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.

7 participants