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
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
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
StevenPuttemans
9f0cd9ee10
upgrade traincascade default memory
2015-03-09 10:43:14 +01:00
Alexander Nitsch
13694c8ae8
Fix MinGW detection on x86
...
Make detection of x64 using the gcc's target triplet identical
to the one used in cmake/OpenCVDetectCXXCompiler.cmake.
Otherwise, MinGW-w64 setups will always be treated as x64 since
they contain "w64" as vendor key.
2015-03-07 15:49:48 +01:00
Alexander Nitsch
dde7c22fad
Fix MinGW architecture detection
...
Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.
2015-03-07 15:37:21 +01:00
Alexander Alekhin
29e7eb7719
Merge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation
2015-03-06 14:53:43 +00:00
StevenPuttemans
3419c704a9
adding usage information
2015-03-06 13:52:52 +01:00
StevenPuttemans
cdbb661eab
update cmakelists of annotation tool
2015-03-06 12:51:28 +01:00
quentin
afdf319f36
Add -L for CUDA libs path to pkg-config
...
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
2015-03-05 14:37:21 +01:00
Vadim Pisarevsky
2c57717ca2
Merge pull request #3774 from JoeHowse:2.4
2015-03-03 12:31:29 +00:00
Joe Howse
e9b4813bb2
Cat face detection cascades
2015-03-02 11:58:08 -04:00
Vadim Pisarevsky
9185b62a1d
Merge pull request #3761 from StevenPuttemans:fix_smile_model
2015-03-02 11:49:41 +00:00
Vadim Pisarevsky
ac8045b9c6
Merge pull request #3754 from eliteraspberries:unsigned-mask
2015-03-02 11:34:43 +00:00
Vadim Pisarevsky
417f1e51a4
Merge pull request #3755 from eliteraspberries:mat-size-sign
2015-03-02 11:34:09 +00:00
Vadim Pisarevsky
b595812bd0
Merge pull request #3745 from nitsch:fix-mingw-detection
2015-03-02 10:55:00 +00:00
Vadim Pisarevsky
0172bd6beb
Merge pull request #3756 from eliteraspberries:cast-double
2015-03-02 10:52:28 +00:00
Vadim Pisarevsky
e02d6e2c8f
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
2015-03-02 10:49:38 +00:00
Vadim Pisarevsky
7458dfc082
Merge pull request #3765 from jet47:gpu-hog-fix
2015-03-02 10:34:51 +00:00
Vadim Pisarevsky
bed8cb42be
Merge pull request #3768 from jet47:gpumat-set-to
2015-03-02 10:33:45 +00:00
Vladislav Vinogradov
4f5d30a865
fix GpuMat::setTo implementation
...
previous implementation was not thread/stream safe, since it used constant
memory
new implementation doesn't use any global objects, so it is thread/stream safe
2015-02-27 16:28:06 +03:00
StevenPuttemans
2c0ef660bf
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
...
This solves the undesired consequence of breaking the GPU interface.
2015-02-27 14:15:30 +01:00
Vladislav Vinogradov
21bbed7baf
fix gpu HOG implementation:
...
move hog::set_up_constants from constructor to compute method
if user changed CUDA device between constructor and computation,
some variables were uninitialized
2015-02-27 14:28:12 +03:00
StevenPuttemans
1e95c964f3
fixing model size, typo in previous PR
2015-02-26 15:53:00 +01:00
Vadim Pisarevsky
2c9547e314
Merge pull request #3747 from StevenPuttemans:fix_annotationtool_extras
2015-02-25 12:10:31 +00:00
Alexander Smorkalov
f73a97b53b
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
2015-02-25 11:54:44 +00:00
StevenPuttemans
387a0f26fb
fix annotation tool, add auto make of tool
2015-02-25 11:27:59 +01:00
Vladislav Vinogradov
c147ab1e85
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
2015-02-25 13:16:36 +03:00
Alexander Nitsch
a5b293b412
Fix setting of architecture for MinGW builds
...
The architecture has been correctly determined earlier in this
file. No need to do it again.
2015-02-24 23:13:27 +01:00
Mansour Moufid
7d4cbbd7aa
Cast a long integer to double explicitly.
2015-02-24 17:04:28 -05:00