Olexa Bilaniuk [Tue, 30 Dec 2014 01:55:24 +0000 (20:55 -0500)]
Merge remote-tracking branch 'upstream/master' into rho
Vadim Pisarevsky [Fri, 26 Dec 2014 14:40:28 +0000 (14:40 +0000)]
Merge pull request #3444 from Sync-my-L2P:patch-1
Vadim Pisarevsky [Fri, 26 Dec 2014 14:38:54 +0000 (14:38 +0000)]
Merge pull request #3485 from mapycz:fix-calibrate-crash
Vadim Pisarevsky [Fri, 26 Dec 2014 14:37:47 +0000 (14:37 +0000)]
Merge pull request #3504 from a-wi:VideoCapture_get_const_v3
Vadim Pisarevsky [Fri, 26 Dec 2014 14:34:39 +0000 (14:34 +0000)]
Merge pull request #3530 from jet47:win-install-testdata
Vadim Pisarevsky [Fri, 26 Dec 2014 12:12:42 +0000 (12:12 +0000)]
Merge pull request #3531 from jet47:cuda-core-refactoring
Vadim Pisarevsky [Fri, 26 Dec 2014 12:12:01 +0000 (12:12 +0000)]
Merge pull request #3539 from mshabunin:openni-linux-paths
Vadim Pisarevsky [Fri, 26 Dec 2014 12:07:12 +0000 (12:07 +0000)]
Merge pull request #3546 from jet47:cuda-imgproc-fixes
Vladislav Vinogradov [Fri, 26 Dec 2014 09:04:07 +0000 (12:04 +0300)]
disable GeneralizedHoughGuil performance test
Vladislav Vinogradov [Fri, 26 Dec 2014 09:03:25 +0000 (12:03 +0300)]
improve error reporting in _InputArray methods
Vladislav Vinogradov [Thu, 25 Dec 2014 16:19:07 +0000 (19:19 +0300)]
disable sanity test for GeneralizedHoughGuil
the algorithm is not stable yet
Vladislav Vinogradov [Thu, 25 Dec 2014 13:11:08 +0000 (16:11 +0300)]
fix tests for match template
Vladislav Vinogradov [Thu, 25 Dec 2014 12:41:14 +0000 (15:41 +0300)]
fix cuda match template:
use correct types for integral/sum outputs
Vladislav Vinogradov [Thu, 25 Dec 2014 08:46:35 +0000 (11:46 +0300)]
rewrite cuda::cvtColor with new device layer and fix test failures
Maksim Shabunin [Tue, 23 Dec 2014 14:10:33 +0000 (17:10 +0300)]
Added enviroment search paths for OpenNI2 for linux and fixed specific warning
Vadim Pisarevsky [Wed, 24 Dec 2014 11:20:27 +0000 (11:20 +0000)]
Merge pull request #3523 from jet47:fix-cuda-buffer-pool
Vadim Pisarevsky [Wed, 24 Dec 2014 11:20:06 +0000 (11:20 +0000)]
Merge pull request #3527 from jet47:cuda-deprivate-old-device-layer
Vadim Pisarevsky [Wed, 24 Dec 2014 11:14:54 +0000 (11:14 +0000)]
Merge pull request #3541 from jet47:find-cuda-update
Vadim Pisarevsky [Wed, 24 Dec 2014 09:02:23 +0000 (09:02 +0000)]
Merge pull request #3532 from oresths:filter_neon
Vadim Pisarevsky [Wed, 24 Dec 2014 09:00:32 +0000 (09:00 +0000)]
Merge pull request #3538 from alalek:icv_fix_package
Vladislav Vinogradov [Tue, 23 Dec 2014 14:48:18 +0000 (17:48 +0300)]
[FindCUDA] improvements for cross-platform build
* improve `CUDA_TARGET_CPU_ARCH` cache initialization,
allow to override initial value from calling script;
* add `CUDA_TARGET_OS_VARIANT` option to select OS variant;
* add `CUDA_TARGET_TRIPLET` option to select target triplet from
`${CUDA_TOOLKIT_ROOT_DIR}/targets` folder;
* remove `CUDA_TOOLKIT_TARGET_DIR` option, now it is calculated from
`CUDA_TARGET_TRIPLET`, the old approach still can be used for compatibility;
* for CUDA 6.5 and newer try to locate static libraries too, because
in 6.5 toolkit for ARM cross compilation only static libraries are included.
Vladislav Vinogradov [Tue, 23 Dec 2014 14:47:04 +0000 (17:47 +0300)]
update FindCUDA CMake module to the latest version from upstream
Vladislav Vinogradov [Tue, 23 Dec 2014 08:19:11 +0000 (11:19 +0300)]
fix GpuMat::swap method:
add swap instruction for allocator field
Vladislav Vinogradov [Tue, 23 Dec 2014 14:43:14 +0000 (17:43 +0300)]
refactor CV_CUDA_TEST_MAIN, use CV_TEST_MAIN for it
use CV_CUDA_TEST_MAIN for opencv_test_core to initialize CUDA
device information
Vladislav Vinogradov [Fri, 19 Dec 2014 16:33:53 +0000 (19:33 +0300)]
add Allocator parameter to cudev::GpuMat_ contructors
Vladislav Vinogradov [Fri, 19 Dec 2014 14:59:18 +0000 (17:59 +0300)]
add cuda::HostMem::getAllocator method
it allows to use cudaHostAlloc methods for cv::Mat objects
Vladislav Vinogradov [Fri, 19 Dec 2014 14:07:58 +0000 (17:07 +0300)]
add more FeatureSet constants
Vladislav Vinogradov [Fri, 19 Dec 2014 14:07:44 +0000 (17:07 +0300)]
move CUDA core tests to core module
Vladislav Vinogradov [Fri, 19 Dec 2014 10:46:28 +0000 (13:46 +0300)]
rename CudaMem -> HostMem to better reflect its purpose
Vladislav Vinogradov [Thu, 18 Dec 2014 15:02:58 +0000 (18:02 +0300)]
move allocMatFromBuf function to farneback.cpp:
* it is the only place, where it is used
* no need to make this function public
Vladislav Vinogradov [Thu, 18 Dec 2014 14:56:31 +0000 (17:56 +0300)]
minor reorganization for CUDA doxygen groups:
move main CUDA group to modules/core/cuda.hpp
Vladislav Vinogradov [Thu, 18 Dec 2014 14:55:48 +0000 (17:55 +0300)]
mark old CUDA device layer as deprecated and remove it from doxygen documentation
add a note to use new cudev module as a replacement
Vladislav Vinogradov [Mon, 22 Dec 2014 08:33:39 +0000 (11:33 +0300)]
fix null stream initialization for multi-gpu systems
Vladislav Vinogradov [Fri, 19 Dec 2014 16:33:32 +0000 (19:33 +0300)]
move StackAllocator to cpp file
it is internal class, no need to export it
Vladislav Vinogradov [Wed, 17 Dec 2014 15:51:15 +0000 (18:51 +0300)]
fix cuda::BufferPool deinitialization
The deinitialization of BufferPool internal objects is controled by global
object, but it depends on other global objects, which leads to errors
caused by undefined deinitialization order of global objects.
I merge global objects initialization into single class, which performs
initialization and deinitialization in correct order.
Vladislav Vinogradov [Fri, 12 Dec 2014 15:47:41 +0000 (18:47 +0300)]
install test data on Windows platform too
Alexander Alekhin [Tue, 23 Dec 2014 13:10:47 +0000 (16:10 +0300)]
IPPICV: don't use full paths in dependencies
Vadim Pisarevsky [Tue, 23 Dec 2014 13:38:23 +0000 (13:38 +0000)]
Merge pull request #3529 from jet47:fix-linux-install
Vadim Pisarevsky [Tue, 23 Dec 2014 13:36:40 +0000 (13:36 +0000)]
Merge pull request #3536 from mshabunin:doxygen-intro
Jiri Drbalek [Mon, 22 Dec 2014 21:01:17 +0000 (21:01 +0000)]
fix crash when sample point out of image boundaries
Maksim Shabunin [Mon, 22 Dec 2014 14:21:37 +0000 (17:21 +0300)]
Fixed some mistakes
Maksim Shabunin [Tue, 9 Dec 2014 15:45:36 +0000 (18:45 +0300)]
Tutorial: documenting OpenCV
Vadim Pisarevsky [Mon, 22 Dec 2014 11:58:01 +0000 (11:58 +0000)]
Merge pull request #3513 from mshabunin:compat-30
Vadim Pisarevsky [Mon, 22 Dec 2014 11:14:29 +0000 (11:14 +0000)]
Merge pull request #3520 from JoeHowse:master
Vadim Pisarevsky [Mon, 22 Dec 2014 10:58:07 +0000 (10:58 +0000)]
Merge pull request #3524 from jet47:fix-cuda-warnings
Vadim Pisarevsky [Mon, 22 Dec 2014 10:57:06 +0000 (10:57 +0000)]
Merge pull request #3525 from jet47:fix-cudev-tests
Vadim Pisarevsky [Mon, 22 Dec 2014 10:44:47 +0000 (10:44 +0000)]
Merge pull request #3490 from oresths:symmcolumnsmall_fix
Vadim Pisarevsky [Mon, 22 Dec 2014 10:39:42 +0000 (10:39 +0000)]
Merge pull request #3512 from vins31:OpenNi2_AsusXtion
Vadim Pisarevsky [Mon, 22 Dec 2014 10:29:31 +0000 (10:29 +0000)]
Merge pull request #3499 from StevenPuttemans:fix_2432
Vadim Pisarevsky [Mon, 22 Dec 2014 10:27:33 +0000 (10:27 +0000)]
Merge pull request #3510 from boaz001:feature-4057
Vadim Pisarevsky [Mon, 22 Dec 2014 10:26:30 +0000 (10:26 +0000)]
Merge pull request #3516 from ana-GT:openni2_defaultMode
Vadim Pisarevsky [Mon, 22 Dec 2014 10:25:47 +0000 (10:25 +0000)]
Merge pull request #3518 from wangyan42164:ocl_cascade_detect
Vadim Pisarevsky [Mon, 22 Dec 2014 10:25:00 +0000 (10:25 +0000)]
Merge pull request #3519 from fvgoto:patch-1
Vadim Pisarevsky [Mon, 22 Dec 2014 10:22:19 +0000 (10:22 +0000)]
Merge pull request #3528 from ilya-lavrenov:update_android_cmake
Vladislav Vinogradov [Thu, 18 Dec 2014 08:37:26 +0000 (11:37 +0300)]
increase epsilons for tests due to different optimizations (IPP vs CUDA, float vs double)
Vladislav Vinogradov [Thu, 18 Dec 2014 08:36:43 +0000 (11:36 +0300)]
update cudev color conversions according to the latest changes in CPU code
Vladislav Vinogradov [Thu, 18 Dec 2014 08:35:45 +0000 (11:35 +0300)]
disable -Wshadow warning for CUDA modules:
it is generated by CUDA headers and we can't fix it
orestis [Sun, 21 Dec 2014 19:27:03 +0000 (21:27 +0200)]
Change DescriptorExtractor_ORB regression test
to compensate for neon ieee754 non-compliancy.
Also changed the comparison between max valid and calculated distance to
make the error message more accurate (in case curMaxDist == maxDist)
orestis [Sat, 20 Dec 2014 15:14:21 +0000 (17:14 +0200)]
Change gaussianBlur5x5 perf test epsilon
Set it 1 instead of 0.001, as is already done in gaussianBlur3x3. That
will allow integer destination matrices that are not exactly the same,
but very close to the expected result, to pass the test.
orestis [Fri, 19 Dec 2014 20:51:42 +0000 (22:51 +0200)]
SymmRowSmallVec_32f 1x5 asymm
NEON speedup: 2.31x
Auto-vect speedup: 2.26x
Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
orestis [Fri, 19 Dec 2014 20:47:06 +0000 (22:47 +0200)]
SymmRowSmallVec_32f 1x5
NEON speedup: 2.36x
Auto-vect speedup: 2.36x
Test kernel: [0.1, 0.2408, 0.3184, 0.2408, 0.1]
orestis [Fri, 19 Dec 2014 20:44:39 +0000 (22:44 +0200)]
SymmColumnVec_32f16s asymm
NEON speedup: 9.46x
Auto-vect speedup: 1x
Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
orestis [Fri, 19 Dec 2014 20:42:31 +0000 (22:42 +0200)]
SymmColumnVec_32f16s
NEON speedup: 8.64x
Auto-vect speedup: 1x
Test kernel: [0.1, 0.2408, 0.3184, 0.2408, 0.1]
orestis [Fri, 19 Dec 2014 20:40:55 +0000 (22:40 +0200)]
SymmColumnSmallVec_32s16s 3x1 asymm
NEON speedup: 2.12x
Auto-vect speedup: 1.01x
Test kernel: [-2, 0, 2]
orestis [Fri, 19 Dec 2014 20:37:52 +0000 (22:37 +0200)]
SymmColumnSmallVec_32s16s [-1, 0, 1]
NEON speedup: 3.27x
Auto-vect speedup: 1.01x
orestis [Fri, 19 Dec 2014 20:36:46 +0000 (22:36 +0200)]
SymmColumnSmallVec_32s16s 3x1
NEON speedup: 1.75x
Auto-vect speedup: 1x
orestis [Fri, 19 Dec 2014 20:35:52 +0000 (22:35 +0200)]
SymmColumnSmallVec_32s16s [3, 10, 3] Scharr
NEON speedup: 2.04x
Auto-vect speedup: 1x
orestis [Fri, 19 Dec 2014 20:34:11 +0000 (22:34 +0200)]
SymmColumnSmallVec_32s16s [1, -2, 1]
NEON speedup: 2.75x
Auto-vect speedup: 1.01x
orestis [Fri, 19 Dec 2014 20:33:11 +0000 (22:33 +0200)]
SymmColumnSmallVec_32s16s [1, 2, 1]
NEON speedup: 2.66x
Auto-vect speedup: 1x
orestis [Fri, 19 Dec 2014 20:29:54 +0000 (22:29 +0200)]
SymmColumnVec_32s8u asymm
NEON speedup: 2.95x
Auto-vect speedup: 1x
Test kernel: [-0.9432, -1.1528, 0, 1.1528, 0.9432]
orestis [Fri, 19 Dec 2014 20:26:41 +0000 (22:26 +0200)]
SymmColumnVec_32s8u
NEON speedup: 1.96x
Auto-vect speedup: 1x
Test kernel: [0.0708, 0.2445, 0.3694, 0.2445, 0.0708]
orestis [Fri, 19 Dec 2014 20:23:09 +0000 (22:23 +0200)]
SymmRowSmallVec_8u32s 1x5 asymm
NEON speedup: 3.14x
Auto-vect speedup: 1.6x
Test kernel: [-5, -2, 0, 2, 5]
orestis [Fri, 19 Dec 2014 20:15:37 +0000 (22:15 +0200)]
SymmRowSmallVec_8u32s 1x3 asymmetric
NEON speedup: 1.95x
Auto-vect speedup: 1.17x
Test kernel: [-2, 0, 2]
orestis [Fri, 19 Dec 2014 20:11:52 +0000 (22:11 +0200)]
SymmRowSmallVec_8u32s [-1, 0, 1]
NEON speedup: 1.84x
Auto-vect speedup: 1.2x
orestis [Fri, 19 Dec 2014 20:10:58 +0000 (22:10 +0200)]
SymmRowSmallVec_8u32s 1x5 general
NEON speedup: 3.86x
Auto-vect speedup: 1.67x
Test kernel: [0.0708, 0.2445, 0.3694, 0.2445, 0.0708]
orestis [Fri, 19 Dec 2014 20:08:23 +0000 (22:08 +0200)]
SymmRowSmallVec_8u32s 1x3 general
NEON speedup: 2.56x
Auto-vect speedup: 1.26x
Test kernel: [1, 3, 1]
orestis [Fri, 19 Dec 2014 20:02:57 +0000 (22:02 +0200)]
SymmRowSmallVec_8u32s [1, 2, 1]
NEON speedup: 4.1
Auto-vect speedup: 2.25
Maksim Shabunin [Thu, 18 Dec 2014 14:56:24 +0000 (17:56 +0300)]
Included c-headers for better 2.4 compatibility
Vladislav Vinogradov [Fri, 12 Dec 2014 15:42:15 +0000 (18:42 +0300)]
remove opencv_testing.sh installation to /etc/profile.d/
opencv_run_all_tests_unix.sh already exports OPENCV_TEST_DATA_PATH
Ilya Lavrenov [Thu, 18 Dec 2014 16:31:10 +0000 (19:31 +0300)]
update android.toolchain.cmake
Vadim Pisarevsky [Thu, 18 Dec 2014 14:50:13 +0000 (14:50 +0000)]
Merge pull request #3517 from wangyan42164:ocl_denoising_2
Joe Howse [Wed, 17 Dec 2014 01:37:14 +0000 (21:37 -0400)]
For Java compatibility, avoiding explicit pseudonym in enum
Joe Howse [Wed, 17 Dec 2014 00:07:37 +0000 (20:07 -0400)]
Allow BGR, RGB, or gray capture via libv4l
Artur Wieczorek [Wed, 10 Dec 2014 17:17:35 +0000 (18:17 +0100)]
Implement VideoCapture::get, CvCapture::getProperty, IVideoCapture::getProperty as constant methods.
Florian Verdet [Tue, 16 Dec 2014 11:46:07 +0000 (12:46 +0100)]
fix obvious copy+paste typo in computeDistance()
(with this else-branch, argument contour2 would not be used at all)
Yan Wang [Tue, 16 Dec 2014 08:21:05 +0000 (16:21 +0800)]
Use preprocessor for constant values in OpenCL kernel instead of
the parameter variable.
It could improve the performance of
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*.
Especially,
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/15
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/16
could be improved about 2% in Intel platform.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Yan Wang [Tue, 16 Dec 2014 06:25:24 +0000 (14:25 +0800)]
Remove unnecessary local variable "size".
It should also be better for optimizing when compiling kernel.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Ana Huaman Quispe [Mon, 15 Dec 2014 23:16:25 +0000 (18:16 -0500)]
Changed CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise, in release mode the default modes never get set
Vadim Pisarevsky [Mon, 15 Dec 2014 18:07:09 +0000 (18:07 +0000)]
Merge pull request #3491 from mshabunin:ios-extra-world
Vadim Pisarevsky [Mon, 15 Dec 2014 18:04:01 +0000 (18:04 +0000)]
Merge pull request #3473 from TobyWanKenobi:master
Vadim Pisarevsky [Mon, 15 Dec 2014 18:03:01 +0000 (18:03 +0000)]
Merge pull request #3448 from Ashod:highgui_trackbar_improvements
Olexa Bilaniuk [Mon, 15 Dec 2014 17:31:22 +0000 (12:31 -0500)]
Merge remote-tracking branch 'upstream/master' into rho
StevenPuttemans [Wed, 10 Dec 2014 12:41:22 +0000 (13:41 +0100)]
fix documentation bug 2432
vincentweb [Sun, 14 Dec 2014 19:52:24 +0000 (20:52 +0100)]
Added better OpenNI2 support to the Asus Xtion and Occipital Structure
sensors which do not have image generators.
Boaz Stolk [Fri, 12 Dec 2014 13:21:47 +0000 (14:21 +0100)]
add option to link to dynamic IPP libraries
Sync-my-L2P [Thu, 11 Dec 2014 16:36:36 +0000 (17:36 +0100)]
Update segmentation.cpp
removed trailing whitespaces
Vadim Pisarevsky [Tue, 9 Dec 2014 14:12:22 +0000 (14:12 +0000)]
Merge pull request #3495 from taka-no-me:fix_android_arm64
Vadim Pisarevsky [Tue, 9 Dec 2014 14:06:23 +0000 (14:06 +0000)]
Merge pull request #3479 from mshabunin:doxygen-tutorials
Vadim Pisarevsky [Tue, 9 Dec 2014 14:05:35 +0000 (14:05 +0000)]
Merge pull request #3492 from Dmitry-Me:reduceVariablesScope1
Andrey Kamaev [Tue, 9 Dec 2014 09:06:56 +0000 (12:06 +0300)]
Fix build for Android arm64-v8a