platform/upstream/opencv.git
9 years agoMerge pull request #3580 from JoeHowse:master
Alexander Alekhin [Mon, 5 Jan 2015 19:40:37 +0000 (19:40 +0000)]
Merge pull request #3580 from JoeHowse:master

9 years agoMerge pull request #3579 from basheersubei:patch-1
Alexander Alekhin [Mon, 5 Jan 2015 19:39:39 +0000 (19:39 +0000)]
Merge pull request #3579 from basheersubei:patch-1

9 years agoFix shadowed variable warning
Joe Howse [Mon, 5 Jan 2015 14:56:46 +0000 (10:56 -0400)]
Fix shadowed variable warning

9 years agotypo fix in instructions of fitline.py sample
Basheer Subei [Sun, 4 Jan 2015 21:09:00 +0000 (00:09 +0300)]
typo fix in instructions of fitline.py sample

9 years agoMerge pull request #3548 from alalek:fix_sample_python
Vadim Pisarevsky [Wed, 31 Dec 2014 09:31:33 +0000 (09:31 +0000)]
Merge pull request #3548 from alalek:fix_sample_python

9 years agoMerge pull request #3547 from ilya-lavrenov:ocl_setto
Vadim Pisarevsky [Wed, 31 Dec 2014 09:30:40 +0000 (09:30 +0000)]
Merge pull request #3547 from ilya-lavrenov:ocl_setto

9 years agoMerge pull request #3493 from vbystricky:createsamples
Vadim Pisarevsky [Wed, 31 Dec 2014 09:29:56 +0000 (09:29 +0000)]
Merge pull request #3493 from vbystricky:createsamples

9 years agoMerge pull request #3549 from mshabunin:sphinx-doc-remove
Vadim Pisarevsky [Wed, 31 Dec 2014 09:14:22 +0000 (09:14 +0000)]
Merge pull request #3549 from mshabunin:sphinx-doc-remove

9 years agoMerge pull request #3555 from ilya-lavrenov:sse_integral
Vadim Pisarevsky [Wed, 31 Dec 2014 09:13:17 +0000 (09:13 +0000)]
Merge pull request #3555 from ilya-lavrenov:sse_integral

9 years agoMerge pull request #3559 from ilya-lavrenov:sse_dot_s8
Vadim Pisarevsky [Wed, 31 Dec 2014 08:06:06 +0000 (08:06 +0000)]
Merge pull request #3559 from ilya-lavrenov:sse_dot_s8

9 years agoMerge pull request #3558 from ilya-lavrenov:sse_resize
Vadim Pisarevsky [Wed, 31 Dec 2014 08:04:00 +0000 (08:04 +0000)]
Merge pull request #3558 from ilya-lavrenov:sse_resize

9 years agoMerge pull request #3551 from serval2412:master
Vadim Pisarevsky [Wed, 31 Dec 2014 06:09:29 +0000 (06:09 +0000)]
Merge pull request #3551 from serval2412:master

9 years agoMerge pull request #3556 from rokm:semicolon-warnings
Vadim Pisarevsky [Wed, 31 Dec 2014 06:08:11 +0000 (06:08 +0000)]
Merge pull request #3556 from rokm:semicolon-warnings

9 years agoMerge pull request #3560 from ilya-lavrenov:sse_remap
Vadim Pisarevsky [Wed, 31 Dec 2014 06:07:01 +0000 (06:07 +0000)]
Merge pull request #3560 from ilya-lavrenov:sse_remap

9 years agoMerge pull request #3567 from vbystricky:intelperc_fix
Vadim Pisarevsky [Wed, 31 Dec 2014 06:06:18 +0000 (06:06 +0000)]
Merge pull request #3567 from vbystricky:intelperc_fix

9 years agoFix error of compilation of cap_intelperc.cpp
vbystricky [Tue, 30 Dec 2014 12:38:03 +0000 (15:38 +0300)]
Fix error of compilation of cap_intelperc.cpp

9 years agoMerge pull request #3550 from JoeHowse:master
Vadim Pisarevsky [Tue, 30 Dec 2014 11:10:02 +0000 (11:10 +0000)]
Merge pull request #3550 from JoeHowse:master

