Scott Graybill
3d2c0ed97f
Removed check on limits. A common use of HoughLines would be to restrict theta to be between a small negative number and a small positive number, e.g. -pi/16 to pi/16. This wasn't possible with the previous checks.
2015-03-13 17:04:13 -07:00
Vadim Pisarevsky
930808c22b
Merge pull request #3820 from LorenaGdL:patch-1
2015-03-13 13:20:09 +00: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
Vadim Pisarevsky
18904036dc
Merge pull request #3825 from alalek:fix_msvs2010_build
2015-03-13 13:02:43 +00:00
Alexander Alekhin
50b99e5aef
fix compilation on MSVS2010
2015-03-12 19:07:53 +03:00
Vadim Pisarevsky
74e88cc0f1
Merge pull request #3801 from StevenPuttemans:add_parameter_info_annotation_master
2015-03-12 14:28:19 +00:00
Vadim Pisarevsky
79a77cb91f
Merge pull request #3819 from MSOpenTech:readme-24
2015-03-12 13:11:59 +00:00
Vadim Pisarevsky
06703c9d56
Merge pull request #3817 from SpecLad:forward-ports
2015-03-12 12:15:24 +00:00
Vadim Pisarevsky
362c1a23ea
Merge pull request #3821 from i-ito:master-flann-lsh-addable-index
2015-03-12 12:14:23 +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
LorenaGdL
b21b24fd8a
Update train_HOG.cpp
...
Incorrect number of input arguments in main function
2015-03-11 14:18:07 +01:00
Maxim Kostin
b194812f5a
Fixed trailing whitespace.
2015-03-11 13:22:22 +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
Maxim Kostin
052c010d3f
Reformatted since this is not a markdown file
2015-03-10 17:02:31 +03:00
Max Kostin
deb2cb752b
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
2015-03-10 16:58:06 +03:00
Roman Donchenko
c71e94f054
Mark the libs component required
...
Everything else depends on it, after all.
(cherry picked from commit cf54e3b97e
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-03-10 16:24:23 +03:00
Roman Donchenko
8a732e306f
Add component display names
...
(cherry picked from commit 6d52ea8984
)
2015-03-10 16:24:23 +03:00
Roman Donchenko
87eb3f6e68
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 b8c60234c3
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-03-10 16:24:23 +03:00
Roman Donchenko
35760bb6bf
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 c1e3ca170e
)
Conflicts:
CMakeLists.txt
2015-03-10 16:24:23 +03:00
Roman Donchenko
592122bf4f
Install data on Windows
...
Because why not?
(cherry picked from commit e8a7394009
)
Conflicts:
data/CMakeLists.txt
2015-03-10 12:55:17 +03:00
Roman Donchenko
1a3273a7e3
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 49fe496914
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-03-10 12:53:28 +03: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
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
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
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
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