Alexander Alekhin
8b4fa2605e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-03 12:32:49 +00:00
yuki takehara
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
Alexander Alekhin
57ee14d62d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-11-27 16:50:55 +00:00
Christian Clauss
ebe4ca6b60
Fix typos discovered by codespell
2021-11-26 12:29:56 +01:00
Alexander Alekhin
a2716712ab
highgui(win32): fix trackbar setRange
2021-11-06 15:19:22 +00:00
Alexander Alekhin
66f3e97457
highgui: drop invalid cvGetWindowImageRect
2021-10-30 12:47:07 +00:00
Alexander Alekhin
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
Alexander Alekhin
31c40fa4cc
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-15 13:35:03 +00:00
Stanislaw Halik
3d93675ff9
fix link error on shared libs with -MT
2021-10-12 17:50:31 +02:00
Alexander Alekhin
023e86d68f
Merge pull request #20848 from alalek:reverse_plugins_candidates_order
2021-10-09 15:45:17 +00:00
Alexander Alekhin
39ee5c5a46
plugins: reverse candidates order to fetch higher versions first
2021-10-08 20:34:07 +00:00
Alexander Alekhin
af56151231
highgui(docs): we don't support 32-bit integer images in imshow()
2021-10-08 19:51:18 +00:00
Alexander Alekhin
bdaa6a1910
highgui: repair Qt backend
2021-10-06 19:14:22 +00:00
Alexander Alekhin
87d4970e8b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-04 19:50:01 +00:00
xhawk18
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
Alexander Alekhin
350562919c
highgui(win32): avoid using of stalled iterator
2021-08-23 18:16:14 +00:00
Alexander Alekhin
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
Alexander Alekhin
4015a5486c
cmake: process modules in the same CMake scope
2021-07-22 15:22:42 +00:00
Alexander Alekhin
9e42e04b4a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-07-10 13:01:03 +00:00
Xinguang Bian
5627a0cbdf
fix scale problem in DefaultViewPort::controlImagePosition()
2021-07-07 12:35:11 +08:00
Alexander Alekhin
cbff19ff1a
highgui: fix win32 backend behavior
2021-07-04 17:37:45 +03:00
Alexander Alekhin
5d0cfa2527
cmake(highgui): don't allow multiple builtin backends
2021-07-03 11:37:08 +00:00
Alexander Alekhin
9b7dca2fa1
Merge pull request #20281 from alalek:highgui_win32ui_plugin
2021-06-20 16:25:20 +00:00
Alexander Alekhin
735a79ae83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-19 18:44:16 +00:00
Alexander Alekhin
ef2b400c61
highgui: win32ui plugin
2021-06-19 13:15:46 +00:00
Smirnov Egor
7a276f39fb
reorder defined checks according to cmake file
2021-06-16 11:36:13 +03:00
Smirnov Egor
8f4f834ce6
applied modifier mask to the state
2021-06-10 10:57:15 +03:00
Alexander Alekhin
80238880e6
highgui(gtk): fix initialization order of global objects
2021-06-09 09:04:29 +00:00
Alexander Alekhin
f4abafb093
highgui: update error messages if no builtin backend
2021-06-09 08:39:50 +00:00
Alexander Alekhin
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
Alexander Alekhin
995841624c
highgui(gtk): fix NULL ptr checks
2021-06-08 10:57:24 +00:00
Alexander Alekhin
f5f675ef6c
highgui(gtk): fix NULL ptr checks
2021-06-08 10:55:51 +00:00
Alexander Alekhin
327109f327
highgui: update backends handling, fix WITH_OPENGL=ON build
2021-06-07 11:28:05 +00:00
Alexander Alekhin
3e513ee6ab
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-03 16:23:36 +00:00
Alexander Alekhin
15af65d4cf
Merge pull request #20149 from rogday:on_mouse_floor
2021-06-02 17:48:43 +00:00
Alexander Alekhin
de781b306f
Merge pull request #20187 from alalek:highgui_plugins_cleanup
2021-06-01 13:16:23 +00:00
Alexander Alekhin
fb9a00c36d
highgui: cleanup and fixes
2021-05-31 17:03:53 +00:00
Smirnov Egor
fb68fe8930
bring back bounds check and switch to floor
2021-05-31 19:03:50 +03:00
Alexander Alekhin
cb51a155b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-05-29 19:00:14 +00:00
Alexander Alekhin
3d2f4fa164
highgui: fix trackbar value pointer handling
2021-05-28 01:58:58 +00:00
Maksim Shabunin
684ba6fe14
highgui: fix config verification for GTK
2021-05-26 19:59:36 +03:00
Alexander Alekhin
70f69cb265
highgui: backends and plugins
2021-05-24 16:12:02 +00:00
Christoph Rackwitz
f479935cda
fix for #19870
...
HAVE_QT and HAVE_WIN32UI can both be true at the same time
if HAVE_QT, window_w32.cpp is not included in the build, see CMakeLists.txt
2021-04-08 12:59:06 +02:00
Alexander Alekhin
0a6f216f83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-21 20:14:09 +00:00
Alexander Alekhin
d2d6eba16a
cmake: fix add_apple_compiler_options() calls and OBJCXX handling
2021-02-13 18:37:30 +00:00
Alexander Alekhin
b6933dbf3a
highgui(pollKey): properly handle no-GUI case
2021-02-05 23:51:52 +00:00
Alexander Alekhin
9d227641c9
Merge pull request #19411 from crackwitz:highgui-pollkey
2021-02-05 20:18:53 +00:00
Christoph Rackwitz
ab0e1c573a
highgui: expose VSYNC window property for OpenGL on W32
...
property getter/setter code conditional on HAVE_OPENGL
getter: return -1 upon specific OpenGL errors
2021-02-03 09:53:13 +01:00
Christoph Rackwitz
26da491053
implementation of pollKey, companion to waitKey
...
w32 backend: implemented
other backends: stubbed or fallback to waitKey
documentation: cross-linked and more precise in some places
2021-02-02 22:24:54 +01:00
Alexander Alekhin
e85b41f9be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-25 22:42:13 +00:00
Christoph Rackwitz
0c0cf8b19f
highgui: remove gutter in window_w32
2021-01-23 16:01:07 +01:00
Alexander Alekhin
cd59516433
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-22 21:29:21 +00:00
shioko
5967acc9ca
fix typo of the word storage
2021-01-17 18:59:20 +00:00
Alexander Alekhin
0105f8fa38
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-20 20:32:00 +00:00
Suleyman TURKMEN
cc7f17f011
update documentation
2020-11-18 17:07:04 +03:00
Alexander Alekhin
199687a1c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-10-02 15:58:45 +00:00
Suleyman TURKMEN
14e264f646
Update window_w32.cpp
2020-09-29 21:50:06 +03:00
Alexander Alekhin
1f2c83845d
backport: checks and fixes from static code analyzers results
...
original commit: 71f665bd8c
2020-09-02 19:05:47 +00:00
Alexander Alekhin
71f665bd8c
checks and fixes from static code analyzers results
2020-09-02 21:59:34 +03:00
Alexander Alekhin
8753203df0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-08-17 10:29:12 +00:00
Alexander Alekhin
7ec9f52509
highgui: don't terminate if we can't initialize GTK backend
...
- allow Users to handle such case
- exception will be thrown instead
2020-08-16 09:30:09 +00:00
Alexander Alekhin
1537a5f253
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-04-09 19:19:20 +00:00
shimat
39d3bbb601
fix error at #include <window_winrt_bridge.hpp>
2020-04-09 09:54:13 +09:00
Alexander Alekhin
333a767be4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-28 18:34:37 +00:00
Yuriy Obukh
edcc762f7a
add "Copy to clipboard functional" to imshow wnd with Qt
2020-02-28 00:03:38 +02:00
Alexander Alekhin
96b26dc8f4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-20 19:47:27 +03:00
Vadim Pisarevsky
d67a6c1be4
Merge pull request #16588 from vpisarev:fix_macos_move_window
...
fixed cv::moveWindow() on mac
* fixed cv::moveWindow() on mac (issue #16343 ). Thanks to cwreynolds and saskatchewancatch for the help!
* fixed warnings about _x0 and _y0
* fixed warnings about _x0 and _y0
2020-02-17 14:54:36 +03:00
Alexander Alekhin
225566da7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-02-04 19:49:24 +03:00
StefanBruens
f05d5888c9
Merge pull request #16479 from StefanBruens:fix_gles_glx_h_include
...
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 #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 #9171 .
2020-02-02 16:29:04 +03:00
Alexander Alekhin
c6c8783c60
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-12-16 21:30:30 +00:00
Tatsuro Shibamura
971ae00942
Merge pull request #16027 from shibayan:arm64-windows10
...
* Support ARM64 Windows 10 platform
* Fixed detection issue for ARM64 Windows 10
* Try enabling ARM NEON intrin
* build: disable NEON with MSVC compiler
* samples(directx): gdi32 dependency
2019-12-17 00:23:30 +03:00
Alexander Alekhin
fc41c18c6f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-18 13:56:24 +03:00
Alexander Alekhin
7ecdcf6ca6
build: GCC9 compilation
2019-11-12 18:49:34 +03:00
TH3CHARLie
da0fec7308
fix incorrect imshow behavior
2019-10-19 20:34:18 +08:00
Alexander Alekhin
b4c5b50a3e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-13 17:15:45 +00:00
Maksim Shabunin
5c0502b470
Fixed OSX build with Qt
2019-09-13 15:23:59 +03:00
Alexander Alekhin
bea2c75452
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-05 14:29:22 +03:00
Jaime
fafada28eb
Merge pull request #14872 from AhiyaHiya:feature/topmost_window
...
* Added mechanism to set/toggle NORMAL window to TOPMOST window.
* highgui: remove unnecessary/legacy code
2019-09-05 13:55:17 +03:00
luz.paz
fcc7d8dd4e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
backporting of commit: ec43292e1e
2019-08-16 17:34:29 +03:00
luz.paz
ec43292e1e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
2019-08-15 18:02:09 -04:00
John Smith
b9d6fc9dad
Fix cv::selectROI rectangle rendering issue
...
backport of commit: 95c65aff75
2019-08-05 17:18:30 +03:00
Alexander Alekhin
f9cefc84a3
Merge pull request #15098 from RealJohnSmith:master
2019-08-01 16:35:07 +00:00
John Smith
95c65aff75
Fix cv::selectROI rectangle rendering issue
2019-07-19 14:07:09 +02:00
Alexander Alekhin
c024edb9a8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-04-19 15:43:58 +03:00
Alexander Alekhin
0d747daf47
cmake: use absolute library paths from 'pkgconfig'
...
- drop legacy check_module() macro
- drop 'ALIASOF_'
2019-04-15 22:11:49 +00:00
Alexander Alekhin
7621b91769
Merge pull request #14292 from alalek:issue_14291
...
* macosx: fix C++11 build
backporting commit c3cf35ab63
* macosx: eliminate build warning
2019-04-11 17:46:28 +03:00
Alexander Alekhin
332c37f332
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-06 11:43:16 +03:00
Alexander Alekhin
35edad3e74
build: fix warnings
2019-03-05 14:47:04 +03:00
Alexander Alekhin
c3cf35ab63
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-26 17:34:42 +03:00
Alexander Alekhin
85ade61ef7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-27 18:15:50 +03:00
Alexander Alekhin
5f2fed0e25
Merge pull request #13453 from crackwitz:w32-opengl-mouse-position
2018-12-26 12:38:59 +00:00
Christoph Rackwitz
deb8ba2237
fix for #4990 : highgui w32 ogl: correct calculation of image coordinates from window coordinates
2018-12-26 15:00:39 +03:00
Christoph Rackwitz
beba82b22b
Off-by-ones in windows/GDI window calculations
...
Check for "gutter" around displayed image. there was one row/column missing on the bottom/right.
Might as well set gutter = 0?
2018-12-25 17:54:44 +01:00
Maksim Shabunin
905d96dd4a
Restored 500ms delay in highgui test
2018-12-03 14:34:29 +03:00
Alexander Alekhin
4fb9bce79f
Merge pull request #13264 from mshabunin:fix-windows
2018-11-28 20:00:04 +00:00
Alexander Alekhin
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
Maksim Shabunin
db1c8b3f9e
Restored function to rescale pixel values before imshow
2018-11-26 15:25:05 +03:00
Tomoaki Teshima
a1c073d289
add missing API cvGetPropVisible_W32
2018-11-21 23:04:23 +09:00
berak
9344d0d0e3
highgui: restore convertscale semantics in window_w32.cpp
2018-11-21 11:05:24 +01:00
Pavel Rojtberg
f54b230906
highgui: Qt - restore convertscale semantics
...
broken in 11eafca3e2
2018-11-16 16:13:05 +01:00