Skip to content

Merge 3.4#16506

Merged
alalek merged 17 commits intoopencv:masterfrom
alalek:merge-3.4
Feb 4, 2020
Merged

Merge 3.4#16506
alalek merged 17 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Feb 4, 2020

#15464 from tallestorange:3.4
#16479 from StefanBruens:fix_gles_glx_h_include
#16483 from saskatchewancatch:issue-16458
#16490 from dkurt:dnn_refactor_resize
#16491 from rayonnant14:objdetect_decodeMulti_issue
#16493 from vpisarev:bordertype_sgbm_doc_fixes
#16495 from vpisarev:drawing_aa_border_fix
#16499 from ankit6979:3.4
#16502 from tomoaki0705:fixTypo
#16504 from alalek:issue_16501

Previous "Merge 3.4": #16478

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

tallestorange and others added 17 commits September 6, 2019 11:56
Fix compilation errors on GLES platforms

* Do not include glx.h when using GLES

GL/glx.h is included on all LINUX plattforms, which is wrong
for a number of reasons:

- GL_PERSPECTIVE_CORRECTION_HINT is defined in GL/gl.h, so we
  want gl.h not glx.h, the latter just includes the former
- GL/gl.h is a Desktop GL header, and should not be included
  on GLES plattforms
- GL/gl.h is already included via QtOpenGL ->
  QtGui/qopengl.h on desktop plattforms

This fixes a problem when Qt is compiled with GLES, which
is often done on ARM platforms where desktop GL is not or
only poorly supported (e.g. slow due to emulation).

Fixes part of opencv#9171.

* Only set GL_PERSPECTIVE_CORRECTION_HINT when GL version defines it

GL_PERSPECTIVE_CORRECTION_HINT does not exist in GLES 2.0/3.x,
and has been deprecated in OpenGL 3.0 core profiles.

Fixes part of opencv#9171.
* added note about BORDER_TYPE in separable filters; fixed SGBMStereo description

* added # to BORDER_ constants to generate hyperlinks
* Update py_thresholding.markdown

* 📝 Update py_thresholding.markdown
…i_issue

* fixed issue with Mat reshape in decodeMulti()

* added test for decodeMulti

* used assign
* fixed antialiased line rendering to process image border correctly

* fixed warning on Windows

* imgproc(test): circle drawing regression
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Feb 4, 2020

👍

@alalek alalek merged commit 225566d into opencv:master Feb 4, 2020
@alalek alalek mentioned this pull request Feb 10, 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.

9 participants