Andrey Kamaev
15b7b01243
Merge pull request #86 from taka-no-me/test/python_kmeans
2012-10-23 18:03:52 +04:00
Andrey Kamaev
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
Andrey Kamaev
08e4298a96
Merge pull request #84 from Daniil-Osokin/perfTest-warpPerspective
2012-10-23 17:35:05 +04:00
Andrey Kamaev
cd320565dd
Merge pull request #82 from taka-no-me/perf/fix_failures
2012-10-23 16:22:16 +04:00
Andrey Kamaev
2d6ff8e946
Merge pull request #88 from taka-no-me/build_ubuntu_x86_o2
2012-10-23 16:20:56 +04:00
Daniil Osokin
e9ba5c225d
extended perf test warpPerspectiveLarge
2012-10-23 16:06:03 +04:00
Andrey Kamaev
ed00642600
Force build with -O2 instead of -O3 on 32-bit linux
2012-10-23 15:52:11 +04:00
Andrey Kamaev
e64bb3654a
Remove wrong assertion
2012-10-23 15:28:44 +04:00
Vladislav Vinogradov
26f9534544
fixed string->string conversion
2012-10-23 15:24:21 +04:00
Anatoly Baksheev
d681717702
warnings
2012-10-23 15:13:46 +04:00
Anatoly Baksheev
275ab53ebc
Added default Eigen search path to support Eigen that comes with PCL
2012-10-23 15:12:39 +04:00
OpenCV Buildbot
1cb21d292b
update FFMPEG wrapper binaries
2012-10-23 13:17:43 +04:00
Andrey Kamaev
585f3bc391
Disable perf test for unstable solvePnPRansac
2012-10-23 12:13:39 +04:00
Andrey Kamaev
b45a870d9a
Limit 32S data in perf test for addWeighted to avoid integer overflow
2012-10-23 12:07:32 +04:00
Andrey Kamaev
c13eb07d47
Fix argument parsing for old command line parser
2012-10-23 12:07:01 +04:00
Stephen Fox
9f8ce906f4
fix to documentation regarding CV_CAP_OPENNI_* in high gui userguide
...
fix comments to accurate match CV_CAP_OPENNI_* vs. wrong OPENNI_*
2012-10-22 23:18:46 -05:00
Andrey Kamaev
22e352d9cc
Merge pull request #76 vpisarev/test_fixes_1
2012-10-22 21:13:26 +04:00
Vadim Pisarevsky
fbe0d6963c
disabled several tests on Mac when no FFMPEG is used; disabled automatic table initialization in imgwarp in the case of MinGW
2012-10-22 21:13:26 +04:00
Andrey Kamaev
781d89829f
Merge pull request #79 from taka-no-me:warnings
2012-10-22 20:56:53 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Andrey Kamaev
40030d2ca0
Fix windows build warnings
2012-10-22 19:13:18 +04:00
Andrey Kamaev
15076f9232
Fix implementation of PCA overload with retained variance parameter
2012-10-22 18:46:20 +04:00
Andrey Kamaev
d0ec65e80c
Fix linux build warning
2012-10-22 18:38:22 +04:00
Andrey Kamaev
bfa466dcbd
Merge pull request #75 form taka-no-me:comments/2463
2012-10-22 18:31:20 +04:00
Andrey Kamaev
9900f8deb2
Remove russian comments
2012-10-22 17:24:43 +04:00
Andrey Kamaev
ecb707ca7b
Convert cl2cpp.py script to cmake
...
New version removes inner comments and empty lines
2012-10-22 17:19:55 +04:00
Andrey Kamaev
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
Andrey Kamaev
ef6a6cfb40
Merge pull request #69 from mdim/core_tests
2012-10-22 16:47:49 +04:00
Andrey Kamaev
769f61f8c7
Merge pull request #55 from vpisarev/ocl_fixes
2012-10-22 16:40:18 +04:00
Andrey Kamaev
d1d6ce63fc
Merge pull request #48 from kazuki-ma/2430_ostream_24
2012-10-22 16:27:10 +04:00
Vadim Pisarevsky
eea6fe8e7f
Merge pull request #71 from NikoKJ/ocl4_2.4.3
...
This patch is for the ocl module of 2.4.3
(tested on Mac (OSX 10.8, Xcode 4.5, OpenCL 1.1(?))
2012-10-22 04:57:42 -07:00
Vadim Pisarevsky
1770ba1df7
Merge pull request #66 from alekcac/ios-armv7s
...
added support armv7s for iOS framework; tested on my computer (OSX 10.8, Xcode 4.5)
2012-10-22 04:07:07 -07:00
marina.kolpakova
8e2f729aa7
Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4
2012-10-22 13:16:27 +04:00
Niko
5df77a841e
remove redundant OPENCL_DIR flag
...
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
Maria Dimashova
78dd1893bb
added tests for cv::merge, cv::split, cv::phase
2012-10-21 12:22:39 +04:00
marina.kolpakova
b14f447cc6
fix GPU SURF tests for masked case
2012-10-21 11:40:08 +04:00
marina.kolpakova
99c666691e
Restore core multiply/divide depth to CV_64F value.
...
After setting depth to CV_32F for non double types this produces difference in results. I've attached test that reproduce this issue.The issue was found during anali broken GPU tests for multiply/device functions.
2012-10-21 11:20:39 +04:00
Kazuki MATSUDA
72c93dabd3
Add stream operators (Requested #2430 )
...
Add output stream operators (<<) for Rect, Size, Matx, Vec.
I can't add operations for cv::KeyPoint.
And putting together all operator<<.
(Matx, Point_, Point3_, Vec, Size_, Rect_)
2012-10-20 11:19:42 +09:00
Andrey Kamaev
b6a2717c2b
Merge pull request #65 from taka-no-me:android/warnings
2012-10-19 20:49:19 +04:00
Andrey Kamaev
59452dfc6f
Merge pull request #64 from vpisarev/bugs_1939_2100
2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
40a30b6f30
fixed type "compatible -> incompatible" in the error message
2012-10-19 20:47:58 +04:00
Vadim Pisarevsky
d652cc72f2
fixed bugs #2100 (kind of) and #1393
...
[edit: cleaned whitespace]
2012-10-19 20:47:57 +04:00
Alexander Shishkov
2dba13f7d4
added support armv7s for iOS framework
...
for supporting with iOS 6 devices
2012-10-19 19:36:20 +04:00
Andrey Kamaev
8fb6d9f650
Fix Android build warnings
2012-10-19 16:14:14 +04:00
Andrey Kamaev
d9ffe5e7c4
Merge branch '2.4'
2012-10-19 15:07:12 +04:00
Andrey Kamaev
cb66dd8000
Normalize android/scripts/wincfg.cmd.tmpl
2012-10-19 15:06:32 +04:00
Andrey Kamaev
e8dd73798c
Merge pull request #59 from taka-no-me:doc/fix-signatures-master
2012-10-19 15:03:26 +04:00
Andrey Kamaev
546ec2af65
Merge pull request #54 from taka-no-me:doc/fix-signatures
2012-10-19 15:02:30 +04:00
Andrey Kamaev
5bc104cef5
Merge branch '2.4'
2012-10-19 15:00:05 +04:00
Andrey Kamaev
09abcd567e
Merge pull request #50 from taka-no-me:parallel/fix-build-2445
2012-10-19 14:57:08 +04:00