Andrey Kamaev
f4b413e830
Merge pull request #570 from taka-no-me:fix_android_cmakeconfig
2013-02-28 15:45:45 +04:00
Andrey Kamaev
1f411b5a2b
Merge pull request #572 from asmorkalov:manager_4_digit_version
2013-02-28 15:44:57 +04:00
Andrey Kamaev
bf4c8c6ff1
Merge pull request #584 from bitwangyaoyao:2.4_perfTest
2013-02-28 15:44:06 +04:00
Andrey Kamaev
d0e340bc80
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
2013-02-28 15:43:51 +04:00
Alexander Smorkalov
ddc2e334da
OpenCV version swithed to 4 digit in GUI and package revision number.
2013-02-28 12:59:24 +04:00
yao
f12369a53c
Fix ocl::HOG crash on Intel OCL
2013-02-28 16:56:39 +08:00
Andrey Kamaev
831580ef31
Merge pull request #578 from jet47:nmake-ffmpeg-copy
2013-02-28 12:56:26 +04:00
Andrey Kamaev
6ce51d88a4
Merge pull request #573 from jet47:config-cross-compilation
2013-02-28 12:56:08 +04:00
cuda-geek
0771fd82c0
Merge pull request #557 from jet47:gpu-sanity
2013-02-28 11:17:12 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
yao
f791344810
linux warning fix
2013-02-28 14:37:37 +08:00
Vladislav Vinogradov
61ef48eee6
fixed OpenCVConfig for cross-compilation:
...
* added CUDA to EXTRA libs if OpenCV uses it
* added -rpath-link option for linker if OpenCV was built as SHARED libs
2013-02-28 10:33:05 +04:00
yao
504008dbe0
Fix ocl::bruteforcematcher crash on Intel OCL
2013-02-28 14:31:08 +08:00
Vladislav Vinogradov
df456245e7
fixed ffmpeg destination folder for NMake generator
2013-02-28 10:16:41 +04:00
yao
7c1f1d8837
fix bug #2787
2013-02-28 14:05:36 +08:00
yao
ed3c3822fc
adjust some test cases, use original template file name in Haar
2013-02-28 12:15:13 +08:00
yao
69eebdd608
fix the blend crash in some cases
2013-02-28 09:03:10 +08:00
Andrey Kamaev
2be893a21e
Revise git attributes
2013-02-28 03:18:54 +04:00
Andrey Kamaev
c5e979ceb7
Merge pull request #581 from vpisarev:ios_fix
2013-02-28 01:58:13 +04:00
Andrey Kamaev
c6318ffaa0
Merge pull request #567
2013-02-28 01:50:40 +04:00
Georgios Evangelidis
f40725bb50
Add ECC algorithm
...
Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008
2013-02-28 01:48:00 +04:00
Vadim Pisarevsky
11ba220e02
fixed iOS framework compile errors after recent changes
2013-02-28 00:54:01 +04:00
Andrey Kamaev
b9b4200504
Merge pull request #580 from vrabaud:patch-1
2013-02-28 00:39:04 +04:00
Andrey Kamaev
a5d2253be8
Merge pull request #544 from AnnaKogan8:added-regressions-only-option
2013-02-28 00:38:47 +04:00
Andrey Kamaev
68bb317ce1
Merge pull request #462 from kobigurk:master
2013-02-28 00:38:20 +04:00
Vincent Rabaud
c7bbd1aef2
Update cmake/templates/OpenCVConfig.cmake.in
...
find_package(OpenCV) should not include_directories by default, that is not standard afaik. Plus that creates problems when creating the ROS package :)
2013-02-27 11:00:38 -08:00
Andrey Kamaev
d620ef0d55
Merge pull request #577 from ilya-lavrenov:BilateralFilter
2013-02-27 19:44:56 +04:00
Andrey Kamaev
5b7a4cd955
Merge pull request #579 from bitwangyaoyao:2.4_perfTest
2013-02-27 19:34:17 +04:00
Andrey Kamaev
0a8711d76b
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
2013-02-27 19:33:54 +04:00
Andrey Kamaev
af13c8604d
Merge pull request #568 from bitwangyaoyao:2.4_moments
2013-02-27 19:33:26 +04:00
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
yao
cbff75db9e
fix build errors
2013-02-27 21:56:03 +08:00
Ilya Lavrenov
3eed5d8c72
additional improvements for 32f
2013-02-27 17:54:22 +04:00
yao
bf427c01c1
adjust matchTemplate in performance sample, as current version is too slow when template size isn't small
2013-02-27 21:41:04 +08:00
Ilya Lavrenov
efad6942e2
some improvements of existing sse3 optimization of bilateral filter in case of 8uc3. Now perf tests take 6120ms instead of previous 7250ms (1.18x speed-up)
2013-02-27 16:53:09 +04:00
Andrey Kamaev
024185b9ed
Fix OpenCVConfig.cmake generated for Android platform (issue #2496 )
...
* fix path to libraries in Android SDK
* allow to link to opencv_java.so as Android.mk does
To link to opencv_java.so you can either change your cmake to find OpenCV as
find_package(OpenCV opencv_java)
or pass -DOpenCV_FIND_COMPONENTS=opencv_java to your cmake command
2013-02-27 15:04:29 +04:00
yao
9ccf27c7f5
add interfaces enable custom oclMat device memory type
2013-02-27 17:32:32 +08:00
cuda-geek
5d43ce853e
Merge pull request #559 from jet47:gpu-hough-circles
2013-02-27 12:29:45 +04:00
Andrey Kamaev
242a6de719
Merge pull request #566 from FabricioS:master
2013-02-27 11:37:31 +04:00
Andrey Kamaev
1a82ceac9c
Merge pull request #563 from taka-no-me:perf_classify_speedups
2013-02-27 11:37:18 +04:00
Andrey Kamaev
b836e3c65b
Merge pull request #556 from bitwangyaoyao:2.4_SURF
2013-02-27 11:37:04 +04:00
Andrey Kamaev
f03c04c151
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
2013-02-27 11:36:40 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
dba2ec0539
remove the compile warnings
2013-02-27 14:53:27 +08:00
yao
6df23428af
Add moments function
2013-02-27 13:45:16 +08:00
yao
6409a4b112
fix the compile warnings
2013-02-27 11:16:46 +08:00
yao
9ec5333a9b
pyrlk also take advantages of cl_image support detection
2013-02-27 10:45:07 +08:00
yao
da47ccec9c
Put the cl_image support detection in utils
2013-02-27 10:24:03 +08:00
Andrey Kamaev
8304f17d63
Merge pull request #565 from cuda-geek:auto-arch
2013-02-27 00:05:16 +04:00
Andrey Kamaev
e9307259d7
Merge pull request #564 from apavlenko:eclipse_import_fix
2013-02-27 00:05:02 +04:00
