Alexander Alekhin
d326c77007
fix build (related to PR #3814 )
2015-03-30 16:32:00 +03:00
Vadim Pisarevsky
4b0543c887
Merge pull request #3883 from kmsquire:python_cmake_fix
2015-03-30 09:38:18 +00:00
Vadim Pisarevsky
fa9c9e791b
Merge pull request #3876 from vpisarev:mjpeg_codec
2015-03-30 09:27:10 +00:00
Vadim Pisarevsky
ff682a30b3
Merge pull request #3872 from mshabunin:add-rst-link
2015-03-30 09:13:26 +00:00
Alexander Alekhin
d279f127c1
Merge pull request #3884 from mshabunin:fix-vc10-build
2015-03-27 18:03:37 +00:00
Vadim Pisarevsky
602d2c33c0
added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder
2015-03-27 15:15:59 +03:00
Maksim Shabunin
56b02331f7
Commented unused constants in the RHO algorithm
2015-03-27 14:36:27 +03:00
Maksim Shabunin
fab2a947ca
Fix build for VC10
2015-03-27 12:15:26 +03:00
Kevin Squire
5e354fa844
Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden
2015-03-26 17:48:03 -07:00
Vadim Pisarevsky
77cbddf715
Merge pull request #3847 from mshabunin:android-build
2015-03-26 16:56:49 +00:00
Vadim Pisarevsky
1381564a84
Merge pull request #3880 from vpisarev:fix_emd
2015-03-26 16:40:17 +00:00
Vadim Pisarevsky
10e0540e61
Merge pull request #3871 from potpath:patch-1
2015-03-26 13:35:35 +00:00
Vadim Pisarevsky
b123870871
Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc
2015-03-26 13:35:12 +00:00
Vadim Pisarevsky
b91313a84e
initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report)
2015-03-26 16:26:41 +03:00
Vadim Pisarevsky
eff302a231
Merge pull request #3875 from alalek:fix_build
2015-03-26 13:09:01 +00:00
Vadim Pisarevsky
8d1232cc7a
fixed warnings; transpose qtab to make it compatible with neon branch
2015-03-26 15:59:49 +03:00
Vadim Pisarevsky
109b696599
Merge pull request #3878 from mshabunin:fix-python
2015-03-26 10:22:11 +00:00
Maksim Shabunin
e94dfcee0d
Add python test for inheritance structure generation
2015-03-26 11:43:49 +03:00
Maksim Shabunin
82adf7955f
Fix python submodules inheritance detection
2015-03-26 11:22:56 +03:00
Vadim Pisarevsky
3df6b6fdcf
added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG"
2015-03-26 00:39:29 +03:00
Alexander Alekhin
32da602bf7
fix build (related to PR #3814 )
2015-03-25 19:12:36 +03:00
Dmitry-Me
75a65542ba
Reduce variables scope
2015-03-25 17:17:06 +03:00
Vadim Pisarevsky
97bdc92d1b
Merge pull request #3870 from Dmitry-Me:reduceVariableScope9
2015-03-25 13:32:33 +00:00
Maksim Shabunin
313e799df5
Add link to old documentation format
2015-03-25 16:27:35 +03:00
Dikay900
3465cef689
disable cuda::OpticalFlowNeedleMap if configured without cudaimgproc
...
disable cuda::FastOpticalFlowBM if configured without cudaarithm
2015-03-25 13:47:53 +01:00
potpath
86c7d601b0
Fix a typo in template_matching.markdown
...
Fix a typo in first equation under method=CV_TM_CCOEFF.
2015-03-25 18:07:01 +07:00
Vadim Pisarevsky
0545aeb11b
Merge pull request #3670 from obilaniu:master
2015-03-25 10:10:05 +00:00
Vadim Pisarevsky
bd7c78ffd5
Merge pull request #3866 from tdsmith:python-linkage
2015-03-25 09:51:20 +00:00
Dmitry-Me
6318409a5d
Reduce variable scope
2015-03-25 10:35:11 +03:00
Vadim Pisarevsky
f6c561a01b
Merge pull request #3634 from mshabunin:transition-guide
2015-03-24 16:10:19 +00:00
Maksim Shabunin
dddba2637f
Changed Android Manager version to 3.0
2015-03-24 18:57:29 +03:00
Vadim Pisarevsky
5501cfd809
Merge pull request #3814 from erikrk:denoising-16bit-master
2015-03-24 15:23:58 +00:00
Vadim Pisarevsky
7ea0239776
Merge pull request #3835 from StevenPuttemans:upgrade_traincascade_memory_master
2015-03-24 15:19:56 +00:00
Vadim Pisarevsky
3c51fdffac
Merge pull request #3849 from Dikay900:fix_tilted_features_crash
2015-03-24 15:19:13 +00:00
Vadim Pisarevsky
f7f10a7d2c
Merge pull request #3854 from Dmitry-Me:reduceVariableScope8
2015-03-24 15:13:34 +00:00
Vadim Pisarevsky
d7cb99254e
Merge pull request #3858 from MSOpenTech:fix-ml-test
2015-03-24 15:09:53 +00:00
Vadim Pisarevsky
70ff448067
Merge pull request #3859 from NewProggie:fix-doc-typo
2015-03-24 15:08:03 +00:00
Vadim Pisarevsky
54deb5ed5a
Merge pull request #3860 from theodr:document_hconcat_vconcat
2015-03-24 15:07:34 +00:00
Vadim Pisarevsky
72b3dcd8b5
Merge pull request #3861 from wangyan42164:cascade_optimizing
2015-03-24 15:07:12 +00:00
Vadim Pisarevsky
174593643c
Merge pull request #3863 from MSOpenTech:fix_winrt_linker
2015-03-24 15:05:43 +00:00
Vadim Pisarevsky
dec722b2ee
Merge pull request #3864 from MSOpenTech:removed-unused-winrttest
2015-03-24 15:05:15 +00:00
Vadim Pisarevsky
f18eba44f8
Merge pull request #3867 from RafaRuiz:patch-1
2015-03-24 15:04:45 +00:00
theodore
02c3d8d792
documentation for the hconcat and vconcat functions
2015-03-24 13:59:09 +01:00
RafaRuiz
660a53e0e0
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
2015-03-24 09:06:55 +00:00
Tim D. Smith
b9b743bbe3
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.
2015-03-23 23:36:46 -07:00
Erik Karlsson
01d3df0d00
Added normType parameter to fastNlMeansDenoisingMulti
2015-03-24 02:01:31 +01:00
Erik Karlsson
70a64ebe72
Added test cases
2015-03-24 01:16:17 +01:00
Erik Karlsson
5f8d688664
Added parameter normType to fastNlMeansDenoising
2015-03-24 00:47:11 +01:00
Erik Karlsson
9fff7896c5
Removed fastNlMeansDenoisingColored[Multi]Abs
2015-03-23 23:23:35 +01:00
Evgeny Agafonchikov
c196df6db0
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)
2015-03-23 20:45:58 +03:00
