Evgeny Agafonchikov [Tue, 24 Mar 2015 12:52:49 +0000 (15:52 +0300)]
Fixing help messages
--help message and starting run.py w/o parameters generate different messages
E. g. w/ and w/o build_path in the end
build_path is required, removing square brackets
Vadim Pisarevsky [Mon, 30 Mar 2015 17:20:39 +0000 (17:20 +0000)]
Merge pull request #3873 from Dmitry-Me:reduceVariableScope10
Alexander Alekhin [Mon, 30 Mar 2015 15:52:05 +0000 (15:52 +0000)]
Merge pull request #3888 from alalek:fix_build
Alexander Alekhin [Mon, 30 Mar 2015 13:28:53 +0000 (16:28 +0300)]
fix build (related to PR #3814)
Vadim Pisarevsky [Mon, 30 Mar 2015 09:38:18 +0000 (09:38 +0000)]
Merge pull request #3883 from kmsquire:python_cmake_fix
Vadim Pisarevsky [Mon, 30 Mar 2015 09:27:10 +0000 (09:27 +0000)]
Merge pull request #3876 from vpisarev:mjpeg_codec
Vadim Pisarevsky [Mon, 30 Mar 2015 09:13:26 +0000 (09:13 +0000)]
Merge pull request #3872 from mshabunin:add-rst-link
Alexander Alekhin [Fri, 27 Mar 2015 18:03:37 +0000 (18:03 +0000)]
Merge pull request #3884 from mshabunin:fix-vc10-build
Vadim Pisarevsky [Fri, 27 Mar 2015 12:15:59 +0000 (15:15 +0300)]
added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder
Maksim Shabunin [Fri, 27 Mar 2015 11:36:27 +0000 (14:36 +0300)]
Commented unused constants in the RHO algorithm
Maksim Shabunin [Fri, 27 Mar 2015 09:15:26 +0000 (12:15 +0300)]
Fix build for VC10
Kevin Squire [Fri, 16 Jan 2015 02:13:06 +0000 (18:13 -0800)]
Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden
Vadim Pisarevsky [Thu, 26 Mar 2015 16:56:49 +0000 (16:56 +0000)]
Merge pull request #3847 from mshabunin:android-build
Vadim Pisarevsky [Thu, 26 Mar 2015 16:40:17 +0000 (16:40 +0000)]
Merge pull request #3880 from vpisarev:fix_emd
Vadim Pisarevsky [Thu, 26 Mar 2015 13:35:35 +0000 (13:35 +0000)]
Merge pull request #3871 from potpath:patch-1
Vadim Pisarevsky [Thu, 26 Mar 2015 13:35:12 +0000 (13:35 +0000)]
Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc
Vadim Pisarevsky [Thu, 26 Mar 2015 13:26:41 +0000 (16:26 +0300)]
initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report)
Vadim Pisarevsky [Thu, 26 Mar 2015 13:09:01 +0000 (13:09 +0000)]
Merge pull request #3875 from alalek:fix_build
Vadim Pisarevsky [Thu, 26 Mar 2015 12:59:49 +0000 (15:59 +0300)]
fixed warnings; transpose qtab to make it compatible with neon branch
Vadim Pisarevsky [Thu, 26 Mar 2015 10:22:11 +0000 (10:22 +0000)]
Merge pull request #3878 from mshabunin:fix-python
Maksim Shabunin [Thu, 26 Mar 2015 08:43:49 +0000 (11:43 +0300)]
Add python test for inheritance structure generation
Maksim Shabunin [Thu, 26 Mar 2015 08:22:52 +0000 (11:22 +0300)]
Fix python submodules inheritance detection
Vadim Pisarevsky [Wed, 25 Mar 2015 21:39:29 +0000 (00:39 +0300)]
added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG"
Alexander Alekhin [Wed, 25 Mar 2015 16:09:53 +0000 (19:09 +0300)]
fix build (related to PR #3814)
Dmitry-Me [Wed, 25 Mar 2015 14:17:06 +0000 (17:17 +0300)]
Reduce variables scope
Vadim Pisarevsky [Wed, 25 Mar 2015 13:32:33 +0000 (13:32 +0000)]
Merge pull request #3870 from Dmitry-Me:reduceVariableScope9
Maksim Shabunin [Wed, 25 Mar 2015 13:27:35 +0000 (16:27 +0300)]
Add link to old documentation format
Dikay900 [Sat, 21 Mar 2015 18:18:54 +0000 (19:18 +0100)]
disable cuda::OpticalFlowNeedleMap if configured without cudaimgproc
disable cuda::FastOpticalFlowBM if configured without cudaarithm
potpath [Wed, 25 Mar 2015 11:07:01 +0000 (18:07 +0700)]
Fix a typo in template_matching.markdown
Fix a typo in first equation under method=CV_TM_CCOEFF.
Vadim Pisarevsky [Wed, 25 Mar 2015 10:10:04 +0000 (10:10 +0000)]
Merge pull request #3670 from obilaniu:master
Vadim Pisarevsky [Wed, 25 Mar 2015 09:51:20 +0000 (09:51 +0000)]
Merge pull request #3866 from tdsmith:python-linkage
Dmitry-Me [Wed, 25 Mar 2015 07:35:11 +0000 (10:35 +0300)]
Reduce variable scope
Vadim Pisarevsky [Tue, 24 Mar 2015 16:10:19 +0000 (16:10 +0000)]
Merge pull request #3634 from mshabunin:transition-guide
Maksim Shabunin [Tue, 24 Mar 2015 15:57:29 +0000 (18:57 +0300)]
Changed Android Manager version to 3.0
Vadim Pisarevsky [Tue, 24 Mar 2015 15:23:58 +0000 (15:23 +0000)]
Merge pull request #3814 from erikrk:denoising-16bit-master
Vadim Pisarevsky [Tue, 24 Mar 2015 15:19:55 +0000 (15:19 +0000)]
Merge pull request #3835 from StevenPuttemans:upgrade_traincascade_memory_master
Vadim Pisarevsky [Tue, 24 Mar 2015 15:19:13 +0000 (15:19 +0000)]
Merge pull request #3849 from Dikay900:fix_tilted_features_crash
Vadim Pisarevsky [Tue, 24 Mar 2015 15:13:34 +0000 (15:13 +0000)]
Merge pull request #3854 from Dmitry-Me:reduceVariableScope8
Vadim Pisarevsky [Tue, 24 Mar 2015 15:09:53 +0000 (15:09 +0000)]
Merge pull request #3858 from MSOpenTech:fix-ml-test
Vadim Pisarevsky [Tue, 24 Mar 2015 15:08:03 +0000 (15:08 +0000)]
Merge pull request #3859 from NewProggie:fix-doc-typo
Vadim Pisarevsky [Tue, 24 Mar 2015 15:07:34 +0000 (15:07 +0000)]
Merge pull request #3860 from theodr:document_hconcat_vconcat
Vadim Pisarevsky [Tue, 24 Mar 2015 15:07:12 +0000 (15:07 +0000)]
Merge pull request #3861 from wangyan42164:cascade_optimizing
Vadim Pisarevsky [Tue, 24 Mar 2015 15:05:43 +0000 (15:05 +0000)]
Merge pull request #3863 from MSOpenTech:fix_winrt_linker
Vadim Pisarevsky [Tue, 24 Mar 2015 15:05:15 +0000 (15:05 +0000)]
Merge pull request #3864 from MSOpenTech:removed-unused-winrttest
Vadim Pisarevsky [Tue, 24 Mar 2015 15:04:45 +0000 (15:04 +0000)]
Merge pull request #3867 from RafaRuiz:patch-1
theodore [Mon, 23 Mar 2015 00:44:10 +0000 (01:44 +0100)]
documentation for the hconcat and vconcat functions
RafaRuiz [Tue, 24 Mar 2015 09:06:55 +0000 (09:06 +0000)]
Update lkdemo.cpp because of memory leak
In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250
Tim D. Smith [Tue, 24 Mar 2015 06:36:46 +0000 (23:36 -0700)]
Don't explicitly link Python on OS X
Explicitly linking to a Python framework on OS X prevents modules from
being built against one Python (i.e. system python) and imported from
another (i.e. Homebrew python); the interpreter segfaults if there's a
linkage to a foreign Python. Building the module with `-undefined
dynamic_lookup` instead of an explicit link allows the symbols to be
resolved at load time from a compatible python.
Erik Karlsson [Tue, 24 Mar 2015 01:01:31 +0000 (02:01 +0100)]
Added normType parameter to fastNlMeansDenoisingMulti
Erik Karlsson [Tue, 24 Mar 2015 00:16:17 +0000 (01:16 +0100)]
Added test cases
Erik Karlsson [Mon, 23 Mar 2015 23:47:11 +0000 (00:47 +0100)]
Added parameter normType to fastNlMeansDenoising
Erik Karlsson [Mon, 23 Mar 2015 22:23:35 +0000 (23:23 +0100)]
Removed fastNlMeansDenoisingColored[Multi]Abs
Evgeny Agafonchikov [Fri, 20 Mar 2015 15:19:18 +0000 (18:19 +0300)]
Do not link vfw32 library for WinRT
HAVE_VFW flag is defined by CMake try_compile check.
Check fails for WINRT as vfw.h begins with
and contains empty set of functions for Store apps.
So we can safely remove vfw32.lib for WINRT in general
(independently of availability for specific configuration)
Evgeny Agafonchikov [Mon, 23 Mar 2015 13:55:47 +0000 (16:55 +0300)]
Removing unused winrttest.cpp file
Maksim Shabunin [Mon, 23 Mar 2015 13:26:46 +0000 (13:26 +0000)]
Merge pull request #3862 from mshabunin:abi-contrib-disable
Maksim Shabunin [Mon, 23 Mar 2015 10:10:18 +0000 (13:10 +0300)]
Do not compare extra modules in ABI check
Yan Wang [Mon, 23 Mar 2015 09:47:40 +0000 (17:47 +0800)]
Optimize the performance of cascade OpenCL kernel.
1. Use built-in mad() instead of += and *.
2. For stump stages, if weight.z == 0, avoid unnecessary calculation
because some features only have 2 rectangles..
It could improve
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*
about 10% mean values.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Vadim Pisarevsky [Mon, 23 Mar 2015 08:10:21 +0000 (08:10 +0000)]
Merge pull request #3853 from alalek:ocl_fix_bufferpool_cleanup
Vadim Pisarevsky [Mon, 23 Mar 2015 08:04:41 +0000 (08:04 +0000)]
Merge pull request #3848 from yxiong:fix-4125
Vadim Pisarevsky [Mon, 23 Mar 2015 08:01:25 +0000 (08:01 +0000)]
Merge pull request #3846 from mshabunin:fix-headers
Kai Wolf [Sun, 22 Mar 2015 09:55:54 +0000 (10:55 +0100)]
Fix typo in types_c.h
Evgeny Agafonchikov [Fri, 20 Mar 2015 07:10:32 +0000 (10:10 +0300)]
Fixing invalid opencv_test_ml calls
Dikay900 [Fri, 20 Mar 2015 12:26:13 +0000 (13:26 +0100)]
add resetting the offset variable after setting a new image
Vadim Pisarevsky [Fri, 20 Mar 2015 10:48:51 +0000 (10:48 +0000)]
Merge pull request #3841 from MSOpenTech:samples-contrib
Dmitry-Me [Fri, 20 Mar 2015 10:27:08 +0000 (13:27 +0300)]
Reduce variable scope
Alexander Alekhin [Fri, 20 Mar 2015 10:21:10 +0000 (13:21 +0300)]
ocl/bufferpool: fix cleanup
Vadim Pisarevsky [Fri, 20 Mar 2015 10:03:11 +0000 (10:03 +0000)]
Merge pull request #3836 from Dmitry-Me:uninitializedMember
Vadim Pisarevsky [Fri, 20 Mar 2015 09:34:04 +0000 (09:34 +0000)]
Merge pull request #3851 from ellbur:findTransformECC-initialize-bug
Owen Healy [Fri, 20 Mar 2015 00:50:49 +0000 (20:50 -0400)]
Fix bug of uninitialized matrix in findTransformECC
The matrix templateZM needs to be initialized because otherwise
uninitialized values leak into the correlation in:
const double correlation = templateZM.dot(imageWarped)
In the worst case this will lead the correlation to be NaN ruining the
whole routine. The subtraction does not initialize templateZM due to the
mask.
Unfortunately, the uninitialized values (by altering the correlation)
have the side effect of dragging out the computation a little longer
giving a slightly better error bound. This means that fixing this bug
breaks perf_ecc where
SANITY_CHECK(warpMat, 1e-3);
is just a little too tight and happens to work due to the uninitialized
values. Since this is a performance not a accuracy test I think it is OK
to just relax the error bound a little bit (the tight error bound being
after all the result of a bug).
Dikay900 [Thu, 19 Mar 2015 18:50:16 +0000 (19:50 +0100)]
resolve crash of haarclassifier when using a tilted feature
Ying Xiong [Thu, 19 Mar 2015 18:23:44 +0000 (14:23 -0400)]
Fix compiler error on std::swap (CUDA7.0/clang/OSX)
Vadim Pisarevsky [Thu, 19 Mar 2015 15:11:01 +0000 (15:11 +0000)]
Merge pull request #3840 from MSOpenTech:concurrency-contrib
Maksim Shabunin [Thu, 19 Mar 2015 12:51:12 +0000 (15:51 +0300)]
Reverted unneeded change
Vadim Pisarevsky [Thu, 19 Mar 2015 12:47:22 +0000 (12:47 +0000)]
Merge pull request #3823 from lupustr3:pvlasov/implementation_detector_update
Maksim Shabunin [Thu, 19 Mar 2015 12:45:34 +0000 (15:45 +0300)]
Disabled TrainData::getNormCatValues wrapping due to pointer in parameters
Vadim Pisarevsky [Thu, 19 Mar 2015 12:33:56 +0000 (12:33 +0000)]
Merge pull request #3838 from PhilLab:patch-3
Vadim Pisarevsky [Thu, 19 Mar 2015 12:30:31 +0000 (12:30 +0000)]
Merge pull request #3837 from mshabunin:abi-compliance
Maksim Shabunin [Thu, 12 Mar 2015 09:49:49 +0000 (12:49 +0300)]
OpenCV Manager: support 3.0.0 library
Maksim Shabunin [Tue, 10 Mar 2015 15:18:35 +0000 (18:18 +0300)]
Ported from 2.4
Maksim Shabunin [Thu, 19 Mar 2015 12:11:49 +0000 (15:11 +0300)]
Disabled missing python method for static ml function
Maksim Shabunin [Thu, 19 Mar 2015 10:34:19 +0000 (13:34 +0300)]
Removed blank line at EOF
Maksim Shabunin [Thu, 19 Mar 2015 10:22:30 +0000 (13:22 +0300)]
Add python and java support for ml module
Maksim Shabunin [Thu, 19 Mar 2015 10:18:10 +0000 (13:18 +0300)]
Added to TOC
Maksim Shabunin [Mon, 19 Jan 2015 10:21:01 +0000 (13:21 +0300)]
Added transition (from 2.4) guide
Maxim Kostin [Wed, 18 Mar 2015 14:37:42 +0000 (17:37 +0300)]
Fixed 'doc' builder warnings.
Maksim Shabunin [Wed, 18 Mar 2015 14:33:12 +0000 (17:33 +0300)]
Moved property implementation macros to private header
Maksim Shabunin [Wed, 18 Mar 2015 14:23:42 +0000 (17:23 +0300)]
Replaced CV_PURE_PROPERTY macros with corresponding code
Maxim Kostin [Wed, 18 Mar 2015 13:31:27 +0000 (16:31 +0300)]
Added WinRT 8.1 Modern Desktop JavaScript sample
Maxim Kostin [Wed, 18 Mar 2015 12:13:08 +0000 (15:13 +0300)]
Added WinRT concurrency support.
Olexa Bilaniuk [Wed, 18 Mar 2015 06:21:36 +0000 (02:21 -0400)]
Merge remote-tracking branch 'refs/remotes/upstream/master'
Olexa Bilaniuk [Wed, 18 Mar 2015 06:21:16 +0000 (02:21 -0400)]
Bugfix in n* optimization.
Similar to the problem in LevMarq, arg.inl was being used instead of
best.inl. This opened us up to a potential segfault.
Philipp Hasper [Tue, 17 Mar 2015 14:28:37 +0000 (15:28 +0100)]
Fixed persistent.hpp documentation
Small error - object fs does not exist in this code example
Maksim Shabunin [Mon, 16 Mar 2015 09:45:21 +0000 (12:45 +0300)]
Added cmake option for abi descriptor generating (GENERATE_ABI_DESCRIPTOR)
Dmitry-Me [Tue, 17 Mar 2015 11:47:00 +0000 (14:47 +0300)]
Fix uninitialized members, fix log output typo
Vadim Pisarevsky [Tue, 17 Mar 2015 11:22:10 +0000 (11:22 +0000)]
Merge pull request #3811 from StevenPuttemans:fix_traincascade_getNegatives_master
Vadim Pisarevsky [Tue, 17 Mar 2015 11:12:49 +0000 (11:12 +0000)]
Merge pull request #3804 from polarfuchs99:master
Vadim Pisarevsky [Tue, 17 Mar 2015 10:37:09 +0000 (10:37 +0000)]
Merge pull request #3833 from sgrayb:houghline_bugfix
Vadim Pisarevsky [Tue, 17 Mar 2015 10:36:52 +0000 (10:36 +0000)]
Merge pull request #3832 from Dmitry-Me:fixNullPointerDereference3
Vadim Pisarevsky [Tue, 17 Mar 2015 10:34:53 +0000 (10:34 +0000)]
Merge pull request #3828 from vpisarev:fix_win32_perf_calib3d_solvepnp_failure
StevenPuttemans [Tue, 17 Mar 2015 08:00:41 +0000 (09:00 +0100)]
update traincascade assigned memory buffers