799622affd
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
...
(cherry picked from commit 2b2e3ee93c
2015-06-09 15:53:08 +03:00
607d3b54ce
Fixes resizeWindow() on OS X (Bug #3200 )
2015-05-23 17:36:46 +02:00
7ca0557b40
typos in comments
2015-05-23 17:36:45 +02:00
5de9d8e6e1
Merge pull request #3994 from mshabunin:fix-gtk-crash
2015-05-12 15:11:07 +00:00
7cd198623e
Prevent the parent from drawing over OpenGL context.
2015-05-09 12:23:09 -04:00
58dd70e8dc
Revert support for audio
2015-05-08 12:06:03 -04:00
53ff537f1c
temporary fixes
2015-05-08 11:33:11 -04:00
01c3d491e7
Fixed python crash when both cv2.imshow and gtk module are used
2015-05-07 16:44:45 +03:00
a5814871d9
Adding audio to opencv
2015-05-06 17:01:38 -04:00
9682430a69
Adding code to deal with audio output
2015-05-05 13:14:26 -04:00
b69ffe6376
Fixed memory leak when recording video in iOS
2015-05-04 16:21:25 -04:00
b599774e30
Fix a bug that impede to set the trackbar pos using the Qt control panel
...
Conflicts:
modules/highgui/src/window_QT.cpp
2015-04-25 18:54:53 +02:00
e6f7e96ff4
Fixing the bug #4244 that I just reported in code.opencv.org
2015-04-25 18:54:52 +02:00
b4c7c011b7
In cvAddText, construct QString from "text" using fromUtf8.
2015-04-25 18:54:51 +02:00
41b920344d
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
...
Conflicts:
modules/imgcodecs/src/grfmt_tiff.cpp
2015-04-24 22:59:08 +02:00
8c55d7be5e
Ximea camera fix (see issue #4235 )
2015-04-03 22:50:05 +03:00
a9d4e05346
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: highgui/include/opencv2/highgui/highgui_c.h
modified: highgui/src/cap_dshow.cpp
modified: java/generator/gen_java.py
The correction of the orthographic error in the enumeration constant
CAP_PROP_MONOCROME has been undone.
2015-03-25 15:45:20 +01:00
e5e6367223
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-25 13:38:49 +01:00
756c1a22d9
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-20 01:44:29 +01:00
a7bf1d53d8
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/highgui/include/opencv2/highgui/highgui_c.h
modified: modules/highgui/src/cap_dshow.cpp
modified: modules/highgui/src/cap_pvapi.cpp
modified: modules/java/generator/gen_java.py
Änderungen in der PvAPI hinzugefügt.
2015-03-20 01:42:16 +01:00
7711cd284b
Fix a bug that impede to set the trackbar pos using the Qt control panel
2015-03-19 21:25:10 +01:00
d14a1de947
Fixing the bug #4244 that I just reported in code.opencv.org
2015-03-18 20:07:08 +01:00
cef2cf2852
fixing locale settings - making it universal
2015-03-06 13:13:53 +01:00
65e4df751c
Merge pull request #3705 from SpecLad:unused-nNull
2015-02-19 18:40:22 +00:00
4e8aac5308
Merge pull request #3683 from SeninAndrew:2.4
2015-02-18 17:15:10 +00:00
d218f28070
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
2015-02-16 19:31:51 +03:00
77578d415f
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
2015-02-13 15:12:52 +03:00
b9a6edfe3d
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-09 15:15:23 +03:00
e938563de5
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
2015-02-02 15:04:29 +01:00
9a6a046caf
Merge pull request #3613 from asmorkalov:aarch64_tiff
2015-01-20 12:36:38 +00:00
72d90ba8d2
In cvAddText, construct QString from "text" using fromUtf8.
2015-01-16 14:57:11 -08:00
d277a1ba75
TIFF support hack for aarch64 reverted.
2015-01-17 01:25:58 +03:00
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
8acd4c3ff4
More accurate fix for libtiff and aarch64.
2014-12-28 12:44:24 +03:00
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
53862687d5
rename CudaMem -> HostMem to better reflect its purpose
2014-12-23 17:42:49 +03:00
d54b069ae1
Merge pull request #3448 from Ashod:highgui_trackbar_improvements
2014-12-15 18:03:01 +00:00
63c49be487
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:56:01 -05:00
006384edaf
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:55:17 -05:00
05bc48e8f4
Make Ctrl+S open save dialog on Gtk backend
2014-12-05 14:53:19 +03:00
fac99de7ec
It turns opengl gheck is not needed for win ctrl+s
2014-12-05 14:52:44 +03:00
3fa02787ac
Make Ctrl+S open save dialog on Windows
2014-11-30 00:43:21 +03:00
ba9bc2d72f
Merge pull request #3409 from fish2000:patch-1
2014-11-19 16:25:36 +00:00
f151b1d277
fix wrong property name and corresponding documentation
2014-11-19 14:00:40 +01:00
f4ba8b13c7
Add cv::setWindowTitle to highgui
2014-11-18 16:54:03 +03:00
d9164bdd4c
added extra BUFFERSIZE doc and getter
2014-11-14 14:09:43 +01:00
2b8229f716
adding extra buffer parameter
2014-11-12 13:09:53 +01:00
8340e31f1f
Fixed OS X compilation error in window_cocoa.mm
...
Un-commented `NSApplicationActivationPolicyRegular` argument (in leu of zero) and got rid of problematic dereference
2014-11-11 04:35:35 -08:00
e05a0bc6c5
Merge pull request #3322 from StevenPuttemans:fix_pvpapi_interface
2014-11-10 08:27:42 +00:00
7dce2d0b8f
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
...
series are supported. Testing this with both cams for Windows and Linux
exhaustively.
Optimizing memory footprint by removing unused calls.
Adapted with the input of Shai
Added small example that illustrates how it should work.
2014-10-28 15:33:37 +01:00
Vadim Pisarevsky
Mike Maraya
Dikay900
Ashod Nakashian
Nguyen Nguyen
Maksim Shabunin
Luis Díaz Más
Craig Reynolds
Eric Sommerlade
Andrew Senin
Prof. Dr. Rudolf Haussmann
StevenPuttemans
Alexander Alekhin
Roman Donchenko
AfterEight
Alexander Smorkalov
Artur Wieczorek
Andrey Kamaev
Vladislav Vinogradov
Alexander Bohn / FI$H2k