Roman Donchenko [Wed, 19 Jun 2013 08:25:23 +0000 (12:25 +0400)]
Merge pull request #1012 from apavlenko:fix_3077
Andrey Pavlenko [Fri, 14 Jun 2013 16:25:23 +0000 (20:25 +0400)]
fix for #3077
removing "-fvisibility=hidden" gcc option due to lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT
Roman Donchenko [Fri, 14 Jun 2013 12:24:23 +0000 (16:24 +0400)]
Merge pull request #977 from jet47:gpucodec-refactoring
Roman Donchenko [Fri, 14 Jun 2013 12:24:03 +0000 (16:24 +0400)]
Merge pull request #978 from jet47:gpuarithm-refactoring
Roman Donchenko [Fri, 14 Jun 2013 11:51:03 +0000 (15:51 +0400)]
Merge pull request #1003 from vhdirk:gstreamerfixes
Roman Donchenko [Fri, 14 Jun 2013 11:48:37 +0000 (15:48 +0400)]
Merge pull request #983 from HapeMask:python3-compatibility
Roman Donchenko [Fri, 14 Jun 2013 07:48:05 +0000 (11:48 +0400)]
Merge pull request #990 from asmorkalov:pthread_build_fix
Roman Donchenko [Fri, 14 Jun 2013 07:23:59 +0000 (11:23 +0400)]
Merge pull request #976 from PeterMinin:num_detections
Peter Minin [Fri, 14 Jun 2013 00:25:17 +0000 (04:25 +0400)]
Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods
Gabe Schwartz [Mon, 10 Jun 2013 21:29:36 +0000 (17:29 -0400)]
Updated usage of METH_X definitions for python 3.
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
Gabe Schwartz [Wed, 12 Jun 2013 20:04:34 +0000 (16:04 -0400)]
Updated cmake files to use print().
In these cases, just using print() is enough to ensure py2/3
compatibility.
Gabe Schwartz [Wed, 12 Jun 2013 20:03:34 +0000 (16:03 -0400)]
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.
Gabe Schwartz [Wed, 12 Jun 2013 20:02:30 +0000 (16:02 -0400)]
Updated generator and parser to support Python 3.
Alexander Smorkalov [Thu, 13 Jun 2013 08:19:25 +0000 (12:19 +0400)]
Fix compiler error due to missing pthread header (Issue #2953)
Dirk Van Haerenborgh [Thu, 13 Jun 2013 09:16:33 +0000 (11:16 +0200)]
allow for arbitraty number of sources and sinks
Roman Donchenko [Thu, 13 Jun 2013 08:01:56 +0000 (12:01 +0400)]
Merge pull request #696 from znah:detect_method
Dirk Van Haerenborgh [Wed, 12 Jun 2013 14:58:16 +0000 (16:58 +0200)]
gstreamer: cleaning up resources
Roman Donchenko [Tue, 11 Jun 2013 14:17:07 +0000 (18:17 +0400)]
Merge pull request #966 from berak:master
Vladislav Vinogradov [Tue, 11 Jun 2013 11:45:04 +0000 (15:45 +0400)]
updated documentation
Vladislav Vinogradov [Fri, 26 Apr 2013 08:40:03 +0000 (12:40 +0400)]
refactored gpu::convolve function:
* converted it to Algorithm
* old API still can be used for source compatibility (marked as deprecated)
Vladislav Vinogradov [Fri, 26 Apr 2013 07:33:46 +0000 (11:33 +0400)]
switched to Input/Output Array in Fourier operations
Vladislav Vinogradov [Fri, 26 Apr 2013 08:22:56 +0000 (12:22 +0400)]
switched to Input/Output Array in gpu::gemm
Vladislav Vinogradov [Fri, 26 Apr 2013 10:40:44 +0000 (14:40 +0400)]
switched to Input/Output Array in reductions operations
Vladislav Vinogradov [Thu, 25 Apr 2013 12:56:19 +0000 (16:56 +0400)]
switched to Input/Output Array in gpu::copyMakeBorder
Vladislav Vinogradov [Fri, 26 Apr 2013 08:39:02 +0000 (12:39 +0400)]
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)
Vladislav Vinogradov [Thu, 25 Apr 2013 12:09:51 +0000 (16:09 +0400)]
switched to Input/Output Array in transpose/flip operations
Vladislav Vinogradov [Thu, 25 Apr 2013 12:02:41 +0000 (16:02 +0400)]
switched to Input/Output Array in split/merge operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:46:45 +0000 (15:46 +0400)]
switched to Input/Output Array in cart<->polar operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:33:19 +0000 (15:33 +0400)]
switched to Input/Output Array in gpu::threshold
Vladislav Vinogradov [Thu, 25 Apr 2013 11:28:29 +0000 (15:28 +0400)]
switched to Input/Output Array in gpu::addWeighted
Vladislav Vinogradov [Thu, 25 Apr 2013 11:23:44 +0000 (15:23 +0400)]
switched to Input/Output Array in min/max operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:10:13 +0000 (15:10 +0400)]
switched to Input/Output Array in shift operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:02:22 +0000 (15:02 +0400)]
switched to Input/Output Array in bitwise logical operations
Vladislav Vinogradov [Thu, 25 Apr 2013 10:20:57 +0000 (14:20 +0400)]
switched to Input/Output Array in gpu::compare
Vladislav Vinogradov [Thu, 25 Apr 2013 09:49:45 +0000 (13:49 +0400)]
switched to Input/Output Array in abs, sqr, sqrt, exp, log, pow
Vladislav Vinogradov [Thu, 25 Apr 2013 09:37:44 +0000 (13:37 +0400)]
switched to Input/Output Array in gpu::absdiff
Vladislav Vinogradov [Fri, 26 Apr 2013 10:39:58 +0000 (14:39 +0400)]
switched to Input/Output Array in gpu::divide
Vladislav Vinogradov [Thu, 25 Apr 2013 08:55:38 +0000 (12:55 +0400)]
switched to Input/Output Array in gpu::multiply
Vladislav Vinogradov [Thu, 25 Apr 2013 08:21:26 +0000 (12:21 +0400)]
added arithm_op function to reduce code duplication
Vladislav Vinogradov [Thu, 25 Apr 2013 08:08:36 +0000 (12:08 +0400)]
switched to Input/Output Array in gpu::subtract
Vladislav Vinogradov [Thu, 25 Apr 2013 08:07:57 +0000 (12:07 +0400)]
switched to Input/Output Array in gpu::add
Vladislav Vinogradov [Tue, 11 Jun 2013 09:05:02 +0000 (13:05 +0400)]
refactored VideoReader (convert it to abstract interface)
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
Vladislav Vinogradov [Mon, 22 Apr 2013 10:04:27 +0000 (14:04 +0400)]
refactored VideoWriter class (convert it to abstract interface)
Roman Donchenko [Tue, 11 Jun 2013 13:30:16 +0000 (17:30 +0400)]
Merge pull request #899 from LeszekSwirski:fix-drawingdoc
Roman Donchenko [Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)]
Merge pull request #975 from SpecLad:merge-2.4
Roman Donchenko [Tue, 11 Jun 2013 08:05:56 +0000 (12:05 +0400)]
Merge pull request #974 from jet47:gpu-core-refactoring
Roman Donchenko [Mon, 10 Jun 2013 14:18:01 +0000 (18:18 +0400)]
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
Vladislav Vinogradov [Mon, 10 Jun 2013 13:47:55 +0000 (17:47 +0400)]
added missing <iostream> header
Vladislav Vinogradov [Mon, 10 Jun 2013 11:52:01 +0000 (15:52 +0400)]
fixed documentation build
Roman Donchenko [Mon, 10 Jun 2013 11:51:29 +0000 (15:51 +0400)]
Merge pull request #958 from apavlenko:fix_java_mixchannels
Vadim Pisarevsky [Mon, 10 Jun 2013 11:25:07 +0000 (15:25 +0400)]
Merge pull request #856 from ericgreveson:master
Andrey Pavlenko [Mon, 10 Jun 2013 10:37:01 +0000 (14:37 +0400)]
fixing Java wrapper for mixChannels
'dst' should be treated as an input arg (epilog not needed)
Vladislav Vinogradov [Thu, 30 May 2013 07:11:40 +0000 (11:11 +0400)]
renamed gpu_private.hpp to private.gpu.hpp
Vladislav Vinogradov [Thu, 30 May 2013 09:11:32 +0000 (13:11 +0400)]
used cudaMalloc for 1-row or 1-column matrix instead of cudaMallocPitch
Vladislav Vinogradov [Fri, 26 Apr 2013 06:53:15 +0000 (10:53 +0400)]
made createContinuous & ensureSizeIsEnough generic (OutputArray support)
Vladislav Vinogradov [Tue, 23 Apr 2013 13:11:45 +0000 (17:11 +0400)]
added Event class (wrapper for cudaEvent)
Vladislav Vinogradov [Tue, 16 Apr 2013 13:44:19 +0000 (17:44 +0400)]
refactored gpu info structures (TargetArchs and DeviceInfo)
now DeviceInfo provides full information about device (from cudaDeviceProp)
Vladislav Vinogradov [Tue, 16 Apr 2013 13:43:49 +0000 (17:43 +0400)]
refactored gpu::Stream (minor fixes)
Vladislav Vinogradov [Tue, 16 Apr 2013 10:39:42 +0000 (14:39 +0400)]
refactored CudaMem (now alloc type assign only in constructor)
Vladislav Vinogradov [Tue, 16 Apr 2013 09:17:51 +0000 (13:17 +0400)]
new implementation for GpuMat::setTo (without constant memory)
Vladislav Vinogradov [Tue, 16 Apr 2013 09:03:34 +0000 (13:03 +0400)]
refactored GpuMat:
* switch to InputArray/OutputArray
* add Stream support
Vladislav Vinogradov [Tue, 16 Apr 2013 07:12:55 +0000 (11:12 +0400)]
moved GpuMat implementation to separate file
Vladislav Vinogradov [Mon, 15 Apr 2013 13:47:13 +0000 (17:47 +0400)]
moved inline implementation to separate file
Vladislav Vinogradov [Mon, 15 Apr 2013 10:17:18 +0000 (14:17 +0400)]
added Stream support to ogl::Buffer
Vladislav Vinogradov [Mon, 15 Apr 2013 09:27:12 +0000 (13:27 +0400)]
removed obsolete DevMem2D class
Vladislav Vinogradov [Thu, 30 May 2013 07:23:18 +0000 (11:23 +0400)]
renamed gpu headers (made it more consistent)
Vladislav Vinogradov [Fri, 26 Apr 2013 06:49:51 +0000 (10:49 +0400)]
added CudaMem support to Input/Output arrays
Vladislav Vinogradov [Mon, 15 Apr 2013 07:29:21 +0000 (11:29 +0400)]
removed ogl::Texture2D support from InputArray
Roman Donchenko [Mon, 10 Jun 2013 08:05:52 +0000 (12:05 +0400)]
Merge pull request #964 from jet47:cuda-5.5-support
berak [Fri, 7 Jun 2013 16:29:00 +0000 (18:29 +0200)]
Moments.nu** fields initialized in completeMomentState( Moments* moments )
berak [Fri, 7 Jun 2013 16:13:15 +0000 (18:13 +0200)]
restored utility.hpp
berak [Fri, 7 Jun 2013 15:22:42 +0000 (17:22 +0200)]
added initialization of Moments.nu** params in completeMomentState( Moments* moments )
Vladislav Vinogradov [Tue, 4 Jun 2013 11:01:06 +0000 (15:01 +0400)]
fixed BroxOpticalFlow sanity test (increase epsilon value)
Vladislav Vinogradov [Tue, 4 Jun 2013 10:59:47 +0000 (14:59 +0400)]
fixed BoxFilter sanity test (different rounding results)
Vladislav Vinogradov [Tue, 4 Jun 2013 09:58:45 +0000 (13:58 +0400)]
fixed BroxOpticalFlow regression test
the output of BroxOpticalFlow differs a bit in CUDA 5.5
Vladislav Vinogradov [Fri, 7 Jun 2013 10:56:37 +0000 (14:56 +0400)]
rewrite core/cuda/vec_math.hpp file
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
Vladislav Vinogradov [Fri, 7 Jun 2013 10:46:42 +0000 (14:46 +0400)]
fixed constructors for functional objects (added __host__ modifier)
Vladislav Vinogradov [Fri, 7 Jun 2013 10:38:27 +0000 (14:38 +0400)]
fixed NPP error constants usage
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:44:28 +0000 (13:44 +0400)]
Merge pull request #946 from bitwangyaoyao:2.4_samples2
Vadim Pisarevsky [Fri, 7 Jun 2013 09:44:10 +0000 (13:44 +0400)]
Merge pull request #957 from pengx17:2.4_fix_corner_detector
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:29:40 +0000 (11:29 +0400)]
Merge pull request #960 from SpecLad:extra-modules
Roman Donchenko [Fri, 7 Jun 2013 07:28:10 +0000 (11:28 +0400)]
Merge pull request #951 from apavlenko:fix_java_test_randshuffle
Roman Donchenko [Fri, 7 Jun 2013 07:27:45 +0000 (11:27 +0400)]
Merge pull request #959 from SpecLad:qt4-build
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 13:58:14 +0000 (17:58 +0400)]
Merge pull request #955 from SpecLad:symlink
Roman Donchenko [Thu, 6 Jun 2013 10:09:33 +0000 (14:09 +0400)]
Fix a missing header path when building with Qt 4.
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
Roman Donchenko [Thu, 6 Jun 2013 08:09:41 +0000 (12:09 +0400)]
Merge pull request #956 from IanVS:COLOR_CODE
peng xiao [Thu, 6 Jun 2013 03:44:35 +0000 (11:44 +0800)]
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.
IanVS [Thu, 6 Jun 2013 01:55:56 +0000 (21:55 -0400)]
Updated documentation to new "COLOR_" format for color conversion enums.
Roman Donchenko [Wed, 5 Jun 2013 14:09:47 +0000 (18:09 +0400)]
Add support for adding custom OpenCV modules.
Roman Donchenko [Wed, 5 Jun 2013 13:56:35 +0000 (17:56 +0400)]
Merge pull request #953 from jet47:fix-bug-3069
Roman Donchenko [Wed, 5 Jun 2013 13:50:11 +0000 (17:50 +0400)]
Merge pull request #952 from SpecLad:jepg
Roman Donchenko [Wed, 5 Jun 2013 11:54:27 +0000 (15:54 +0400)]
Don't resolve symlinks when looking for modules.
We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.
Roman Donchenko [Wed, 5 Jun 2013 13:04:21 +0000 (17:04 +0400)]
Merge pull request #948 from jet47:cuda-5.5-support