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
Alexander Alekhin
4dc2313527
Merge pull request #5552 from hyunkim9123:camshift-2.4
2015-10-21 06:13:38 +00: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
938d42a89f
Merge pull request #5545 from alalek:fix_linker_libs
2015-10-19 15:29:02 +00: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
Alexander Alekhin
937a096bf1
export simple libs from OPENCV_LINKER_LIBS ( fix #5541 )
2015-10-19 13:49:41 +03: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
paul.kim
78a566611d
Fix the issue in mouse click event
2015-10-17 10:42:48 +09:00
Suleyman TURKMEN
73240b736b
Update camera_calibration_and_3d_reconstruction.rst
2015-10-16 22:30:00 +03:00
grundman
f260b13a6f
Fix racy modification of ForThread::m_state during invocation of stop()
2015-10-16 11:19:27 -07:00
Jan S. (Milania1)
3e0b1f2845
Added example to the documentation for the NormTypes enum (L1, L2, INF)
2015-10-15 19:16:07 +02:00
Alexander Smorkalov
bf41e791ff
Merge pull request #5514 from asmorkalov:as/nonfree-independent-samples
2015-10-15 10:56:23 +00:00
Alexander Smorkalov
bac151675a
Merge pull request #5501 from asmorkalov:as/samples_lintian_fixes
2015-10-15 10:52:46 +00:00
paul.kim
d5d16bb3b1
Fix the issue in mouse click event
2015-10-15 11:09:31 +09:00
Bovaz
aeb260a3f9
Merge pull request #1 from Bovaz/Bovaz-patch-1
...
sqrtf to std::sqrt
2015-10-14 19:02:41 -07:00
Bovaz
7be3d3ab2c
sqrtf to std::sqrt
2015-10-14 18:57:33 -07:00
Matteo Piovanelli
216baf5b11
Speedup of arcLength
...
By my tests, this version of cv::arcLength is almost 10% faster than the
one using a buffer it replaces.
2015-10-14 13:37:48 -07:00
Alexander Smorkalov
341e7b3be2
Fixed samples build with nonfree.
2015-10-14 16:19:37 +03:00
Alexander Alekhin
37ce3b8cfe
Merge pull request #5478 from alalek:fix_android_pack_build
2015-10-14 13:05:18 +00:00
Lorena García
33f77774c5
Hit&Miss morphological operation
2015-10-14 14:01:53 +02:00
Alexander Alekhin
98c26d95e5
Merge pull request #5511 from paleozogt:android-64-bit
2015-10-14 11:35:05 +00:00
Alexander Smorkalov
bba8c0beac
Made samples build independent from nonfree module.
2015-10-14 12:56:58 +03: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
Alexander Alekhin
bd34f6dd98
Merge pull request #5505 from a-andre:highguiheader
2015-10-14 09:11:21 +00:00
