bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +04:00
69648f0a6f
Make photo.hpp independent from C API
2013-04-08 15:47:29 +04:00
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
d62bc8cfbf
Remove more old definitions from internal.hpp
2013-04-01 16:32:08 +04:00
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
29cfeb7cee
Fix build of apps and samples
2013-03-22 22:14:36 +04:00
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
cf66942505
enable training test. refactor globbing
2013-03-13 13:43:22 +04:00
ac471fadd6
remove unused parameter from softcascade::Octave constructor
2013-03-02 13:06:29 +04:00
1bf696f392
fixes for soft cascade training app
2013-03-02 09:24:13 +04:00
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
e2536f1c35
Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4
2013-02-04 11:54:43 +04:00
cc538ddfa6
changes related with code review
2013-02-01 17:47:05 +04:00
87b0126e0d
Fixed dummy warning.
2013-02-01 16:16:43 +04:00
f7ac73998a
code review fixes
2013-02-01 14:36:06 +04:00
14ac8a528e
final refactoring and test for training
2013-02-01 14:36:06 +04:00
fa15fcc53e
move feature pool to softcascade module
2013-02-01 14:36:06 +04:00
0b039f3c6b
refactor feature pool
2013-02-01 14:36:06 +04:00
b4aa33b6d3
move ICF -> ChannelFeature
2013-02-01 14:36:06 +04:00
a01f596474
update documentation for softcascade module
2013-02-01 14:36:06 +04:00
7f80054dfd
move miscellaneous python scripts to softcascade module
2013-02-01 14:36:06 +04:00
4ba8b53152
split public interface and realization for SoftCascadeOctave
2013-02-01 14:36:06 +04:00
f3227c3f1a
merged ICFPreprocessor and Channels -> ChannelFeatureBuilder
2013-02-01 14:36:06 +04:00
716a9ccb71
move training to softcascade module
...
rename Octave -> SoftCascadeOctave
2013-02-01 14:36:05 +04:00
1b43b0e2df
move soft cascade functionality into dedicated module
2013-02-01 14:36:05 +04:00
28098b6632
refactor python
2013-02-01 14:35:29 +04:00
8cf30c728e
parse Caltech annotations
2013-02-01 14:35:29 +04:00
1fc7134f21
add legend for ROC plot
2013-02-01 14:35:29 +04:00
faecb4f01d
ROC script refactoring
2013-02-01 14:35:29 +04:00
e9232a4b67
add parameter to control range and extended range for annotations
2013-02-01 14:35:29 +04:00
decb137185
use long seeds only for 64 bit systems
2013-02-01 14:35:29 +04:00
5f082b9876
improve ROC test script: handle ignored
2013-02-01 14:35:29 +04:00
922de414ef
refactor python ROC script and add axis ticks
2013-02-01 14:35:29 +04:00
990ca86de6
fix spelling
2013-02-01 14:35:28 +04:00
11f3927c58
allow multiple detectors
2013-02-01 14:35:28 +04:00
469eeea370
add ROC estimation
...
in the same way as Dallar's matlab toolbox does
2013-02-01 14:35:28 +04:00
4c4c878b1b
add detection to ground truth matching
...
according to Piotr Dollar paper
2013-02-01 14:35:28 +04:00
d1952f28d9
add cropping and aspect ratio normalization
2013-02-01 14:35:28 +04:00
18df46fbe9
add plotting function (matplotlib required)
2013-02-01 14:35:28 +04:00
4622aea86a
ROC test: add overlap calculation according to Pascal criteria
2013-02-01 14:35:28 +04:00
Roman Donchenko