mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-17 19:08:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,392 Commits 6 Branches 127 Tags 3 GiB
2f0fc920dd
Commit Graph

69 Commits

Author SHA1 Message Date
Alexander Alekhin
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
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
Adi Shavit
183081ccd3 Changes window position only if BOTH top corners are outside ALL monitors. 2017-08-27 13:47:20 +03:00
Alexander Alekhin
602f047fe8 build: replace WIN32 => _WIN32 2017-07-25 13:30:48 +03: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
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
Suleyman TURKMEN
dff9d2288b Update window_w32.cpp 2015-09-21 00:34:15 +03: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
Suleyman TURKMEN
7522527827 Update window_w32.cpp 2015-07-20 16:35:00 +03:00
Ashod Nakashian
7cd198623e Prevent the parent from drawing over OpenGL context. 2015-05-09 12:23:09 -04:00
StevenPuttemans
cef2cf2852 fixing locale settings - making it universal 2015-03-06 13:13:53 +01:00
Artur Wieczorek
1264be8785 Check if _WIN32_IE is defined with proper value in window_w32.cpp 
TBBUTTONINFO struct and BTNS_xxx symbols used in the code need _WIN32_IE to be defined with at least 0x0500 value (_WIN32_IE_IE50) in order to be included from commctrl.h.
 2015-01-14 14:52:32 +01:00
Vadim Pisarevsky
d54b069ae1 Merge pull request #3448 from Ashod:highgui_trackbar_improvements 2014-12-15 18:03:01 +00:00
Ashod Nakashian
006384edaf highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows. 2014-12-06 11:55:17 -05:00
Andrey Kamaev
fac99de7ec It turns opengl gheck is not needed for win ctrl+s 2014-12-05 14:52:44 +03:00
Andrey Kamaev
3fa02787ac Make Ctrl+S open save dialog on Windows 2014-11-30 00:43:21 +03:00
Andrey Kamaev
f4ba8b13c7 Add cv::setWindowTitle to highgui 2014-11-18 16:54:03 +03:00
Adi Shavit
b449bd5150 Clarified code. 2014-07-03 22:45:11 +03:00
Adi Shavit
e25dca21d1 Fixed indentation. 2014-07-03 22:29:45 +03:00
Adi Shavit
68827072c9 [HighGUI] On Windows: Support Ctrl+C to copy image to clipboard. 2014-07-03 22:29:43 +03:00
Roman Donchenko
3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp
 2014-05-19 18:39:20 +04:00
StevenPuttemans
12207ac763 fix coordinate problem with large images - bug 1523 2014-05-19 13:07:44 +02:00
David Rolland
cb8ddb1179 Corrected bug #1437. Corrected the cast of two short values from an lParam. lParam contains two signed-short, the position can be negative when another mouse event happens with a mouse_move (mouse_click, etc.) 
The Microsoft documentation specifies NOT to use LOWORD and HIWORD macros to extract the x/y positions as it won't work correctly with multiple monitors. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms645607(v=vs.85).aspx.
 2014-04-09 18:24:21 +12:00
Anatoly Baksheev
5ea3ecdc3b horisontal mwhell support 2014-01-19 18:32:22 +04:00
Anatoly Baksheev
0fc4ac4f1f warnings and compilation with installed Windows 8.1 SDK 2014-01-19 04:07:17 +04:00
Roman Donchenko
79fcc06a4b Merge pull request #2146 from SpecLad:merge-2.4 2014-01-17 16:28:30 +04:00
Adi Shavit
24333569aa Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect() 2014-01-16 11:09:25 +02:00
Adi Shavit
e45cf2173f [HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API. 2014-01-14 21:33:32 +02:00
Adi Shavit
fecd5c994b Added support for mouse-wheel events on Windows. 
To be used in the mouse callback like this:
    if (CV_EVENT_MOUSEWHEEL == CV_GET_MOUSEWHEEL_EVENT(event))
    {
       int delta= CV_GET_WHEEL_DELTA(event);
       // use delta...
    }
 2014-01-14 21:20:05 +02:00
Adi Shavit
9dc0bfc755 Small fix for extracting mouse coordinates on Windows, in a way that will always work with multiple monitors. 
This is the way recommended by Microsoft.
 2014-01-14 21:20:04 +02:00
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
 2014-01-14 11:53:59 +04:00
Roman Donchenko
795c108f2b Fixed MinGW build by declaring the minimal required Windows version. 
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.

This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
 2013-12-30 18:13:42 +04:00
Roman Donchenko
9dfb96389c Merge commit '4b885e206' into merge-2.4 2013-12-30 16:48:45 +04:00
Andrey Pavlenko
734bf8babd removing legacy stuff 2013-12-26 15:49:12 +04:00
Andrey Pavlenko
f9aa148ba9 eliminating VS2013 build warnings 2013-12-26 13:35:59 +04:00
Roman Donchenko
4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt
 2013-10-22 14:28:00 +04:00
Vladislav Vinogradov
fa70f95272 fix imshow under Windows with OpenGL support: 
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
 2013-10-17 20:58:33 +04:00
Andrey Kamaev
3890a74565 Drop outdated definitions from internal.hpp 
This also fixes few clang build errors
 2013-04-01 15:24:35 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00
Vladislav Vinogradov
e06c3ec7c5 updated OpenGL functionality: 
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
 2013-02-19 14:13:11 +04:00
Vladislav Vinogradov
08fbf667f9 refactored opengl functionality 
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
 2012-11-30 17:35:28 +04:00
Andrey Kamaev
fd4909360f Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library. 2012-11-01 12:44:10 +04:00
Vadim Pisarevsky
63c9412922 enable huge value range in highgui sliders on Windows (patch #941) 2012-10-10 23:05:15 +04:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
f62028dc16 Fixed mingw build. 2012-06-08 03:15:08 +00:00
Andrey Kamaev
c9027fecc0 Fixed few MinGW build problems 2012-05-20 18:45:19 +00:00
Andrey Kamaev
9961658eab Fixing compile on some MinGW platforms 2012-05-19 10:44:43 +00:00
Andrey Kamaev
def87eae19 Fixed MinGW build after r8358 2012-05-17 20:19:48 +00:00
Vadim Pisarevsky
00c30681bc Added Snap-to-Screen Edge feature in the case of multiple monitors (patch by Adi Shavit) 2012-05-16 16:13:24 +00:00