Commit Graph

17084 Commits

Author SHA1 Message Date
Maksim Shabunin 6e2a68fdf3 Merge pull request #5384 from mshabunin:run-py-changes 2015-10-30 13:45:59 +00:00
Maksim Shabunin 90c74e3be0 ts: refactor run.py script 2015-10-29 11:28:12 +03:00
Alexander Alekhin dfec99691b Merge pull request #5370 from berak:fix_svm_autoTrain 2015-10-26 10:47:29 +00:00
Alexander Alekhin 8c2d712fb0 Merge pull request #5538 from micalan:JpegExif 2015-10-25 15:18:08 +00:00
Alexander Alekhin c3eb1254cf Merge pull request #5570 from paroj:qsliderfix 2015-10-24 14:38:38 +00:00
Alexander Alekhin 89697310b0 Merge pull request #5553 from pletessier:aspect-ratio 2015-10-24 14:38:02 +00:00
Pierre Letessier e6615c5825 Changed CV_FFMPEG_CAP_PROP_SAR_* values 2015-10-24 11:22:18 +02:00
Pavel Rojtberg cfd498a8eb fix compilation with qt
QSlider does not have getMinimum/Maximum getters. Probably was not
compile tested.
2015-10-23 21:42:11 +02:00
Pierre Letessier baa21484a1 Added CV_CAP_PROP_SAR properties to videoio module 2015-10-23 21:14:22 +02:00
micalan 0a306f8804 Camera orientation handling is added for jpeg files 2015-10-23 21:19:35 +03:00
Alexander Alekhin 9a0beda037 Merge pull request #5489 from paroj:v4l2noconvert 2015-10-23 16:35:36 +00:00
Alexander Alekhin 09e6c82190 Merge pull request #5474 from paroj:v4l2ctrls 2015-10-23 16:28:26 +00:00
Maksim Shabunin e9ec52368f Merge pull request #5562 from rodrigob:patch-2 2015-10-23 10:58:10 +00:00
Rodrigo Benenson 0ef7387298 mush -> must
fixed typo
2015-10-22 23:27:55 +02:00
Alexander Alekhin debe99f1a4 Merge pull request #5531 from mshabunin:fix-vs2015 2015-10-22 16:28:42 +00:00
Alexander Alekhin 031568831c Merge pull request #5513 from jet47:ctest-extended-support 2015-10-22 12:37:40 +00:00
Maksim Shabunin 4e7a14355d Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo 2015-10-22 12:27:45 +00:00
Maksim Shabunin 490b327be9 Merge pull request #5365 from sturkmen72:patch-2 2015-10-22 12:25:48 +00:00
Maksim Shabunin ff35726fc3 Merge pull request #5432 from sturkmen72:patch-11 2015-10-22 12:24:47 +00:00
Maksim Shabunin 31e0d90da6 Enable temp objects destruction test for VS versions less than 2015 2015-10-22 12:44:03 +03:00
Vadim Pisarevsky b34f0d99bb Merge pull request #5539 from sturkmen72:patch-14 2015-10-21 11:54:52 +00:00
Vadim Pisarevsky 66f2000548 Merge pull request #5532 from grundman:patch-2 2015-10-21 11:54:30 +00:00
Vadim Pisarevsky 91e9e6489b Merge pull request #5542 from renatoGarcia:matx_constructors 2015-10-21 11:46:27 +00:00
Vadim Pisarevsky f820df2ea0 Merge pull request #5543 from aman11dhanpat:master 2015-10-21 11:44:35 +00:00
Vadim Pisarevsky a91dcb015d Merge pull request #5548 from berak:patch-2 2015-10-21 11:41:25 +00:00
berak 781931a671 update python features2d tutorials 2015-10-21 08:22:22 +02:00
Suleyman TURKMEN fd4761ba31 Update face detection samples 2015-10-20 19:09:21 +03:00
Maksim Shabunin 3119f0a61b Merge pull request #5519 from hyunkim9123:camshift_py 2015-10-20 14:43:33 +00:00
Maksim Shabunin 6e9d0d9a0c Visual Studio 2015 warning and test fixes 2015-10-20 12:48:37 +03:00
Alexander Alekhin 1648e9292c Merge pull request #5431 from MiguelAlgaba:em_one_cluster 2015-10-19 15:27:35 +00: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
Renato Florentino Garcia f5b98bea41 Fix behavior of Matx 12 and 16 args constructors.
The 12 and 16 arguments Matx constructors differs from all others,
leaving values initialized and requiring the argument number to be equal
to the channels number.
2015-10-18 23:16:21 -02:00
Suleyman TURKMEN 51e687f7a9 Update imgproc.hpp 2015-10-18 15:53:15 +03:00
Pavel Rojtberg eac5cab5cb cap_v4l: implement PROP_CONVERT_RGB
allows disabling automatic conversion to RGB for certain formats. If
conversion is disabled the returned image just points to the underlying
buffer, so no memcpy is performed.

