ippei ito
b7276359e9
Test accuracy for PR#3829
10 years ago
Vadim Pisarevsky
83d6d70a56
Merge pull request #3855 from polarfuchs99:2.4
10 years ago
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.
10 years ago
Prof. Dr. Rudolf Haussmann
e5e6367223
Merge remote-tracking branch 'upstream/2.4' into 2.4
10 years ago
Vadim Pisarevsky
5678ba1227
Merge pull request #3805 from nitsch:fix-mingw-cmake-config
10 years ago
Vadim Pisarevsky
b01f067614
Merge pull request #3865 from tdsmith:2.4-python-linkage
10 years ago
ippei ito
65b0ecfec5
Test accuracy for PR#3829.Fix WOrder warning on gcc
10 years ago
ippei ito
d1902a1276
Test accuracy for PR#3829.Fix warning on gcc, comment out INIT_RANDOM_SEED for same result each ran.
10 years ago
ippei ito
56cae1b293
Test accuracy for PR#3829.Fix Some Error, Modify SLA.
10 years ago
ippei ito
7c740b6a31
Test accuracy for Pull Request # 3829
10 years ago
Alexander Nitsch
d430664791
Remove local variables from CMAKE namespace
10 years ago
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.
10 years ago
Vadim Pisarevsky
c9bb18b9f7
Merge pull request #3850 from piponazo:2.4
10 years ago
Vadim Pisarevsky
297e2b6f1a
Merge pull request #3834 from asmorkalov:retina_docs_fix
10 years ago
Vadim Pisarevsky
3853a18e0e
Merge pull request #3792 from laomaiweng:cuda-pkg-config-Ldir
10 years ago
Vadim Pisarevsky
226b4e3ed5
Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq
10 years ago
Prof. Dr. Rudolf Haussmann
756c1a22d9
Merge remote-tracking branch 'upstream/2.4' into 2.4
10 years ago
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.
10 years ago
Luis Díaz Más
7711cd284b
Fix a bug that impede to set the trackbar pos using the Qt control panel
10 years ago
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.
10 years ago
Vadim Pisarevsky
69344f175b
Merge pull request #3843 from piponazo:BugFix4244
10 years ago
Luis Díaz Más
d14a1de947
Fixing the bug #4244 that I just reported in code.opencv.org
10 years ago
Alexander Smorkalov
514b3b520c
Documentation update after iOS warnings fix in contrib/retina header.
10 years ago
Vadim Pisarevsky
4a6b1805e0
Merge pull request #3824 from Milania1:tutorial_hough_lines_fix
10 years ago
Vadim Pisarevsky
4ab525c880
Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory
10 years ago
ippei ito
7d665a4754
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
10 years ago
ippei ito
f7d52c774e
Fix compile error on linux change cv::InputArray& to cv::InputArray
10 years ago
ippei ito
8efdfd9dfc
Fix unused-parameter Warning
10 years ago
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.
10 years ago
Milania1
339e6aa782
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)
10 years ago
Vadim Pisarevsky
309eb3c122
Merge pull request #3815 from StevenPuttemans:add_camera_IP_regulations
10 years ago
Vadim Pisarevsky
2594e5e384
Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation
10 years ago
StevenPuttemans
3a7ea37090
extra camera specific information for IP settings
10 years ago
StevenPuttemans
9f0cd9ee10
upgrade traincascade default memory
10 years ago
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.
10 years ago
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.
10 years ago
Alexander Alekhin
29e7eb7719
Merge pull request #3789 from StevenPuttemans:fix_cmakelist_annotation
10 years ago
StevenPuttemans
3419c704a9
adding usage information
10 years ago
StevenPuttemans
cdbb661eab
update cmakelists of annotation tool
10 years ago
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.
10 years ago
StevenPuttemans
488babf3b3
fixing undesired behaviour
10 years ago
Vadim Pisarevsky
2c57717ca2
Merge pull request #3774 from JoeHowse:2.4
10 years ago
Joe Howse
e9b4813bb2
Cat face detection cascades
10 years ago
Vadim Pisarevsky
9185b62a1d
Merge pull request #3761 from StevenPuttemans:fix_smile_model
10 years ago
Vadim Pisarevsky
ac8045b9c6
Merge pull request #3754 from eliteraspberries:unsigned-mask
10 years ago
Vadim Pisarevsky
417f1e51a4
Merge pull request #3755 from eliteraspberries:mat-size-sign
10 years ago
Vadim Pisarevsky
b595812bd0
Merge pull request #3745 from nitsch:fix-mingw-detection
10 years ago
Vadim Pisarevsky
0172bd6beb
Merge pull request #3756 from eliteraspberries:cast-double
10 years ago
Vadim Pisarevsky
e02d6e2c8f
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
10 years ago
Vadim Pisarevsky
7458dfc082
Merge pull request #3765 from jet47:gpu-hog-fix
10 years ago