Roman Donchenko
a2d576c1bb
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
2013-07-04 17:24:21 +04:00
Roman Donchenko
4d569732b9
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
2013-07-04 17:23:53 +04:00
Jin Ma
97e620b8f3
Fix oclMat constructor when roi is provided.
2013-07-04 16:14:55 +08:00
yao
f2333e90f6
optimize stereoBP kernel
2013-07-04 14:46:38 +08:00
Alexander Pacha
eaa29110e1
Fixed issue 3130 ( http://code.opencv.org/issues/3130 ), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
...
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
2013-07-04 16:36:29 +12:00
yao
c23510785b
remove the redundant function
2013-07-04 08:59:42 +08:00
Alexander Mordvintsev
8045093cfb
GFTT wrapped to python
2013-07-03 22:26:18 +04:00
Heinz Hofbauer
a26c4fa2a2
Bugfix for an overlapping size of image and template for matchTemplate.
...
Example: img of size 10x10 and templ of size 11x9.
In subsequent code this will results in either width or height of
corrSize to be zero (0).
Line 261 will call crossCorr which will then have a zero size of either
blocksize.width or blocksize.height resulting in a division by zero
crach in lines 137 or 138.
2013-07-03 14:58:40 +02:00
yao
8d8dc29ced
add kmeans
2013-07-03 13:13:04 +08:00
Philippe FOUBERT
639450efdc
PvAPI support on Windows with MinGW (PR #1038 applied to the branch 2.4)
2013-07-03 00:19:22 +02:00
Frédéric Devernay
b524e275c1
allow QtKit capture in secondary threads
...
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
2013-07-02 18:08:12 +02:00
Alexander Smorkalov
91b713b8c9
JavaCameraView delivers same frame twice (Bug #3123 ) fixed.
2013-07-02 12:58:59 +04:00
Roman Donchenko
6bf8f474fa
Merge pull request #1051 from pengx17:2.4_fback_ocl
2013-07-01 13:45:43 +04:00
Roman Donchenko
c8cd2cf601
Merge pull request #1061 from bitwangyaoyao:2.4_fix2
2013-07-01 13:21:12 +04:00
Roman Donchenko
087bab6ceb
Merge pull request #1060 from pengx17:2.4_setbinary_fix
2013-07-01 13:20:51 +04:00
Roman Donchenko
38cf0a692e
Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround
2013-07-01 13:20:04 +04:00
Andrey Pavlenko
a4c38196bc
Merge pull request #1069 from apavlenko:fix_bin_compat_checker
2013-07-01 12:10:57 +04:00
Andrey Pavlenko
97b939195f
adding 'ios.h' to ignore list should work on non-Mac)
2013-07-01 10:03:08 +04:00
Roman Donchenko
eedc032b98
Merge pull request #1067 from asmorkalov:android_service_readme
2013-06-28 19:47:30 +04:00
Roman Donchenko
43632bf973
Merge pull request #1065 from apavlenko:fix_eclipse_warning
2013-06-28 19:32:44 +04:00
Roman Donchenko
d60cb1d00a
Merge pull request #1064 from asmorkalov:winrt_sample_fix
2013-06-28 19:08:12 +04:00
Alexander Smorkalov
8b6f1d9bd9
OpenCV Version++; Manager Version++
2013-06-28 18:25:53 +04:00
Andrey Pavlenko
6069967109
removing unused import
2013-06-28 17:28:57 +04:00
Alexander Smorkalov
67d4d9e9f4
Path to OpenCV dll libs fixes.
2013-06-28 16:48:27 +04:00
Roman Donchenko
4b51b1e3a8
Merge pull request #1059 from dominikrose:dc1394_2-1394b
2013-06-28 14:47:45 +04:00
Roman Donchenko
1707b1769f
Merge pull request #1063 from alekcac:conversion
2013-06-28 14:41:35 +04:00
Roman Donchenko
a96466a73a
Merge pull request #1062 from kirill-kornyakov:fixes-for-documentation
2013-06-28 14:35:51 +04:00
Roman Donchenko
156155addb
Merge pull request #1018 from jet47:cuda-5.5-arm
2013-06-28 14:26:45 +04:00
yao
c66e27d49e
stereoBM fix an error on Linux when running full performance test
2013-06-28 17:45:39 +08:00
Alexander Shishkov
7b06592dea
added conversions between UIImage and cv::Mat
2013-06-28 13:26:54 +04:00
Kirill Kornyakov
aef347e7b3
Removed references to opencv.itseez.com
2013-06-28 12:48:12 +04:00
Kirill Kornyakov
0339dd51f1
Removed all references to trunk
2013-06-28 12:38:44 +04:00
yao
c73a10cb4d
warnings fix
2013-06-28 16:23:01 +08:00
Kirill Kornyakov
cbed07bc18
Removed references to YG from samples
2013-06-28 12:21:52 +04:00
Kirill Kornyakov
f065c46fbe
Completely get rid of opencv_group
2013-06-28 12:15:14 +04:00
Kirill Kornyakov
a78ebc1175
Updated a couple of more links
2013-06-28 12:12:53 +04:00
Kirill Kornyakov
2cacad9470
updated email address
2013-06-28 11:53:39 +04:00
Kirill Kornyakov
2980a88570
Mentioned 2.4 and master branches
2013-06-28 11:51:40 +04:00
Kirill Kornyakov
e447d87496
Added link to contribution process, updated formatting
2013-06-28 11:44:10 +04:00
Alexander Shishkov
a8db327574
changed contacts in tutorual
2013-06-28 11:44:09 +04:00
Roman Donchenko
3b78fe2684
Merge pull request #1054 from asmorkalov:opencv_version
2013-06-28 11:29:55 +04:00
yao
6982ea5a66
some tweaks to samples
2013-06-28 15:08:39 +08:00
yao
c1a59b8d80
more fix to HOG
2013-06-28 13:38:58 +08:00
yao
f1d9680ba8
format the ocl's samples name
2013-06-28 11:44:43 +08:00
yao
587fb4940d
some accuracy fix of HOG
2013-06-28 11:43:43 +08:00
peng xiao
a5383b8627
Move function definition from header to cpp.
2013-06-28 10:52:39 +08:00
peng xiao
e858a6c347
Renew function logic.
2013-06-28 10:39:09 +08:00
peng xiao
14dd345cdf
Fix ocl::setBinaryDiskCache
...
Previously the function requires Info::Impl implicitly. A call will create
new Context this function which is not intended.
The properties are now moved to global scope to fix this issue.
2013-06-28 10:12:18 +08:00
Dominik Rose
d39aeeca0f
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
2013-06-27 19:43:05 +02:00
Dominik Rose
e32700cf8f
dc1394-2: support for operation mode 1394b added
2013-06-27 15:05:32 +02:00
