Gregory Morse
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
Vadim Pisarevsky
9e6ef99422
Merge pull request #9850 from klchang:master
2017-10-27 11:22:28 +00:00
Alexander Alekhin
3fd03964a3
fix code style
2017-10-18 13:08:01 +03:00
klchang
d4ef5bc16a
fix the possible bug for key mapping in Linux GTK library
2017-10-13 20:05:55 +08:00
Maksim Shabunin
334241d82e
Merge pull request #9546 from sturkmen72:GrammaTech
2017-09-04 09:51:22 +00:00
Alexander Alekhin
7b4f323b8b
Merge pull request #9498 from saskatchewancatch:i9403
2017-09-03 09:15:15 +00:00
Suleyman TURKMEN
ee6aacee9c
Update window_gtk.cpp
...
Update miniflann.cpp
Update test_stereomatching.cpp
2017-09-03 04:06:45 +03:00
saskatchewancatch
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
Alexander Alekhin
cae467cda0
Merge pull request #9521 from saskatchewancatch:i9489
2017-08-31 09:19:28 +00:00
saskatchewancatch
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
Adi Shavit
183081ccd3
Changes window position only if BOTH top corners are outside ALL monitors.
2017-08-27 13:47:20 +03:00
Adi Shavit
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
Dmitry Kurtaev
7123d9c376
Added 1ms delay to let system decorate Qt windows
2017-08-23 15:48:52 +03:00
Alexander Alekhin
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
Alexander Alekhin
602f047fe8
build: replace WIN32 => _WIN32
2017-07-25 13:30:48 +03:00
Tony Lian
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
Neil Shipp
3f72ff215e
Fix WinRT build breaks in highgui and videoio.
2017-06-29 17:56:09 -07:00
huangqinjin
aa75b6067c
gtk: check NULL before unref
2017-06-29 11:35:34 +08:00
Alexander Alekhin
324851882a
Merge pull request #9025 from mshabunin:fix-static-3
2017-06-28 20:50:21 +00:00
Maksim Shabunin
a769d69a9d
Fixed several issues found by static analysis
2017-06-28 18:06:18 +03:00
Vadim Pisarevsky
7567eb8433
Merge pull request #8953 from mattmyne:cocoa_window_32_64_objc_fix
2017-06-28 10:56:21 +00:00
Alexander Alekhin
006966e629
trace: initial support for code trace
2017-06-26 17:07:13 +03:00
Matt Bennett
05acf40aff
remove ARC and auto synthesize assumptions in cocoa_window.mm
2017-06-21 12:00:26 +01:00
Vadim Pisarevsky
11af7b7e55
Merge pull request #8307 from AhiyaHiya:dev_xcode_macos_universal_binary
2017-05-25 15:54:13 +00:00
Vladislav Sovrasov
ad7cf58450
highgui: add ROI selector
2017-04-21 13:29:35 +03:00
Maksim Shabunin
9333f82be0
Reduce dependencies between modules
2017-03-15 17:58:52 +03:00
Vladislav Sovrasov
cd7f0a5177
QT: disable debug output in Release mode
2017-03-07 15:41:07 +03:00
Jaime O. Rios
5d03262b00
Added message about 32-bit Obj-C to all @synthesize sections.
2017-03-03 13:34:29 -05:00
Jaime O. Rios
10651d491f
Added message about synthesize keyword.
2017-03-03 09:43:44 -05:00
Jaime O. Rios
2d20aa4ed0
Modified code to work with universal build.
2017-03-02 16:00:29 -05:00
Tony Theodore
678e114e5f
highgui: use forward slash for gl.h include
...
The backslash causes build failure when cross-compiling with mingw-w64
2017-02-06 04:15:10 +11:00
Alexander Alekhin
d015b55e6b
highgui: preserve waitKey -1 return value
2016-12-28 13:06:28 +03:00
Alexander Alekhin
4e7b521438
highgui: change waitKey() default behaviour
...
The old behaviour is available via waitKeyEx() call or
via setting of OPENCV_LEGACY_WAITKEY environment variable
2016-12-15 14:17:38 +03:00
Alexander Alekhin
3f37e34e76
highgui: g_thread_create deprecated warning
2016-11-26 03:01:39 +03:00
Alexander Alekhin
30cdcfa554
warnings
2016-11-18 14:08:53 +03:00
sourin
879315f2fe
Fix error gtk
2016-11-11 10:55:38 +05:30
Rok Mandeljc
baf613bc5c
highgui: window_QT: added missing virtual method specifier
...
Fixes #7603 , which was caused by OCVViewPort::icvmouseProcessing
not being declared as virtual, and hence was not overriden by
DefaultViewPort::icvmouseProcessing (which does the inverse
coordinate mapping).
2016-11-02 13:11:51 +01:00
Pavel Rojtberg
358ec04413
highgui: add property WND_PROP_VISIBLE
...
checks whether the window exists and is visible. On QT closing a window
merley hides it, so the common hack for checking whether a window exists
exists = cv2.getWindowProperty(.., 0) >= 0
does not work.
2016-10-28 11:35:02 +02:00
Pavel Rojtberg
a37a6bd783
fix BGR <> RGB swap
...
we are drawing on a BGR image declared as RGB, so we should not swap
components here either.
2016-10-14 12:06:50 +02:00
Pavel Rojtberg
8cc09f1784
highgui: allow wrapping cv::addText
...
also correctly forward spacing parameter in fontQt
2016-10-14 12:06:49 +02:00
Valeriy Van
acb62692e4
Cleans up declarations in window_cocoa.mm removing unnecessary iVars declarations and changing retain property attribute to strong
2016-08-29 21:55:59 +03:00
Alexander Alekhin
4e8f8922e2
Merge pull request #7170 from alalek:fix_build
2016-08-29 10:15:58 +00:00
Alexander Alekhin
5383a625a7
fix Win build, change default WINNT macro to WinXP
...
Returning to Win2k value is possible via this CMake option:
cmake -DOPENCV_EXTRA_FLAGS="/D_WIN32_WINNT=0x0500" ...
2016-08-25 16:21:52 +03:00
Alexander Alekhin
063ac74369
fix modules deps
2016-08-25 14:57:12 +03:00
Alexander Alekhin
fd1da009a8
Merge pull request #7129 from paroj:mousecallback-dry-code
2016-08-18 14:12:46 +00:00
Alexandr Kondratev
46bfdbaf82
highgui: window_QT mousecallback code refactored using DRY
2016-08-18 11:54:33 +02:00
Pavel Rojtberg
e4cf3297c7
highgui: allow specifying that a button should create a new buttonbar
2016-08-17 14:34:33 +02:00
Christian Kapeller
81e6ef2958
highgui: window QT+OpenGL mouse wheel support, another build fix
...
amends work done in pull request #6976 .
2016-07-27 16:14:57 +02:00
Alexandr Kondratev
d394d26b46
highgui: window QT+OpenGL mouse wheel support, build fix
2016-07-23 18:06:46 +03:00
Alexandr Kondratev
ecfabd7aac
Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse-wheel-support
2016-07-21 18:16:41 +03:00
Alexandr Kondratev
13aef2c0cf
highgui: window_QT mouse wheel support
2016-07-21 18:13:42 +03:00
Alexandr Kondratev
82e4e1816f
highgui: removed excessed variable orient in window_gtk
2016-07-21 17:51:19 +03:00
Vadim Pisarevsky
b34272f8a2
Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
2016-07-19 19:06:03 +00:00
Ilya Lavrenov
3bf16da92d
added condition for Qt5
2016-07-15 14:01:36 +03:00
Alexandr Kondratev
179998a8a2
highgui module: window_QT mouse wheel reuse variable delta instead call evnt->delta()
2016-07-05 12:02:16 +03:00
Alexandr Kondratev
4e63bd04e5
highgui module: mouse wheel - modification keys fixed, wheel event value is CV_EVENT_MOUSEWHEEL or CV_EVENT_MOUSEHWHEEL
2016-07-04 15:02:05 +03:00
Alexandr Kondratev
1f2e159054
highgui module: using event->scroll.delta_{x,y} instead parsing direction and added widget event mask GDK_SMOOTH_SCROLL_MASK for GTK>=3.4
2016-07-03 15:52:59 +03:00
Alexandr Kondratev
7dcac647e5
highgui module: a bit readable onMouse flags mapping
2016-07-03 13:31:25 +03:00
Alexandr Kondratev
81c69ecd16
highgui: window_gtk.cpp directive boolean operations or/and replaced by ||/&& to keep compatible with older systems
2016-06-29 23:01:57 +03:00
Alexandr Kondratev
a4e9712006
Compilate switch-case with GTK_SCROLL_SMOOTH since GTK>=3.4
2016-06-27 13:34:41 +03:00
Alexandr Kondratev
fd78e2cc6c
highgui module: removed unused type_mouse_event mouse_wheel
2016-06-25 00:47:22 +03:00
Alexandr Kondratev
6020dacc11
highgui module: implemented QT and GTK mouse wheel callback support in linux
2016-06-25 00:18:07 +03:00
Alexander Alekhin
67a734ce73
Merge branch '2.4' into master
...
Commits:
67fe57adb0ae2c97ac59ceb40afa421fcf9912592dbb1c2d7
2016-04-21 20:15:08 +03:00
Kevin, Hu
db0ae2ca50
Restore 2.4 source branch for bug fix 6317.
2016-04-19 19:27:42 +08:00
Suleyman TURKMEN
194f1beae8
fix for writing 16-bit jpeg2000
2016-04-18 14:51:55 +03:00
Alexander Alekhin
6f139b4f8e
ffmpeg: interrupt callback fix
...
backport from master
2016-04-05 14:19:44 +03:00
Roman Donchenko
97ac59cb73
Fix a memory leak indirectly caused by cvDestroyWindow
2016-03-29 14:06:05 +03:00
Roman Donchenko
eb40afa26a
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
...
I delete the LIBAVFORMAT_BUILD < 5231 branch, because I couldn't even find FFmpeg with
such a small build number, let alone test with it.
2016-03-16 20:04:33 +03:00
Roman Donchenko
421fcf9e35
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
2016-03-16 16:28:59 +03:00
Roman Donchenko
9a5d7f1a0b
Backport PR #3813 to 2.4
...
It has already been partially backported by #6199 ; this commit completes
the backport.
2016-03-16 12:34:41 +03:00
WANG Guoqin
8cfc87cf01
MacOSX / QTKit capture: trying to fix invalid timer call
2016-03-10 02:49:10 +08:00
Alexander Alekhin
a61b19b524
backport ffmpeg fixes
2016-03-02 18:42:53 +03:00
Maksim Shabunin
ee2f8d006f
Cocoa backend: added checks before accessing sliders dictionary
2016-02-25 11:51:01 +03:00
Vitaly Tuzov
389f176a67
Removed ioctl calls to query for VIDIOC_G_INPUT and VIDIOC_ENUMINPUT since information returned by the calls is never used.
...
Fixed icvCaptureFromCAM_V4L return value in case of V4L2 camera initialization failure.
2016-01-18 12:54:53 +03:00
Alexander Alekhin
0862e8e34c
fix build
2015-12-17 13:25:10 +03:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Ilya Lavrenov
9e2395e7e0
return false in grabFrame failed in open method
2015-10-27 16:56:31 +03:00
Ilya Lavrenov
05945bf00e
fixed case when grabbing failed
2015-10-27 16:26:24 +03:00
Ilya Lavrenov
9d78a1ea9f
allow to retrieve videocapture properties before first frame reading
2015-10-26 14:37:38 +03:00
Pavel Rojtberg
cfd498a8eb
fix compilation with qt
...
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
2015-10-23 21:42:11 +02:00
Aman Verma
d5e314e728
Fixing compilation errors in windows and mac
2015-10-19 10:58:43 +00:00
Aman Verma
b0209ad7f7
Fix for #5495 : add setTrackbarMin
2015-10-19 08:44:06 +00:00
spmallick
066c775321
Update window_QT.h
...
QPushButton was included twice.
2015-10-13 15:51:43 -07:00
Sergiu Dotenco
514b202d7b
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
2015-10-06 17:01:28 +02:00
Alexander Alekhin
60a689d27c
Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2
2015-09-24 14:46:23 +00:00
Vadim Pisarevsky
f838a832b2
Merge pull request #5357 from fxtentacle:ha-2.4.11
2015-09-21 14:31:13 +00:00
Suleyman TURKMEN
dff9d2288b
Update window_w32.cpp
2015-09-21 00:34:15 +03:00
Hajo Nils Krabbenhöft
7825cbeb7d
buffer_size should be in bytes, not bits
2015-09-16 22:19:51 +02:00
Hajo Nils Krabbenhöft
d38fee7599
fix crash for large BW tif images
2015-09-16 22:04:42 +02:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Vadim Pisarevsky
587b0cc7b4
Merge pull request #4200 from Astero92:#3800
2015-08-25 18:08:54 +00:00
Ilya Lavrenov
75fcedf0ed
added some property setting and getting
2015-08-16 21:25:36 +03:00
Ilya Lavrenov
c19ed39a78
repaired GStreamer 0.10 version
2015-08-16 21:01:22 +03:00
Ilya Lavrenov
dbd7912b88
repaired gstreamer camera capture:
...
1. Enabled property retrieval: height, width, FPS
2. Fixed issue when isOpened returns always true even for non-existing devices
3. Ability to work with non-0 device. Camera capture index is taken into account
2015-08-16 11:16:25 +03:00
Suleyman TURKMEN
7522527827
Update window_w32.cpp
2015-07-20 16:35:00 +03:00
Dominik Kleiser
f363670934
Bug #3800 - Resize viewport when CV_WINDOW_KEEPRATIO was set (Qt)
2015-07-17 20:02:01 +02:00
Maxim Kostin
face069874
Added support for highgui module on WinRT 8.1+
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-06-26 23:41:25 +03:00
Maxim Kostin
6724a0b8cd
Added dummy highgui WinRT implementation
2015-06-15 15:59:16 +03:00
Vincent Rabaud
50842b9036
get code to compile on Ubuntu Saucy
...
A define was forgotten for the codecs and there was a typo for
another.
(cherry picked from commit f052b0bc4d
2015-06-09 15:53:08 +03:00
Vadim Pisarevsky
3d6413cfc6
fixed compile warnings; hopefully fixed test failures
...
(cherry picked from commit 30912b49f3
2015-06-09 15:53:08 +03:00