Note that we do not check image size in retrieve frame any more as it
can not possibly while the device is streaming.
Furthermore this code was disabled altogether by the wrong ifdef in the
previous commit.
2015-10-18 14:14:20 +02:00
Pavel Rojtberg 5e62e71b13 fix wrong ifdef bracketing
in the case of HAVE_CAMV4L2 && !HAVE_CAMV4L there was no body for the if
statement.
2015-10-18 14:13:44 +02:00
Pavel Rojtberg 54e7f08760 add python sample to test/ showcase new cap_v4l2 features 2015-10-18 14:13:44 +02:00
Pavel Rojtberg 838947bb8e replace custom yuyv_to_rgb24 implementation by cvtColor 2015-10-18 13:51:20 +02:00
Pavel Rojtberg 80747088e3 avoid needless copies during mjpeg decoding 2015-10-18 13:51:20 +02:00
Pavel Rojtberg 56dd7eda0d remove additional V4L2 pixelformat defines
they are upstream since at least linux 2.6.8 (10 Years)
http://lxr.oss.org.cn/ident?v=2.6.8&i=V4L2_PIX_FMT_SBGGR8
2015-10-18 13:51:20 +02:00
Pavel Rojtberg 588eba3b37 simplify autosetup_capture_mode_v4l2 by using a for loop 2015-10-18 13:51:20 +02:00
Pavel Rojtberg 5525cc4d09 implement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT
do not use a custom enum instead of the V4L2 fourcc defines for palette.
This way we can easily implement CAP_PROP_FOURCC and CAP_PROP_MODE.
2015-10-18 13:51:20 +02:00
Pavel Rojtberg c0fe522c9d allow changing FPS and Image Size using V4L2
use logic similar to cap_libv4l: replace icvSetVideoSize by v4l2_reset
as it was not used for V4L1, the actual frame format is negotiated in
try_palette_v4l2 and the stream has to restarted anyway.
2015-10-18 13:51:16 +02:00
Pavel Rojtberg 18034a5138 allow icvGetPropertyCAM_V4L to return zero
now icvGetPropertyCAM_V4L behaves the same as in cap_libv4l. This also
fixes passing boolean values.
2015-10-18 13:48:15 +02:00
Pavel Rojtberg f7981a8ae8 support setting focus and autofocus with V4L2
also refactor property range handling and opencv property to V4L2
translation.
2015-10-18 12:56:09 +02:00
grundman f260b13a6f Fix racy modification of ForThread::m_state during invocation of stop() 2015-10-16 11:19:27 -07:00
paul.kim d5d16bb3b1 Fix the issue in mouse click event 2015-10-15 11:09:31 +09:00
Alexander Alekhin 37ce3b8cfe Merge pull request #5478 from alalek:fix_android_pack_build 2015-10-14 13:05:18 +00:00
Alexander Alekhin 885ce6b348 Merge pull request #5507 from rodrigob:patch-1 2015-10-14 09:14:43 +00:00
Alexander Alekhin dcca0b499c Merge pull request #5509 from spmallick:master 2015-10-14 09:14:10 +00:00