peng xiao [Tue, 14 May 2013 09:50:38 +0000 (17:50 +0800)]
Copy ocl::queryDeviceInfo interface from master to 2.4.
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
Andrey Pavlenko [Tue, 7 May 2013 13:00:29 +0000 (17:00 +0400)]
Merge pull request #866 from MadEgg:RetrieveFrame_index_argument
Vadim Pisarevsky [Tue, 7 May 2013 12:39:49 +0000 (16:39 +0400)]
Merge pull request #865 from pengx17:2.4_ocl_ver
Andrey Pavlenko [Tue, 7 May 2013 11:15:16 +0000 (15:15 +0400)]
Merge pull request #846 from smart-mobile-software:tuto_crash
poiuytrez [Tue, 7 May 2013 09:45:18 +0000 (11:45 +0200)]
Link to bug tracker replaced by bug description
peng xiao [Mon, 6 May 2013 09:16:45 +0000 (17:16 +0800)]
Suppress warning when compiling deprecated OpenCL function on GNU compilers.
Egbert van der Wal [Sat, 4 May 2013 15:17:12 +0000 (17:17 +0200)]
add (optional) index argument to RetrieveFrame method
peng xiao [Fri, 3 May 2013 01:45:56 +0000 (09:45 +0800)]
ocl: Enable backward binary portability for setTo function.
peng xiao [Thu, 2 May 2013 06:44:59 +0000 (14:44 +0800)]
Add OpenCL version 1.2 query into ocl::Context::supportsFeature().
Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.
poiuytrez [Wed, 1 May 2013 14:58:15 +0000 (16:58 +0200)]
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.
Andrey Pavlenko [Tue, 30 Apr 2013 13:36:39 +0000 (17:36 +0400)]
Merge pull request #854 from asmorkalov:android_null_invalid_cam
Andrey Pavlenko [Tue, 30 Apr 2013 07:25:30 +0000 (11:25 +0400)]
Merge pull request #858 from apavlenko:fix_ocl_build_on_bb
Andrey Pavlenko [Mon, 29 Apr 2013 19:10:03 +0000 (23:10 +0400)]
fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one)
Alexander Smorkalov [Sat, 13 Apr 2013 15:15:45 +0000 (19:15 +0400)]
NullPointerException in case of error on opening native camera fixed.
Andrey Pavlenko [Mon, 29 Apr 2013 06:00:07 +0000 (10:00 +0400)]
Merge pull request #800 from asmorkalov:android_cam_idx_semantic
Andrey Pavlenko [Mon, 29 Apr 2013 05:59:18 +0000 (09:59 +0400)]
Merge pull request #827 from apavlenko:fix_android_tutorial1
Vadim Pisarevsky [Sat, 27 Apr 2013 20:37:39 +0000 (00:37 +0400)]
Merge pull request #844 from bitwangyaoyao:2.4_integral
Vadim Pisarevsky [Sat, 27 Apr 2013 20:32:25 +0000 (00:32 +0400)]
Merge pull request #843 from pengx17:2.4_stereobp_fix
poiuytrez [Wed, 24 Apr 2013 10:38:15 +0000 (12:38 +0200)]
Fix android tutorial 3 second picture taken bug
Alexander Smorkalov [Thu, 11 Apr 2013 10:34:20 +0000 (14:34 +0400)]
Front/Back camera semantic support added to Android VideoCapture back-end.
yao [Tue, 23 Apr 2013 09:23:05 +0000 (17:23 +0800)]
use float when sum overflow
peng xiao [Tue, 23 Apr 2013 07:34:40 +0000 (15:34 +0800)]
Fix a bug found on Intel OpenCL SDK.
Andrey Kamaev [Wed, 17 Apr 2013 11:45:53 +0000 (15:45 +0400)]
Merge pull request #829 from SpecLad:sphinx-ver-1
Andrey Kamaev [Wed, 17 Apr 2013 11:45:37 +0000 (15:45 +0400)]
Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup
Roman Donchenko [Wed, 17 Apr 2013 08:21:17 +0000 (12:21 +0400)]
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.
Andrey Kamaev [Wed, 17 Apr 2013 07:09:49 +0000 (11:09 +0400)]
Merge pull request #826 from pengx17:2.4_canny_clampfix
Andrey Kamaev [Wed, 17 Apr 2013 07:09:36 +0000 (11:09 +0400)]
Merge pull request #825 from pengx17:2.4_query_cpu_wavesize
Andrey Kamaev [Wed, 17 Apr 2013 07:08:58 +0000 (11:08 +0400)]
Merge pull request #822 from taka-no-me:better_cv_enum
Andrey Pavlenko [Tue, 16 Apr 2013 11:30:43 +0000 (15:30 +0400)]
fixing build and lint warnings
peng xiao [Tue, 16 Apr 2013 07:49:15 +0000 (15:49 +0800)]
Add clamping for y dimension.
peng xiao [Tue, 16 Apr 2013 06:41:30 +0000 (14:41 +0800)]
Let wave_size=1 on CPU.
Andrey Kamaev [Tue, 16 Apr 2013 06:16:14 +0000 (10:16 +0400)]
Merge pull request #821 from taka-no-me:contributing
Andrey Kamaev [Mon, 15 Apr 2013 15:39:49 +0000 (19:39 +0400)]
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
Andrey Kamaev [Mon, 15 Apr 2013 12:57:58 +0000 (16:57 +0400)]
Add contributing page for Github
Andrey Kamaev [Mon, 15 Apr 2013 08:13:16 +0000 (12:13 +0400)]
Merge pull request #814 from taka-no-me:gtest_r652
Andrey Kamaev [Mon, 15 Apr 2013 08:12:17 +0000 (12:12 +0400)]
Merge pull request #811 from pengx17:2.4_ocl_bfmatcher_newtype
peng xiao [Mon, 15 Apr 2013 02:36:03 +0000 (10:36 +0800)]
Merge ocl and/or/xor operators into one kernel each.
Andrey Kamaev [Sat, 13 Apr 2013 12:53:59 +0000 (16:53 +0400)]
Fix build issues
Andrey Kamaev [Sat, 13 Apr 2013 12:29:05 +0000 (16:29 +0400)]
Update gtest to upstream r652
It is already marked as a gtest 1.7.0
Peng Xiao [Sat, 13 Apr 2013 06:34:30 +0000 (14:34 +0800)]
Use a faster way to count 1's (used by Hamming)
Peng Xiao [Sat, 13 Apr 2013 06:09:21 +0000 (14:09 +0800)]
Merge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into 2.4_ocl_bfmatcher_newtype
Peng Xiao [Sat, 13 Apr 2013 06:08:58 +0000 (14:08 +0800)]
Allow more query/train types for ocl::bfmatcher
Peng Xiao [Sat, 13 Apr 2013 05:42:26 +0000 (13:42 +0800)]
Allow more input query/train types for ocl::bfmatcher
RadiusMatch for HammingDist cannot pass yet.
Peng Xiao [Sat, 13 Apr 2013 04:50:17 +0000 (12:50 +0800)]
Enable runtime type definition in kernels
Peng Xiao [Sat, 13 Apr 2013 03:39:13 +0000 (11:39 +0800)]
Pass query type T into kernel
Peng Xiao [Sat, 13 Apr 2013 03:22:22 +0000 (11:22 +0800)]
Untabify
Peng Xiao [Sat, 13 Apr 2013 03:07:26 +0000 (11:07 +0800)]
Add HammingDist test case
Andrey Kamaev [Fri, 12 Apr 2013 11:00:28 +0000 (15:00 +0400)]
Merge pull request #802 from SpecLad:shebang
Andrey Kamaev [Fri, 12 Apr 2013 10:59:45 +0000 (14:59 +0400)]
Merge pull request #808 from bitwangyaoyao:2.4_mac
Andrey Kamaev [Fri, 12 Apr 2013 10:59:26 +0000 (14:59 +0400)]
Merge pull request #804 from gpsinghsandhu:staticCast
Andrey Kamaev [Fri, 12 Apr 2013 10:59:11 +0000 (14:59 +0400)]
Merge pull request #801 from kirill-kornyakov:lkdemo-fix
Vadim Pisarevsky [Fri, 12 Apr 2013 09:46:55 +0000 (13:46 +0400)]
Merge pull request #807 from pengx17:2.4_ocl_bfm_opt
Vadim Pisarevsky [Fri, 12 Apr 2013 09:46:33 +0000 (13:46 +0400)]
Merge pull request #806 from bitwangyaoyao:2.4_fix
Vadim Pisarevsky [Fri, 12 Apr 2013 09:44:58 +0000 (13:44 +0400)]
Merge pull request #781 from bitwangyaoyao:2.4_fixerr
yao [Fri, 12 Apr 2013 09:38:59 +0000 (17:38 +0800)]
fix the compile errors on Mac
peng xiao [Fri, 12 Apr 2013 08:56:49 +0000 (16:56 +0800)]
Capitalize macro namings.
peng xiao [Fri, 12 Apr 2013 08:54:06 +0000 (16:54 +0800)]
Rename test case category and code clean up.
peng xiao [Fri, 12 Apr 2013 08:52:21 +0000 (16:52 +0800)]
Fix build error on linux.
peng xiao [Fri, 12 Apr 2013 08:51:36 +0000 (16:51 +0800)]
Further optimize bfmatcher by passing macros.
peng xiao [Fri, 12 Apr 2013 08:50:30 +0000 (16:50 +0800)]
Optimize bfmatcher by passing macros.
peng xiao [Fri, 12 Apr 2013 08:47:44 +0000 (16:47 +0800)]
Replace create with ensureSizeIsEnough thus buffer objects can be reused.
yao [Fri, 12 Apr 2013 06:44:55 +0000 (14:44 +0800)]
remove the OpenCL Dir finding in CMake
Gurpinder Singh Sandhu [Thu, 11 Apr 2013 17:02:50 +0000 (22:32 +0530)]
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
Roman Donchenko [Thu, 11 Apr 2013 14:34:04 +0000 (18:34 +0400)]
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.
Kirill Kornyakov [Thu, 11 Apr 2013 13:57:33 +0000 (17:57 +0400)]
Minor code cleanings in lkdemo.cpp
Kirill Kornyakov [Thu, 11 Apr 2013 13:50:10 +0000 (17:50 +0400)]
#2813 bugfix
Andrey Kamaev [Thu, 11 Apr 2013 11:48:16 +0000 (15:48 +0400)]
Merge pull request #796 from SpecLad:more-backports
Andrey Kamaev [Thu, 11 Apr 2013 11:47:57 +0000 (15:47 +0400)]
Merge pull request #799 from SpecLad:boost-initial-weights
Roman Donchenko [Thu, 11 Apr 2013 09:43:51 +0000 (13:43 +0400)]
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.
Andrey Kamaev [Thu, 11 Apr 2013 08:24:04 +0000 (12:24 +0400)]
Merge pull request #793 from SpecLad:auto-cuda
Andrey Kamaev [Thu, 11 Apr 2013 07:34:42 +0000 (11:34 +0400)]
Merge pull request #794 from asmorkalov:android_no_layout
Andrey Kamaev [Thu, 11 Apr 2013 07:34:21 +0000 (11:34 +0400)]
Merge pull request #792 from asmorkalov:manager_incompat_wh
Andrey Kamaev [Thu, 11 Apr 2013 07:33:45 +0000 (11:33 +0400)]
Merge pull request #742 from bitwangyaoyao:2.4_fix
Andrey Kamaev [Thu, 11 Apr 2013 07:33:30 +0000 (11:33 +0400)]
Merge pull request #740 from evil0sheep:2.4
Roman Donchenko [Wed, 10 Apr 2013 15:39:38 +0000 (19:39 +0400)]
Backported RNG_MT19937 from master.
Roman Donchenko [Wed, 10 Apr 2013 15:36:39 +0000 (19:36 +0400)]
Backported globbing from master.
Alexander Smorkalov [Wed, 10 Apr 2013 12:57:34 +0000 (16:57 +0400)]
Front/back camera constants semantic for Android fixed (Bug #2839).
Front/Back camera constants' values changed;
Additional camera facing check added for JavaCameraView.
Alexander Smorkalov [Wed, 10 Apr 2013 09:38:59 +0000 (13:38 +0400)]
Feature #2893 Create Java sample without layout.xml implemented.
Roman Donchenko [Wed, 10 Apr 2013 08:20:54 +0000 (12:20 +0400)]
Automatically add CUDA support to a module if it has CUDA sources.
Backport from master.
Alexander Smorkalov [Wed, 10 Apr 2013 06:43:22 +0000 (10:43 +0400)]
Incompatible hardware detetction added to OpenCV Manager(Feature #2941)
Andrey Kamaev [Tue, 9 Apr 2013 09:14:21 +0000 (13:14 +0400)]
Merge pull request #789 from asmorkalov:android_na_mk_fix
Alexander Smorkalov [Tue, 9 Apr 2013 06:13:46 +0000 (10:13 +0400)]
Native activity build with Android.mk fixed.
Andrey Kamaev [Tue, 9 Apr 2013 04:52:32 +0000 (08:52 +0400)]
Merge pull request #782 from taka-no-me:bitness_detection
Andrey Kamaev [Tue, 9 Apr 2013 04:51:09 +0000 (08:51 +0400)]
Merge pull request #776 from virtuald:2.4
Andrey Kamaev [Sat, 6 Apr 2013 16:11:40 +0000 (20:11 +0400)]
Fix bitness detection for target platform
Andrey Kamaev [Mon, 8 Apr 2013 06:11:16 +0000 (10:11 +0400)]
Merge pull request #780 from sivapvarma:2.4
yao [Sat, 6 Apr 2013 05:37:36 +0000 (13:37 +0800)]
merge add and sub into one set of kernels
Siva Prasad Varma [Fri, 5 Apr 2013 13:39:09 +0000 (19:09 +0530)]
Fix bug #2590
replaced wrong check to correct check
yao [Fri, 5 Apr 2013 13:29:29 +0000 (21:29 +0800)]
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data
Andrey Kamaev [Fri, 5 Apr 2013 09:00:20 +0000 (13:00 +0400)]
Merge pull request #778 from asmorkalov:android_wanr_fix
Andrey Kamaev [Fri, 5 Apr 2013 09:00:03 +0000 (13:00 +0400)]
Merge pull request #777 from taka-no-me:ocl_win_hang
Andrey Kamaev [Fri, 5 Apr 2013 08:59:45 +0000 (12:59 +0400)]
Merge pull request #775 from bitwangyaoyao:2.4_fixerr
Andrey Kamaev [Fri, 5 Apr 2013 08:59:22 +0000 (12:59 +0400)]
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
Andrey Kamaev [Fri, 5 Apr 2013 08:59:01 +0000 (12:59 +0400)]
Merge pull request #769 from apavlenko:fix_2901
Alexander Smorkalov [Fri, 5 Apr 2013 08:17:45 +0000 (12:17 +0400)]
Waning fixes for Android samples
Andrey Kamaev [Fri, 5 Apr 2013 07:46:06 +0000 (11:46 +0400)]
Merge pull request #772 from gpsinghsandhu:featureDescriptionTutorials
Andrey Kamaev [Fri, 5 Apr 2013 07:01:28 +0000 (11:01 +0400)]
Workaround hanging of ocl module when ocl API in not really used
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:37 +0000 (08:50 +0400)]
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:24 +0000 (08:50 +0400)]
test for the issue #2901
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:08 +0000 (08:50 +0400)]
copying '.classpath' and '.project' to build dir, useful for opening in eclipse