2faa2adae2
Merge pull request #846 from smart-mobile-software:tuto_crash
2013-05-07 15:15:16 +04:00
7dda8e2cb8
Link to bug tracker replaced by bug description
2013-05-07 11:45:18 +02:00
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
48a8aefd6b
Merge pull request #854 from asmorkalov:android_null_invalid_cam
2013-04-30 17:36:39 +04:00
f21e99de0f
Merge pull request #858 from apavlenko:fix_ocl_build_on_bb
2013-04-30 11:25:31 +04:00
108bb811c5
fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one)
2013-04-29 23:10:03 +04:00
456c56fe90
NullPointerException in case of error on opening native camera fixed.
2013-04-29 11:00:52 +04:00
5ce4e3c265
Merge pull request #800 from asmorkalov:android_cam_idx_semantic
2013-04-29 10:00:08 +04:00
6d89e1f412
Merge pull request #827 from apavlenko:fix_android_tutorial1
2013-04-29 09:59:19 +04:00
2068c4582c
Merge pull request #844 from bitwangyaoyao:2.4_integral
2013-04-28 00:37:40 +04:00
4f26f0c2e2
Merge pull request #843 from pengx17:2.4_stereobp_fix
2013-04-28 00:32:26 +04:00
60bf018781
Fix android tutorial 3 second picture taken bug
2013-04-24 12:38:15 +02:00
8606ee4beb
Front/Back camera semantic support added to Android VideoCapture back-end.
2013-04-24 10:56:16 +04:00
b386ea72aa
use float when sum overflow
2013-04-23 17:23:05 +08:00
3282aaa1f5
Fix a bug found on Intel OpenCL SDK.
2013-04-23 15:34:40 +08:00
a9a269505c
Merge pull request #829 from SpecLad:sphinx-ver-1
2013-04-17 15:45:53 +04:00
28aefc4f5a
Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup
2013-04-17 15:45:38 +04:00
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
f6848b66d6
Merge pull request #826 from pengx17:2.4_canny_clampfix
2013-04-17 11:09:49 +04:00
bf551df4cf
Merge pull request #825 from pengx17:2.4_query_cpu_wavesize
2013-04-17 11:09:37 +04:00
5eff4f8340
Merge pull request #822 from taka-no-me:better_cv_enum
2013-04-17 11:08:58 +04:00
8c40f0ccf2
fixing build and lint warnings
2013-04-16 15:30:43 +04:00
0f7d7100e5
Add clamping for y dimension.
2013-04-16 15:49:15 +08:00
6f63a5d8d5
Let wave_size=1 on CPU.
2013-04-16 14:41:30 +08:00
c02095ae1c
Merge pull request #821 from taka-no-me:contributing
2013-04-16 10:16:14 +04:00
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
ecf28cc21e
Add contributing page for Github
2013-04-15 16:57:58 +04:00
2ae3ab11e3
Merge pull request #814 from taka-no-me:gtest_r652
2013-04-15 12:13:16 +04:00
0df6dc16a5
Merge pull request #811 from pengx17:2.4_ocl_bfmatcher_newtype
2013-04-15 12:12:18 +04:00
06a4bad809
Merge ocl and/or/xor operators into one kernel each.
2013-04-15 10:36:03 +08:00
802d004bbb
Fix build issues
2013-04-13 16:53:59 +04:00
9deea80b83
Update gtest to upstream r652
...
It is already marked as a gtest 1.7.0
2013-04-13 16:29:05 +04:00
6dd6013546
Use a faster way to count 1's (used by Hamming)
2013-04-13 14:34:30 +08:00
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
6b6b1c9cbf
Allow more query/train types for ocl::bfmatcher
2013-04-13 14:08:58 +08:00
d9de84091c
Allow more input query/train types for ocl::bfmatcher
...
RadiusMatch for HammingDist cannot pass yet.
2013-04-13 13:42:26 +08:00
1db20099a9
Enable runtime type definition in kernels
2013-04-13 12:50:17 +08:00
fd1528795e
Pass query type T into kernel
2013-04-13 11:39:13 +08:00
63813e83ae
Untabify
2013-04-13 11:22:22 +08:00
6a40383aee
Add HammingDist test case
2013-04-13 11:07:26 +08:00
abe2ea59ed
Merge pull request #802 from SpecLad:shebang
2013-04-12 15:00:28 +04:00
36028bd8ad
Merge pull request #808 from bitwangyaoyao:2.4_mac
2013-04-12 14:59:45 +04:00
d2de68c14c
Merge pull request #804 from gpsinghsandhu:staticCast
2013-04-12 14:59:26 +04:00
b696d49d5a
Merge pull request #801 from kirill-kornyakov:lkdemo-fix
2013-04-12 14:59:11 +04:00
03e2a52e2c
Merge pull request #807 from pengx17:2.4_ocl_bfm_opt
2013-04-12 13:46:55 +04:00
3d39087a67
Merge pull request #806 from bitwangyaoyao:2.4_fix
2013-04-12 13:46:33 +04:00
a770d04e78
Merge pull request #781 from bitwangyaoyao:2.4_fixerr
2013-04-12 13:44:59 +04:00
719e8674ad
fix the compile errors on Mac
2013-04-12 17:38:59 +08:00
2338a895f5
Capitalize macro namings.
2013-04-12 16:56:49 +08:00
1bea9ee26c
Rename test case category and code clean up.
2013-04-12 16:54:06 +08:00
Andrey Pavlenko