StevenPuttemans [Tue, 17 Mar 2015 08:00:41 +0000 (09:00 +0100)]
update traincascade assigned memory buffers
Vadim Pisarevsky [Mon, 16 Mar 2015 09:25:41 +0000 (09:25 +0000)]
Merge pull request #3802 from sanuj:master
Vadim Pisarevsky [Mon, 16 Mar 2015 09:11:24 +0000 (09:11 +0000)]
Merge pull request #3827 from MSOpenTech:license-26
Vadim Pisarevsky [Mon, 16 Mar 2015 09:09:55 +0000 (09:09 +0000)]
Merge pull request #3816 from ilya-lavrenov:il/cvround
Vadim Pisarevsky [Mon, 16 Mar 2015 09:08:54 +0000 (09:08 +0000)]
Merge pull request #3826 from mshabunin:fix-install-paths
Vadim Pisarevsky [Mon, 16 Mar 2015 09:05:42 +0000 (09:05 +0000)]
Merge pull request #3830 from NaerChang:issue.3710
Vadim Pisarevsky [Mon, 16 Mar 2015 09:05:18 +0000 (09:05 +0000)]
Merge pull request #3831 from Dmitry-Me:reduceVariableScope7
Naer Chang [Sat, 14 Mar 2015 22:32:46 +0000 (18:32 -0400)]
Revert "issue 3710"
Trying to fix whitespace issue.
This reverts commit
dcc2512f581f56fb887ae955ebe828071dee7b92.
Dmitry-Me [Sat, 14 Mar 2015 09:50:42 +0000 (12:50 +0300)]
Reduce variable scope, make formatting consistent with surrounding code
Naer Chang [Sat, 14 Mar 2015 06:56:29 +0000 (02:56 -0400)]
issue 3710
added a check to prevent illegal access to operator[] when vector is empty
Maxim Kostin [Fri, 13 Mar 2015 16:28:36 +0000 (19:28 +0300)]
Changed encoding from ANSI to UTF8.
Vadim Pisarevsky [Fri, 13 Mar 2015 13:20:09 +0000 (13:20 +0000)]
Merge pull request #3820 from LorenaGdL:patch-1
Vadim Pisarevsky [Fri, 13 Mar 2015 13:16:09 +0000 (13:16 +0000)]
Merge pull request #3780 from StevenPuttemans:fix_locale_master
Vadim Pisarevsky [Fri, 13 Mar 2015 13:15:51 +0000 (13:15 +0000)]
Merge pull request #3769 from adamgreig:fix-py3-submodules
Vadim Pisarevsky [Fri, 13 Mar 2015 13:02:43 +0000 (13:02 +0000)]
Merge pull request #3825 from alalek:fix_msvs2010_build
Maxim Kostin [Fri, 13 Mar 2015 11:33:09 +0000 (14:33 +0300)]
Replacing license headers per PR-3700 feedback. Updates #26
Maksim Shabunin [Thu, 12 Mar 2015 16:14:14 +0000 (19:14 +0300)]
Fixed mangled install layout on unix machines
Alexander Alekhin [Thu, 12 Mar 2015 16:07:53 +0000 (19:07 +0300)]
fix compilation on MSVS2010
Vadim Pisarevsky [Thu, 12 Mar 2015 14:28:19 +0000 (14:28 +0000)]
Merge pull request #3801 from StevenPuttemans:add_parameter_info_annotation_master
Vadim Pisarevsky [Thu, 12 Mar 2015 13:11:59 +0000 (13:11 +0000)]
Merge pull request #3819 from MSOpenTech:readme-24
Vadim Pisarevsky [Thu, 12 Mar 2015 12:15:24 +0000 (12:15 +0000)]
Merge pull request #3817 from SpecLad:forward-ports
Vadim Pisarevsky [Thu, 12 Mar 2015 12:14:23 +0000 (12:14 +0000)]
Merge pull request #3821 from i-ito:master-flann-lsh-addable-index
ippei ito [Wed, 11 Mar 2015 16:09:15 +0000 (01:09 +0900)]
fixed whitespace error
ippei ito [Wed, 11 Mar 2015 15:32:17 +0000 (00:32 +0900)]
Fixed compile error build with VisualStudio2013 on windows.
REG_NONE defined in ml.hpp conflicts with defined in Winnt.h
LorenaGdL [Wed, 11 Mar 2015 13:18:07 +0000 (14:18 +0100)]
Update train_HOG.cpp
Incorrect number of input arguments in main function
Ilya Lavrenov [Fri, 27 Feb 2015 15:59:55 +0000 (18:59 +0300)]
cvRound
Maxim Kostin [Wed, 11 Mar 2015 10:22:22 +0000 (13:22 +0300)]
Fixed trailing whitespace.
Adam Greig [Mon, 2 Mar 2015 04:04:14 +0000 (04:04 +0000)]
Fix Python3 binding's submodules
Previously the Python3 cv2 package ends up with no submodules (bgsegm, face,
etc) in it, which makes a lot of functionality unusable. By not writing over
our root reference we ensure the new submodules are added to the correct cv2
module.
Maxim Kostin [Tue, 10 Mar 2015 14:02:31 +0000 (17:02 +0300)]
Reformatted since this is not a markdown file
Max Kostin [Tue, 10 Mar 2015 13:54:08 +0000 (16:54 +0300)]
Updates README for setup_script
Updates README to reflect setup_script build capabilities and requirements to setup binaries and includes for sample applications. Fixes #24
Roman Donchenko [Fri, 20 Feb 2015 15:37:21 +0000 (18:37 +0300)]
Mark the libs component required
Everything else depends on it, after all.
(cherry picked from commit
cf54e3b97ea13c0aeef5e94b5330a4b26a601d81)
Conflicts:
cmake/OpenCVPackaging.cmake
Roman Donchenko [Fri, 20 Feb 2015 15:20:29 +0000 (18:20 +0300)]
Add component display names
(cherry picked from commit
6d52ea898442d2458a40f8b06b75320c9ab4a5cc)
Roman Donchenko [Fri, 20 Feb 2015 15:15:20 +0000 (18:15 +0300)]
Update the CPack variables to match the changes in asmorkalov/CMake#1
Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.
(cherry picked from commit
b8c60234c3fa94c31a3e2a72275fefa811c75d5c)
Conflicts:
cmake/OpenCVPackaging.cmake
Roman Donchenko [Fri, 20 Feb 2015 09:38:25 +0000 (12:38 +0300)]
Add a script to run all tests on Windows
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
(cherry picked from commit
c1e3ca170e6acd983fc010bffd6bc10f12a738c5)
Conflicts:
CMakeLists.txt
Roman Donchenko [Mon, 16 Feb 2015 16:24:07 +0000 (19:24 +0300)]
Install data on Windows
Because why not?
(cherry picked from commit
e8a73940099b9823879e156a896e42a1854ca1bb)
Conflicts:
data/CMakeLists.txt
Roman Donchenko [Fri, 13 Feb 2015 12:31:19 +0000 (15:31 +0300)]
Remove useless CPACK_*_COMPONENT_INSTALL variables
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
(cherry picked from commit
49fe496914cca93f19dd61aa7b1c120037d65282)
Conflicts:
cmake/OpenCVPackaging.cmake
Roman Donchenko [Fri, 13 Feb 2015 12:12:52 +0000 (15:12 +0300)]
Fix a memory leak in CvCapture_FFMPEG::close
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
(cherry picked from commit
77578d415f4d2b22a4ee1989ef0afda73c9d649b)
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
Roman Donchenko [Thu, 12 Feb 2015 13:51:26 +0000 (16:51 +0300)]
Don't install documentation if it isn't built
The HAVE_DOC_GENERATOR variable was always true.
(cherry picked from commit
3d46c1f9602bea7e6c6a49db8b6f2421166ef65d)
Conflicts:
doc/CMakeLists.txt
Roman Donchenko [Mon, 22 Dec 2014 15:54:39 +0000 (18:54 +0300)]
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
... before any exceptions occur.
(cherry picked from commit
08da247a871ed40b868119a999af538da6526c6d)
Roman Donchenko [Tue, 9 Dec 2014 16:13:19 +0000 (19:13 +0300)]
Fix memory leaks appearing when cvOpenFileStorage throws
(cherry picked from commit
16ce114e0cad6c85efead4a0ebb07724d691407a)
Vadim Pisarevsky [Mon, 9 Mar 2015 21:49:15 +0000 (21:49 +0000)]
Merge pull request #3771 from mshabunin:arm-round
Vadim Pisarevsky [Mon, 9 Mar 2015 21:47:09 +0000 (21:47 +0000)]
Merge pull request #3803 from Dmitry-Me:doubleUsedAsBoolean
Vadim Pisarevsky [Mon, 9 Mar 2015 21:44:33 +0000 (21:44 +0000)]
Merge pull request #3806 from enpe:master
Vadim Pisarevsky [Mon, 9 Mar 2015 21:41:40 +0000 (21:41 +0000)]
Merge pull request #3807 from guopei:patch-1
Vadim Pisarevsky [Mon, 9 Mar 2015 21:41:02 +0000 (21:41 +0000)]
Merge pull request #3808 from guopei:patch-2
Vadim Pisarevsky [Mon, 9 Mar 2015 21:34:17 +0000 (21:34 +0000)]
Merge pull request #3794 from vpisarev:ubuntu_x86_fixes
guopei [Sun, 8 Mar 2015 10:59:28 +0000 (18:59 +0800)]
grammar fix: then -> than
guopei [Sun, 8 Mar 2015 10:51:48 +0000 (18:51 +0800)]
grammar fix: a -> the
Nils Plath [Sat, 7 Mar 2015 23:19:25 +0000 (00:19 +0100)]
- Fixed compile error that appeared with Clang 5.1 on Mac 10.8.5:
modules/videoio/src/cap_gstreamer.cpp:577:31: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4lsrc ! "COLOR_ELEM" ! appsink";
^
modules/videoio/src/cap_gstreamer.cpp:585:32: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4l2src ! "COLOR_ELEM" ! appsink";
Dmitry-Me [Fri, 6 Mar 2015 14:04:54 +0000 (17:04 +0300)]
Double used as boolean for no reason
Vadim Pisarevsky [Fri, 6 Mar 2015 13:57:38 +0000 (16:57 +0300)]
looks like Maksim was right; the new fix does not do the second attempt to detect python libs, it finds it correctly with the first attempt
sanuj [Fri, 6 Mar 2015 13:44:07 +0000 (19:14 +0530)]
Add documentation for solvePnP in calib3d
Maksim Shabunin [Fri, 6 Mar 2015 13:16:57 +0000 (16:16 +0300)]
Fixed warnings for iOS
Maksim Shabunin [Fri, 27 Feb 2015 15:59:55 +0000 (18:59 +0300)]
Added ARM implementation in cvRound function
- note: uses VFPv3 instructions
- also added overloaded cvRound variants with float and int parameters
- thanks to Marina Kolpakova from Itseez for idea
- thanks to developers from #llvm IRC channel for help with inline asm
StevenPuttemans [Fri, 6 Mar 2015 12:50:46 +0000 (13:50 +0100)]
info on how to use the tool
Vadim Pisarevsky [Fri, 6 Mar 2015 12:48:36 +0000 (15:48 +0300)]
added Maksim's fix as well; they both handle correctly more cases than each of them individually
StevenPuttemans [Fri, 6 Mar 2015 11:59:26 +0000 (12:59 +0100)]
fixing locale settings - making it universal
Vadim Pisarevsky [Fri, 6 Mar 2015 12:02:22 +0000 (15:02 +0300)]
explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only
Vadim Pisarevsky [Fri, 6 Mar 2015 10:22:56 +0000 (10:22 +0000)]
Merge pull request #3795 from samyak-268:sqr-filter-doc
Vadim Pisarevsky [Fri, 6 Mar 2015 10:21:57 +0000 (10:21 +0000)]
Merge pull request #3796 from enpe:master
Vadim Pisarevsky [Fri, 6 Mar 2015 10:20:45 +0000 (10:20 +0000)]
Merge pull request #3797 from Dmitry-Me:reduceVariableScope6
Vadim Pisarevsky [Fri, 6 Mar 2015 10:20:16 +0000 (10:20 +0000)]
Merge pull request #3793 from sanuj:master
Vadim Pisarevsky [Fri, 6 Mar 2015 10:17:43 +0000 (10:17 +0000)]
Merge pull request #3786 from jviney:fix_background_subtractor_knn_width_step
Dmitry-Me [Fri, 6 Mar 2015 07:17:37 +0000 (10:17 +0300)]
Reduce variable scope
Nils Plath [Thu, 5 Mar 2015 22:55:07 +0000 (23:55 +0100)]
Fixed: wrong conversion of float-based Mat input inside the AKAZE.
Samyak Datta [Thu, 5 Mar 2015 21:27:14 +0000 (02:57 +0530)]
Added doxygen comments for sqrBoxFilter() method
Alexander Alekhin [Thu, 5 Mar 2015 16:01:39 +0000 (16:01 +0000)]
Merge pull request #3790 from StevenPuttemans:fix_cmakelist_annotation_master
Vadim Pisarevsky [Thu, 5 Mar 2015 15:58:54 +0000 (18:58 +0300)]
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
sanuj [Thu, 5 Mar 2015 14:27:55 +0000 (19:57 +0530)]
Fix documentation in python binding tutorial
StevenPuttemans [Thu, 5 Mar 2015 13:25:43 +0000 (14:25 +0100)]
update cmakelists for annotation tool
Vadim Pisarevsky [Thu, 5 Mar 2015 12:22:50 +0000 (12:22 +0000)]
Merge pull request #3788 from berak:fix_features2d_tut
Vadim Pisarevsky [Thu, 5 Mar 2015 12:19:02 +0000 (12:19 +0000)]
Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2
berak [Thu, 5 Mar 2015 09:15:35 +0000 (10:15 +0100)]
fix features2d tutorials
Dmitry-Me [Thu, 5 Mar 2015 07:31:51 +0000 (10:31 +0300)]
Fix potential null pointer dereference
Vadim Pisarevsky [Thu, 5 Mar 2015 06:43:02 +0000 (06:43 +0000)]
Merge pull request #3784 from ilya-lavrenov:nvidia_android
Jonathan Viney [Wed, 4 Mar 2015 23:46:07 +0000 (12:46 +1300)]
Fix KNN background subtraction not honoring width step.
Vadim Pisarevsky [Wed, 4 Mar 2015 13:53:41 +0000 (13:53 +0000)]
Merge pull request #3777 from ilya-lavrenov:nvidia_cvtcolor_eps
Ilya Lavrenov [Wed, 4 Mar 2015 11:45:21 +0000 (14:45 +0300)]
disabled some kernels for Android && NVidia
Vadim Pisarevsky [Wed, 4 Mar 2015 10:49:27 +0000 (10:49 +0000)]
Merge pull request #3583 from oresths:tbb_canny
Vadim Pisarevsky [Wed, 4 Mar 2015 10:45:25 +0000 (10:45 +0000)]
Merge pull request #3781 from Dmitry-Me:dangerousStringManipulation
Dmitry-Me [Wed, 4 Mar 2015 07:35:06 +0000 (10:35 +0300)]
Remove dangerous string manipulation, merge declaration with assignment
Vadim Pisarevsky [Tue, 3 Mar 2015 18:51:56 +0000 (18:51 +0000)]
Merge pull request #3779 from Dmitry-Me:uniformComputationOfVariableSize
Vadim Pisarevsky [Tue, 3 Mar 2015 18:16:25 +0000 (18:16 +0000)]
Merge pull request #3722 from berak:py_houghlines_sample
Vadim Pisarevsky [Tue, 3 Mar 2015 18:15:50 +0000 (18:15 +0000)]
Merge pull request #3607 from soyersoyer:yuyv_pixfmt
Vadim Pisarevsky [Tue, 3 Mar 2015 16:15:24 +0000 (16:15 +0000)]
Merge pull request #3717 from Dmitry-Me:removeUnneededIndirections
Dmitry-Me [Tue, 3 Mar 2015 13:11:07 +0000 (16:11 +0300)]
Uniform computation of variable size
Vadim Pisarevsky [Tue, 3 Mar 2015 12:53:06 +0000 (12:53 +0000)]
Merge pull request #3654 from StevenPuttemans:add_annotation_master
Vadim Pisarevsky [Tue, 3 Mar 2015 12:52:02 +0000 (12:52 +0000)]
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
Vadim Pisarevsky [Tue, 3 Mar 2015 12:33:17 +0000 (12:33 +0000)]
Merge pull request #3773 from ilya-lavrenov:warning
Vadim Pisarevsky [Tue, 3 Mar 2015 12:29:18 +0000 (12:29 +0000)]
Merge pull request #3775 from Dmitry-Me:reduceVariableScope5
Ilya Lavrenov [Tue, 3 Mar 2015 10:15:23 +0000 (13:15 +0300)]
increased EPS for cvtColor for NVIDIA
Dmitry-Me [Tue, 3 Mar 2015 08:04:22 +0000 (11:04 +0300)]
Reduce variable scope, only compute values that are used later
Vadim Pisarevsky [Mon, 2 Mar 2015 19:52:18 +0000 (19:52 +0000)]
Merge pull request #3772 from Dmitry-Me:reduceVariableScope4
Vadim Pisarevsky [Mon, 2 Mar 2015 19:51:42 +0000 (19:51 +0000)]
Merge pull request #3759 from mshabunin:wrap-all
Maxim Kostin [Mon, 2 Mar 2015 19:26:13 +0000 (22:26 +0300)]
Enabled property sheets for WinRT related samples
Maxim Kostin [Fri, 20 Feb 2015 16:49:10 +0000 (19:49 +0300)]
Fixing 'doc' buildbot job: removing trailing whitespaces and tab indents
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Fri, 13 Feb 2015 16:11:46 +0000 (19:11 +0300)]
Fixing buildbot job:
- explicitly turning OCL off since WinRT does not support it
- fixing macro definitions in core/ocl.cpp
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Fri, 13 Feb 2015 14:29:30 +0000 (17:29 +0300)]
Adding Widows Phone 8 sample apps
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Wed, 18 Feb 2015 15:23:41 +0000 (18:23 +0300)]
Added WinRT Universal Apps samples
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
Maxim Kostin [Fri, 13 Feb 2015 14:12:37 +0000 (17:12 +0300)]
Added and updated WinRT samples
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>