Roman Donchenko
a4ecd32176
Merge pull request #980 from SpecLad:include-config
2013-06-11 18:18:14 +04:00
Roman Donchenko
572cfc99a8
Merge pull request #973 from pengx17:2.4_oclclahe
2013-06-11 18:17:57 +04:00
Roman Donchenko
3af21cad4c
Merge pull request #903 from aks2:2.4
2013-06-11 17:35:39 +04:00
Peng Xiao
c8398c9fdc
Use anonymous enumerations instead of constants
2013-06-11 20:32:55 +08:00
Roman Donchenko
a75fbb0031
Merge pull request #968 from asmorkalov:android_na_cproj_fix
2013-06-11 11:59:32 +04:00
Roman Donchenko
d583a79869
Revert "Add a variant of detectMultiScale with an argument 'weights'"
...
It was merged by mistake.
This reverts commit ab6be9b7b7
.
2013-06-10 17:06:34 +04:00
Vadim Pisarevsky
52e9974431
Merge pull request #961 from PeterMinin:detected_objects_weight
2013-06-10 15:22:46 +04:00
Roman Donchenko
1b689a7431
Merge pull request #971 from SpecLad:matchers-ctor
2013-06-10 15:06:31 +04:00
Roman Donchenko
55e83b8d18
Merge pull request #970 from asmorkalov:dshow_valid_check_fix
2013-06-10 15:06:14 +04:00
Alexander Smorkalov
956d8027ef
Bug #3044 cap_dshow.cpp forgotten validity check fixed.
2013-06-10 13:29:45 -07:00
Roman Donchenko
3016986833
Merge pull request #965 from apavlenko:fix_java_empty_mats
2013-06-10 15:04:16 +04:00
Peng Xiao
1d8cd3a717
Add ocl CLACH implementation.
...
Test cases (accuracy and performance) are provided.
2013-06-10 18:37:48 +08:00
Vladislav Vinogradov
99a5b3417a
added missing BackgroundSubtractorMOG2 parameters
2013-06-10 13:41:46 +04:00
Roman Donchenko
41482fe56c
Erase MatchPairsBody's copy constructor.
...
It's the same as the implicitly defined one, and it causes a -Wextra warning
(not initializing the base class in a copy constructor).
2013-06-10 13:30:23 +04:00
Peng Xiao
e77abeef16
Add a new global function to control ocl binary storage
...
Previously the feature is controlled by setBinpath implicitly.
We add the function to cope with setBinpath and setBinpath is only
useful when setBinaryDiskCache is set.
Refer to the header to see more info.
2013-06-10 16:38:22 +08:00
Alexander Smorkalov
a39a9f677f
NativeActivity sample build with Eclipse CDT fixed.
2013-06-10 11:06:28 +04:00
Andrey Pavlenko
264d26e671
fixing empty Mat case
2013-06-08 12:41:57 +04:00
Roman Donchenko
33d1f67501
Include the OpenCV config headers into every module.
...
This has no bearing on compilation, but it makes them show up in IDEs.
2013-06-07 19:07:55 +04:00
Vadim Pisarevsky
4cf7a963a0
Merge pull request #946 from bitwangyaoyao:2.4_samples2
2013-06-07 13:44:29 +04:00
Vadim Pisarevsky
51f81eec36
Merge pull request #957 from pengx17:2.4_fix_corner_detector
2013-06-07 13:44:10 +04:00
Roman Donchenko
68e4256fd2
Merge pull request #960 from SpecLad:extra-modules
2013-06-07 11:29:40 +04:00
Roman Donchenko
9b46c6fb8a
Merge pull request #959 from SpecLad:qt4-build
2013-06-07 11:27:46 +04:00
Peter Minin
ab6be9b7b7
Add a variant of detectMultiScale with an argument 'weights' that
...
receives the number of neighbors joined into each detected object
2013-06-06 19:00:55 +04:00
Roman Donchenko
e53b7d040c
Merge pull request #955 from SpecLad:symlink
2013-06-06 17:58:15 +04:00
Leszek Swirski
7d0f6b4d68
Fix image saving from QT toolbar
2013-06-06 11:15:00 +01:00
Leszek Swirski
9a1cc06ebe
Fix pixel value rendering for non-fixed-size QT windows
2013-06-06 11:14:52 +01:00
Roman Donchenko
8714cbac91
Fix a missing header path when building with Qt 4.
...
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
2013-06-06 14:09:33 +04:00
peng xiao
429f84e59e
Fix a bug of cornerHarris and cornerMinEigenVal.
...
The bug is a buffer overrun when border type is reflect101.
It is found that gfft crashed with input of size 100x100 on Intel CPU.
2013-06-06 11:44:35 +08:00
Roman Donchenko
a954d3630f
Add support for adding custom OpenCV modules.
2013-06-05 18:10:44 +04:00
Roman Donchenko
7f9675bcc0
Merge pull request #953 from jet47:fix-bug-3069
2013-06-05 17:56:35 +04:00
Roman Donchenko
7a80b9adaf
Merge pull request #952 from SpecLad:jepg
2013-06-05 17:50:12 +04:00
Roman Donchenko
985bfea556
Don't resolve symlinks when looking for modules.
...
We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.
2013-06-05 17:17:13 +04:00
Roman Donchenko
087db2949a
Merge pull request #948 from jet47:cuda-5.5-support
2013-06-05 17:04:22 +04:00
Roman Donchenko
127a152f76
Merge pull request #890 from caorong:patch-1
2013-06-05 16:00:25 +04:00
caorong
a2adafd508
fix a bug(DetectorType never change)
...
changed line281 -> line220
Presentation:
because line 220 give the globle var mDetectorType,and in line 230 it will be compared with mDeteorType !!! it will never be unequal ~
fix:
change mDetectorType(previous globle var) to a new local val tmpDetectorType
2013-06-05 15:57:54 +04:00
Vladislav Vinogradov
31a5f7ef3c
fixed bug #3069 (infinite loop in GPU LBP Cascade detectMultiScale)
2013-06-05 14:08:55 +04:00
Roman Donchenko
93a44d4236
Fix typo in .gitattributes.
2013-06-05 13:51:11 +04:00
Roman Donchenko
27bff3c175
Merge pull request #947 from jet47:fix-gpu-arm-build
2013-06-05 11:50:12 +04:00
Roman Donchenko
99340b5613
Merge pull request #941 from apavlenko:signed_char
2013-06-05 11:27:08 +04:00
Roman Donchenko
5b5815d8cf
Merge pull request #893 from jet47:gpu-arm-fixes
2013-06-04 17:52:30 +04:00
Roman Donchenko
f527b6a93f
Merge pull request #940 from SpecLad:autolock
2013-06-04 17:50:31 +04:00
Vladislav Vinogradov
89f3c40d79
fixed BroxOpticalFlow sanity test (increase epsilon value)
...
+ interpolateFrames and createOpticalFlowNeedleMap
2013-06-04 15:01:06 +04:00
Vladislav Vinogradov
4a770535c4
fixed BoxFilter sanity test (different rounding results)
2013-06-04 14:59:47 +04:00
Vladislav Vinogradov
516e5b2563
fixed BroxOpticalFlow regression test
...
the output of BroxOpticalFlow differs a bit in CUDA 5.5
2013-06-04 13:58:45 +04:00
Vladislav Vinogradov
918381875a
rewrite gpu/device/vec_math.hpp file
...
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
2013-06-04 13:57:35 +04:00
Vadim Pisarevsky
119b7a298d
Merge pull request #933 from pengx17:2.4_macfix_cont
2013-06-04 13:34:53 +04:00
Vadim Pisarevsky
2d88f20c1e
Merge pull request #935 from pengx17:2.4_filter2d_fix
2013-06-04 13:34:40 +04:00
Vadim Pisarevsky
0cb1644825
Merge pull request #936 from bitwangyaoyao:2.4_perf
2013-06-04 13:34:25 +04:00
Vadim Pisarevsky
e0c2daadbf
Merge pull request #937 from bitwangyaoyao:2.4_fixPyrLK
2013-06-04 13:34:09 +04:00
Vadim Pisarevsky
267eb99a7d
Merge pull request #938 from pengx17:2.4_surf_sample
2013-06-04 13:33:49 +04:00