mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,825 Commits 6 Branches 126 Tags 3 GiB
df4b67a749
Commit Graph

7825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kdrobnyh
df4b67a749 Merge pull request #1 from Itseez/2.4 
Add calculating integral image using IPP
 2013-07-10 10:45:24 -07:00
Roman Donchenko
241e2d2360 Merge pull request #1077 from bitwangyaoyao:2.4_kmeans 2013-07-10 18:32:14 +04:00
Roman Donchenko
894b30b34d Merge pull request #1088 from apacha:brisk_noDescriptors_fix 2013-07-10 18:18:31 +04:00
Roman Donchenko
f0c7cce87a Merge pull request #1080 from hhofbaue:matchTemplate_bugfix 2013-07-10 18:17:06 +04:00
Roman Donchenko
a0f6e1ba1d Merge pull request #1103 from apavlenko:ver_2.4.6.1 2013-07-10 15:49:00 +04:00
Andrey Pavlenko
2b2e02166e setting version to 2.4.6.1 (hot-fix release for Linux camera support) 2013-07-10 15:12:39 +04:00
kdrobnyh
f8eb806565 Add IPP support to integral function 2013-07-10 11:25:36 +04:00
Roman Donchenko
2dedfd9762 Merge pull request #1099 from asmorkalov:linux_vcap_fix 2013-07-09 17:13:05 +04:00
Alexander Smorkalov
f77d1f57ee V4L and V4L2 based Video capture bug fix (Bugfix #3144). 2013-07-09 16:07:55 +04:00
Roman Donchenko
b1f04c5388 Merge pull request #1097 from apavlenko:ocl_tests_fixes 2013-07-09 14:00:38 +04:00
Andrey Pavlenko
fcb4c0e51c fixing working with test data and a small fix for init code 
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
 2013-07-09 13:25:21 +04:00
Andrey Pavlenko
1a2458885b Merge pull request #1094 from asmorkalov:android_na_fix 2013-07-08 11:25:40 +04:00
Alexander Smorkalov
69b308a368 Various fixes in android sample NativeActivity. 2013-07-05 14:08:37 +04:00
Roman Donchenko
f5089100b9 Merge pull request #1073 from asmorkalov:android_cvjavaframe 2013-07-05 13:41:51 +04:00
Roman Donchenko
c4e59866a2 Merge pull request #1074 from devernay:2.4-cap_qt-multithread 2013-07-05 13:28:38 +04:00
Andrey Pavlenko
b6b1d5e75d Merge pull request #1092 from asmorkalov:manager_version_inc 2013-07-05 13:02:10 +04:00
Roman Donchenko
36a4d246f4 Merge pull request #1087 from znah:2.4 2013-07-05 12:07:45 +04:00
Alexander Smorkalov
e905c81ccc OpenCV Manager version++. 2013-07-05 12:07:04 +04:00
Roman Donchenko
dbf02c71b6 Merge pull request #1091 from SpecLad:xls-updates 2013-07-05 12:00:52 +04:00
yao
88ed74a7ec fix the function name 2013-07-05 08:59:21 +08:00
Roman Donchenko
2b44172026 xls-report.py: make behaviour more intelligent in case of repeated results 2013-07-04 20:01:27 +04:00
Roman Donchenko
0732905cff xls-report.py: write tests in sorted order 2013-07-04 20:01:27 +04:00
Roman Donchenko
ea054e2888 xls-report.py: made most columns a little wider 2013-07-04 20:01:27 +04:00
Roman Donchenko
4e939e2fce xls-report.py: added an option to include data from unrecognized XMLs 2013-07-04 20:00:59 +04:00
Roman Donchenko
ec1df9f54d Merge pull request #1090 from asmorkalov:android_tbb_downgrade 2013-07-04 19:46:53 +04:00
Alexander Smorkalov
c2e6668414 Bug #3124 libopencv_java.so v 2.4.6 hangs on some Android 4.0.3 devices fixed. 
Downgrade TBB to 4.1u2 for all platforms, except WinRT.
 2013-07-04 18:52:52 +04:00
Roman Donchenko
83fd385bbd xls-report.py: don't eat all errors when reading sheet.conf 2013-07-04 18:03:03 +04:00
Alexander Mordvintsev
3677a66403 line realign 2013-07-04 17:43:38 +04:00
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
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