Roman Donchenko
421fcf9e35
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
9 years ago
Alexander Smorkalov
d142c05d61
Merge pull request #6276 from SpecLad:bp-3813
9 years ago
Bleach666
150a9e8e14
suppress warning while generating solution in cmake
9 years ago
Robbert Klarenbeek
81b11ee463
Replace deprecated malloc.h
9 years ago
Alexander Alekhin
74490399db
Merge pull request #6268 from robbertkl:patch-1
9 years ago
Roman Donchenko
9a5d7f1a0b
Backport PR #3813 to 2.4
...
It has already been partially backported by #6199 ; this commit completes
the backport.
9 years ago
Robbert Klarenbeek
dd510e1de9
Fix incompatibility with some C++11 implementations
9 years ago
Dan
1d21493302
Merge branch 'issue_6251' of http://github.com/dtmoodie/opencv into thrust_allocator_usage_pr
9 years ago
Dan
a21ede9452
Thrust allocator usage.
9 years ago
Dan
7a934f9ee0
Compatibility and bug fixes.
9 years ago
Dan
a8ca560684
Fixed more missing async calls.
9 years ago
Dan
79ecefb51f
Implemented async calls.
9 years ago
Alexander Alekhin
97d8ca3464
Merge pull request #6266 from gongzg:master
9 years ago
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>
9 years ago
Alexander Alekhin
947307baae
Merge pull request #6261 from dtmoodie:issue_6251
9 years ago
Dan
42c36c0c80
Linux bug fix for ThrustAllocator.
9 years ago
Alexander Alekhin
7783206934
Merge pull request #6259 from polevoy-d-v:move_sematics_fix
9 years ago
Alexander Alekhin
5517ea0adb
Merge pull request #6255 from delftswa2016:fix-5002
9 years ago
Прун Виктор
a90a576d76
fixed incorrect behaviour of move semantics for cv::Ptr, cv::Mat, cv::UMat in case when rvalue-reference references to *this.
9 years ago
Alexander Alekhin
695a430007
Merge pull request #6254 from berak:patch-2
9 years ago
Alexander Alekhin
708761b219
Merge pull request #6253 from berak:patch-1
9 years ago
Alexander Alekhin
4f9e1a9a58
Merge pull request #6249 from sturkmen72:patch-15
9 years ago
Alexander Alekhin
9d49cef29e
Merge pull request #6245 from delftswa2016:fix-for-issue-4375
9 years ago
Alexander Alekhin
cc3433f349
Merge pull request #6045 from matthieu-ft:master
9 years ago
renu285
45f9d32866
Removed older libraries pointing to 2.4 in eclipse tutorial docs
9 years ago
berak
79ac072e6c
train_svmsgd.cpp : float response
...
responses must be float, else we trigger an assertion in line 150
9 years ago
berak
4555f9ac25
svmsgd.cpp, fix #6248
...
add a cast to double, to make vs compilers happy
9 years ago
Suleyman TURKMEN
826b5a2ef1
Update lda.cpp
...
typo correction
9 years ago
shruthikashyap
1fbc6ab05d
Adding the syntax and usage for cv2.undistortPoints().
9 years ago
Vadim Pisarevsky
fbc221d334
Merge pull request #6096 from mnoskova:mn/SVMSGD_to_opencv3_0
9 years ago
Vadim Pisarevsky
cd1426ba8d
Merge pull request #6025 from sovrasov:new_python_tests
9 years ago
Vadim Pisarevsky
c186f424c5
Merge pull request #6119 from mshabunin:hal_filter2d
9 years ago
Vadim Pisarevsky
c9db05de22
Merge pull request #6137 from dtmoodie:thrust_allocator
9 years ago
Vadim Pisarevsky
bad09e5f58
Merge pull request #6206 from alalek:polar_fix
9 years ago
Vadim Pisarevsky
93c4dfb16d
Merge pull request #6236 from alalek:backport_6232
9 years ago
Vadim Pisarevsky
da82acda6b
Merge pull request #6241 from cbalint13:agast
9 years ago
Balint Cristian
f819323296
Fix AGAST keypoint declared size.
9 years ago
Alexander Alekhin
52b9207105
Merge pull request #6237 from mshabunin:fix-vtk-on-2.4
9 years ago
Maksim Shabunin
d2e451e877
Ported VTK cmake detection from master branch
9 years ago
Alexander Alekhin
c41dc915fd
Merge pull request #6232 from piotr-semenov:semenovp_fixes
9 years ago
Piotr Semenov
00e91fd3d0
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
9 years ago
Alexander Alekhin
afc62f076a
Merge pull request #6234 from asmorkalov:as/deb_version_check
9 years ago
Alexander Smorkalov
9c4204b89e
Added check if debian package version matches version from version.hpp
9 years ago
Alexander Alekhin
bcca213b88
Merge pull request #6224 from alalek:fix_java_binary
9 years ago
Maksim Shabunin
508c382673
Merge pull request #6208 from alalek:templates
9 years ago
Maksim Shabunin
3afb5a6006
Merge pull request #6171 from terfendail:vt/new_python_tests_backport
9 years ago
Piotr Semenov
108ddc199a
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
9 years ago
Maksim Shabunin
7e44faf635
Merge pull request #6228 from wangguoqin1001:2.4
9 years ago
WANG Guoqin
8cfc87cf01
MacOSX / QTKit capture: trying to fix invalid timer call
9 years ago
Alexander Alekhin
a7d28f3b1f
Merge pull request #6217 from krrishnarraj:master
9 years ago