Alexander Alekhin
ff0d115800
Merge pull request #6332 from sovrasov:python_rng_seed
2016-03-29 14:23:26 +00:00
Vladislav Sovrasov
72ed4173df
Change setRNGSeed implementaion
2016-03-29 10:54:42 +03:00
Vadim Pisarevsky
1e1dc1429f
Merge pull request #6321 from mshabunin:hal_cmake
2016-03-27 08:06:24 +00:00
Vadim Pisarevsky
481473eb12
Merge pull request #6326 from sovrasov:python_samples_update
2016-03-27 08:03:28 +00:00
Alexander Alekhin
ee123b8a9e
Merge pull request #6311 from peters:master
2016-03-26 19:55:17 +00:00
Vladislav Sovrasov
362d52a3cb
Fix doxygen warnings
2016-03-25 16:34:45 +03:00
Vladislav Sovrasov
a490b64e9b
Add function setRNGSeed and seed setup in python tests
2016-03-25 16:17:58 +03:00
Alexander Alekhin
05384f05cc
Merge pull request #6313 from amannababanana:master
2016-03-25 11:31:17 +00:00
Maksim Shabunin
50edaae06c
Merge pull request #6322 from berak:fix_linux_eclipse_tutorial
2016-03-25 07:39:19 +00:00
Vladislav Sovrasov
1f8fd5382c
Replace of some synthetic scenes in python samples
2016-03-24 20:05:26 +03:00
berak
0b389b24f6
fix changed libraries in eclipse tutorial
2016-03-24 16:09:14 +01:00
Maksim Shabunin
79ffaa8ce9
Fixed cutom_hal.hpp file generation
2016-03-24 17:39:16 +03:00
Maksim Shabunin
727743809e
Using find_package to import custom HAL library
2016-03-24 17:05:54 +03:00
Vadim Pisarevsky
e792ee89de
Merge pull request #6243 from mshabunin:hal_morph
2016-03-23 13:09:19 +00:00
Vadim Pisarevsky
e547916e88
Merge pull request #6285 from sovrasov:python_tests_cleanup
2016-03-23 13:07:00 +00:00
Lucas Solomon
d2d5d32fe0
remove trailing whitespace
2016-03-22 22:31:16 -07:00
Lucas Solomon
688b4d9d7a
return 0 from VideoCapture::read() when cannot connect to camera
2016-03-22 19:03:28 -07:00
Peter Rekdal Sunde
278747ba45
Add support for ffmpeg 3.0.
2016-03-22 22:52:35 +01: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
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
Alexander Alekhin
2f4e38c831
Merge pull request #6283 from jlubawy:vfw-surface4-fix
2016-03-17 11:08:12 +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
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
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
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
