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
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
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
dcca0b499c
Merge pull request #5509 from spmallick:master
2015-10-14 09:14:10 +00:00
Alexander Alekhin
d8c352d20d
Merge pull request #5504 from aman11dhanpat:master
2015-10-14 09:10:30 +00:00
Alexander Alekhin
c1545c6f2a
Merge pull request #5502 from AlexanderStohr:file-handle-volatile-fix
2015-10-14 09:09:30 +00:00
edgarriba
1e9bd59f07
load multi/hyperspectral images with using gdal
2015-10-14 09:16:04 +02:00
spmallick
066c775321
Update window_QT.h
...
QPushButton was included twice.
2015-10-13 15:51:43 -07:00
Vladislav Vinogradov
02c48ab7d6
add CTest support to build tree
2015-10-13 17:34:08 +03:00
Vladislav Vinogradov
d81d51d155
assing labels to targets and sources
2015-10-13 17:33:26 +03:00
Alexander Alekhin
466a98f7c3
Merge pull request #5493 from lupustr3:pvlasov/ipp9_fixes
2015-10-13 14:24:09 +00:00
AlexanderStohr
0098c4b571
fix VS2010 error with type mismatch due to volatile qualifier
2015-10-13 16:15:49 +02:00
Alexander Stohr
7e3d7677ae
not only print file-not-found as a warning but also print the name of the problematic file and the uri used for the open attempt
2015-10-13 16:15:48 +02:00
StevenPuttemans
0a708e4070
adding extra explanation for mask parameter
2015-10-13 15:19:50 +02:00
Pavel Vlasov
40b2dfae09
Fix for filter2D and IPP < 900
2015-10-13 14:10:32 +03:00
Aman Verma
411be4fde8
Fix for #5481 , removing repeated/useless assignment in contours.cpp
2015-10-12 16:16:27 +00:00
Alexander Alekhin
ddd91bcebf
android: add targetSdkVersion="21"
2015-10-12 18:12:34 +03:00
Pavel Vlasov
89eee6ca99
Fixes for IPP integration:
...
dotProd_16s - disabled for IPP 9.0.0;
filter2D - fixed kernel preparation;
morphology - conditions fix and disabled FilterMin and FilterMax for IPP 9.0.0;
GaussianBlur - disabled for CV_8UC1 due to buffer overflow;
integral - disabled for IPP 9.0.0;
IppAutoBuffer class was added;
2015-10-12 10:51:28 +03:00
Amro
13a0a37e63
fix randMVNormal in ML ( #5469 )
...
Fix the failed assertion by replacing the GEMM call.
Also random numbers are generated from normal distribution ~N(0,1),
instead of uniform distribution ~U(0,1).
2015-10-11 01:54:11 +03:00
Nickolay Polyarniy
846e6f731a
stereoRectifyUncalibrated: assertion of input points shape fixed
...
Fix for https://github.com/Itseez/opencv/issues/4426
Documentation says that input points format is the same to input for findFundamentalMat
2015-10-10 14:00:31 +03:00
Alexander Alekhin
dbcc55a196
cleanup <build>/src|gen folders to remove stalled/unused Java files
2015-10-09 17:28:50 +03:00
Alexander Alekhin
441eeef319
Merge pull request #5470 from apavlenko:android_camera_gl_view
2015-10-08 13:31:51 +00:00
Andrey Pavlenko
23fea91e84
minor fixes
2015-10-08 12:37:59 +03:00
Alexander Alekhin
484c68cbb8
Merge pull request #5460 from sergiud:highgui-autosize-gtk3
2015-10-07 14:47:16 +00:00
Alexander Alekhin
56e8827ce0
Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size
2015-10-07 14:42:29 +00:00
Andrey Pavlenko
15db8243ef
refactored; added Camera2, notify callbacks, front/back maxCamera sizes; disable new stuff if target API < 21
2015-10-07 15:01:32 +03:00
Alexander Alekhin
706b8a6266
Merge pull request #5459 from aman11dhanpat:master
2015-10-06 17:12:03 +00:00
Alexander Alekhin
559b538be8
Merge pull request #5458 from berak:fix_putText
2015-10-06 17:11:47 +00:00
berak
f2decec3e8
fix zero length std::string in putText()
2015-10-06 17:07:40 +02:00
Sergiu Dotenco
514b202d7b
highgui: CV_WINDOW_AUTOSIZE does not resize with GTK3
2015-10-06 17:01:28 +02:00
Aman Verma
dff7037156
Adding fix for issue 5451 "putText fails with empty std::string"
2015-10-06 14:23:27 +00:00
Sergiu Dotenco
9da4fe4b02
videoio: fixed segmentation fault at frame size change
2015-10-06 15:09:31 +02:00
Alexander Alekhin
6025738b8b
Merge pull request #5454 from alalek:fix_ffmpeg_priv_data
2015-10-06 10:01:59 +00:00
Alexander Alekhin
7a4b2e18a7
Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation
2015-10-06 10:01:39 +00:00
Alexander Alekhin
4760d32937
ffmpeg: fix invalid NULL pointer access
...
Catched on Ubuntu 12.04 with FFMPEG:
codec: YES (ver 53.35.0)
format: YES (ver 53.21.1)
util: YES (ver 51.22.3)
swscale: YES (ver 2.1.0)
resample: NO
gentoo-style: YES
2015-10-05 19:28:35 +03:00
Alexander Alekhin
33f5ac5c15
Merge pull request #5429 from PhilLab:patch-6
2015-10-05 12:50:17 +00:00
Alexander Alekhin
59a41c1c51
Merge pull request #5453 from paroj:capgstleak
2015-10-05 12:47:11 +00:00
Pavel Rojtberg
345cd1242f
do not leak GstMapInfo
...
it is new'ed but never deleted. However it does not need to be global or
heap allocated in the first place.
2015-10-05 12:28:47 +02:00
Alexander Alekhin
50a0a167f0
fix ffmpeg frame creation ( fix #5439 )
2015-10-02 18:27:18 +03:00
Alexander Alekhin
76afd9a1b5
Merge pull request #5436 from jet47:fix-cuda-normalize
2015-10-02 12:50:38 +00:00
Alexander Alekhin
b37387ef90
Merge pull request #5425 from lupustr3:pvlasov/ipp_initialization_changes
2015-10-02 12:49:37 +00:00