9 years agoAdded dummy build targets for compatibility
Maksim Shabunin [Tue, 30 Dec 2014 09:11:37 +0000 (12:11 +0300)]
Added dummy build targets for compatibility

9 years agoReplaced tabs with spaces in stylesheet
Maksim Shabunin [Tue, 30 Dec 2014 07:52:08 +0000 (10:52 +0300)]
Replaced tabs with spaces in stylesheet

9 years agoSSE resize Lanczos
Ilya Lavrenov [Mon, 29 Dec 2014 21:19:05 +0000 (00:19 +0300)]
SSE resize Lanczos

9 years agoSSE2 conversio in remap
Ilya Lavrenov [Mon, 29 Dec 2014 22:00:22 +0000 (01:00 +0300)]
SSE2 conversio in remap

9 years agoSSE2 cv::Mat::dot
Ilya Lavrenov [Mon, 29 Dec 2014 21:34:09 +0000 (00:34 +0300)]
SSE2 cv::Mat::dot

9 years agomodules/core: removed extra semi-colon from mat.inl.hpp and utility.hpp
Rok Mandeljc [Mon, 29 Dec 2014 15:21:17 +0000 (16:21 +0100)]
modules/core: removed extra semi-colon from mat.inl.hpp and utility.hpp

This silences the pedantic warning messages from gcc 4.8.3

9 years agoSSE2 optimization of cv::integral
Ilya Lavrenov [Mon, 29 Dec 2014 12:38:49 +0000 (15:38 +0300)]
SSE2 optimization of cv::integral

9 years agooptimization of UMat::setTo
Ilya Lavrenov [Thu, 25 Dec 2014 21:56:23 +0000 (00:56 +0300)]
optimization of UMat::setTo

