c797746b6e
use constant instead of value backported from #785
2015-04-24 21:58:28 +02:00
1bf4427a5c
filename correction from #3217
2015-04-24 21:58:28 +02:00
ac3ec0d96d
squashed #823
...
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
starter_video.cpp hid local functions
2015-04-24 21:58:14 +02:00
5c6c537044
Fix typo in error for extrinsic parameters
2015-04-24 18:39:34 +02:00
f8c82fc214
update openni sample comments referring #81
2015-04-24 18:25:23 +02:00
26e3bcb9de
Merge pull request #3956 from ilya-lavrenov:cuda_aarch64
2015-04-23 13:49:33 +00:00
960dee8ab8
Merge pull request #3953 from ilya-lavrenov:cuda_unused
2015-04-23 12:26:07 +00:00
847976de4e
fixed find cuda for aarch64
2015-04-23 14:49:12 +03:00
ceec0eb33a
rmeoved unused functions
2015-04-23 12:48:50 +03:00
4840c4ae6f
Merge pull request #3949 from ilya-lavrenov:clobbered_warning
2015-04-22 19:07:46 +00:00
02e29fc99c
suppress -Wclobbered warning
2015-04-22 16:42:03 +03:00
c879b1ab09
Merge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4
2015-04-20 19:47:55 +00:00
de8d8720a2
Merge pull request #3924 from jet47:gpu-fixes
2015-04-19 11:04:55 +00:00
a855d230ec
completing and fixing gen_pattern.py for 2.4 branch
2015-04-18 22:13:22 +02:00
6a6619ec1e
increase epsilons for some sanity tests
2015-04-14 10:12:56 +03:00
8c2bde2af4
Merge pull request #3923 from ilya-lavrenov:typo
2015-04-13 16:57:13 +00:00
d22516872c
fix BruteForceMatcher resource distribution
...
added launch bounds attributes for all CUDA kernels
2015-04-13 17:12:04 +03:00
17608f7ade
make NVIDIA tests verbose by default
2015-04-13 17:11:19 +03:00
81ebe28c24
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)
...
uninitialized value
2015-04-13 17:09:59 +03:00
f7792f0be2
Merge pull request #3908 from jet47:gpu-wrap-border-mode
2015-04-07 11:44:51 +00:00
27302c367c
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
2015-04-07 13:04:31 +03:00
a153948a19
Merge pull request #3898 from greensea:2.4
2015-04-07 09:31:36 +00:00
4273534c92
typo
2015-04-07 11:08:21 +03:00
7274e2ff1a
Fix a segment fault issue in cascade classfier
2015-04-07 10:38:58 +08:00
0e8bfff386
Merge pull request #3904 from SeninAndrew:2.4
2015-04-05 18:00:30 +00:00
8c55d7be5e
Ximea camera fix (see issue #4235 )
2015-04-03 22:50:05 +03:00
f6de017171
Merge pull request #3900 from apavlenko:doc_fix_imwrite
2015-04-03 13:26:00 +00:00
cc63452f65
Merge pull request #3899 from StevenPuttemans:add_breakrule_traincascade_2.4
2015-04-03 11:44:55 +00:00
eeae81e903
fixing confusing variable naming in a sample code
2015-04-03 13:54:49 +03:00
e30139edc3
add the possibility to add traincascade accuracy
2015-04-03 12:47:09 +02:00
f01b2413c3
Merge pull request #3770 from jet47:gpu-hog-tests
2015-04-03 10:32:59 +00:00
772fcf4088
Merge pull request #3893 from SpecLad:cuda-imported-targets
2015-04-02 13:56:31 +00:00
ba0a8dc723
Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives
2015-04-01 13:56:29 +00:00
100c2dd91c
Merge pull request #3852 from renko:multithread_cl_not_studio_generator
2015-04-01 13:25:39 +00:00
58c9135626
Not block PDB file in multithreaded build on Windows.
...
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.
2015-04-01 13:52:07 +03:00
6e121b2e29
Use imported targets for linking to CUDA
...
This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:
* It removes the need to use link_directories, which doesn't guarantee that
the libraries from the supplied directory will be used (there may be
libraries with the same names earlier in the search path).
* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
is used with target_link_libraries, where such entries are treated as linker
flags, so doing this is unportable. I remove the support for -L entries
from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
future.
2015-03-31 13:46:28 +03:00
e6619cf580
Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop
...
There's no reason to do it twice.
2015-03-30 15:04:27 +03:00
122b9f8e17
Turn ocv_convert_to_lib_name into a function
2015-03-30 14:58:37 +03:00
d948b2a235
Merge pull request #3886 from beahacker:2.4
2015-03-30 09:09:31 +00:00
ebd7d08408
fix bug 4269
2015-03-30 00:01:20 +08:00
83d6d70a56
Merge pull request #3855 from polarfuchs99:2.4
2015-03-26 16:55:30 +00:00
a9d4e05346
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: highgui/include/opencv2/highgui/highgui_c.h
modified: highgui/src/cap_dshow.cpp
modified: java/generator/gen_java.py
The correction of the orthographic error in the enumeration constant
CAP_PROP_MONOCROME has been undone.
2015-03-25 15:45:20 +01:00
e5e6367223
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-25 13:38:49 +01:00
5678ba1227
Merge pull request #3805 from nitsch:fix-mingw-cmake-config
2015-03-25 09:53:35 +00:00
b01f067614
Merge pull request #3865 from tdsmith:2.4-python-linkage
2015-03-25 09:52:52 +00:00
d430664791
Remove local variables from CMAKE namespace
2015-03-24 14:42:55 +01:00
d057828ee3
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:13:48 -07:00
c9bb18b9f7
Merge pull request #3850 from piponazo:2.4
2015-03-23 08:03:49 +00:00
297e2b6f1a
Merge pull request #3834 from asmorkalov:retina_docs_fix
2015-03-20 10:14:29 +00:00
3853a18e0e
Merge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir
2015-03-20 10:13:46 +00:00
Dikay900
Kevin Hughes
Maximilien Cuony
Vadim Pisarevsky
Ilya Lavrenov
Alexander Smorkalov
S. Garrido
Vladislav Vinogradov
Alexander Alekhin
greensea
Andrew Senin
Andrey Pavlenko
StevenPuttemans
Vladimir Kolesnikov
Roman Donchenko
howtobeahacker
Prof. Dr. Rudolf Haussmann
Alexander Nitsch
Tim D. Smith