poiuytrez
7dda8e2cb8
Link to bug tracker replaced by bug description
2013-05-07 11:45:18 +02:00
poiuytrez
bef6de9025
Fix tuto3 picture taken crash on all devices
...
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
2013-05-01 16:58:15 +02:00
poiuytrez
60bf018781
Fix android tutorial 3 second picture taken bug
2013-04-24 12:38:15 +02:00
Andrey Kamaev
a9a269505c
Merge pull request #829 from SpecLad:sphinx-ver-1
2013-04-17 15:45:53 +04:00
Andrey Kamaev
28aefc4f5a
Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup
2013-04-17 15:45:38 +04:00
Roman Donchenko
bd6f80faf3
Redo the Sphinx check to do the same thing on all platforms.
...
This also fixes the bug where the Sphinx version gets detected as
"Sphinx vX.Y.Z" instead of "X.Y.Z" on Unix-like systems.
2013-04-17 12:33:11 +04:00
Andrey Kamaev
f6848b66d6
Merge pull request #826 from pengx17:2.4_canny_clampfix
2013-04-17 11:09:49 +04:00
Andrey Kamaev
bf551df4cf
Merge pull request #825 from pengx17:2.4_query_cpu_wavesize
2013-04-17 11:09:37 +04:00
Andrey Kamaev
5eff4f8340
Merge pull request #822 from taka-no-me:better_cv_enum
2013-04-17 11:08:58 +04:00
peng xiao
0f7d7100e5
Add clamping for y dimension.
2013-04-16 15:49:15 +08:00
peng xiao
6f63a5d8d5
Let wave_size=1 on CPU.
2013-04-16 14:41:30 +08:00
Andrey Kamaev
c02095ae1c
Merge pull request #821 from taka-no-me:contributing
2013-04-16 10:16:14 +04:00
Andrey Kamaev
96b008cd29
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
...
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
2013-04-15 19:39:49 +04:00
Andrey Kamaev
ecf28cc21e
Add contributing page for Github
2013-04-15 16:57:58 +04:00
Andrey Kamaev
2ae3ab11e3
Merge pull request #814 from taka-no-me:gtest_r652
2013-04-15 12:13:16 +04:00
Andrey Kamaev
0df6dc16a5
Merge pull request #811 from pengx17:2.4_ocl_bfmatcher_newtype
2013-04-15 12:12:18 +04:00
peng xiao
06a4bad809
Merge ocl and/or/xor operators into one kernel each.
2013-04-15 10:36:03 +08:00
Andrey Kamaev
802d004bbb
Fix build issues
2013-04-13 16:53:59 +04:00
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
Peng Xiao
6dd6013546
Use a faster way to count 1's (used by Hamming)
2013-04-13 14:34:30 +08:00
Peng Xiao
f2dc445412
Merge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into 2.4_ocl_bfmatcher_newtype
2013-04-13 14:09:21 +08:00
Peng Xiao
6b6b1c9cbf
Allow more query/train types for ocl::bfmatcher
2013-04-13 14:08:58 +08:00
Peng Xiao
d9de84091c
Allow more input query/train types for ocl::bfmatcher
...
RadiusMatch for HammingDist cannot pass yet.
2013-04-13 13:42:26 +08:00
Peng Xiao
1db20099a9
Enable runtime type definition in kernels
2013-04-13 12:50:17 +08:00
Peng Xiao
fd1528795e
Pass query type T into kernel
2013-04-13 11:39:13 +08:00
Peng Xiao
63813e83ae
Untabify
2013-04-13 11:22:22 +08:00
Peng Xiao
6a40383aee
Add HammingDist test case
2013-04-13 11:07:26 +08: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
Andrey Kamaev
b696d49d5a
Merge pull request #801 from kirill-kornyakov:lkdemo-fix
2013-04-12 14:59:11 +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
3d39087a67
Merge pull request #806 from bitwangyaoyao:2.4_fix
2013-04-12 13:46:33 +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
yao
61e041673e
remove the OpenCL Dir finding in CMake
2013-04-12 14:44:55 +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
Kirill Kornyakov
53a06913cb
Minor code cleanings in lkdemo.cpp
2013-04-11 17:57:33 +04:00
Kirill Kornyakov
e351538697
#2813 bugfix
2013-04-11 17:50:10 +04:00
Andrey Kamaev
ca56e99a62
Merge pull request #796 from SpecLad:more-backports
2013-04-11 15:48:17 +04:00
Andrey Kamaev
a1fa63ffc9
Merge pull request #799 from SpecLad:boost-initial-weights
2013-04-11 15:47:57 +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