mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-01 22:24:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,164 Commits 6 Branches 127 Tags 3 GiB
0934344a3d
Commit Graph

6325 Commits

Author SHA1 Message Date
Roman Donchenko
d998e38a12 Merge pull request #983 from HapeMask:python3-compatibility 2013-06-14 15:48:37 +04:00
Roman Donchenko
47ea0614dc Merge pull request #969 from pengx17:2.4_binary_cache 2013-06-14 15:47:23 +04:00
Roman Donchenko
0124902f42 Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows 2013-06-14 15:46:25 +04:00
Alexander Shishkov
0cee15eb7f Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure. 2013-06-14 15:10:25 +04:00
Roman Donchenko
308c7f5f6e Merge pull request #1000 from ivan-korolev:fix_sift_bug_2892 2013-06-14 13:50:01 +04:00
Vladislav Vinogradov
a4750f49c6 fix for bug #3068 (PCA::computeVar for double input): 
The matrix g  can have CV_32F or CV_64F type,  but g.at uses only float template.
This fix adds specialization for double type.
 2013-06-14 12:53:44 +04:00
peng xiao
e6b18fc492 Fix a bug caused by NDEBUG macro; it is now removed. 
Revise some descriptions of the enums.
 2013-06-14 16:37:00 +08:00
Roman Donchenko
130794d41c Merge pull request #990 from asmorkalov:pthread_build_fix 2013-06-14 11:48:05 +04:00
Roman Donchenko
83fa4d38a4 Merge pull request #976 from PeterMinin:num_detections 2013-06-14 11:24:00 +04:00
Ivan Korolev
58fa401b4d Fixed a bug #2405 2013-06-14 10:43:20 +04:00
Ivan Korolev
fc82150edc Fixed a bug #2892 2013-06-14 08:21:42 +04:00
Peter Minin
7d70399d72 Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods 2013-06-14 04:25:17 +04:00
Gabe Schwartz
bb209193c9 Updated usage of METH_X definitions for python 3. 
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
bce1b352e7 Updated cmake files to use print(). 
In these cases, just using print() is enough to ensure py2/3
compatibility.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
fb9781b97b Updated cv2.cpp to support Python 3 API. 
Added a header with defines to enable the module to compile with either
python 2 or 3 without changes.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
931ebab822 Updated generator and parser to support Python 3. 2013-06-13 18:39:47 -04:00
Sergei Nosov
c90abb6a03 add multiruns to fix "unreliable results" error 2013-06-13 21:14:42 +04:00
Roman Donchenko
8fa1e756e2 Merge pull request #993 from ivan-korolev:fix_videostab_bug_3023 2013-06-13 16:57:12 +04:00
Roman Donchenko
b725cbf73f Merge pull request #986 from pengx17:2.4_initiated_context 2013-06-13 16:55:56 +04:00
Roman Donchenko
5bb6d36684 Merge pull request #982 from pengx17:2.4_fix_two_bugs 2013-06-13 16:55:12 +04:00
Roman Donchenko
462047d1e4 Merge pull request #981 from SeninAndrew:ximea_camera_support_fix 2013-06-13 16:54:45 +04:00
Vladislav Vinogradov
0367a7f992 link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled 2013-06-13 16:46:34 +04:00
Alexander Smorkalov
37b67fa50d Fix compiler error due to missing pthread header (Issue #2953) 2013-06-13 16:11:39 +04:00
Ivan Korolev
de4c3f0178 Fixed a bug related to video stabilization crashes with a blank video (Bug #3023) 2013-06-13 13:41:43 +04:00
Dirk Van Haerenborgh
30f7f9717f allow for arbitraty number of sources and sinks 2013-06-13 11:16:33 +02:00
Alexander Smorkalov
83e9b0a87a Javadoc waring fix. 2013-06-13 12:40:14 +04:00
Roman Donchenko
6faf00b8e5 Merge pull request #696 from znah:detect_method 2013-06-13 12:01:59 +04:00
Vladislav Vinogradov
e433145b7e fix for Bug #3085: 
weights array is only allocated for (l_count+1) elements,
but then weights[l_count+1] element is accessed.
 2013-06-13 10:22:56 +04:00
alexandre benoit
c39159069e last warnings solved 2013-06-13 07:36:37 +02:00
alexandre benoit
2c1fb5fd71 minor correction after buildbot warnings 2013-06-13 06:55:35 +02:00
peng xiao
5fd724b54a Add a function to query if global OpenCL context is initialized. 2013-06-13 10:46:12 +08:00
alexandre benoit
7bff79bbeb updated demos and tutorial regarding the Retina class transfer to bioinspired module. 2013-06-12 22:43:36 +02:00
alexandre benoit
cdbbe0dfbe 1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method 2013-06-12 22:40:43 +02:00
Dirk Van Haerenborgh
6d66d11046 gstreamer: cleaning up resources 2013-06-12 16:58:16 +02:00
Peng Xiao
d9ab22e4ed Fix two bugs related to opencl context. 
1. As getDevice will implicitly call setDevice, in getContext we should not need to call it again.
2. Fix an incorrect type casting.
 2013-06-12 13:55:20 +08:00
Andrew Senin
8eb6decb25 Fixed Ximea cameras support 2013-06-11 21:17:31 +04:00
Roman Donchenko
98f6a4a615 Merge pull request #972 from jet47:mog2-params-bug-2168 2013-06-11 18:21:52 +04:00
Roman Donchenko
572cfc99a8 Merge pull request #973 from pengx17:2.4_oclclahe 2013-06-11 18:17:57 +04:00
Roman Donchenko
1acbc7b7bd Merge pull request #966 from berak:master 2013-06-11 18:17:07 +04:00
Vladislav Vinogradov
a3341006ee updated documentation 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8461cb3f4b refactored gpu::convolve function: 
* converted it to Algorithm
* old API still can be used for source compatibility (marked as deprecated)
 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
26a4be89b1 switched to Input/Output Array in Fourier operations 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
948661d722 switched to Input/Output Array in gpu::gemm 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8fcef225fb switched to Input/Output Array in reductions operations 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
c52d56964c switched to Input/Output Array in gpu::copyMakeBorder 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
539f367d0b refactored gpu::LUT function: 
* converted it to Algorithm, because implementation uses inner buffers and
  requires preprocessing step
* new implementation splits preprocessing and transform,
  what is more effecient
* old API still can be used for source compatibility (marked as deprecated)
 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0c50d0821f switched to Input/Output Array in transpose/flip operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
3d8ca010b7 switched to Input/Output Array in split/merge operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
58c4d0eaeb switched to Input/Output Array in cart<->polar operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0a83817ace switched to Input/Output Array in gpu::threshold 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
44ec450b53 switched to Input/Output Array in gpu::addWeighted 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
ec70282bf7 switched to Input/Output Array in min/max operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
f2aa6ebe15 switched to Input/Output Array in shift operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
d81f54db0b switched to Input/Output Array in bitwise logical operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
04a1a6dd8f switched to Input/Output Array in gpu::compare 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
b866890b27 switched to Input/Output Array in abs, sqr, sqrt, exp, log, pow 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
5ec8c51b98 switched to Input/Output Array in gpu::absdiff 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
3ee12cbeb4 switched to Input/Output Array in gpu::divide 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4595e3aa3e switched to Input/Output Array in gpu::multiply 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
ffa25be3d2 added arithm_op function to reduce code duplication 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
5330faf5a0 switched to Input/Output Array in gpu::subtract 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4ebbf69134 switched to Input/Output Array in gpu::add 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
76211709a3 refactored VideoReader (convert it to abstract interface) 
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
 2013-06-11 17:57:40 +04:00
Vladislav Vinogradov
e9a74c17f8 refactored VideoWriter class (convert it to abstract interface) 2013-06-11 17:57:39 +04:00
Roman Donchenko
3af21cad4c Merge pull request #903 from aks2:2.4 2013-06-11 17:35:39 +04:00
Roman Donchenko
7a07f1a9e7 Merge pull request #899 from LeszekSwirski:fix-drawingdoc 2013-06-11 17:30:19 +04:00
Roman Donchenko
7c4e3715b3 Merge pull request #975 from SpecLad:merge-2.4 2013-06-11 17:28:26 +04:00
Peng Xiao
c8398c9fdc Use anonymous enumerations instead of constants 2013-06-11 20:32:55 +08:00
Roman Donchenko
81c6b46fc6 Merge pull request #974 from jet47:gpu-core-refactoring 2013-06-11 12:05:56 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-10 18:18:01 +04:00
Vladislav Vinogradov
4f0d72bf43 added missing <iostream> header 2013-06-10 17:47:55 +04:00
Roman Donchenko
d583a79869 Revert "Add a variant of detectMultiScale with an argument 'weights'" 
It was merged by mistake.

This reverts commit ab6be9b7b7.
 2013-06-10 17:06:34 +04:00
Vladislav Vinogradov
564fd21e87 fixed documentation build 2013-06-10 15:52:01 +04:00
Roman Donchenko
e16af9bdc9 Merge pull request #958 from apavlenko:fix_java_mixchannels 2013-06-10 15:51:30 +04:00
Vadim Pisarevsky
1fe7ad850b Merge pull request #856 from ericgreveson:master 2013-06-10 15:25:09 +04:00
Vadim Pisarevsky
52e9974431 Merge pull request #961 from PeterMinin:detected_objects_weight 2013-06-10 15:22:46 +04:00
Roman Donchenko
1b689a7431 Merge pull request #971 from SpecLad:matchers-ctor 2013-06-10 15:06:31 +04:00
Roman Donchenko
55e83b8d18 Merge pull request #970 from asmorkalov:dshow_valid_check_fix 2013-06-10 15:06:14 +04:00
Alexander Smorkalov
956d8027ef Bug #3044 cap_dshow.cpp forgotten validity check fixed. 2013-06-10 13:29:45 -07:00
Peng Xiao
1d8cd3a717 Add ocl CLACH implementation. 
Test cases (accuracy and performance) are provided.
 2013-06-10 18:37:48 +08:00
Andrey Pavlenko
438649ffee fixing Java wrapper for mixChannels 
'dst' should be treated as an input arg (epilog not needed)
 2013-06-10 14:37:01 +04:00
Vladislav Vinogradov
99a5b3417a added missing BackgroundSubtractorMOG2 parameters 2013-06-10 13:41:46 +04:00
Roman Donchenko
41482fe56c Erase MatchPairsBody's copy constructor. 
It's the same as the implicitly defined one, and it causes a -Wextra warning
(not initializing the base class in a copy constructor).
 2013-06-10 13:30:23 +04:00
Vladislav Vinogradov
439c3574ed renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
0489489322 used cudaMalloc for 1-row or 1-column matrix instead of cudaMallocPitch 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
1db4afac6a made createContinuous & ensureSizeIsEnough generic (OutputArray support) 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
f17b836d24 added Event class (wrapper for cudaEvent) 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
2dab93c2e8 refactored gpu info structures (TargetArchs and DeviceInfo) 
now DeviceInfo provides full information about device (from cudaDeviceProp)
 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
76f4b02b06 refactored gpu::Stream (minor fixes) 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
a52af84dcf refactored CudaMem (now alloc type assign only in constructor) 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
cc34a8ac3c new implementation for GpuMat::setTo (without constant memory) 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
69be49bac1 refactored GpuMat: 
* switch to InputArray/OutputArray
* add Stream support
 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
db1178b5df moved GpuMat implementation to separate file 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
2153a14872 moved inline implementation to separate file 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
6994a02c15 added Stream support to ogl::Buffer 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
649737b6a8 removed obsolete DevMem2D class 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
4c9773d55f renamed gpu headers (made it more consistent) 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
6c253a41c2 added CudaMem support to Input/Output arrays 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
2fae1d9507 removed ogl::Texture2D support from InputArray 2013-06-10 12:40:30 +04:00
Peng Xiao
e77abeef16 Add a new global function to control ocl binary storage 
Previously the feature is controlled by setBinpath implicitly.
We add the function to cope with setBinpath and setBinpath is only
useful when setBinaryDiskCache is set.
Refer to the header to see more info.
 2013-06-10 16:38:22 +08:00
Andrey Pavlenko
264d26e671 fixing empty Mat case 2013-06-08 12:41:57 +04:00
berak
765a2c6045 Moments.nu** fields initialized in completeMomentState( Moments* moments ) 2013-06-07 18:29:00 +02:00
berak
610e29fa31 restored utility.hpp 2013-06-07 18:13:15 +02:00
berak
50e27ffc37 added initialization of Moments.nu** params in completeMomentState( Moments* moments ) 2013-06-07 17:22:42 +02:00
Vladislav Vinogradov
4559d46190 fixed BroxOpticalFlow sanity test (increase epsilon value) 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
4d9a1cf14b fixed BoxFilter sanity test (different rounding results) 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
302250f241 fixed BroxOpticalFlow regression test 
the output of BroxOpticalFlow differs a bit in CUDA 5.5
 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
14e4b3adde rewrite core/cuda/vec_math.hpp file 
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
869a35faef fixed constructors for functional objects (added __host__ modifier) 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
bf7c1c6c25 fixed NPP error constants usage 2013-06-07 16:32:43 +04:00
Roman Donchenko
c929547164 Merge pull request #900 from jet47:restore-gpu-modules 2013-06-07 14:33:35 +04:00
Vadim Pisarevsky
51f81eec36 Merge pull request #957 from pengx17:2.4_fix_corner_detector 2013-06-07 13:44:10 +04:00
Vadim Pisarevsky
a5ffa1da34 Merge pull request #963 from bitwangyaoyao:master_oclMat 2013-06-07 13:43:51 +04:00
Vladislav Vinogradov
3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
Roman Donchenko
10340fe234 Merge pull request #949 from SpecLad:merge-2.4 2013-06-07 12:45:03 +04:00
yao
9284c07a84 remove commented lines 2013-06-07 15:31:12 +08:00
Roman Donchenko
68e4256fd2 Merge pull request #960 from SpecLad:extra-modules 2013-06-07 11:29:40 +04:00
Roman Donchenko
aa7f70c31e Merge pull request #951 from apavlenko:fix_java_test_randshuffle 2013-06-07 11:28:10 +04:00
yao
960a0eacf3 merge openCLMallocPitch and openCLMallocPitchEx into one interface 2013-06-07 15:27:44 +08:00
Peter Minin
ab6be9b7b7 Add a variant of detectMultiScale with an argument 'weights' that 
receives the number of neighbors joined into each detected object
 2013-06-06 19:00:55 +04:00
Leszek Swirski
7d0f6b4d68 Fix image saving from QT toolbar 2013-06-06 11:15:00 +01:00
Leszek Swirski
9a1cc06ebe Fix pixel value rendering for non-fixed-size QT windows 2013-06-06 11:14:52 +01:00
Roman Donchenko
8714cbac91 Fix a missing header path when building with Qt 4. 
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
 2013-06-06 14:09:33 +04:00
Roman Donchenko
0a42a3eb06 Merge pull request #956 from IanVS:COLOR_CODE 2013-06-06 12:09:41 +04:00
peng xiao
429f84e59e Fix a bug of cornerHarris and cornerMinEigenVal. 
The bug is a buffer overrun when border type is reflect101.
It is found that gfft crashed with input of size 100x100 on Intel CPU.
 2013-06-06 11:44:35 +08:00
IanVS
41fc41829c Updated documentation to new "COLOR_" format for color conversion enums. 2013-06-05 21:59:01 -04:00
Roman Donchenko
a954d3630f Add support for adding custom OpenCV modules. 2013-06-05 18:10:44 +04:00
Roman Donchenko
7f9675bcc0 Merge pull request #953 from jet47:fix-bug-3069 2013-06-05 17:56:35 +04:00
Roman Donchenko
087db2949a Merge pull request #948 from jet47:cuda-5.5-support 2013-06-05 17:04:22 +04:00
Roman Donchenko
bae85660da 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
 2013-06-05 15:42:07 +04:00
Vladislav Vinogradov
31a5f7ef3c fixed bug #3069 (infinite loop in GPU LBP Cascade detectMultiScale) 2013-06-05 14:08:55 +04:00
Roman Donchenko
a760684674 Merge pull request #950 from apavlenko:fix_java_mat_dump 2013-06-05 13:32:34 +04:00
Andrey Pavlenko
c2d3ce9ce5 fix failing test 
small matrix becomes the same after shuffling
 2013-06-05 12:41:09 +04:00
Roman Donchenko
27bff3c175 Merge pull request #947 from jet47:fix-gpu-arm-build 2013-06-05 11:50:12 +04:00
Andrey Pavlenko
c7873dd03d fixing broken Mat::dump() in Java 2013-06-05 11:46:06 +04:00
Roman Donchenko
f527b6a93f Merge pull request #940 from SpecLad:autolock 2013-06-04 17:50:31 +04:00
Vladislav Vinogradov
89f3c40d79 fixed BroxOpticalFlow sanity test (increase epsilon value) 
+ interpolateFrames and createOpticalFlowNeedleMap
 2013-06-04 15:01:06 +04:00
Vladislav Vinogradov
4a770535c4 fixed BoxFilter sanity test (different rounding results) 2013-06-04 14:59:47 +04:00
Vladislav Vinogradov
516e5b2563 fixed BroxOpticalFlow regression test 
the output of BroxOpticalFlow differs a bit in CUDA 5.5
 2013-06-04 13:58:45 +04:00
Vladislav Vinogradov
918381875a rewrite gpu/device/vec_math.hpp file 
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
 2013-06-04 13:57:35 +04:00
Vadim Pisarevsky
119b7a298d Merge pull request #933 from pengx17:2.4_macfix_cont 2013-06-04 13:34:53 +04:00
Vadim Pisarevsky
2d88f20c1e Merge pull request #935 from pengx17:2.4_filter2d_fix 2013-06-04 13:34:40 +04:00
Vadim Pisarevsky
0cb1644825 Merge pull request #936 from bitwangyaoyao:2.4_perf 2013-06-04 13:34:25 +04:00
Vadim Pisarevsky
e0c2daadbf Merge pull request #937 from bitwangyaoyao:2.4_fixPyrLK 2013-06-04 13:34:09 +04:00
Vadim Pisarevsky
37953b7cf0 Merge pull request #939 from pengx17:2.4_getDevice 2013-06-04 13:33:21 +04:00
Vladislav Vinogradov
3aea7e8f8d fixed gpu module build on arm platform 
links with CUDA driver library only if we use video encoding/decoding
 2013-06-04 12:51:36 +04:00
peng xiao
a7a94de74a Fix a bug of gfft. 
When user provided corners buffer is big enough to be copied to from
tmpCorners_, we allow the buffer to be reused other than allocate a new
cl_mem object.
 2013-06-04 15:55:33 +08:00
yao
dc937c10f9 change a test image of pyrlk 2013-06-04 11:31:54 +08:00
Malcolm Reynolds
a9c9210bf9 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.
 2013-06-03 18:07:05 +02:00
Malcolm Reynolds
229ff632b6 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.
 2013-06-03 18:06:25 +02:00
Roman Donchenko
75cf5cc4ee Merge pull request #943 from jet47:cuda-5.5-support 2013-06-03 16:08:23 +04:00
Vladislav Vinogradov
bcf8bdb401 fixed constructors for functional objects (added __host__ modifier) 2013-06-03 14:41:23 +04:00
Vladislav Vinogradov
58e472754a fixed norm diff function (it uses pre-allocated buffer now) 2013-06-03 13:37:44 +04:00
Vladislav Vinogradov
0521e8908c fixed NPP error constants usage 2013-06-03 13:37:36 +04:00
Vladislav Vinogradov
013581f371 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
 2013-06-03 13:29:26 +04:00
Roman Donchenko
34c5f47f60 Merge pull request #934 from SpecLad:parallel-for 2013-06-03 12:13:16 +04:00
Roman Donchenko
8a4090fe3f Make AutoLock noncopyable (it would break on copying, anyway). 2013-05-31 17:27:42 +04:00
Roman Donchenko
85360572b0 Merge pull request #931 from jet47:gpu-test-fixes 2013-05-31 16:46:31 +04:00
peng xiao
97b86aa259 Initialize OpenCL context at the end of getDevice call. 
Added for better compatibility with the current samples/test cases.
User now will be able to initialize OpenCL context explicitly with
ocl::getDevice api.
This may be obsoleted in future releases.
 2013-05-31 16:48:40 +08:00
Roman Donchenko
f90fd5b0da 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. ;=]
 2013-05-31 12:22:04 +04:00
Roman Donchenko
29b13ec1de 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.
 2013-05-31 12:22:04 +04:00
yao
15a213d3fc fix a crash on Linux 2013-05-31 15:35:54 +08:00
yao
abefcc6061 Adjust perf_filters, as this function only supports 3x3 kernel 2013-05-31 15:16:03 +08:00
Alex Leontiev
47ce461d97 The initial commit for generic optimization 
Generic optimization package for openCV project, will be developed
between the June and September of 2013. This work is funded by Google
Summer of Code 2013 project. This project is about
implementing several algorithms, that will find global maxima/minima of a
given function on a given domain subject to a given constraints.

All comments/suggestions are warmly appreciated and to be sent to
alozz1991@gmail.com (please, mention the word "openCV" in topic of
message, for I'm using the spam-filters)
 2013-05-31 07:39:15 +03:00
peng xiao
b1c248fcc9 Fix ocl::filter2D. 
In current implementation, this function only works when anchor point is
in the kernel center and kernel size supported is either 3x3 or 5x5.
 2013-05-31 10:53:52 +08:00
peng xiao
fdc133d8c9 Fix ocl::pyrup kernel build on Mac. 2013-05-30 16:34:20 +08:00
Vadim Pisarevsky
37091b086c Merge pull request #932 from bitwangyaoyao:2.4_fixBFM 2013-05-30 12:21:27 +04:00
yao
5b598f8a0e a few fixes of ocl::perf test cases 2013-05-30 16:20:31 +08:00
Vadim Pisarevsky
5a4efe8bcf Merge pull request #924 from pengx17:2.4_arithm_fix 2013-05-30 12:01:25 +04:00
Vadim Pisarevsky
678371be39 Merge pull request #925 from pengx17:2.4_canny_tmp_fix 2013-05-30 12:01:09 +04:00
Vadim Pisarevsky
c176131a67 Merge pull request #927 from bitwangyaoyao:2.4_perf 2013-05-30 12:00:47 +04:00
yao
7ed9c0e87a Fix brute_force_matcher's hung on some Intel CPU OCL 2013-05-30 14:57:15 +08:00
peng xiao
fd7ba355ee 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.
 2013-05-30 14:01:19 +08:00
Vladislav Vinogradov
6b1c28ce6d fixed some gpu tests (different rounding results due to float arithmetics) 2013-05-29 17:38:32 +04:00
Roman Donchenko
fbb25787cd Merge pull request #920 from asmorkalov:android_move 2013-05-29 16:53:04 +04:00
peng xiao
006e4242b2 Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft 2013-05-29 17:57:14 +08:00
yao
a9b7ff41bd adjust test cases 2013-05-29 15:48:56 +08:00
peng xiao
d015fa76fa 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.
 2013-05-29 14:15:26 +08:00
Vadim Pisarevsky
2ccdf56119 Merge pull request #913 from janm399:2.4 2013-05-28 22:05:14 +04:00
Vadim Pisarevsky
24ca620c32 Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK 2013-05-28 22:04:37 +04:00
Vadim Pisarevsky
d3c7ae6adf Merge pull request #919 from abidrahmank:2.4 2013-05-28 21:54:51 +04:00
yao
d81c145fa9 fix memory leak 2013-05-28 18:07:41 +08:00
yao
14bd6402be revise perf 2013-05-28 17:53:06 +08:00
peng xiao
1d0c283508 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.
 2013-05-28 17:27:55 +08:00
peng xiao
6fae02c05d Fix some OpenCL kernel file build errors on Mac. 2013-05-28 11:12:05 +08:00
Roman Donchenko
5ac3b8d5d8 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
 2013-05-27 16:58:04 +04:00
Alexander Smorkalov
20fef00a77 android -> plarforms/android 2013-05-27 11:10:38 +04:00
abidrahmank
ca09ba6852 Bug #2960 : docs about CV_BGR2GRAY 2013-05-25 01:50:41 +05:30
abidrahmank
98960bf201 A new python sample on grabcut 2013-05-25 00:55:31 +05:30
yao
c58e0d5d73 fix hog 2013-05-24 13:46:21 +08:00
Roman Donchenko
dad58d8940 Fix a build error which manifests when building with CUDA < 5. 2013-05-23 14:00:13 +04:00
yao
d45f9ef866 fix Linux build errors 2013-05-23 17:58:50 +08:00
yao
a223b5624f fix pyrLK's mismatch on Intel GPUs 2013-05-23 10:55:08 +08:00
Roman Donchenko
324cafdda6 Merge pull request #904 from ograycode:2.4 2013-05-22 18:46:40 +04:00
Roman Donchenko
5e0e1fac87 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
 2013-05-22 18:28:28 +04:00
Jan Machacek
46b770f255 Fixed include name in OpenCL on OS X 2013-05-22 13:22:16 +01:00
Roman Donchenko
7efb24917f Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex 2013-05-22 12:57:04 +04:00
Roman Donchenko
519ee72f6f Merge pull request #905 from bitwangyaoyao:2.4_TVL1 2013-05-22 12:08:16 +04:00
peng xiao
b4a4a05bdc 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.
 2013-05-22 13:46:42 +08:00
Roman Donchenko
029fce10c9 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
 2013-05-21 17:19:23 +04:00
Andrey Pavlenko
d4255b7f75 Merge pull request #902 from apavlenko:fix_run_py 2013-05-21 14:07:32 +04:00
alex77git
445860d619 (typo) 2013-05-20 13:19:36 +02:00
alex77git
c8abaea368 (tab to space) 2x 2013-05-20 12:06:25 +02:00
Vadim Pisarevsky
cbbc82a789 Merge pull request #882 from pengx17:2.4_rewrite_query_info 2013-05-20 14:01:03 +04:00
Vadim Pisarevsky
b51a1a7d15 Merge pull request #895 from bitwangyaoyao:2.4_perf 2013-05-20 14:00:47 +04:00
Leszek Swirski
7542d66dbd Fix drawing documentation referring to C API macros 2013-05-20 10:56:06 +01:00
Roman Donchenko
389be67605 Merge pull request #853 from icylord:2.4 2013-05-20 12:11:47 +04:00
yao
d8b192c84d Fix the mismatch on NV GPUs 2013-05-20 14:46:17 +08:00
ograycode
97e9368e75 Simple set of the camera index to allow the user to change it after the object has been initialized. 2013-05-19 22:04:56 -04:00
alex77git
bc59428b3a Bug #2966, insert CV_Assert(size.width>0 && size.height>0); in imshow() 2013-05-20 02:28:40 +02:00
alex77git
6e7b1ef252 Bug #2967, void DescriptorMatcher::radiusMatch() // description unclear, 
only file:  common_interfaces_of_descriptor_matchers.rst
 2013-05-20 02:26:58 +02:00
alex77git
44a2b109b7 Bug #2967, basic_structures.rst, fix 2 typos 2013-05-20 02:24:09 +02:00
Andrey Pavlenko
4af104aaae 'aapt' tool moved in SDK r22, adding support to run.py 2013-05-19 14:57:21 +04:00
ericgreveson
e7995b4d5d Take account of multi-channel matrices when comparing histograms 
Ensure that all channels are considered when comparing multi-channel histograms
 2013-05-18 23:31:22 +02:00
Vadim Pisarevsky
aee6a617a6 Merge pull request #897 from bitwangyaoyao:2.4_TVL1 2013-05-19 00:23:24 +04:00
yao
04399a27d0 fix a warning 2013-05-17 15:44:22 +08:00
yao
4162ebfad3 add OpticalFlowDual_TVL1_OCL function 2013-05-17 15:34:22 +08:00
Vladislav Vinogradov
49a4f27d42 removed VIBE implementation 2013-05-17 11:27:00 +04:00
yao
03c55db4fb fix the waring in gemm test 2013-05-17 13:19:09 +08:00
yao
5f20fce6fd add accuracy tests while running perf 2013-05-17 13:18:46 +08:00
Vladislav Vinogradov
ec52096e30 removed VIBE implementation 2013-05-16 13:47:24 +04:00
Leszek Swirski
0e8c2b0395 Fix visibility of g_linked_ptr_mutex on Windows 
Reverts some changes in b8ed00bd64
 2013-05-15 14:42:28 +01:00
Vadim Pisarevsky
7d9041460a Merge pull request #885 from pengx17:2.4_bfmatcher_ocl 2013-05-15 14:21:50 +04:00
peng xiao
d053f2165d Add BFMatcher_OCL class alias for BruteForceMatcher_OCL. 
This adds a similar interface with pure-cpp and gpu versions.
 2013-05-15 10:47:17 +08:00
peng xiao
3f93c3cc4e Clean up spaces in ocl.hpp 2013-05-15 10:43:47 +08:00
peng xiao
1ecc765903 Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix 2013-05-15 08:55:43 +08:00
peng xiao
df3997b108 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
 2013-05-15 08:51:21 +08:00
Dominik Rose
86ec9b79fd libd1394 2.x support for mingw on windows added 2013-05-14 16:30:12 +02:00
Vadim Pisarevsky
2a646f7626 Merge pull request #862 from piponazo:v4lFPS 2013-05-14 16:00:28 +04:00
Vadim Pisarevsky
25e6902a43 Merge pull request #818 from bitwangyaoyao:2.4_optBlur 2013-05-14 15:56:56 +04:00
Vadim Pisarevsky
54afb85d0c Merge pull request #823 from pickle27:starter_image_sequence 2013-05-14 15:56:35 +04:00
Vadim Pisarevsky
bd1d7cd208 Merge pull request #839 from pengx17:2.4_ocl_csbp 2013-05-14 15:56:07 +04:00
Vadim Pisarevsky
87765c0f16 Merge pull request #883 from bitwangyaoyao:2.4_fixMoments 2013-05-14 15:55:38 +04:00
yao
1d1d28baf2 fix black screen when input Mat is large 2013-05-14 18:02:53 +08:00
peng xiao
ac21cabda2 Copy ocl::queryDeviceInfo interface from master to 2.4. 
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
 2013-05-14 17:50:38 +08:00
Vadim Pisarevsky
35d8fa444b Merge pull request #849 from dominikrose:dom_2.4 2013-05-13 23:38:26 +04:00
Vadim Pisarevsky
d79c05fec9 Merge pull request #872 from pengx17:2.4_create2dimage_fix 2013-05-13 23:12:25 +04:00
Vadim Pisarevsky
6eb5a95a59 Merge pull request #871 from bitwangyaoyao:2.4_acry 2013-05-13 23:04:11 +04:00
Vadim Pisarevsky
14c50d2fce Merge pull request #874 from pengx17:master_queryDeviceInfo_rewrite 2013-05-13 23:03:24 +04:00
Vadim Pisarevsky
fd83f2f5ca Merge pull request #819 from bitwangyaoyao:2.4_haarBuf 2013-05-13 22:36:10 +04:00
Vadim Pisarevsky
c549ec8371 Merge pull request #850 from SpecLad:convhull-orientation 2013-05-13 22:18:54 +04:00
Vadim Pisarevsky
6e44e0a476 Merge pull request #881 from apavlenko:hidden_visibility 2013-05-13 22:08:45 +04:00
Andrey Pavlenko
885566295a Merge pull request #840 from pablospe:master 2013-05-13 21:22:27 +04:00
Andrey Pavlenko
d94ecf40e6 Merge pull request #880 from apavlenko:qt-5.0 2013-05-13 21:18:47 +04:00
Andrey Pavlenko
0fec2eb6e5 Merge pull request #879 from apavlenko:gcc-4.8 2013-05-13 21:17:04 +04:00
Vadim Pisarevsky
e4d4b07f00 Merge pull request #873 from prclibo:2.4 2013-05-13 21:06:54 +04:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Kamaev
f856f78ac0 Update CMake scripts to recognize Qt 5.0 2013-05-13 17:10:32 +04:00
Andrey Kamaev
2665c39a0d Fix build warnings from gcc 4.8 2013-05-13 17:07:30 +04:00
yao
e23884a238 fix the warnings in fft tests 2013-05-13 15:04:23 +08:00
Vadim Pisarevsky
9cce8ca4b6 Merge pull request #864 from pengx17:2.4_stereobm 2013-05-12 22:16:03 +04:00
Andrey Pavlenko
d5881bc00a adding version info to test log 2013-05-12 18:36:55 +04:00
Vadim Pisarevsky
103ee12f00 Merge pull request #845 from githubuser0xFFFF:master 2013-05-12 12:54:44 +04:00
Vadim Pisarevsky
4b49b84976 Merge pull request #848 from pengx17:master_ocl_platform_name 2013-05-12 12:54:25 +04:00
Vadim Pisarevsky
f1e8f69d2c Merge pull request #861 from albenoit:master 2013-05-12 12:53:14 +04:00
yao
ada8f92cc7 fix warnings, unify test names 2013-05-09 17:57:13 +08:00
peng xiao
e5ea018185 Let surf.ocl use the new queryDeviceInfo interface. 2013-05-09 17:19:51 +08:00
peng xiao
bfa0f02303 Rewrite queryDeviceInfo interface. 
Previously the function may cause some unsafe issue. It is fixed now by introducing a template parameter.
 2013-05-09 17:15:26 +08:00
Bo Li
81779d8287 fixed pca bug for fixed mean input 2013-05-09 15:20:00 +08:00
peng xiao
e14acabb3d Fix ocl moudle build with latest Intel OpenCL SDK. 
We found that cl.h file provided in latest Intel SDK muted deprecated interfaces.
 2013-05-09 14:00:36 +08:00
peng xiao
69e6d0016e Optimize stereobm a bit. 
Speedup about 30% on 6730M GPU.
 2013-05-08 17:29:24 +08:00
peng xiao
861de8a6e9 CL_PLATFORM_VENDOR should be CL_PLATFORM_NAME. 2013-05-08 17:19:34 +08:00
yao
b6313951dc use clean EXPECT_MAT_NEAR (no string output) 2013-05-08 17:07:44 +08:00
yao
35c6860f06 further simplify the logics in filter tests 2013-05-08 16:08:33 +08:00
yao
1a53e2cfb2 remove interpolation.hpp 2013-05-08 15:27:35 +08:00
yao
3928c1ee26 add copyrights 2013-05-08 15:21:53 +08:00
yao
e4d3378230 simplify logics in filter tests, remove redundant code in arithm tests 2013-05-08 15:12:12 +08:00
Andrey Pavlenko
2aa5f1bfd1 Merge pull request #866 from MadEgg:RetrieveFrame_index_argument 2013-05-07 17:00:29 +04:00
Vadim Pisarevsky
741fb9b7d1 Merge pull request #865 from pengx17:2.4_ocl_ver 2013-05-07 16:39:49 +04:00
Andrey Pavlenko
2faa2adae2 Merge pull request #846 from smart-mobile-software:tuto_crash 2013-05-07 15:15:16 +04:00
yao
52dbbae82c some cleanup, remove some commented codes 2013-05-07 16:14:50 +08:00
Brian McKinnon
36745a80c3 Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
peng xiao
d34e7eca60 Suppress warning when compiling deprecated OpenCL function on GNU compilers. 2013-05-06 17:16:45 +08:00
Egbert van der Wal
dc6a144396 add (optional) index argument to RetrieveFrame method 2013-05-04 17:18:12 +02:00
alexandre benoit
a5acc9ee1f nicer interface with the use of InputArray and OutptArray instated of (const Mat&) 2013-05-03 11:45:13 +02:00
peng xiao
ed2199a497 Fix build 2013-05-03 09:54:11 +08:00
peng xiao
1eca49f40b ocl: Enable backward binary portability for setTo function. 2013-05-03 09:45:56 +08:00
peng xiao
168c0b0385 Optimize ocl::stereobm. 
1. Use macro defines for some parameters(radius).
2. Reduce local memory usage.
3. Fix accuracy problem on Intel GPU.
 2013-05-02 16:14:28 +08:00
peng xiao
355bc691fc 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.
 2013-05-02 14:44:59 +08:00
alexandre benoit
b58d9f1c2a enhancing documentation 2013-05-01 19:35:32 +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
alexandre benoit
f5d2d7b29b enhancing documentation 2013-05-01 13:58:53 +02:00
alexandre benoit
cf6e833169 trying to solve valarray pointer access problem, enhancing documentation 2013-05-01 11:47:26 +02:00
Luis Díaz Más
d13d5c0c12 Added setting feature of FPS in cap_libv4l 2013-05-01 01:07:03 +02:00
alexandre benoit
9adde75be3 updated doc+minor typo/buildbot reports correction 2013-04-30 20:26:00 +02:00
alexandre benoit
9c26387ce0 updated sources to correct buildbot warnings 2013-04-30 17:32:47 +02:00
alexandre benoit
25b482f1c9 updated/corrected documentation 2013-04-30 16:52:47 +02:00
alexandre benoit
a659e287fb minor error correction 2013-04-30 14:52:14 +02:00
alexandre benoit
80e65e08b5 updated doc and interface code to solve compile warnings and errors 2013-04-30 14:40:03 +02:00
alexandre benoit
b70b5a3011 corrections required for portability. To be validated by buildbot 2013-04-30 13:13:50 +02:00
alexandre benoit
1976b3d9b6 updated doc 2013-04-29 20:08:13 +02:00
ericgreveson
19794e6857 Fix for spurious assert in cv::compareHist 
When comparing histograms that look like multi-channel images (e.g a 3D histogram, of 4x4x4 bins, might appear as a CV_32FC4 matrix), cv::compareHist would complain because it was expecting the matrix type() == CV_32F. Now we test matrix depth() == CV_32F instead.
 2013-04-29 19:52:41 +02:00
alexandre benoit
72742f5316 resolved conflicts, updated retina class interface and optimized a heavy retinacolor process 2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228 minor chnges for conflict removal 2013-04-29 15:12:44 +02:00
Alexander Smorkalov
456c56fe90 NullPointerException in case of error on opening native camera fixed. 2013-04-29 11:00:52 +04:00
Andrey Pavlenko
5ce4e3c265 Merge pull request #800 from asmorkalov:android_cam_idx_semantic 2013-04-29 10:00:08 +04:00
Andrey Pavlenko
6d89e1f412 Merge pull request #827 from apavlenko:fix_android_tutorial1 2013-04-29 09:59:19 +04:00
ShengyinWu
ef5578a7ce Fixs: After scaling back to original image, some detected ROI will outside the original image ROI 2013-04-29 12:16:42 +08:00
albenoit
9e1ce1ed52 Merge pull request #2 from albenoit/retina_devel 
Retina devel
 2013-04-27 13:47:30 -07:00
Vadim Pisarevsky
2068c4582c Merge pull request #844 from bitwangyaoyao:2.4_integral 2013-04-28 00:37:40 +04:00
alexandre benoit
737046916c activated parallelized gradient computation 2013-04-27 21:30:35 +02:00
alexandre benoit
3b15eefcad forgot method name update 2013-04-27 21:22:57 +02:00
alexandre benoit
b62d101115 updated retina interface for cleaner use, following OpenCV standards 2013-04-27 21:13:45 +02:00
Roman Donchenko
2dc8642508 Changed convexHull's documentation to essentially invert the meaning of `clockwise`. 
The orientation of convexHull's result is currently the opposite of what the
documentation would suggest:

>>> import cv2, numpy as np
>>> points = np.array([[0,0],[0,1],[1,0]], dtype=np.int32)
>>> cv2.convexHull(points, clockwise=False)
array([[[1, 0]],
       [[0, 1]],
       [[0, 0]]], dtype=int32)
>>> cv2.convexHull(points, clockwise=True)
array([[[0, 0]],
       [[0, 1]],
       [[1, 0]]], dtype=int32)

Changing the function itself is probably not a good idea at this point, so
this fixes the documentation by flipping the coordinate system.

I also removed the mention of the origin, since it's irrelevant for this
function.
 2013-04-26 14:22:55 +04:00
Dominik Rose
cfaae5917b Calib3d documentation: 
- fixed reference to Slabaugh
 2013-04-26 11:34:35 +02:00
peng xiao
bb4b410512 Add ocl::PlatformName to ocl::Info. 2013-04-25 15:00:50 +08:00
Alexander Smorkalov
8606ee4beb Front/Back camera semantic support added to Android VideoCapture back-end. 2013-04-24 10:56:16 +04:00
yao
f788d010f7 fix a crash on CPU OCL for some specified image sizes 2013-04-24 14:12:41 +08:00
Uwe Kindler
ca42a50de6 Changed visibility of the virtual functions in OnePassStabilizer and TwoPassStabilizer that are derived from StabilizerBase from private to protected to enable stabilizer implementations that are derived from OnePassStabilizer and TwoPassStabilier to properly overwrite these functions 2013-04-24 07:33:22 +02:00
peng xiao
9cfa24e515 Fix thread sync for csbp. 2013-04-23 17:35:40 +08:00
yao
b386ea72aa use float when sum overflow 2013-04-23 17:23:05 +08:00
peng xiao
3282aaa1f5 Fix a bug found on Intel OpenCL SDK. 2013-04-23 15:34:40 +08:00
Peng Xiao
c701d54281 Fix build errors 2013-04-21 11:19:37 +08:00
Pablo Speciale
caf449a991 The deletion of "cv.py" file (Commit b2ba8b9) breaks "make install" 2013-04-20 15:55:48 -07:00
Peng Xiao
7b08d5ec69 Add OpenCL stereo CSBP implementation 2013-04-20 00:34:37 +08:00
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules" 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
 2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
787e56ab5c disabled gpucodec module on MacOS 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
3be997cfa9 gpulegacy module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
6d735c11c6 removed const qualifier (it produces warnings) 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
0ce10532b3 softcascade module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
13d087e62d videostab module fixes 2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
fdeec6896c stitching module fixes 2013-04-18 13:28:30 +04:00
Vladislav Vinogradov
033dd77504 superres module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
f375c86dfb photo module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
12f16b7a26 nonfree module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
5d7bbdc837 gpu module fixes 2013-04-18 12:36:07 +04:00
Vladislav Vinogradov
3156e803be gpuoptflow module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
f531dd839c gpubgsegm module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
c0b3424a23 gpuimgproc module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
b4f3d08725 gpuarithm module fixes 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
43d5e2d8b4 removed gpu BORDER_* constants 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
d5ee931287 fixed compilation issues 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
ac0f506d0e split gpuvideo onto gpuoptflow and gpubgsegm 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
eda124ec32 removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
28b1caa730 gpustereo module for stereo correspondence 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
cad9518928 moved image labeling to gpu module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
e72ba73e70 moved gpu nlm to photo module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
fc3730fcc2 gpuwarping module for image warping 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
71eeaa7276 gpuarithm module fixes 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
508fb6aa5b renamed gpunvidia -> gpulegacy 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
7e91e1871d simplify CMakeLists.txt for gpu module 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
77aafc2984 removed unused includes 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
623c7da747 removed obsolete source files from gpu module 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
a981dc93d0 removed obsolete headers from gpu module 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
96ac27e68c removed nv_perf_test (it is a duplicate for perf4au) 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
a6648b5372 gpuobjdetect module for object detection 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
b08b9ab83b gpucalib3d module for camera calibration and stereo correspondence 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
fc1fa28556 gpuvideo module for video processing 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
7544ddbfef gpufeatures2d module 2d for feature detection and matching 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e41aea0acf gpuimgproc module for image processing 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
d569e72ad4 moved mulSpectrums, dft and convolve to gpuarithm 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
c56bdbc1c5 moved integral to gpuarithm module 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
10ac854358 moved copyMakeBorder to gpuarithm module 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
d08ebfe4d3 moved rectStdDev to gpuarithm 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
ca474de639 made objdetect dependecy for gpunvidia optional 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e654714973 replaced NCV_EXPORTS with CV_EXPORTS 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
ed006a0612 added private header to gpunvidia module 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
c2402053b9 removed columnSum function (it is a duplicate for reduce) 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
229ca0914a gpunvidia module for NCV & NPP API 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
bc0e563092 CV_GPU_TEST_MAIN macros 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
84de6ce036 gpufilters module for image filtering 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
31c8b527c6 gpuarithm module for arithmetics operations on matrices 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
1b00a3ed54 gpucodec module for video decoding/encoding 2013-04-18 11:33:29 +04:00
Andrey Kamaev
02131ffb62 Merge pull request #828 from tim36272:patch-1 2013-04-17 22:30:39 +04:00
Kevin Hughes
eedb6fa3c4 removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface 2013-04-17 13:20:32 -04:00
Andrey Kamaev
28aefc4f5a Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup 2013-04-17 15:45:38 +04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Andrey Kamaev
8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
tim36272
5ef3ef9c4a Clarified floodfill documentation 
Clarified what value floodfill sets pixels in the mask to when FOODFILL_MASK_ONLY is set.
 2013-04-17 00:34:20 -07: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 Pavlenko
8c40f0ccf2 fixing build and lint warnings 2013-04-16 15:30:43 +04:00
Andrey Kamaev
8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +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
4223a59497 Merge pull request #809 from taka-no-me:drop_python1 2013-04-16 10:15:51 +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
yao
69a0b5dde5 Add OclCascadeClassifierBuf interface 2013-04-15 17:24:30 +08:00
yao
dec6a3b080 make boxfilter kernel compile on Mac GPU OCL 2013-04-15 16:46:25 +08:00
Andrey Kamaev
2ae3ab11e3 Merge pull request #814 from taka-no-me:gtest_r652 2013-04-15 12:13:16 +04:00
Andrey Kamaev
f7641be434 Merge pull request #812 from bitwangyaoyao:master_uhp 2013-04-15 12:12:46 +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
6168bf0062 Merge pull request #813 from bitwangyaoyao:master_fix 2013-04-13 16:34:07 +04:00
Andrey Kamaev
a54a307386 Merge pull request #810 from pengx17:master_fix_ocl_tmflag 2013-04-13 16:33:53 +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
yao
2f781a53a9 Fix arithm's substract mismatch caused by incomplete merge 2013-04-13 15:57:12 +08:00
yao
40d0e0eda0 use host data when DEVICE_MEM_UHP is set (the risk of vary align size is owned by users) 2013-04-13 14:58:49 +08: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
6b6b1c9cbf Allow more query/train types for ocl::bfmatcher 2013-04-13 14:08:58 +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
298ccf6487 Turn pyopencv_to and pyopencv_from into templates 
This protects from unwanted implicit conversions between types at compile time.
 2013-04-13 01:02:57 +04:00
Andrey Kamaev
8b294c6c90 Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
Andrey Kamaev
f886651cf0 Drop old python samples and tests 2013-04-12 19:37:40 +04:00
Andrey Kamaev
b2ba8b9969 Drop old python interface 2013-04-12 19:37:40 +04:00
Andrey Kamaev
909d6fcf51 Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00