Roman Donchenko [Wed, 22 May 2013 08:57:04 +0000 (12:57 +0400)]
Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex
Roman Donchenko [Wed, 22 May 2013 08:03:27 +0000 (12:03 +0400)]
Merge pull request #907 from SpecLad:master
Roman Donchenko [Tue, 21 May 2013 10:35:24 +0000 (14:35 +0400)]
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
Roman Donchenko [Mon, 20 May 2013 08:11:47 +0000 (12:11 +0400)]
Merge pull request #853 from icylord:2.4
Vadim Pisarevsky [Sat, 18 May 2013 20:23:23 +0000 (00:23 +0400)]
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
Vadim Pisarevsky [Fri, 17 May 2013 10:44:49 +0000 (14:44 +0400)]
Merge pull request #896 from jet47:removed-vibe-master
yao [Fri, 17 May 2013 07:34:22 +0000 (15:34 +0800)]
add OpticalFlowDual_TVL1_OCL function
Vladislav Vinogradov [Thu, 16 May 2013 09:47:24 +0000 (13:47 +0400)]
removed VIBE implementation
Andrey Pavlenko [Thu, 16 May 2013 14:44:06 +0000 (18:44 +0400)]
Merge pull request #892 from jet47:removed-vibe
Vladislav Vinogradov [Thu, 16 May 2013 09:47:24 +0000 (13:47 +0400)]
removed VIBE implementation
Leszek Swirski [Wed, 15 May 2013 13:42:28 +0000 (14:42 +0100)]
Fix visibility of g_linked_ptr_mutex on Windows
Reverts some changes in
b8ed00bd642971877e1dfda6e0815d7211a7ace2
Vadim Pisarevsky [Wed, 15 May 2013 10:21:49 +0000 (14:21 +0400)]
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
Vadim Pisarevsky [Wed, 15 May 2013 10:18:53 +0000 (14:18 +0400)]
Merge pull request #884 from pengx17:2.4_pyrup_fix
peng xiao [Wed, 15 May 2013 02:47:17 +0000 (10:47 +0800)]
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
This adds a similar interface with pure-cpp and gpu versions.
peng xiao [Wed, 15 May 2013 02:43:47 +0000 (10:43 +0800)]
Clean up spaces in ocl.hpp
peng xiao [Wed, 15 May 2013 00:55:43 +0000 (08:55 +0800)]
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
peng xiao [Wed, 15 May 2013 00:51:21 +0000 (08:51 +0800)]
Fix ocl::pyrUp
Use predefined OpenCL function to convert integers to floating points.
This is more accurate than before as it enables:
1. saturate cast
2. customized rounding
Vadim Pisarevsky [Tue, 14 May 2013 12:00:28 +0000 (16:00 +0400)]
Merge pull request #862 from piponazo:v4lFPS
Vadim Pisarevsky [Tue, 14 May 2013 11:56:55 +0000 (15:56 +0400)]
Merge pull request #818 from bitwangyaoyao:2.4_optBlur
Vadim Pisarevsky [Tue, 14 May 2013 11:56:34 +0000 (15:56 +0400)]
Merge pull request #823 from pickle27:starter_image_sequence
Vadim Pisarevsky [Tue, 14 May 2013 11:56:06 +0000 (15:56 +0400)]
Merge pull request #839 from pengx17:2.4_ocl_csbp
Vadim Pisarevsky [Tue, 14 May 2013 11:55:38 +0000 (15:55 +0400)]
Merge pull request #883 from bitwangyaoyao:2.4_fixMoments
yao [Tue, 14 May 2013 10:02:53 +0000 (18:02 +0800)]
fix black screen when input Mat is large
Andrey Pavlenko [Tue, 14 May 2013 07:57:24 +0000 (11:57 +0400)]
Merge pull request #878 from apavlenko:better_glue_search
Vadim Pisarevsky [Mon, 13 May 2013 19:38:26 +0000 (23:38 +0400)]
Merge pull request #849 from dominikrose:dom_2.4
Vadim Pisarevsky [Mon, 13 May 2013 19:12:25 +0000 (23:12 +0400)]
Merge pull request #872 from pengx17:2.4_create2dimage_fix
Vadim Pisarevsky [Mon, 13 May 2013 19:04:11 +0000 (23:04 +0400)]
Merge pull request #871 from bitwangyaoyao:2.4_acry
Vadim Pisarevsky [Mon, 13 May 2013 19:03:24 +0000 (23:03 +0400)]
Merge pull request #874 from pengx17:master_queryDeviceInfo_rewrite
Vadim Pisarevsky [Mon, 13 May 2013 18:36:09 +0000 (22:36 +0400)]
Merge pull request #819 from bitwangyaoyao:2.4_haarBuf
Vadim Pisarevsky [Mon, 13 May 2013 18:18:53 +0000 (22:18 +0400)]
Merge pull request #850 from SpecLad:convhull-orientation
Vadim Pisarevsky [Mon, 13 May 2013 18:08:44 +0000 (22:08 +0400)]
Merge pull request #881 from apavlenko:hidden_visibility
Andrey Pavlenko [Mon, 13 May 2013 17:22:27 +0000 (21:22 +0400)]
Merge pull request #840 from pablospe:master
Andrey Pavlenko [Mon, 13 May 2013 17:18:47 +0000 (21:18 +0400)]
Merge pull request #880 from apavlenko:qt-5.0
Andrey Pavlenko [Mon, 13 May 2013 17:17:04 +0000 (21:17 +0400)]
Merge pull request #879 from apavlenko:gcc-4.8
Vadim Pisarevsky [Mon, 13 May 2013 17:06:54 +0000 (21:06 +0400)]
Merge pull request #873 from prclibo:2.4
Andrey Kamaev [Thu, 18 Apr 2013 06:30:15 +0000 (10:30 +0400)]
Compile OpenCV with GCC visibility set to hidden
Andrey Kamaev [Wed, 17 Apr 2013 18:02:01 +0000 (22:02 +0400)]
Update CMake scripts to recognize Qt 5.0
Andrey Kamaev [Wed, 17 Apr 2013 18:01:03 +0000 (22:01 +0400)]
Fix build warnings from gcc 4.8
Andrey Kamaev [Wed, 17 Apr 2013 12:55:05 +0000 (16:55 +0400)]
Improve handling of native_app_glue dependency in Android samples
yao [Mon, 13 May 2013 07:04:23 +0000 (15:04 +0800)]
fix the warnings in fft tests
Vadim Pisarevsky [Sun, 12 May 2013 18:16:03 +0000 (22:16 +0400)]
Merge pull request #864 from pengx17:2.4_stereobm
Vadim Pisarevsky [Sun, 12 May 2013 18:15:47 +0000 (22:15 +0400)]
Merge pull request #877 from apavlenko:version_info_in_test_log
Andrey Pavlenko [Sun, 12 May 2013 14:36:55 +0000 (18:36 +0400)]
adding version info to test log
Vadim Pisarevsky [Sun, 12 May 2013 09:00:23 +0000 (13:00 +0400)]
Merge pull request #841 from Pastafarianist:patch-1
Vadim Pisarevsky [Sun, 12 May 2013 08:54:44 +0000 (12:54 +0400)]
Merge pull request #845 from githubuser0xFFFF:master
Vadim Pisarevsky [Sun, 12 May 2013 08:54:24 +0000 (12:54 +0400)]
Merge pull request #848 from pengx17:master_ocl_platform_name
Vadim Pisarevsky [Sun, 12 May 2013 08:53:14 +0000 (12:53 +0400)]
Merge pull request #861 from albenoit:master
Vadim Pisarevsky [Sun, 12 May 2013 08:52:45 +0000 (12:52 +0400)]
Merge pull request #867 from Pastafarianist:patch-2
yao [Thu, 9 May 2013 09:57:13 +0000 (17:57 +0800)]
fix warnings, unify test names
peng xiao [Thu, 9 May 2013 09:19:51 +0000 (17:19 +0800)]
Let surf.ocl use the new queryDeviceInfo interface.
peng xiao [Thu, 9 May 2013 09:15:26 +0000 (17:15 +0800)]
Rewrite queryDeviceInfo interface.
Previously the function may cause some unsafe issue. It is fixed now by introducing a template parameter.
Bo Li [Thu, 9 May 2013 07:20:00 +0000 (15:20 +0800)]
fixed pca bug for fixed mean input
peng xiao [Thu, 9 May 2013 06:00:36 +0000 (14:00 +0800)]
Fix ocl moudle build with latest Intel OpenCL SDK.
We found that cl.h file provided in latest Intel SDK muted deprecated interfaces.
peng xiao [Wed, 8 May 2013 09:29:24 +0000 (17:29 +0800)]
Optimize stereobm a bit.
Speedup about 30% on 6730M GPU.
peng xiao [Wed, 8 May 2013 09:19:34 +0000 (17:19 +0800)]
CL_PLATFORM_VENDOR should be CL_PLATFORM_NAME.
yao [Wed, 8 May 2013 09:07:44 +0000 (17:07 +0800)]
use clean EXPECT_MAT_NEAR (no string output)
yao [Wed, 8 May 2013 08:08:33 +0000 (16:08 +0800)]
further simplify the logics in filter tests
yao [Wed, 8 May 2013 07:27:35 +0000 (15:27 +0800)]
remove interpolation.hpp
yao [Wed, 8 May 2013 07:21:53 +0000 (15:21 +0800)]
add copyrights
yao [Wed, 8 May 2013 07:12:12 +0000 (15:12 +0800)]
simplify logics in filter tests, remove redundant code in arithm tests
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
Vadim Pisarevsky [Tue, 7 May 2013 12:32:58 +0000 (16:32 +0400)]
Merge pull request #869 from bpmckinnon:master
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
yao [Tue, 7 May 2013 08:14:50 +0000 (16:14 +0800)]
some cleanup, remove some commented codes
Brian McKinnon [Tue, 7 May 2013 02:45:11 +0000 (22:45 -0400)]
Added #include <limits> to files that were missing it.
peng xiao [Mon, 6 May 2013 09:16:45 +0000 (17:16 +0800)]
Suppress warning when compiling deprecated OpenCL function on GNU compilers.
Pastafarianist [Sun, 5 May 2013 12:17:41 +0000 (16:17 +0400)]
Fixed typo
Egbert van der Wal [Sat, 4 May 2013 15:17:12 +0000 (17:17 +0200)]
add (optional) index argument to RetrieveFrame method
alexandre benoit [Fri, 3 May 2013 09:45:13 +0000 (11:45 +0200)]
nicer interface with the use of InputArray and OutptArray instated of (const Mat&)
peng xiao [Fri, 3 May 2013 01:54:11 +0000 (09:54 +0800)]
Fix build
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 08:14:28 +0000 (16:14 +0800)]
Optimize ocl::stereobm.
1. Use macro defines for some parameters(radius).
2. Reduce local memory usage.
3. Fix accuracy problem on Intel GPU.
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.
alexandre benoit [Wed, 1 May 2013 17:35:32 +0000 (19:35 +0200)]
enhancing documentation
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.
alexandre benoit [Wed, 1 May 2013 11:58:53 +0000 (13:58 +0200)]
enhancing documentation
alexandre benoit [Wed, 1 May 2013 09:47:26 +0000 (11:47 +0200)]
trying to solve valarray pointer access problem, enhancing documentation
Luis Díaz Más [Tue, 30 Apr 2013 23:07:03 +0000 (01:07 +0200)]
Added setting feature of FPS in cap_libv4l
alexandre benoit [Tue, 30 Apr 2013 18:26:00 +0000 (20:26 +0200)]
updated doc+minor typo/buildbot reports correction
alexandre benoit [Tue, 30 Apr 2013 15:32:47 +0000 (17:32 +0200)]
updated sources to correct buildbot warnings
alexandre benoit [Tue, 30 Apr 2013 14:52:47 +0000 (16:52 +0200)]
updated/corrected documentation
Andrey Pavlenko [Tue, 30 Apr 2013 13:36:39 +0000 (17:36 +0400)]
Merge pull request #854 from asmorkalov:android_null_invalid_cam
alexandre benoit [Tue, 30 Apr 2013 12:52:14 +0000 (14:52 +0200)]
minor error correction
alexandre benoit [Tue, 30 Apr 2013 12:40:03 +0000 (14:40 +0200)]
updated doc and interface code to solve compile warnings and errors
alexandre benoit [Tue, 30 Apr 2013 11:13:50 +0000 (13:13 +0200)]
corrections required for portability. To be validated by buildbot
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)
alexandre benoit [Mon, 29 Apr 2013 18:08:13 +0000 (20:08 +0200)]
updated doc
alexandre benoit [Mon, 29 Apr 2013 17:06:35 +0000 (19:06 +0200)]
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
alexandre benoit [Mon, 29 Apr 2013 13:12:44 +0000 (15:12 +0200)]
minor chnges for conflict removal
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
ShengyinWu [Mon, 29 Apr 2013 04:16:42 +0000 (12:16 +0800)]
Fixs: After scaling back to original image, some detected ROI will outside the original image ROI
alexandre benoit [Sat, 27 Apr 2013 21:18:47 +0000 (23:18 +0200)]
updated comments and new retina interface use
albenoit [Sat, 27 Apr 2013 20:47:30 +0000 (13:47 -0700)]
Merge pull request #2 from albenoit/retina_devel
Retina devel
alexandre benoit [Sat, 27 Apr 2013 20:39:28 +0000 (22:39 +0200)]
updated tutorial with new retina interface use
Vadim Pisarevsky [Sat, 27 Apr 2013 20:37:39 +0000 (00:37 +0400)]
Merge pull request #844 from bitwangyaoyao:2.4_integral