Commit Graph

15783 Commits

Author SHA1 Message Date
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
1858b5cfba Don't install documentation if it isn't built
The HAVE_DOC_GENERATOR variable was always true.

(cherry picked from commit 3d46c1f960)

Conflicts:
	doc/CMakeLists.txt
2015-03-10 12:46:00 +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
192e630cb8 Merge pull request #3807 from guopei:patch-1 2015-03-09 21:41:41 +00:00
Vadim Pisarevsky
a9ce2333c3 Merge pull request #3808 from guopei:patch-2 2015-03-09 21:41:02 +00:00
Vadim Pisarevsky
64bd77cf4d Merge pull request #3794 from vpisarev:ubuntu_x86_fixes 2015-03-09 21:34:17 +00:00
StevenPuttemans
bf16f74618 fixing universal location execution 2015-03-09 13:11:29 +01:00
guopei
f94b22fa5e grammar fix: then -> than 2015-03-08 18:59:28 +08:00
guopei
0e5c7720a4 grammar fix: a -> the 2015-03-08 18:51:48 +08: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
Prof. Dr. Rudolf Haussmann
5e3d986ad8 Merge remote-tracking branch 'upstream/master' 2015-03-07 13:10:41 +01:00
Prof. Dr. Rudolf Haussmann
9f1eb70dbc Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

	modified:   modules/java/generator/gen_java.py
	modified:   modules/videoio/include/opencv2/videoio.hpp
	modified:   modules/videoio/include/opencv2/videoio/videoio_c.h
	modified:   modules/videoio/src/cap_dshow.cpp
	modified:   modules/videoio/src/cap_pvapi.cpp

Following changes have been made:
1. Some minor bugs have been removed.
2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
   this option does not make sense and causes an error if a color camera is used.
3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
   to activate the different pixel formats (color modes) of an AVT camera.
4. Since there were two identical defines
   CAP_PROP_MONOCROME = 19
   CAP_PROP_MONOCHROME = 19
   which were also used in the other module DSHOW, the first one with an orthographic
   error has been removed in favor of the second one.
2015-03-07 12:53:32 +01:00
Dmitry-Me
135701feac Double used as boolean for no reason 2015-03-06 17:04:54 +03:00
Vadim Pisarevsky
643bbb2d93 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 2015-03-06 16:57:38 +03:00
sanuj
441cd22343 Add documentation for solvePnP in calib3d 2015-03-06 19:18:22 +05:30
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
a58bfbf3c7 info on how to use the tool 2015-03-06 13:52:02 +01:00
Vadim Pisarevsky
4aa6d10a60 added Maksim's fix as well; they both handle correctly more cases than each of them individually 2015-03-06 15:48:36 +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
a65dbc5dcd Merge pull request #3793 from sanuj:master 2015-03-06 10:20:16 +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
Alexander Alekhin
4e87deae28 Merge pull request #3790 from StevenPuttemans:fix_cmakelist_annotation_master 2015-03-05 16:01:39 +00:00
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
sanuj
1f53b65511 Fix documentation in python binding tutorial 2015-03-05 20:00:19 +05:30
StevenPuttemans
217f628915 update cmakelists for annotation tool 2015-03-05 14:46:52 +01:00
Vadim Pisarevsky
2baf1a3c9f Merge pull request #3788 from berak:fix_features2d_tut 2015-03-05 12:22:50 +00:00
Vadim Pisarevsky
aa113c5a85 Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2 2015-03-05 12:19:02 +00:00
berak
b7f2a4da69 fix features2d tutorials 2015-03-05 10:26:45 +01: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
c9ea878d10 Merge pull request #3722 from berak:py_houghlines_sample 2015-03-03 18:16:25 +00:00