kamjagin
c24c1a5926
added HAVE_QTKIT to tests
2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
2013-08-14 13:34:34 +02:00
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
2013-08-12 17:19:53 +04:00
Roman Donchenko
504ebda7c4
Merge pull request #1235 from WonderRico:bugfix_dshow
2013-08-12 14:33:30 +04:00
WonderRico
d067749c21
fix _index / index
2013-08-12 11:19:53 +02:00
StevenPuttemans
d11746e56d
Added fix mentioned in bug #3206
...
VideoWriter memory leak solved.
2013-08-12 09:49:19 +02:00
WonderRico
a048387376
fix formating
2013-08-09 16:13:40 +02:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
WonderRico
7e7fb0b75d
Bug #3201 fix
2013-08-06 18:35:49 +02:00
Andrey Pavlenko
6483754860
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
2013-08-05 10:20:25 +04:00
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
2013-08-04 22:34:36 +04:00
StevenPuttemans
f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
Andrey Pavlenko
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Andrey Pavlenko
2b8d868560
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
2013-07-30 17:50:50 +04:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Philippe FOUBERT
9c04db554f
Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS
2013-07-20 15:03:30 +02:00
Vadim Pisarevsky
be040ff513
revert patch from PR 1074, since it break capturing on MacOSX
2013-07-16 15:02:33 +04:00
Nikita Manovich
05aeb70831
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-11 15:16:22 +04:00
Roman Donchenko
06742247be
Removed unused PACKAGE_* macros.
2013-07-11 14:30:46 +04:00
Roman Donchenko
e2ef2a5781
Refactored image format library finding logic.
...
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
2013-07-11 12:40:16 +04:00
Roman Donchenko
ca8b621b4f
Refactored detecting several Apple-related technologies.
...
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.
This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
2013-07-10 19:45:56 +04:00
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
2013-07-10 18:29:11 +04:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Alexander Smorkalov
f77d1f57ee
V4L and V4L2 based Video capture bug fix (Bugfix #3144 ).
2013-07-09 16:07:55 +04:00
Andrew Senin
aa2ca3aa8f
Improve FPS on black and white Ximea cameras
2013-07-09 00:33:39 +04:00
Philippe FOUBERT
639450efdc
PvAPI support on Windows with MinGW (PR #1038 applied to the branch 2.4)
2013-07-03 00:19:22 +02:00
Frédéric Devernay
b524e275c1
allow QtKit capture in secondary threads
...
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
2013-07-02 18:08:12 +02:00
Roman Donchenko
4b51b1e3a8
Merge pull request #1059 from dominikrose:dc1394_2-1394b
2013-06-28 14:47:45 +04:00
Roman Donchenko
1707b1769f
Merge pull request #1063 from alekcac:conversion
2013-06-28 14:41:35 +04:00
Alexander Shishkov
7b06592dea
added conversions between UIImage and cv::Mat
2013-06-28 13:26:54 +04:00
Kirill Kornyakov
cbed07bc18
Removed references to YG from samples
2013-06-28 12:21:52 +04:00
Dominik Rose
d39aeeca0f
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
2013-06-27 19:43:05 +02:00
Dominik Rose
e32700cf8f
dc1394-2: support for operation mode 1394b added
2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223
Merge pull request #1040 from asmorkalov:winrt
2013-06-27 16:59:25 +04:00
Alexander Smorkalov
7c5bd78804
Test fixes
...
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
2013-06-27 15:47:37 +04:00
Alexander Smorkalov
347c86d9b5
Windows RT related code cleanup.
...
Windows RT sample cleanup.
Video I/O code cleanup.
2013-06-26 05:44:10 -07:00
Alexander Smorkalov
34c6598752
Perf test failure fixes for Media Foundation.
2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c
GetProperty method for MSMF VideoCapture implemented.
2013-06-25 03:35:56 -07:00
Alexander Smorkalov
43122939cb
Media foundation video i/o fixes.
...
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
2013-06-25 03:35:30 -07:00
Alexander Smorkalov
996f02a531
Multiple Media Foundation video i/o fixes.
...
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
2013-06-24 02:45:27 -07:00
Alexander Smorkalov
0c9d776083
Media Foundation-based code refactoring.
...
I* + SafeRelease -> ComPtr.
2013-06-24 02:45:26 -07:00
Alexander Smorkalov
e94cc0b5ee
Media Foundation camera capture fixed.
...
Camera-based VideoCapture updated to fit changes in ImageGrabber from prev
commit
2013-06-24 02:45:25 -07:00
Alexander Smorkalov
9fb762ccec
VideoCapture for video files implemented.
...
Set and Get methods are not implemented;
Camera based video capture is broken due to modifications.
2013-06-24 02:45:24 -07:00
Alexander Smorkalov
22b0cfbaa2
Media Foundation-based VideoWriter improvements.
...
FourCC parameter handlig added;
Smart pointers instead SafeRelease call;
Windows RT support (vertical mirroring).
2013-06-24 02:45:23 -07:00
Alexander Smorkalov
ccb8292e8e
Media Foundation-based VideoWriter added
2013-06-24 02:45:22 -07:00
Alexander Smorkalov
033e3092a3
Media Foundation based VideoCapture improved
...
Code formating fixed;
GrabFrame method implemented correclty.
2013-06-24 02:45:21 -07:00