9 years agoFix cppcheck reports warnings:
Julien Nabet [Sat, 27 Dec 2014 09:54:34 +0000 (10:54 +0100)]
Fix cppcheck reports warnings:
(performance) Possible inefficient checking for 'lmap' emptiness
(warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
(style) Array index '<xxx>' is used before limits check

9 years agomore const correctness in OpenNI2 getProperty
Joe Howse [Sat, 27 Dec 2014 04:11:14 +0000 (00:11 -0400)]
more const correctness in OpenNI2 getProperty

9 years agoconst correctness in OpenNI and OpenNI2 getProperty
Joe Howse [Sat, 27 Dec 2014 03:54:03 +0000 (23:54 -0400)]
const correctness in OpenNI and OpenNI2 getProperty

9 years agoRemoving whitespace to appease doc builder
Joe Howse [Sat, 27 Dec 2014 01:15:45 +0000 (21:15 -0400)]
Removing whitespace to appease doc builder

9 years agoFrontal cat face detectors
Joe Howse [Sat, 27 Dec 2014 00:13:13 +0000 (20:13 -0400)]
Frontal cat face detectors

9 years agoAdded Qt help generation support
Maksim Shabunin [Fri, 26 Dec 2014 15:39:40 +0000 (18:39 +0300)]
Added Qt help generation support

9 years agoSome documentation customization
Maksim Shabunin [Fri, 26 Dec 2014 14:30:33 +0000 (17:30 +0300)]
Some documentation customization

9 years agoUpdated sample files documentation inclusions
Maksim Shabunin [Fri, 26 Dec 2014 11:35:46 +0000 (14:35 +0300)]
Updated sample files documentation inclusions

9 years agoRestored PlantUML support for doxygen
Maksim Shabunin [Fri, 26 Dec 2014 08:57:41 +0000 (11:57 +0300)]
Restored PlantUML support for doxygen

9 years agoMoved tutorial table-of-contents files to corresponding root level
Maksim Shabunin [Wed, 24 Dec 2014 15:44:52 +0000 (18:44 +0300)]
Moved tutorial table-of-contents files to corresponding root level

9 years agoRemoved Sphinx generation commands from cmake scripts
Maksim Shabunin [Wed, 24 Dec 2014 15:41:01 +0000 (18:41 +0300)]
Removed Sphinx generation commands from cmake scripts

9 years agoRemoved Sphinx documentation files
Maksim Shabunin [Wed, 24 Dec 2014 15:37:57 +0000 (18:37 +0300)]
Removed Sphinx documentation files

9 years agoMerge pull request #3444 from Sync-my-L2P:patch-1
Vadim Pisarevsky [Fri, 26 Dec 2014 14:40:28 +0000 (14:40 +0000)]
Merge pull request #3444 from Sync-my-L2P:patch-1

9 years agoMerge pull request #3485 from mapycz:fix-calibrate-crash
Vadim Pisarevsky [Fri, 26 Dec 2014 14:38:54 +0000 (14:38 +0000)]
Merge pull request #3485 from mapycz:fix-calibrate-crash

9 years agoMerge pull request #3504 from a-wi:VideoCapture_get_const_v3
Vadim Pisarevsky [Fri, 26 Dec 2014 14:37:47 +0000 (14:37 +0000)]
Merge pull request #3504 from a-wi:VideoCapture_get_const_v3

9 years agoMerge pull request #3530 from jet47:win-install-testdata
Vadim Pisarevsky [Fri, 26 Dec 2014 14:34:39 +0000 (14:34 +0000)]
Merge pull request #3530 from jet47:win-install-testdata

9 years agoMerge pull request #3531 from jet47:cuda-core-refactoring
Vadim Pisarevsky [Fri, 26 Dec 2014 12:12:42 +0000 (12:12 +0000)]
Merge pull request #3531 from jet47:cuda-core-refactoring

9 years agoMerge pull request #3539 from mshabunin:openni-linux-paths
Vadim Pisarevsky [Fri, 26 Dec 2014 12:12:01 +0000 (12:12 +0000)]
Merge pull request #3539 from mshabunin:openni-linux-paths

9 years agoMerge pull request #3546 from jet47:cuda-imgproc-fixes
Vadim Pisarevsky [Fri, 26 Dec 2014 12:07:12 +0000 (12:07 +0000)]
Merge pull request #3546 from jet47:cuda-imgproc-fixes

9 years agosamples: fix python contants
Alexander Alekhin [Fri, 26 Dec 2014 11:44:47 +0000 (14:44 +0300)]
samples: fix python contants

9 years agodisable GeneralizedHoughGuil performance test
Vladislav Vinogradov [Fri, 26 Dec 2014 09:04:07 +0000 (12:04 +0300)]
disable GeneralizedHoughGuil performance test

9 years agoimprove error reporting in _InputArray methods
Vladislav Vinogradov [Fri, 26 Dec 2014 09:03:25 +0000 (12:03 +0300)]
improve error reporting in _InputArray methods

9 years agodisable sanity test for GeneralizedHoughGuil
Vladislav Vinogradov [Thu, 25 Dec 2014 16:19:07 +0000 (19:19 +0300)]
disable sanity test for GeneralizedHoughGuil

the algorithm is not stable yet

9 years agofix tests for match template
Vladislav Vinogradov [Thu, 25 Dec 2014 13:11:08 +0000 (16:11 +0300)]
fix tests for match template

9 years agofix cuda 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

9 years agorewrite cuda::cvtColor with new device layer and fix test failures
Vladislav Vinogradov [Thu, 25 Dec 2014 08:46:35 +0000 (11:46 +0300)]
rewrite cuda::cvtColor with new device layer and fix test failures

9 years agoAdded enviroment search paths for OpenNI2 for linux and fixed specific warning
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

9 years agoMerge pull request #3523 from jet47:fix-cuda-buffer-pool
Vadim Pisarevsky [Wed, 24 Dec 2014 11:20:27 +0000 (11:20 +0000)]
Merge pull request #3523 from jet47:fix-cuda-buffer-pool

9 years agoMerge pull request #3527 from jet47:cuda-deprivate-old-device-layer
Vadim Pisarevsky [Wed, 24 Dec 2014 11:20:06 +0000 (11:20 +0000)]
Merge pull request #3527 from jet47:cuda-deprivate-old-device-layer

9 years agoMerge pull request #3541 from jet47:find-cuda-update
Vadim Pisarevsky [Wed, 24 Dec 2014 11:14:54 +0000 (11:14 +0000)]
Merge pull request #3541 from jet47:find-cuda-update

9 years agoMerge pull request #3532 from oresths:filter_neon
Vadim Pisarevsky [Wed, 24 Dec 2014 09:02:23 +0000 (09:02 +0000)]
Merge pull request #3532 from oresths:filter_neon

9 years agoMerge pull request #3538 from alalek:icv_fix_package
Vadim Pisarevsky [Wed, 24 Dec 2014 09:00:32 +0000 (09:00 +0000)]
Merge pull request #3538 from alalek:icv_fix_package

9 years ago[FindCUDA] improvements for cross-platform build
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.

9 years agoupdate FindCUDA CMake module to the latest version from upstream
Vladislav Vinogradov [Tue, 23 Dec 2014 14:47:04 +0000 (17:47 +0300)]
update FindCUDA CMake module to the latest version from upstream

9 years agofix GpuMat::swap method:
Vladislav Vinogradov [Tue, 23 Dec 2014 08:19:11 +0000 (11:19 +0300)]
fix GpuMat::swap method:

add swap instruction for allocator field

9 years agorefactor CV_CUDA_TEST_MAIN, use CV_TEST_MAIN for it
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

9 years agoadd Allocator parameter to cudev::GpuMat_ contructors
Vladislav Vinogradov [Fri, 19 Dec 2014 16:33:53 +0000 (19:33 +0300)]
add Allocator parameter to cudev::GpuMat_ contructors

9 years agoadd cuda::HostMem::getAllocator method
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

9 years agoadd more FeatureSet constants
Vladislav Vinogradov [Fri, 19 Dec 2014 14:07:58 +0000 (17:07 +0300)]
add more FeatureSet constants

9 years agomove CUDA core tests to core module
Vladislav Vinogradov [Fri, 19 Dec 2014 14:07:44 +0000 (17:07 +0300)]
move CUDA core tests to core module

9 years agorename CudaMem -> HostMem to better reflect its purpose
Vladislav Vinogradov [Fri, 19 Dec 2014 10:46:28 +0000 (13:46 +0300)]
rename CudaMem -> HostMem to better reflect its purpose

9 years agomove allocMatFromBuf function to farneback.cpp:
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

9 years agominor reorganization for CUDA doxygen groups:
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

9 years agomark old CUDA device layer as deprecated and remove it from doxygen documentation
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

9 years agofix null stream initialization for multi-gpu systems
Vladislav Vinogradov [Mon, 22 Dec 2014 08:33:39 +0000 (11:33 +0300)]
fix null stream initialization for multi-gpu systems

9 years agomove StackAllocator to cpp file
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

9 years agofix cuda::BufferPool deinitialization
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.

9 years agoinstall test data on Windows platform too
Vladislav Vinogradov [Fri, 12 Dec 2014 15:47:41 +0000 (18:47 +0300)]
install test data on Windows platform too

9 years agoIPPICV: don't use full paths in dependencies
Alexander Alekhin [Tue, 23 Dec 2014 13:10:47 +0000 (16:10 +0300)]
IPPICV: don't use full paths in dependencies

9 years agoMerge pull request #3529 from jet47:fix-linux-install
Vadim Pisarevsky [Tue, 23 Dec 2014 13:38:23 +0000 (13:38 +0000)]
Merge pull request #3529 from jet47:fix-linux-install

9 years agoMerge pull request #3536 from mshabunin:doxygen-intro
Vadim Pisarevsky [Tue, 23 Dec 2014 13:36:40 +0000 (13:36 +0000)]
Merge pull request #3536 from mshabunin:doxygen-intro

9 years agofix crash when sample point out of image boundaries
Jiri Drbalek [Mon, 22 Dec 2014 21:01:17 +0000 (21:01 +0000)]
fix crash when sample point out of image boundaries

9 years agoFixed some mistakes
Maksim Shabunin [Mon, 22 Dec 2014 14:21:37 +0000 (17:21 +0300)]
Fixed some mistakes

9 years agoTutorial: documenting OpenCV
Maksim Shabunin [Tue, 9 Dec 2014 15:45:36 +0000 (18:45 +0300)]
Tutorial: documenting OpenCV

9 years agoMerge pull request #3513 from mshabunin:compat-30
Vadim Pisarevsky [Mon, 22 Dec 2014 11:58:01 +0000 (11:58 +0000)]
Merge pull request #3513 from mshabunin:compat-30

9 years agoMerge pull request #3520 from JoeHowse:master
Vadim Pisarevsky [Mon, 22 Dec 2014 11:14:29 +0000 (11:14 +0000)]
Merge pull request #3520 from JoeHowse:master

9 years agoMerge pull request #3524 from jet47:fix-cuda-warnings
Vadim Pisarevsky [Mon, 22 Dec 2014 10:58:07 +0000 (10:58 +0000)]
Merge pull request #3524 from jet47:fix-cuda-warnings

9 years agoMerge pull request #3525 from jet47:fix-cudev-tests
Vadim Pisarevsky [Mon, 22 Dec 2014 10:57:06 +0000 (10:57 +0000)]
Merge pull request #3525 from jet47:fix-cudev-tests

9 years agoMerge pull request #3490 from oresths:symmcolumnsmall_fix
Vadim Pisarevsky [Mon, 22 Dec 2014 10:44:47 +0000 (10:44 +0000)]
Merge pull request #3490 from oresths:symmcolumnsmall_fix

9 years agoMerge pull request #3512 from vins31:OpenNi2_AsusXtion
Vadim Pisarevsky [Mon, 22 Dec 2014 10:39:42 +0000 (10:39 +0000)]
Merge pull request #3512 from vins31:OpenNi2_AsusXtion

9 years agoMerge pull request #3499 from StevenPuttemans:fix_2432
Vadim Pisarevsky [Mon, 22 Dec 2014 10:29:31 +0000 (10:29 +0000)]
Merge pull request #3499 from StevenPuttemans:fix_2432

9 years agoMerge pull request #3510 from boaz001:feature-4057
Vadim Pisarevsky [Mon, 22 Dec 2014 10:27:33 +0000 (10:27 +0000)]
Merge pull request #3510 from boaz001:feature-4057

9 years agoMerge pull request #3516 from ana-GT:openni2_defaultMode
Vadim Pisarevsky [Mon, 22 Dec 2014 10:26:30 +0000 (10:26 +0000)]
Merge pull request #3516 from ana-GT:openni2_defaultMode

9 years agoMerge pull request #3518 from wangyan42164:ocl_cascade_detect
Vadim Pisarevsky [Mon, 22 Dec 2014 10:25:47 +0000 (10:25 +0000)]
Merge pull request #3518 from wangyan42164:ocl_cascade_detect

9 years agoMerge pull request #3519 from fvgoto:patch-1
Vadim Pisarevsky [Mon, 22 Dec 2014 10:25:00 +0000 (10:25 +0000)]
Merge pull request #3519 from fvgoto:patch-1

9 years agoMerge pull request #3528 from ilya-lavrenov:update_android_cmake
Vadim Pisarevsky [Mon, 22 Dec 2014 10:22:19 +0000 (10:22 +0000)]
Merge pull request #3528 from ilya-lavrenov:update_android_cmake

9 years agoincrease epsilons for tests due to different optimizations (IPP vs CUDA, float vs...
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)

9 years agoupdate cudev color conversions according to the latest changes in CPU code
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

9 years agodisable -Wshadow warning for CUDA modules:
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

9 years agoChange DescriptorExtractor_ORB regression test
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)

9 years agoChange gaussianBlur5x5 perf test epsilon
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.

9 years agoSymmRowSmallVec_32f 1x5 asymm
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]

9 years agoSymmRowSmallVec_32f 1x5
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]

9 years agoSymmColumnVec_32f16s asymm
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]

9 years agoSymmColumnVec_32f16s
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]