Merged
Conversation
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
Member
Author
|
👍 |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#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