Andrew Senin
8c55d7be5e
Ximea camera fix (see issue #4235 )
2015-04-03 22:50:05 +03:00
Vadim Pisarevsky
f6de017171
Merge pull request #3900 from apavlenko:doc_fix_imwrite
2015-04-03 13:26:00 +00:00
Vadim Pisarevsky
cc63452f65
Merge pull request #3899 from StevenPuttemans:add_breakrule_traincascade_2.4
2015-04-03 11:44:55 +00:00
Andrey Pavlenko
eeae81e903
fixing confusing variable naming in a sample code
2015-04-03 13:54:49 +03:00
StevenPuttemans
e30139edc3
add the possibility to add traincascade accuracy
2015-04-03 12:47:09 +02:00
Vadim Pisarevsky
f01b2413c3
Merge pull request #3770 from jet47:gpu-hog-tests
2015-04-03 10:32:59 +00:00
Alexander Smorkalov
772fcf4088
Merge pull request #3893 from SpecLad:cuda-imported-targets
2015-04-02 13:56:31 +00:00
ippei ito
b8c00854fe
instead of "using namespace cv" put all the tests into cv:: namespace.
2015-04-02 19:58:19 +09:00
Vadim Pisarevsky
ba0a8dc723
Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives
2015-04-01 13:56:29 +00:00
Vadim Pisarevsky
100c2dd91c
Merge pull request #3852 from renko:multithread_cl_not_studio_generator
2015-04-01 13:25:39 +00:00
Vladimir Kolesnikov
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
Roman Donchenko
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
Roman Donchenko
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
Roman Donchenko
122b9f8e17
Turn ocv_convert_to_lib_name into a function
2015-03-30 14:58:37 +03:00
Vadim Pisarevsky
d948b2a235
Merge pull request #3886 from beahacker:2.4
2015-03-30 09:09:31 +00:00
howtobeahacker
ebd7d08408
fix bug 4269
2015-03-30 00:01:20 +08:00
ippei ito
140051b18c
Merge remote-tracking branch 'origin/2.4-flann-lsh-addable-index' into 2.4-flann-lsh-addable-index
2015-03-27 20:55:59 +09:00
ippei ito
b7276359e9
Test accuracy for PR#3829
2015-03-27 20:54:05 +09:00
Vadim Pisarevsky
83d6d70a56
Merge pull request #3855 from polarfuchs99:2.4
2015-03-26 16:55:30 +00:00
Prof. Dr. Rudolf Haussmann
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
Prof. Dr. Rudolf Haussmann
e5e6367223
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-25 13:38:49 +01:00
Vadim Pisarevsky
5678ba1227
Merge pull request #3805 from nitsch:fix-mingw-cmake-config
2015-03-25 09:53:35 +00:00
Vadim Pisarevsky
b01f067614
Merge pull request #3865 from tdsmith:2.4-python-linkage
2015-03-25 09:52:52 +00:00
ippei ito
65b0ecfec5
Test accuracy for PR#3829.Fix WOrder warning on gcc
2015-03-25 18:24:52 +09:00
ippei ito
d1902a1276
Test accuracy for PR#3829.Fix warning on gcc, comment out INIT_RANDOM_SEED for same result each ran.
2015-03-25 05:28:29 +09:00
ippei ito
56cae1b293
Test accuracy for PR#3829.Fix Some Error, Modify SLA.
2015-03-25 03:11:44 +09:00
ippei ito
7c740b6a31
Test accuracy for Pull Request # 3829
2015-03-25 02:38:01 +09:00
Alexander Nitsch
d430664791
Remove local variables from CMAKE namespace
2015-03-24 14:42:55 +01:00
Tim D. Smith
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
Vadim Pisarevsky
c9bb18b9f7
Merge pull request #3850 from piponazo:2.4
2015-03-23 08:03:49 +00:00
Vadim Pisarevsky
297e2b6f1a
Merge pull request #3834 from asmorkalov:retina_docs_fix
2015-03-20 10:14:29 +00:00
Vadim Pisarevsky
3853a18e0e
Merge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir
2015-03-20 10:13:46 +00:00
Vadim Pisarevsky
226b4e3ed5
Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq
2015-03-20 09:37:49 +00:00
Prof. Dr. Rudolf Haussmann
756c1a22d9
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-20 01:44:29 +01:00
Prof. Dr. Rudolf Haussmann
a7bf1d53d8
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/highgui/include/opencv2/highgui/highgui_c.h
modified: modules/highgui/src/cap_dshow.cpp
modified: modules/highgui/src/cap_pvapi.cpp
modified: modules/java/generator/gen_java.py
Änderungen in der PvAPI hinzugefügt.
2015-03-20 01:42:16 +01:00
Luis Díaz Más
7711cd284b
Fix a bug that impede to set the trackbar pos using the Qt control panel
2015-03-19 21:25:10 +01:00
Boris Daskalov
8755ffbf31
Fix a bad free space check in icvGrowSeq.
...
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
2015-03-19 17:32:32 +02:00
Vadim Pisarevsky
69344f175b
Merge pull request #3843 from piponazo:BugFix4244
2015-03-19 12:15:41 +00:00
Luis Díaz Más
d14a1de947
Fixing the bug #4244 that I just reported in code.opencv.org
2015-03-18 20:07:08 +01:00
Alexander Smorkalov
514b3b520c
Documentation update after iOS warnings fix in contrib/retina header.
2015-03-17 19:25:05 +03:00
Vadim Pisarevsky
4a6b1805e0
Merge pull request #3824 from Milania1:tutorial_hough_lines_fix
2015-03-17 11:14:13 +00:00
Vadim Pisarevsky
4ab525c880
Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory
2015-03-16 10:02:07 +00:00
ippei ito
7d665a4754
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
2015-03-14 09:35:53 +09:00
ippei ito
f7d52c774e
Fix compile error on linux change cv::InputArray& to cv::InputArray
2015-03-14 06:58:34 +09:00
ippei ito
8efdfd9dfc
Fix unused-parameter Warning
2015-03-14 06:07:55 +09:00
ippei ito
cd42e38013
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
...
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
2015-03-14 04:38:07 +09:00
Milania1
339e6aa782
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)
2015-03-12 16:46:25 +01:00
Vadim Pisarevsky
309eb3c122
Merge pull request #3815 from StevenPuttemans:add_camera_IP_regulations
2015-03-12 14:39:48 +00:00
Vadim Pisarevsky
2594e5e384
Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation
2015-03-12 14:29:04 +00:00
StevenPuttemans
3a7ea37090
extra camera specific information for IP settings
2015-03-10 10:16:13 +01:00