a57d144076
Merge pull request #7462 from alalek:cpu_multi_target
2017-03-21 19:51:32 +00:00
9333f82be0
Reduce dependencies between modules
2017-03-15 17:58:52 +03:00
cd7f0a5177
QT: disable debug output in Release mode
2017-03-07 15:41:07 +03:00
e16227b53c
cmake: support multiple CPU targets
2017-02-13 19:52:59 +03:00
8633ef451e
cmake: cleanup unused defines
2017-02-10 15:18:29 +03:00
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
d015b55e6b
highgui: preserve waitKey -1 return value
2016-12-28 13:06:28 +03:00
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
3f37e34e76
highgui: g_thread_create deprecated warning
2016-11-26 03:01:39 +03:00
30cdcfa554
warnings
2016-11-18 14:08:53 +03:00
879315f2fe
Fix error gtk
2016-11-11 10:55:38 +05:30
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
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
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
8cc09f1784
highgui: allow wrapping cv::addText
...
also correctly forward spacing parameter in fontQt
2016-10-14 12:06:49 +02:00
1c18b1d245
Merge pull request #7370 from souch55:Fixxn
2016-10-01 10:44:56 +00:00
a34fbf7bb1
Fixed identifiers warns
2016-09-30 15:16:29 +05:30
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
4e8f8922e2
Merge pull request #7170 from alalek:fix_build
2016-08-29 10:15:58 +00:00
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
063ac74369
fix modules deps
2016-08-25 14:57:12 +03:00
fd1da009a8
Merge pull request #7129 from paroj:mousecallback-dry-code
2016-08-18 14:12:46 +00:00
46bfdbaf82
highgui: window_QT mousecallback code refactored using DRY
2016-08-18 11:54:33 +02:00
e4cf3297c7
highgui: allow specifying that a button should create a new buttonbar
2016-08-17 14:34:33 +02:00
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
d394d26b46
highgui: window QT+OpenGL mouse wheel support, build fix
2016-07-23 18:06:46 +03:00
ecfabd7aac
Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse-wheel-support
2016-07-21 18:16:41 +03:00
13aef2c0cf
highgui: window_QT mouse wheel support
2016-07-21 18:13:42 +03:00
82e4e1816f
highgui: removed excessed variable orient in window_gtk
2016-07-21 17:51:19 +03:00
b34272f8a2
Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
2016-07-19 19:06:03 +00:00
474868a892
Merge pull request #6884 from alalek:migration
2016-07-18 07:49:38 +00:00
3bf16da92d
added condition for Qt5
2016-07-15 14:01:36 +03:00
ddc0b42bc3
migration: github.com/opencv/opencv
2016-07-12 12:51:12 +03:00
179998a8a2
highgui module: window_QT mouse wheel reuse variable delta instead call evnt->delta()
2016-07-05 12:02:16 +03:00
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
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
7dcac647e5
highgui module: a bit readable onMouse flags mapping
2016-07-03 13:31:25 +03:00
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
a4e9712006
Compilate switch-case with GTK_SCROLL_SMOOTH since GTK>=3.4
2016-06-27 13:34:41 +03:00
fd78e2cc6c
highgui module: removed unused type_mouse_event mouse_wheel
2016-06-25 00:47:22 +03:00
6020dacc11
highgui module: implemented QT and GTK mouse wheel callback support in linux
2016-06-25 00:18:07 +03:00
e59da10bf1
Update highgui.hpp
2016-05-28 05:25:25 +03:00
67a734ce73
Merge branch '2.4' into master
...
Commits:
67fe57adb0ae2c97ac59ceb40afa421fcf9912592dbb1c2d7
2016-04-21 20:15:08 +03:00
db0ae2ca50
Restore 2.4 source branch for bug fix 6317.
2016-04-19 19:27:42 +08:00
194f1beae8
fix for writing 16-bit jpeg2000
2016-04-18 14:51:55 +03:00
6f139b4f8e
ffmpeg: interrupt callback fix
...
backport from master
2016-04-05 14:19:44 +03:00
97ac59cb73
Fix a memory leak indirectly caused by cvDestroyWindow
2016-03-29 14:06:05 +03:00
0ac31a0bd7
highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings
2016-03-24 23:58:47 +01:00
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
421fcf9e35
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
2016-03-16 16:28:59 +03:00
Vadim Pisarevsky