Vadim Pisarevsky
c6e9280373
Merge pull request #3816 from ilya-lavrenov:il/cvround
2015-03-16 09:09:55 +00:00
Vadim Pisarevsky
f9b2444735
Merge pull request #3826 from mshabunin:fix-install-paths
2015-03-16 09:08:54 +00:00
Vadim Pisarevsky
259a54a6dd
Merge pull request #3830 from NaerChang:issue.3710
2015-03-16 09:05:42 +00:00
Naer Chang
cdc9bc397d
Revert "issue 3710"
...
Trying to fix whitespace issue.
This reverts commit dcc2512f58
.
2015-03-14 18:32:46 -04:00
Dmitry-Me
8ed4bae4dd
Reduce variable scope, make formatting consistent with surrounding code
2015-03-14 12:50:42 +03:00
Naer Chang
dcc2512f58
issue 3710
...
added a check to prevent illegal access to operator[] when vector is empty
2015-03-14 02:56:29 -04:00
Vadim Pisarevsky
04f16965d5
Merge pull request #3780 from StevenPuttemans:fix_locale_master
2015-03-13 13:16:09 +00:00
Vadim Pisarevsky
133bd56436
Merge pull request #3769 from adamgreig:fix-py3-submodules
2015-03-13 13:15:51 +00:00
Maksim Shabunin
632afe6ae3
Fixed mangled install layout on unix machines
2015-03-13 14:18:37 +03:00
Vadim Pisarevsky
06703c9d56
Merge pull request #3817 from SpecLad:forward-ports
2015-03-12 12:15:24 +00:00
ippei ito
518fd59a10
fixed whitespace error
2015-03-12 01:09:15 +09:00
ippei ito
49b38fe793
Fixed compile error build with VisualStudio2013 on windows.
...
REG_NONE defined in ml.hpp conflicts with defined in Winnt.h
2015-03-12 00:32:17 +09:00
Ilya Lavrenov
6f8b3fc633
cvRound
2015-03-11 16:14:39 +03:00
Adam Greig
211a131351
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.
2015-03-10 22:07:53 +00:00
Roman Donchenko
34ad2e0fa4
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 77578d415f
)
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-03-10 12:48:46 +03:00
Roman Donchenko
6274e1fc5f
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
(cherry picked from commit 08da247a87
)
2015-03-10 12:38:45 +03:00
Roman Donchenko
6b8ebf3e94
Fix memory leaks appearing when cvOpenFileStorage throws
...
(cherry picked from commit 16ce114e0c
)
2015-03-10 12:38:45 +03:00
Vadim Pisarevsky
baf191fab2
Merge pull request #3771 from mshabunin:arm-round
2015-03-09 21:49:15 +00:00
Vadim Pisarevsky
3ee03a860d
Merge pull request #3803 from Dmitry-Me:doubleUsedAsBoolean
2015-03-09 21:47:09 +00:00
Vadim Pisarevsky
368213290f
Merge pull request #3806 from enpe:master
2015-03-09 21:44:33 +00:00
Vadim Pisarevsky
64bd77cf4d
Merge pull request #3794 from vpisarev:ubuntu_x86_fixes
2015-03-09 21:34:17 +00:00
Nils Plath
ee55e4595c
- 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";
2015-03-08 00:23:38 +01:00
Dmitry-Me
135701feac
Double used as boolean for no reason
2015-03-06 17:04:54 +03:00
Maksim Shabunin
ee2d7a1f39
Fixed warnings for iOS
2015-03-06 16:16:57 +03:00
Maksim Shabunin
451972f3cf
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
2015-03-06 16:14:37 +03:00
StevenPuttemans
cef2cf2852
fixing locale settings - making it universal
2015-03-06 13:13:53 +01:00
Vadim Pisarevsky
5d8a1bf813
explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only
2015-03-06 15:02:22 +03:00
Vadim Pisarevsky
361eb633f6
Merge pull request #3795 from samyak-268:sqr-filter-doc
2015-03-06 10:22:56 +00:00
Vadim Pisarevsky
fd7a76fe5d
Merge pull request #3796 from enpe:master
2015-03-06 10:21:57 +00:00
Vadim Pisarevsky
092f599aac
Merge pull request #3797 from Dmitry-Me:reduceVariableScope6
2015-03-06 10:20:45 +00:00
Vadim Pisarevsky
8c69266cbf
Merge pull request #3786 from jviney:fix_background_subtractor_knn_width_step
2015-03-06 10:17:43 +00:00
Dmitry-Me
2fb4178f7c
Reduce variable scope
2015-03-06 10:17:37 +03:00
Nils Plath
32d56c6b43
Fixed: wrong conversion of float-based Mat input inside the AKAZE.
2015-03-05 23:55:07 +01:00
Samyak Datta
20efcff166
Added doxygen comments for sqrBoxFilter() method
2015-03-06 03:50:51 +05:30
Vadim Pisarevsky
7a52c3d9f1
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
2015-03-05 18:58:54 +03:00
Vadim Pisarevsky
aa113c5a85
Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2
2015-03-05 12:19:02 +00:00
Dmitry-Me
d164d51380
Fix potential null pointer dereference
2015-03-05 10:31:51 +03:00
Vadim Pisarevsky
f9b8ce1d25
Merge pull request #3784 from ilya-lavrenov:nvidia_android
2015-03-05 06:43:03 +00:00
Jonathan Viney
4f24dc0959
Fix KNN background subtraction not honoring width step.
2015-03-05 12:46:07 +13:00
Vadim Pisarevsky
0b99f6bcd6
Merge pull request #3777 from ilya-lavrenov:nvidia_cvtcolor_eps
2015-03-04 13:53:41 +00:00
Ilya Lavrenov
cf4c79ebdd
disabled some kernels for Android && NVidia
2015-03-04 14:46:49 +03:00
Vadim Pisarevsky
e4bc592c46
Merge pull request #3583 from oresths:tbb_canny
2015-03-04 10:49:27 +00:00
Vadim Pisarevsky
ebac739a35
Merge pull request #3781 from Dmitry-Me:dangerousStringManipulation
2015-03-04 10:45:25 +00:00
Dmitry-Me
f8c454733b
Remove dangerous string manipulation, merge declaration with assignment
2015-03-04 10:35:06 +03:00
Vadim Pisarevsky
4bb496409c
Merge pull request #3779 from Dmitry-Me:uniformComputationOfVariableSize
2015-03-03 18:51:56 +00:00
Vadim Pisarevsky
4701b22e14
Merge pull request #3607 from soyersoyer:yuyv_pixfmt
2015-03-03 18:15:50 +00:00
Vadim Pisarevsky
dcff28b778
Merge pull request #3717 from Dmitry-Me:removeUnneededIndirections
2015-03-03 16:15:25 +00:00
Dmitry-Me
c587bae997
Uniform computation of variable size
2015-03-03 16:11:07 +03:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Vadim Pisarevsky
d3b74cdcb2
Merge pull request #3773 from ilya-lavrenov:warning
2015-03-03 12:33:17 +00:00