f28496c628
Added sample links in documentation for python2, ocl and gpu
2013-08-02 14:05:08 +02:00
d138f77143
Merge pull request #1019 from jet47:opengl-documentation
2013-07-31 15:10:27 +04:00
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
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
2b8d868560
Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix
2013-07-30 17:50:50 +04:00
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
be040ff513
revert patch from PR 1074, since it break capturing on MacOSX
2013-07-16 15:02:33 +04:00
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
06742247be
Removed unused PACKAGE_* macros.
2013-07-11 14:30:46 +04:00
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
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
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
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
f77d1f57ee
V4L and V4L2 based Video capture bug fix (Bugfix #3144 ).
2013-07-09 16:07:55 +04:00
aa2ca3aa8f
Improve FPS on black and white Ximea cameras
2013-07-09 00:33:39 +04:00
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
4b51b1e3a8
Merge pull request #1059 from dominikrose:dc1394_2-1394b
2013-06-28 14:47:45 +04:00
1707b1769f
Merge pull request #1063 from alekcac:conversion
2013-06-28 14:41:35 +04:00
7b06592dea
added conversions between UIImage and cv::Mat
2013-06-28 13:26:54 +04:00
cbed07bc18
Removed references to YG from samples
2013-06-28 12:21:52 +04:00
d39aeeca0f
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
2013-06-27 19:43:05 +02:00
e32700cf8f
dc1394-2: support for operation mode 1394b added
2013-06-27 15:05:32 +02:00
d76468c223
Merge pull request #1040 from asmorkalov:winrt
2013-06-27 16:59:25 +04:00
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
347c86d9b5
Windows RT related code cleanup.
...
Windows RT sample cleanup.
Video I/O code cleanup.
2013-06-26 05:44:10 -07:00
34c6598752
Perf test failure fixes for Media Foundation.
2013-06-25 03:35:57 -07:00
2bc1d3709c
GetProperty method for MSMF VideoCapture implemented.
2013-06-25 03:35:56 -07:00
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
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
0c9d776083
Media Foundation-based code refactoring.
...
I* + SafeRelease -> ComPtr.
2013-06-24 02:45:26 -07:00
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
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
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
ccb8292e8e
Media Foundation-based VideoWriter added
2013-06-24 02:45:22 -07:00
033e3092a3
Media Foundation based VideoCapture improved
...
Code formating fixed;
GrabFrame method implemented correclty.
2013-06-24 02:45:21 -07:00
af2fc1a22a
added documentation for OpenGL interoperability
2013-06-20 16:11:10 +04:00
37d19b9c46
Pass the HAVE_QT* flags through the config header, like all others.
...
I don't know why it didn't work for the original author, but it definitely
works now.
2013-06-19 17:44:12 +04:00
1d9660c6d2
Merge pull request #954 from LeszekSwirski:24_fix-qtwindow
2013-06-19 17:01:57 +04:00
5b39c02c39
Merge pull request #1007 from alekcac:i_camera
2013-06-18 15:54:01 +04:00
24fd2cc326
updated licenses
2013-06-18 07:02:09 +04:00
5db08961ce
fixed Kirill's comments
2013-06-18 06:59:52 +04:00
0124902f42
Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows
2013-06-14 15:46:25 +04:00
0cee15eb7f
Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure.
2013-06-14 15:10:25 +04:00
8eb6decb25
Fixed Ximea cameras support
2013-06-11 21:17:31 +04:00
3af21cad4c
Merge pull request #903 from aks2:2.4
2013-06-11 17:35:39 +04:00
956d8027ef
Bug #3044 cap_dshow.cpp forgotten validity check fixed.
2013-06-10 13:29:45 -07:00
7d0f6b4d68
Fix image saving from QT toolbar
2013-06-06 11:15:00 +01:00
9a1cc06ebe
Fix pixel value rendering for non-fixed-size QT windows
2013-06-06 11:14:52 +01:00
8714cbac91
Fix a missing header path when building with Qt 4.
...
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
2013-06-06 14:09:33 +04:00
c8abaea368
(tab to space) 2x
2013-05-20 12:06:25 +02:00
StevenPuttemans