Peter Rekdal Sunde
278747ba45
Add support for ffmpeg 3.0.
2016-03-22 22:52:35 +01:00
Alexander Smorkalov
ef2a376baf
Merge pull request #6297 from terfendail:vt/pytestarm
2016-03-21 15:01:04 +00:00
Maksim Shabunin
dc8bb23a7d
Merge pull request #6287 from StevenPuttemans:add_num_features_info_2.4
2016-03-21 14:09:21 +00:00
Maksim Shabunin
fd1b66b37d
Merge pull request #6286 from StevenPuttemans:add_num_features_info
2016-03-21 14:08:49 +00:00
Maksim Shabunin
26416343c4
Merge pull request #6300 from berak:fix_akaze_sample
2016-03-21 14:01:17 +00:00
Maksim Shabunin
f3127521f3
Merge pull request #6214 from vonnieda:java_features2d
2016-03-21 11:51:11 +00:00
Alexander Alekhin
a4e35d83ff
Merge pull request #6267 from dtmoodie:issue_5918
2016-03-21 09:37:11 +00:00
Maksim Shabunin
3b6190dfad
Merge pull request #6150 from lvv:fix-6149-applColorMap
2016-03-21 09:20:52 +00:00
Maksim Shabunin
83379695a0
HAL interface for morphology operations
2016-03-21 09:32:06 +03:00
Leonid Volnitsky
bebab8d647
fix: 6149 (through CV_Error on wrong image type)
2016-03-19 19:57:05 +02:00
berak
e0c65499fd
remove opencv_contrib dependancy from planar_tracking.cpp
2016-03-19 10:29:22 +01:00
Xiaolei Yu
40eb613bbf
Make install paths relative to CMAKE_INSTALL_PREFIX
2016-03-19 16:41:51 +08:00
Vitaly Tuzov
24361733e4
Fixed face detection python test
2016-03-18 17:44:45 +03:00
Alexander Alekhin
4e479d58f8
Merge pull request #6290 from dtmoodie:thrust_allocator_usage_pr
2016-03-18 12:14:20 +00:00
Vladislav Sovrasov
fd61978795
Add goodfeatures python test and cleanup in test directory
2016-03-18 11:16:08 +03:00
Dan
da189ce1e0
Fixed regression in cv::VideoCapture with gstreamer back end that prevented viewing of rtsp streams.
2016-03-17 13:03:48 -04:00
StevenPuttemans
2a0a27d3f2
add cascade classifier info - total number of unique features passed to boosting process
2016-03-17 13:34:01 +01:00
StevenPuttemans
b5fbb2b1c8
add cascade classifier info - total number of unique features passed to boosting process
2016-03-17 13:33:11 +01:00
Alexander Smorkalov
b8ce65bec8
Merge pull request #6279 from terfendail:vt/pythontest_data
2016-03-17 12:27:12 +00:00
Alexander Alekhin
2f4e38c831
Merge pull request #6283 from jlubawy:vfw-surface4-fix
2016-03-17 11:08:12 +00:00
Vitaly Tuzov
96903dc4ad
Test data necessary for python samples added to test package.
...
Test launch script updated to run new tests as well.
2016-03-17 11:38:40 +03:00
Alexander Smorkalov
da669569e1
Merge pull request #6281 from SpecLad:videowriter-oob
2016-03-17 08:09:13 +00:00
Josh Lubawy
1bd8bcbdd9
Remove cstdio debug
2016-03-17 01:00:49 -07:00
Josh Lubawy
f715e5b0b2
Add support for YUV 4:2:0 NV12 frame format in VFW camera capture
2016-03-16 23:38:17 -07:00
Alexander Alekhin
00ea7fe99c
Merge pull request #6273 from Bleach665:vs2010_mser_sampl
2016-03-16 21:32:41 +00:00
Roman Donchenko
eb40afa26a
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
...
I delete the LIBAVFORMAT_BUILD < 5231 branch, because I couldn't even find FFmpeg with
such a small build number, let alone test with it.
2016-03-16 20:04:33 +03:00
Bleach666
93e50dabcd
fix build detect_mser sample in vc2010
2016-03-16 16:51:20 +02:00
Alexander Alekhin
d6060bbb7f
Merge pull request #6270 from robbertkl:patch-2
2016-03-16 13:50:03 +00:00
Alexander Alekhin
08d5ab577c
Merge pull request #6274 from Bleach665:cmake_policy_0020
2016-03-16 13:49:32 +00:00
Roman Donchenko
421fcf9e35
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
2016-03-16 16:28:59 +03:00
Alexander Smorkalov
d142c05d61
Merge pull request #6276 from SpecLad:bp-3813
2016-03-16 11:41:27 +00:00
Bleach666
150a9e8e14
suppress warning while generating solution in cmake
2016-03-16 13:12:44 +02:00
Robbert Klarenbeek
81b11ee463
Replace deprecated malloc.h
2016-03-16 11:37:27 +01:00
Alexander Alekhin
74490399db
Merge pull request #6268 from robbertkl:patch-1
2016-03-16 09:59:36 +00:00
Roman Donchenko
9a5d7f1a0b
Backport PR #3813 to 2.4
...
It has already been partially backported by #6199 ; this commit completes
the backport.
2016-03-16 12:34:41 +03:00
Robbert Klarenbeek
dd510e1de9
Fix incompatibility with some C++11 implementations
2016-03-15 17:21:05 +01:00
Dan
1d21493302
Merge branch 'issue_6251' of http://github.com/dtmoodie/opencv into thrust_allocator_usage_pr
2016-03-15 11:18:41 -04:00
Dan
a21ede9452
Thrust allocator usage.
2016-03-15 11:14:47 -04:00
Dan
7a934f9ee0
Compatibility and bug fixes.
2016-03-15 11:14:42 -04:00
Dan
a8ca560684
Fixed more missing async calls.
2016-03-15 11:14:42 -04:00
Dan
79ecefb51f
Implemented async calls.
2016-03-15 11:14:41 -04:00
Alexander Alekhin
97d8ca3464
Merge pull request #6266 from gongzg:master
2016-03-15 12:51:20 +00:00
Zhigang Gong
0b08d2559e
fix potential race condition in canny.cl.
...
See the below code snippet:
while(l_counter != 0)
{
int mod = l_counter % LOCAL_TOTAL;
int pix_per_thr = l_counter / LOCAL_TOTAL + ((lid < mod) ? 1 : 0);
for (int i = 0; i < pix_per_thr; ++i)
{
int index = atomic_dec(&l_counter) - 1;
....
}
....
barrier(CLK_LOCAL_MEM_FENCE);
}
If we don't put a barrier before the for loop, then there is a possiblity
that some work item enter this loop but the others are not, the the l_counter
will be reduced in the for loop and may be changed to zero, and the other
work items may can't enter the while loop. If this happens, it breaks the
barrier's rule which requires all the work items reach the same barrier.
And it may hang the GPU depends on the implementation of opencl platform.
This issue is raised at:
https://github.com/Itseez/opencv/issues/5175
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
2016-03-15 19:11:15 +08:00
Alexander Alekhin
947307baae
Merge pull request #6261 from dtmoodie:issue_6251
2016-03-15 07:51:24 +00:00
Dan
42c36c0c80
Linux bug fix for ThrustAllocator.
2016-03-14 11:09:52 -04:00
Alexander Alekhin
7783206934
Merge pull request #6259 from polevoy-d-v:move_sematics_fix
2016-03-14 14:46:21 +00:00
Alexander Alekhin
5517ea0adb
Merge pull request #6255 from delftswa2016:fix-5002
2016-03-14 14:46:06 +00:00
Прун Виктор
a90a576d76
fixed incorrect behaviour of move semantics for cv::Ptr, cv::Mat, cv::UMat in case when rvalue-reference references to *this.
2016-03-14 16:10:23 +03:00
Alexander Alekhin
695a430007
Merge pull request #6254 from berak:patch-2
2016-03-14 11:27:55 +00:00
Alexander Alekhin
708761b219
Merge pull request #6253 from berak:patch-1
2016-03-14 11:27:11 +00:00