Roman Donchenko [Fri, 7 Jun 2013 10:33:33 +0000 (14:33 +0400)]
Merge pull request #900 from jet47:restore-gpu-modules
Vadim Pisarevsky [Fri, 7 Jun 2013 09:43:50 +0000 (13:43 +0400)]
Merge pull request #963 from bitwangyaoyao:master_oclMat
Vladislav Vinogradov [Fri, 7 Jun 2013 09:34:33 +0000 (13:34 +0400)]
fixed compiler warning
removed -fvisibility-inlines-hidden compiler option for CUDA sources
Vladislav Vinogradov [Tue, 4 Jun 2013 09:32:35 +0000 (13:32 +0400)]
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
Roman Donchenko [Fri, 7 Jun 2013 08:45:02 +0000 (12:45 +0400)]
Merge pull request #949 from SpecLad:merge-2.4
yao [Fri, 7 Jun 2013 07:31:12 +0000 (15:31 +0800)]
remove commented lines
Roman Donchenko [Fri, 7 Jun 2013 07:28:10 +0000 (11:28 +0400)]
Merge pull request #951 from apavlenko:fix_java_test_randshuffle
yao [Fri, 7 Jun 2013 07:27:44 +0000 (15:27 +0800)]
merge openCLMallocPitch and openCLMallocPitchEx into one interface
Roman Donchenko [Thu, 6 Jun 2013 08:09:41 +0000 (12:09 +0400)]
Merge pull request #956 from IanVS:COLOR_CODE
IanVS [Thu, 6 Jun 2013 01:55:56 +0000 (21:55 -0400)]
Updated documentation to new "COLOR_" format for color conversion enums.
Roman Donchenko [Tue, 4 Jun 2013 14:31:51 +0000 (18:31 +0400)]
Merge remote-tracking branch 'origin/2.4'
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
Roman Donchenko [Wed, 5 Jun 2013 09:32:33 +0000 (13:32 +0400)]
Merge pull request #950 from apavlenko:fix_java_mat_dump
Andrey Pavlenko [Wed, 5 Jun 2013 08:41:09 +0000 (12:41 +0400)]
fix failing test
small matrix becomes the same after shuffling
Andrey Pavlenko [Wed, 5 Jun 2013 07:46:06 +0000 (11:46 +0400)]
fixing broken Mat::dump() in Java
Vadim Pisarevsky [Tue, 4 Jun 2013 09:32:34 +0000 (13:32 +0400)]
Merge pull request #945 from malcolmreynolds:master
Malcolm Reynolds [Mon, 3 Jun 2013 16:07:05 +0000 (18:07 +0200)]
update safe_call.hpp to fix OpenCL import on case sensitive mac FS
On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
Malcolm Reynolds [Mon, 3 Jun 2013 16:06:25 +0000 (18:06 +0200)]
update util.hpp to fix OpenCL import on case sensitive mac FS
On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
Roman Donchenko [Mon, 3 Jun 2013 12:08:23 +0000 (16:08 +0400)]
Merge pull request #943 from jet47:cuda-5.5-support
Roman Donchenko [Mon, 3 Jun 2013 12:08:06 +0000 (16:08 +0400)]
Merge pull request #944 from jet47:cmake-2.8.11-cuda-fix
Vladislav Vinogradov [Mon, 3 Jun 2013 10:41:23 +0000 (14:41 +0400)]
fixed constructors for functional objects (added __host__ modifier)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:36:02 +0000 (13:36 +0400)]
fixed norm diff function (it uses pre-allocated buffer now)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:34:41 +0000 (13:34 +0400)]
fixed NPP error constants usage
Vladislav Vinogradov [Mon, 3 Jun 2013 09:33:53 +0000 (13:33 +0400)]
fixed NPP library search (it was splitted)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:24:57 +0000 (13:24 +0400)]
fixed GPU module compialtion with CMake 2.8.11
CMake 2.8.11 removed linkage with CUDA driver library,
but it's used by gpu video encoding/decoding
Roman Donchenko [Mon, 3 Jun 2013 08:13:44 +0000 (12:13 +0400)]
Merge pull request #912 from SpecLad:contributing
Roman Donchenko [Mon, 3 Jun 2013 08:13:15 +0000 (12:13 +0400)]
Merge pull request #934 from SpecLad:parallel-for
Roman Donchenko [Fri, 31 May 2013 12:46:30 +0000 (16:46 +0400)]
Merge pull request #931 from jet47:gpu-test-fixes
Roman Donchenko [Thu, 30 May 2013 15:05:59 +0000 (19:05 +0400)]
Split CLAHE into its own file, because it's faster that way.
Yes, it's as ludicrous as it sounds, but it's still true. Bizarrely,
the previous commit makes CLAHE run about 10% slower on Android, even
though it doesn't even touch any CLAHE code. Splitting it off fixes that,
although the reason it does is a mystery for the ages.
It's cleaner when it's in its own file, anyway. ;=]
Roman Donchenko [Thu, 30 May 2013 14:44:33 +0000 (18:44 +0400)]
Replaced most of the usages of parallel_for with that of parallel_for_.
This should allow many algorithms to take advantage of more parallelization
technologies.
Vadim Pisarevsky [Thu, 30 May 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #932 from bitwangyaoyao:2.4_fixBFM
Vadim Pisarevsky [Thu, 30 May 2013 08:01:40 +0000 (12:01 +0400)]
Merge pull request #918 from bitwangyaoyao:2.4_samples
Vadim Pisarevsky [Thu, 30 May 2013 08:01:25 +0000 (12:01 +0400)]
Merge pull request #924 from pengx17:2.4_arithm_fix
Vadim Pisarevsky [Thu, 30 May 2013 08:01:08 +0000 (12:01 +0400)]
Merge pull request #925 from pengx17:2.4_canny_tmp_fix
Vadim Pisarevsky [Thu, 30 May 2013 08:00:46 +0000 (12:00 +0400)]
Merge pull request #927 from bitwangyaoyao:2.4_perf
Roman Donchenko [Thu, 30 May 2013 07:57:24 +0000 (11:57 +0400)]
Merge pull request #930 from pengx17:2.4_haar_ext
yao [Thu, 30 May 2013 06:57:15 +0000 (14:57 +0800)]
Fix brute_force_matcher's hung on some Intel CPU OCL
peng xiao [Thu, 30 May 2013 06:01:19 +0000 (14:01 +0800)]
Add non-stump based ocl Haar cascade classifier support.
For example, haarcascade_frontalface_alt2.xml is now supported.
Note that classifier's pattern of a cascade file must be consistent,
i.e., all trees must either have two nodes or one node, otherwise
unexpected results will occur.
Other fixes:
Test cases are updated.
Some unused codes are removed.
Fix some problems of haar when using OclCascadeClassifierBuf.
Vladislav Vinogradov [Wed, 29 May 2013 13:38:32 +0000 (17:38 +0400)]
fixed some gpu tests (different rounding results due to float arithmetics)
Roman Donchenko [Wed, 29 May 2013 13:10:48 +0000 (17:10 +0400)]
Merge pull request #928 from apavlenko:bugfix_3027
Roman Donchenko [Wed, 29 May 2013 12:53:02 +0000 (16:53 +0400)]
Merge pull request #920 from asmorkalov:android_move
Roman Donchenko [Wed, 29 May 2013 12:24:49 +0000 (16:24 +0400)]
Merge pull request #921 from SpecLad:merge-2.4
Roman Donchenko [Wed, 29 May 2013 11:27:18 +0000 (15:27 +0400)]
Merge pull request #910 from pengx17:2.4_oclgfft
peng xiao [Wed, 29 May 2013 09:57:14 +0000 (17:57 +0800)]
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
Andrey Pavlenko [Wed, 29 May 2013 08:51:26 +0000 (12:51 +0400)]
fixing #3027 (searching JNI even if no ant), fixing java tests status message (ON/OFF)
yao [Wed, 29 May 2013 07:48:56 +0000 (15:48 +0800)]
adjust test cases
peng xiao [Wed, 29 May 2013 06:15:26 +0000 (14:15 +0800)]
Fix 2.4 ocl Canny.
This fix is a workaround for current 2.4 branch without introducing an
additional oclMat buffer into CannyBuf object.
Test case is cleaned up.
Volatile keywords in kernels are removed for performance concern.
Vadim Pisarevsky [Tue, 28 May 2013 18:05:14 +0000 (22:05 +0400)]
Merge pull request #913 from janm399:2.4
Vadim Pisarevsky [Tue, 28 May 2013 18:04:37 +0000 (22:04 +0400)]
Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
Vadim Pisarevsky [Tue, 28 May 2013 17:54:51 +0000 (21:54 +0400)]
Merge pull request #919 from abidrahmank:2.4
Vadim Pisarevsky [Tue, 28 May 2013 17:54:24 +0000 (21:54 +0400)]
Merge pull request #923 from pengx17:2.4_macfix
yao [Tue, 28 May 2013 10:07:41 +0000 (18:07 +0800)]
fix memory leak
yao [Tue, 28 May 2013 09:53:06 +0000 (17:53 +0800)]
revise perf
peng xiao [Tue, 28 May 2013 09:27:55 +0000 (17:27 +0800)]
Fix a bug when pushing pointers of arguments into std::vector.
When argument pointers pushed into an vector and the pointers point to
address on stack, we need to make sure they are valid until kernels are
successfully flushed onto the queue.
Alexander Smorkalov [Wed, 22 May 2013 14:09:24 +0000 (18:09 +0400)]
Build fixes. Build scrips reorganized.
peng xiao [Tue, 28 May 2013 03:12:05 +0000 (11:12 +0800)]
Fix some OpenCL kernel file build errors on Mac.
Roman Donchenko [Wed, 22 May 2013 11:14:38 +0000 (15:14 +0400)]
Replace the pull request guidelines with a link to the wiki.
I've moved the contents of CONTRIBUTING.md to the wiki (and slightly
expanded it), so the former is no longer required. I've put a link to the
wiki page and a summary in the README.
Roman Donchenko [Mon, 27 May 2013 12:58:04 +0000 (16:58 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Pull requests:
#904 from ograycode:2.4
#905 from bitwangyaoyao:2.4_TVL1
#902 from apavlenko:fix_run_py
#882 from pengx17:2.4_rewrite_query_info
Conflicts:
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/hog.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/tvl1flow.cpp
Alexander Smorkalov [Fri, 17 May 2013 13:15:20 +0000 (17:15 +0400)]
android -> plarforms/android
abidrahmank [Mon, 27 May 2013 05:00:30 +0000 (10:30 +0530)]
ANDed waitkey result with 0xFF for x64 systems
abidrahmank [Fri, 24 May 2013 20:20:41 +0000 (01:50 +0530)]
Bug #2960 : docs about CV_BGR2GRAY
abidrahmank [Fri, 24 May 2013 19:25:31 +0000 (00:55 +0530)]
A new python sample on grabcut
yao [Fri, 24 May 2013 07:52:33 +0000 (15:52 +0800)]
add results verification to facedetect and hog samples
yao [Fri, 24 May 2013 05:46:21 +0000 (13:46 +0800)]
fix hog
Roman Donchenko [Thu, 23 May 2013 11:17:55 +0000 (15:17 +0400)]
Merge pull request #911 from jrdi:patch-1
Roman Donchenko [Thu, 23 May 2013 11:15:00 +0000 (15:15 +0400)]
Merge pull request #917 from SpecLad:cuda-4-build
yao [Thu, 23 May 2013 10:12:09 +0000 (18:12 +0800)]
remove the images in ocl sample folder
yao [Thu, 23 May 2013 10:10:38 +0000 (18:10 +0800)]
add two samples
Roman Donchenko [Thu, 23 May 2013 10:00:13 +0000 (14:00 +0400)]
Fix a build error which manifests when building with CUDA < 5.
yao [Thu, 23 May 2013 09:58:50 +0000 (17:58 +0800)]
fix Linux build errors
Roman Donchenko [Thu, 23 May 2013 09:54:57 +0000 (13:54 +0400)]
Merge pull request #914 from SpecLad:master
yao [Thu, 23 May 2013 02:55:08 +0000 (10:55 +0800)]
fix pyrLK's mismatch on Intel GPUs
Roman Donchenko [Wed, 22 May 2013 14:46:39 +0000 (18:46 +0400)]
Merge pull request #904 from ograycode:2.4
Roman Donchenko [Wed, 22 May 2013 13:21:19 +0000 (17:21 +0400)]
Merge commit '
b51a1a7d' (PR #895 from 2.4)
Conflicts:
modules/ocl/CMakeLists.txt
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
Jan Machacek [Wed, 22 May 2013 12:22:16 +0000 (13:22 +0100)]
Fixed include name in OpenCL on OS X
Jordi Villar [Wed, 22 May 2013 10:57:43 +0000 (13:57 +0300)]
fix parenthesis
Andrey Pavlenko [Wed, 22 May 2013 09:54:20 +0000 (13:54 +0400)]
Merge pull request #797 from vhdirk:installheaders
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:08:16 +0000 (12:08 +0400)]
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
Roman Donchenko [Wed, 22 May 2013 08:03:27 +0000 (12:03 +0400)]
Merge pull request #907 from SpecLad:master
peng xiao [Wed, 22 May 2013 05:46:42 +0000 (13:46 +0800)]
Add ocl's good features to track implementation.
Additional notes with this commit:
1. Add cornerHarris_dxdy and cornerMinEigenVal_dxdy to get
the interim dx and dy output of Sobel operator;
2. Add minMax_buf to allow user to reuse buffers in minMax;
3. Fix an error when either min or max pointer fed into minMax is NULL;
4. Corner sorter temporarily uses C++ STL's quick sort. A parallel
selection sort in OpneCL is contained in the implementation but disabled
due to poor performance at the moment.
5. Accuracy test for ocl gfft.
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
Andrey Pavlenko [Tue, 21 May 2013 10:07:31 +0000 (14:07 +0400)]
Merge pull request #902 from apavlenko:fix_run_py
Vadim Pisarevsky [Mon, 20 May 2013 10:01:03 +0000 (14:01 +0400)]
Merge pull request #882 from pengx17:2.4_rewrite_query_info
Vadim Pisarevsky [Mon, 20 May 2013 10:00:46 +0000 (14:00 +0400)]
Merge pull request #895 from bitwangyaoyao:2.4_perf
Roman Donchenko [Mon, 20 May 2013 08:11:47 +0000 (12:11 +0400)]
Merge pull request #853 from icylord:2.4
yao [Mon, 20 May 2013 06:46:17 +0000 (14:46 +0800)]
Fix the mismatch on NV GPUs
ograycode [Mon, 20 May 2013 02:04:56 +0000 (22:04 -0400)]
Simple set of the camera index to allow the user to change it after the object has been initialized.
Andrey Pavlenko [Sun, 19 May 2013 10:57:21 +0000 (14:57 +0400)]
'aapt' tool moved in SDK r22, adding support to run.py
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:44:22 +0000 (15:44 +0800)]
fix a warning
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
yao [Fri, 17 May 2013 05:19:09 +0000 (13:19 +0800)]
fix the waring in gemm test
yao [Fri, 17 May 2013 05:18:46 +0000 (13:18 +0800)]
add accuracy tests while running perf
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