edacd91a27
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-15 20:15:42 +00:00
803ff64b14
Merge pull request #12697 from tellowkrinkle:FasterCocoaWindows
...
* Make cocoa windows draw faster
* Use a CALayer for rendering when possible Uses GPU to scale images, which is important because retina macs will want window sizes much larger (in pixels) than the image
* Fix mouse logic for cocoa windows
* Only halve resolution on retina if image is larger than display
2018-10-14 21:18:05 +03:00
808ba552c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-14 23:44:35 +00:00
d7ac4495c3
highgui: fix QT build
2018-09-11 20:30:50 +00:00
dca657a2fd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-10 00:10:21 +03:00
92517fa359
Update window.cpp
2018-09-09 19:24:25 +00:00
a39e0daacf
Utilize CV_UNUSED macro
2018-09-07 20:33:52 +09:00
73bfe68821
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-07 12:40:27 +03:00
8a3c394d6a
don't use constructors for C API structures
2018-09-06 14:34:16 +03:00
6356403964
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-08-22 17:38:51 +03:00
d2e08a524e
core: repair CV_Assert() messages
...
Multi-argument CV_Assert() is accessible via CV_Assert_N() (with malformed messages).
2018-08-15 17:43:10 +03:00
82c477c9f7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-31 21:35:00 +03:00
e031bada7d
Fixed several issues found by static analysis, Windows-specific
2018-07-27 18:25:55 +03:00
2da96be217
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-09 19:44:51 +03:00
81325a3fa0
highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable
2018-07-06 17:35:47 +03:00
aa0c6ddb4c
highgui: fix GTK issues with external UI thread
2018-07-06 17:35:47 +03:00
4bc080dc50
fix function signatures, drop invalid casts
2018-07-05 13:55:26 +03:00
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
8620bd5a84
highgui(win32): improve waitKey() timeout condition
...
- use cv::getTickCount() instead of Win32 GetTickCount()
- process message queue before timeout exit
2018-06-07 19:31:08 +03:00
4e83f4c579
core: drop cv::errorNoReturn()
...
replaced to cv::error()
2018-04-25 15:07:18 +03:00
cd2b188c9a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-04-24 18:13:06 +03:00
6b581c4e51
build: unreachable code after CV_Error() (part 2)
2018-04-24 16:03:40 +03:00
5b17a60dde
next: drop HAVE_TEGRA_OPTIMIZATION/TADP
2018-04-10 18:09:54 +03:00
82fd00af99
fix build issues with QT/OpenGL
2018-03-30 12:49:09 +03:00
439072a2a6
Fixed two warnings produced by clang
2018-03-29 13:24:04 +03:00
eb3969e244
Better text contrast of pixel brightness values in Qt window
...
This offsets text brightness of pixel brightness values
by offsetting it by 127 to the curent pixel value.
The text is now readable even if pixels are black.
2018-03-14 13:27:11 +01:00
d05714995c
Misc. modules/ cont. pt2
...
Found via `codespell`
2018-02-13 11:28:11 -05:00
d84c7e5143
Merge pull request #10649 from GregoryMorse:patch-3
...
* Fix for QT image window rectangle
* Update window_QT.h
* Update window_QT.cpp
* trailing whitespace
* highgui: fix QT getWindowImageRect()
2018-01-21 09:26:48 +03:00
ec353dbdda
Merge pull request #10412 from GregoryMorse:patch-2
...
Update to add window position and size retrieval to HighGUI (#10412 )
* Update highgui.hpp
Add read only property retrieval for enhanced rendering capabilities and more sophisticated research tools
* Update window.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_QT.h
* Update window_gtk.cpp
* Update precomp.hpp
* Update highgui_c.h
* Update highgui_c.h
* Update window_w32.cpp
* Update precomp.hpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_gtk.cpp
* Update window_gtk.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_carbon.cpp
* Update window_cocoa.mm
* Update precomp.hpp
* Update window_cocoa.mm
* Update window_w32.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_cocoa.mm
* Update window_carbon.cpp
* Update window_w32.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_cocoa.mm
* Update window.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update highgui_c.h
* Update highgui.hpp
* Update window.cpp
* Update highgui_c.h
* Update test_gui.cpp
* Update highgui.hpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
2018-01-18 07:49:47 +03:00
9e6ef99422
Merge pull request #9850 from klchang:master
2017-10-27 11:22:28 +00:00
3fd03964a3
fix code style
2017-10-18 13:08:01 +03:00
d4ef5bc16a
fix the possible bug for key mapping in Linux GTK library
2017-10-13 20:05:55 +08:00
334241d82e
Merge pull request #9546 from sturkmen72:GrammaTech
2017-09-04 09:51:22 +00:00
7b4f323b8b
Merge pull request #9498 from saskatchewancatch:i9403
2017-09-03 09:15:15 +00:00
ee6aacee9c
Update window_gtk.cpp
...
Update miniflann.cpp
Update test_stereomatching.cpp
2017-09-03 04:06:45 +03:00
cc17400849
i9403: Removing checks from trackbar min/max set functions.
...
Removing unnecessary range checks for QT backend support's setTrackbarMin and setTrackbarMax fucntions
Fixes
2017-08-31 17:52:29 -06:00
cae467cda0
Merge pull request #9521 from saskatchewancatch:i9489
2017-08-31 09:19:28 +00:00
33ba7867f6
Don't truncate label for tracknbar name (Qt)
...
Setting truncate option for QString leftJustified method to false fixes 10 character truncation issue noted in issue 9489
2017-08-31 00:40:51 -06:00
183081ccd3
Changes window position only if BOTH top corners are outside ALL monitors.
2017-08-27 13:47:20 +03:00
8a094a5f54
Merge pull request #9445 from adishavit:master
...
* Adds cv::resizeWindow() overload taking a single cv::Size argument.
* Replaces copied documentaion with Doxygen @overload command.
2017-08-25 11:37:50 +00:00
7123d9c376
Added 1ms delay to let system decorate Qt windows
2017-08-23 15:48:52 +03:00
9e239c7a1e
highgui: refactor GTK backend
...
- eliminate legacy C code, used fields
- fix mutex synchronization issues
- set trackbar min/max without unnecessary truncation; allow negative values
2017-08-14 19:33:00 +00:00
602f047fe8
build: replace WIN32 => _WIN32
2017-07-25 13:30:48 +03:00
c8783f3e23
Merge pull request #9075 from TonyLianLong:master
...
Remove unnecessary Non-ASCII characters from source code (#9075 )
* Remove unnecessary Non-ASCII characters from source code
Remove unnecessary Non-ASCII characters and replace them with ASCII
characters
* Remove dashes in the @param statement
Remove dashes and place single space in the @param statement to keep
coding style
* misc: more fixes for non-ASCII symbols
* misc: fix non-ASCII symbol in CMake file
2017-07-03 16:14:17 +00:00
3f72ff215e
Fix WinRT build breaks in highgui and videoio.
2017-06-29 17:56:09 -07:00
aa75b6067c
gtk: check NULL before unref
2017-06-29 11:35:34 +08:00
324851882a
Merge pull request #9025 from mshabunin:fix-static-3
2017-06-28 20:50:21 +00:00
a769d69a9d
Fixed several issues found by static analysis
2017-06-28 18:06:18 +03:00
7567eb8433
Merge pull request #8953 from mattmyne:cocoa_window_32_64_objc_fix
2017-06-28 10:56:21 +00:00
006966e629
trace: initial support for code trace
2017-06-26 17:07:13 +03:00
Alexander Alekhin
tellowkrinkle
Alexander Alekhin
Suleyman TURKMEN
Hamdi Sahloul
Maksim Shabunin
Jan Gaura
luz.paz
Gregory Morse
Vadim Pisarevsky
klchang
saskatchewancatch
Adi Shavit
Dmitry Kurtaev
Tony Lian
Neil Shipp
huangqinjin