Andrey Kamaev
|
9deea80b83
|
Update gtest to upstream r652
It is already marked as a gtest 1.7.0
|
2013-04-13 16:29:05 +04:00 |
|
Andrey Kamaev
|
abe2ea59ed
|
Merge pull request #802 from SpecLad:shebang
|
2013-04-12 15:00:28 +04:00 |
|
Andrey Kamaev
|
36028bd8ad
|
Merge pull request #808 from bitwangyaoyao:2.4_mac
|
2013-04-12 14:59:45 +04:00 |
|
Andrey Kamaev
|
d2de68c14c
|
Merge pull request #804 from gpsinghsandhu:staticCast
|
2013-04-12 14:59:26 +04:00 |
|
Vadim Pisarevsky
|
03e2a52e2c
|
Merge pull request #807 from pengx17:2.4_ocl_bfm_opt
|
2013-04-12 13:46:55 +04:00 |
|
Vadim Pisarevsky
|
a770d04e78
|
Merge pull request #781 from bitwangyaoyao:2.4_fixerr
|
2013-04-12 13:44:59 +04:00 |
|
yao
|
719e8674ad
|
fix the compile errors on Mac
|
2013-04-12 17:38:59 +08:00 |
|
peng xiao
|
2338a895f5
|
Capitalize macro namings.
|
2013-04-12 16:56:49 +08:00 |
|
peng xiao
|
1bea9ee26c
|
Rename test case category and code clean up.
|
2013-04-12 16:54:06 +08:00 |
|
peng xiao
|
c9d8eb7a84
|
Fix build error on linux.
|
2013-04-12 16:52:21 +08:00 |
|
peng xiao
|
6eefd276cf
|
Further optimize bfmatcher by passing macros.
|
2013-04-12 16:51:36 +08:00 |
|
peng xiao
|
113b7584e0
|
Optimize bfmatcher by passing macros.
|
2013-04-12 16:50:30 +08:00 |
|
peng xiao
|
1e49c00f4b
|
Replace create with ensureSizeIsEnough thus buffer objects can be reused.
|
2013-04-12 16:47:44 +08:00 |
|
Gurpinder Singh Sandhu
|
36aad46fe1
|
changed reinterpret_cast to static_cast
This issue seem to be lingering around for quite some time
https://github.com/Itseez/opencv/pull/639
http://code.opencv.org/issues/2819
|
2013-04-11 22:32:50 +05:30 |
|
Roman Donchenko
|
57d4c86b2b
|
Fixed the shebang lines on the Python scripts.
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
|
2013-04-11 18:37:23 +04:00 |
|
Andrey Kamaev
|
ca56e99a62
|
Merge pull request #796 from SpecLad:more-backports
|
2013-04-11 15:48:17 +04:00 |
|
Roman Donchenko
|
4143071e22
|
In CvBoost, delegated update_weights's implementation to a helper method.
This allows subclasses of CvBoost to override initial weights that
update_weights uses without duplicating its entire implementation.
|
2013-04-11 13:50:10 +04:00 |
|
Andrey Kamaev
|
62b593ca8b
|
Merge pull request #793 from SpecLad:auto-cuda
|
2013-04-11 12:24:04 +04:00 |
|
Andrey Kamaev
|
9ba25e9d09
|
Merge pull request #742 from bitwangyaoyao:2.4_fix
|
2013-04-11 11:33:45 +04:00 |
|
Andrey Kamaev
|
0c64fc61dc
|
Merge pull request #740 from evil0sheep:2.4
|
2013-04-11 11:33:31 +04:00 |
|
Roman Donchenko
|
484607fb6f
|
Backported RNG_MT19937 from master.
|
2013-04-10 19:39:38 +04:00 |
|
Roman Donchenko
|
f64d512774
|
Backported globbing from master.
|
2013-04-10 19:36:39 +04:00 |
|
Roman Donchenko
|
e8721f1f6f
|
Automatically add CUDA support to a module if it has CUDA sources.
Backport from master.
|
2013-04-10 12:20:54 +04:00 |
|
Andrey Kamaev
|
6d7313cd3d
|
Merge pull request #776 from virtuald:2.4
|
2013-04-09 08:51:09 +04:00 |
|
yao
|
7726e273a9
|
merge add and sub into one set of kernels
|
2013-04-06 13:37:36 +08:00 |
|
yao
|
bee970ab94
|
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data
|
2013-04-05 21:29:29 +08:00 |
|
Andrey Kamaev
|
72e49dc790
|
Merge pull request #777 from taka-no-me:ocl_win_hang
|
2013-04-05 13:00:03 +04:00 |
|
Andrey Kamaev
|
a2d27429e4
|
Merge pull request #775 from bitwangyaoyao:2.4_fixerr
|
2013-04-05 12:59:45 +04:00 |
|
Andrey Kamaev
|
977562b614
|
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
|
2013-04-05 12:59:22 +04:00 |
|
Andrey Kamaev
|
3b6a82b57c
|
Merge pull request #769 from apavlenko:fix_2901
|
2013-04-05 12:59:02 +04:00 |
|
Andrey Kamaev
|
3400d83778
|
Workaround hanging of ocl module when ocl API in not really used
|
2013-04-05 11:01:28 +04:00 |
|
Andrey Pavlenko
|
4c31c26acf
|
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
|
2013-04-05 08:50:37 +04:00 |
|
Andrey Pavlenko
|
09fe5cddf1
|
test for the issue #2901
|
2013-04-05 08:50:24 +04:00 |
|
Andrey Pavlenko
|
18b2d6bdbb
|
copying '.classpath' and '.project' to build dir, useful for opening in eclipse
|
2013-04-05 08:50:08 +04:00 |
|
Dustin Spicuzza
|
64b5784c0b
|
Catch exceptions when large allocations fail
|
2013-04-05 00:43:10 -04:00 |
|
yao
|
8cc5b98051
|
Fix the problem of device selection on hybrid video systems.
|
2013-04-05 09:19:59 +08:00 |
|
yao
|
5022bc8c25
|
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
|
2013-04-05 09:17:14 +08:00 |
|
yao
|
bcc086baa9
|
fix all redefine build errors on some Intel OCL
|
2013-04-05 08:15:05 +08:00 |
|
Gurpinder Singh Sandhu
|
69127e4105
|
some typo
|
2013-04-04 22:54:27 +05:30 |
|
Gurpinder Singh Sandhu
|
2b1e13f8f4
|
changed surfFeaturesFinder::find() to allow CV_8UC1 type images
http://code.opencv.org/issues/2926
|
2013-04-04 22:52:07 +05:30 |
|
Andrey Kamaev
|
652606f780
|
Merge pull request #770 from asmorkalov:winrt
|
2013-04-04 20:01:55 +04:00 |
|
Andrey Kamaev
|
80fed87d53
|
Merge pull request #760 from alekcac:2.4
|
2013-04-04 18:44:35 +04:00 |
|
Alexander Smorkalov
|
a914088f29
|
Build warning fixes.
|
2013-04-04 07:29:53 -07:00 |
|
Andrey Kamaev
|
6570215205
|
Merge pull request #767 from asmorkalov:version_increment
|
2013-04-04 18:00:44 +04:00 |
|
Andrey Kamaev
|
1d7ff721ed
|
Merge pull request #764 from taka-no-me:svd
|
2013-04-04 17:59:57 +04:00 |
|
Andrey Kamaev
|
579f723fc6
|
Merge pull request #762 from vpisarev:cvt_fix
|
2013-04-04 17:59:28 +04:00 |
|
Andrey Kamaev
|
7c402d1e15
|
Merge pull request #759 from asmorkalov:android_common_fixes
|
2013-04-04 17:58:44 +04:00 |
|
Andrey Kamaev
|
6f288615a2
|
Merge pull request #756 from taka-no-me:libavcodec53.25.0
|
2013-04-04 17:57:17 +04:00 |
|
Andrey Kamaev
|
e22983ddb6
|
Merge pull request #753 from taka-no-me:fix_osx_fat_java
|
2013-04-04 17:55:28 +04:00 |
|
Alexander Smorkalov
|
1e332d690f
|
OpenCV verison incremented
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
|
2013-04-04 15:50:36 +04:00 |
|