Skip to content

(5.x) Merge 4.x #2966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jun 4, 2021
Merged

(5.x) Merge 4.x #2966

merged 29 commits into from
Jun 4, 2021

Conversation

alalek
Copy link
Member

@alalek alalek commented Jun 4, 2021

#2757 from Certseeds:Barcode-Support
#2907 from sturkmen72:Edge_Drawing_Improvements
#2920 from shimat:createRLEImage_const
#2922 from apatsekin:fix-cudafeatures2d-python-bind
#2924 from alalek:cmake_completelly_disable_cnn_3dobj
#2926 from DumDereDum:iss2925
#2928 from alalek:cmake_handle_glog_target
#2929 from SUSTech-OpenCV:bugfix-barcode
#2931 from ferdnyc:wechat-iconv-fix
#2943 from sturkmen72:EdgeDrawing_Improvements
#2944 from paroj:ogre_devel
#2950 from drf5n:patch-1
#2951 from rogday:vtk9_world
#2952 from iclemens:lbf_dont_check_cascade
#2953 from iclemens:lbf_dont_convert_to_grayscale

Main PR: opencv/opencv#20216
Previous "Merge 4.x": #2919

force_builders=Custom,Win64 OpenCL
buildworker:Custom=linux-4,linux-6
build_image:Custom=ubuntu-cuda:18.04
buildworker:Win64 OpenCL=windows-2
build_image:Win64 OpenCL=msvs2019

shimat and others added 29 commits April 11, 2021 07:35
- used FindGlog.cmake has buggy implementation
1D Barcode support

* init barcode interface.

* barcode: update readme.

* now it is just interface, do not need CMakeLists to compiler it.

Signed-off-by: Killer_Quinn <[email protected]>

* fix-trailing whitespace of docs-build.

Signed-off-by: Killer_Quinn <[email protected]>

* Branch: Barcode-Support,replace vector<RotateRect> to vector<vector<Point2f>>,
barcodeDirectly now just output one string,
this commit is still only contain interface, barcode module will not be compile.

Signed-off-by: Killer_Quinn <[email protected]>

* add implementation details

* fix doc bug

* not generate python bindings temporarily

* add barcode group for doxygen

* generate python bindings and improve performance

* remove win10 build warnings in detect stage

* remove win10 build warnings on decode stage

* add samples and accuracy tests

* Update README.md

* add tutorial, part of content is to be done.

* add decode and EAN part in tutorial

* refactor imports

* delete decodeDirectly api for simplicity

* add super resolution and optimize code format

* Use @snippet / @include doxygen statements for embedding code from .cpp files

* improve decoding performance

* optimize code and slightly improve the performance

* add ean8 support

* add references and use uint type for some non-negative variables

* support java bindings

* optimize wording in source code and documentation

* refine code

* whitespace

* bugfix: forget to clear list

Co-authored-by: darkliang <[email protected]>
Co-authored-by: WangberlinT <[email protected]>
Co-authored-by: Junhao Liang <[email protected]>
KinFu fix (iss2925)

* add TODO

* rewrite render

* docs fix

* remove extra comment
Bugfix: barcode module

* bugfix:
1. jni crashing while coping vector<BarcodeType> to list;
2. in python/java, assertion fails when calling decode(), because of (2D Mat).copyTo(vector<Point>);
3. the algorithm of decodeROI() is wrong.

* add python and java tests

* use constexpr
Link wechat_qrcode with libiconv on MinGW

* wechat_qrcode: explicit iconv dependency

Iconv isn't automatic on all systems, non-POSIX have a separate
libiconv that needs to be found in CMake and linked.

* Don't disable iconv on MinGW

* wechat_qrcode: Disable iconv if not found
only compatible versions support CMake CONFIG mode.
Use that to make check more robust.
* Sanity check tutorial_charuco_create_detect.cpp::readCameraParameters()

* check both camMatrix and distCoeffs sizes

* check only widths of camMatrix and distCoeffs matrixes

* check sizes of camMatrix and distCoeffs matrixes

* check size of only camMatrix
@alalek
Copy link
Member Author

alalek commented Jun 4, 2021

👍

with failed OpenCV.js test:

Module: Features2D Test: Detectors
MSER
    at Object.<anonymous> (/build/precommit_custom_linux/build/bin/test_features2d.js:38:10)
Actual value:
0
Expected value:
7

@alalek alalek merged commit ed9e79d into opencv:next Jun 4, 2021
@alalek alalek mentioned this pull request Jun 13, 2021
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.