d573472a86
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-01-31 12:53:45 +00:00
439ef6447d
Update window.cpp
2022-01-28 10:20:36 +03:00
82818e7324
cmake(highgui): update handling of OpenGL libraries
2022-01-20 02:31:15 +00:00
ab181ac329
highgui: Fix unresolved OpenGL functions for Qt backend
...
The Qt backend directly calls some OpenGL functions (glClear, glHint,
glViewport), but since OCV 4.5.5 the GL libraries are no longer part
of the global extra dependencies. When linking with "-Wl,--no-undefined"
this causes linker errors:
`opencv-4.5.5/modules/highgui/src/window_QT.cpp:3307: undefined reference to `glClear'`
Fixes : #21346
Related issues: #21299
2021-12-26 01:10:45 +01:00
217fea9667
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-24 16:48:07 +00:00
f11ab4c569
Merge pull request #21331 from alalek:issue_21289
2021-12-23 20:09:52 +00:00
36bd2a65e3
highgui(gtk): repair scroll events
2021-12-23 13:06:44 +00:00
85d4e56bb1
highgui(gtk): fix onmouse event flags
2021-12-23 12:15:14 +00:00
be110d0464
Merge pull request #21303 from alalek:issue_21299_4.x
2021-12-21 18:42:58 +00:00
c80b270678
cmake: force lowercase plugins internal names
2021-12-21 16:34:48 +00:00
dcc32e84b9
highgui: fix Win32 with OPENGL=ON
2021-12-21 15:51:22 +00:00
3e01a387ba
highgui: fix Win32 with OPENGL=ON
2021-12-21 15:44:59 +00:00
b2005ccaef
Fix broken build for Qt6 with options: WITH_QT=ON and WITH_OPENGL=ON
...
- QGLWidget changed to QOpenGLWidget in window_QT.h for Qt6 using
typedef OpenCVQtWidgetBase for handling Qt version
- Implement Qt6/OpenGL functionality in window_QT.cpp
- Swap QGLWidget:: function calls for OpenCVQtWidgetBase:: function calls
- QGLWidget::updateGL deprecated, swap to QOpenGLWidget::update for Qt6
- Add preprocessor definition to detect Qt6 -- HAVE_QT6
- Add OpenGLWidgets to qdeps list in highgui CMakeLists.txt
- find_package CMake command added for locating Qt module OpenGLWidgets
- Added check that Qt6::OpenGLWidgets component is found. Shut off Qt-openGL functionality if not found.
2021-12-09 13:22:20 -08:00
d2f87ca76c
Merge pull request #21147 from mjmdavis:4.x
...
* remove tickmarks on NSSlider
2021-12-03 16:40:49 +00:00
8b4fa2605e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-03 12:32:49 +00:00
a6277370ca
Merge pull request #21107 from take1014:remove_assert_21038
...
resolves #21038
* remove C assert
* revert C header
* fix several points in review
* fix test_ds.cpp
2021-11-27 18:34:52 +00:00
57ee14d62d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-11-27 16:50:55 +00:00
ebe4ca6b60
Fix typos discovered by codespell
2021-11-26 12:29:56 +01:00
a2716712ab
highgui(win32): fix trackbar setRange
2021-11-06 15:19:22 +00:00
66f3e97457
highgui: drop invalid cvGetWindowImageRect
2021-10-30 12:47:07 +00:00
0ee61d178f
highgui: drop invalid cvGetWindowImageRect
...
- return type is C++ template
- removal from 'extern "C"' scope broke ABI anyway, so this symbols is removed completelly
2021-10-30 12:40:20 +00:00
31c40fa4cc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-15 13:35:03 +00:00
3d93675ff9
fix link error on shared libs with -MT
2021-10-12 17:50:31 +02:00
023e86d68f
Merge pull request #20848 from alalek:reverse_plugins_candidates_order
2021-10-09 15:45:17 +00:00
39ee5c5a46
plugins: reverse candidates order to fetch higher versions first
2021-10-08 20:34:07 +00:00
af56151231
highgui(docs): we don't support 32-bit integer images in imshow()
2021-10-08 19:51:18 +00:00
bdaa6a1910
highgui: repair Qt backend
2021-10-06 19:14:22 +00:00
87d4970e8b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-04 19:50:01 +00:00
24f43e7ae9
Merge pull request #20183 from xhawk18:3.4
...
* improve compatibility for qt 6.
* cmake(highgui): rework Qt dependency support
* cmake(highgui): workaround Qt5Config.cmake "components" bug
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com >
2021-10-04 16:44:57 +00:00
350562919c
highgui(win32): avoid using of stalled iterator
2021-08-23 18:16:14 +00:00
4ff76cad2a
cmake: fix cross-compilation problems
...
- unexpected pkg-config module (we should not use host binary)
- bump cmake_minimum_required to 3.5 in toolchain files
2021-08-05 11:42:58 +00:00
4015a5486c
cmake: process modules in the same CMake scope
2021-07-22 15:22:42 +00:00
9e42e04b4a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-10 13:01:03 +00:00
5627a0cbdf
fix scale problem in DefaultViewPort::controlImagePosition()
2021-07-07 12:35:11 +08:00
cbff19ff1a
highgui: fix win32 backend behavior
2021-07-04 17:37:45 +03:00
5d0cfa2527
cmake(highgui): don't allow multiple builtin backends
2021-07-03 11:37:08 +00:00
9b7dca2fa1
Merge pull request #20281 from alalek:highgui_win32ui_plugin
2021-06-20 16:25:20 +00:00
735a79ae83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-19 18:44:16 +00:00
ef2b400c61
highgui: win32ui plugin
2021-06-19 13:15:46 +00:00
7a276f39fb
reorder defined checks according to cmake file
2021-06-16 11:36:13 +03:00
8f4f834ce6
applied modifier mask to the state
2021-06-10 10:57:15 +03:00
80238880e6
highgui(gtk): fix initialization order of global objects
2021-06-09 09:04:29 +00:00
f4abafb093
highgui: update error messages if no builtin backend
2021-06-09 08:39:50 +00:00
3e538355e2
highgui: force loading of imgcodecs module
...
- required for plugins on Linux (they use imwrite, but there is no link dependency)
2021-06-09 08:36:28 +00:00
995841624c
highgui(gtk): fix NULL ptr checks
2021-06-08 10:57:24 +00:00
f5f675ef6c
highgui(gtk): fix NULL ptr checks
2021-06-08 10:55:51 +00:00
327109f327
highgui: update backends handling, fix WITH_OPENGL=ON build
2021-06-07 11:28:05 +00:00
3e513ee6ab
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-03 16:23:36 +00:00
15af65d4cf
Merge pull request #20149 from rogday:on_mouse_floor
2021-06-02 17:48:43 +00:00
de781b306f
Merge pull request #20187 from alalek:highgui_plugins_cleanup
2021-06-01 13:16:23 +00:00
Alexander Alekhin