Roman Donchenko
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
Roman Donchenko
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
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +04:00
Andrey Kamaev
69648f0a6f
Make photo.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
d62bc8cfbf
Remove more old definitions from internal.hpp
2013-04-01 16:32:08 +04:00
Andrey Kamaev
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
Andrey Kamaev
29cfeb7cee
Fix build of apps and samples
2013-03-22 22:14:36 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Andrey Kamaev
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
Andrey Kamaev
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
marina.kolpakova
cf66942505
enable training test. refactor globbing
2013-03-13 13:43:22 +04:00
marina.kolpakova
ac471fadd6
remove unused parameter from softcascade::Octave constructor
2013-03-02 13:06:29 +04:00
marina.kolpakova
1bf696f392
fixes for soft cascade training app
2013-03-02 09:24:13 +04:00
Andrey Kamaev
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
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
e2536f1c35
Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4
2013-02-04 11:54:43 +04:00
marina.kolpakova
cc538ddfa6
changes related with code review
2013-02-01 17:47:05 +04:00
LeonidBeynenson
87b0126e0d
Fixed dummy warning.
2013-02-01 16:16:43 +04:00
marina.kolpakova
f7ac73998a
code review fixes
2013-02-01 14:36:06 +04:00
marina.kolpakova
14ac8a528e
final refactoring and test for training
2013-02-01 14:36:06 +04:00
marina.kolpakova
fa15fcc53e
move feature pool to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
0b039f3c6b
refactor feature pool
2013-02-01 14:36:06 +04:00
marina.kolpakova
b4aa33b6d3
move ICF -> ChannelFeature
2013-02-01 14:36:06 +04:00
marina.kolpakova
a01f596474
update documentation for softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
7f80054dfd
move miscellaneous python scripts to softcascade module
2013-02-01 14:36:06 +04:00
marina.kolpakova
4ba8b53152
split public interface and realization for SoftCascadeOctave
2013-02-01 14:36:06 +04:00
marina.kolpakova
f3227c3f1a
merged ICFPreprocessor and Channels -> ChannelFeatureBuilder
2013-02-01 14:36:06 +04:00
marina.kolpakova
716a9ccb71
move training to softcascade module
...
rename Octave -> SoftCascadeOctave
2013-02-01 14:36:05 +04:00
marina.kolpakova
1b43b0e2df
move soft cascade functionality into dedicated module
2013-02-01 14:36:05 +04:00
marina.kolpakova
28098b6632
refactor python
2013-02-01 14:35:29 +04:00
marina.kolpakova
8cf30c728e
parse Caltech annotations
2013-02-01 14:35:29 +04:00
marina.kolpakova
1fc7134f21
add legend for ROC plot
2013-02-01 14:35:29 +04:00
marina.kolpakova
faecb4f01d
ROC script refactoring
2013-02-01 14:35:29 +04:00
marina.kolpakova
e9232a4b67
add parameter to control range and extended range for annotations
2013-02-01 14:35:29 +04:00
marina.kolpakova
decb137185
use long seeds only for 64 bit systems
2013-02-01 14:35:29 +04:00
marina.kolpakova
5f082b9876
improve ROC test script: handle ignored
2013-02-01 14:35:29 +04:00
marina.kolpakova
922de414ef
refactor python ROC script and add axis ticks
2013-02-01 14:35:29 +04:00
marina.kolpakova
990ca86de6
fix spelling
2013-02-01 14:35:28 +04:00
marina.kolpakova
11f3927c58
allow multiple detectors
2013-02-01 14:35:28 +04:00
marina.kolpakova
469eeea370
add ROC estimation
...
in the same way as Dallar's matlab toolbox does
2013-02-01 14:35:28 +04:00
marina.kolpakova
4c4c878b1b
add detection to ground truth matching
...
according to Piotr Dollar paper
2013-02-01 14:35:28 +04:00
marina.kolpakova
d1952f28d9
add cropping and aspect ratio normalization
2013-02-01 14:35:28 +04:00
marina.kolpakova
18df46fbe9
add plotting function (matplotlib required)
2013-02-01 14:35:28 +04:00
marina.kolpakova
4622aea86a
ROC test: add overlap calculation according to Pascal criteria
2013-02-01 14:35:28 +04:00
marina.kolpakova
ca08101f7e
caltech ROC test:
...
- parse idl
- replase option parser with argument parser
2013-02-01 14:35:28 +04:00
marina.kolpakova
8cd509e58e
Caltech-style ROC testing script
2013-02-01 14:35:28 +04:00
marina.kolpakova
b0905c67ba
minor
2013-02-01 14:35:28 +04:00
marina.kolpakova
737f5efbfb
filter samples
2013-02-01 14:35:28 +04:00
marina.kolpakova
8d9875cc7b
add script for negatives extraction
2013-02-01 14:35:28 +04:00
marina.kolpakova
c073138d6d
generalize extraction method for any scale
2013-02-01 14:35:28 +04:00
marina.kolpakova
7a713a4932
collect Caltech positives for 32x64 octave:
...
- resized
- cropped
- flipped around the x axis
2013-02-01 14:35:28 +04:00
marina.kolpakova
56edff90ba
drop deth code
2013-02-01 14:35:28 +04:00
marina.kolpakova
16aacf1780
use long seeds
2013-02-01 14:35:27 +04:00
marina.kolpakova
31687178d2
implement positive sample extraction
2013-02-01 14:35:27 +04:00
marina.kolpakova
92e50d952f
caltech parsing script
2013-02-01 14:35:27 +04:00
marina.kolpakova
e903ce10ce
fix wartings for 32bit build
2013-02-01 14:35:27 +04:00
marina.kolpakova
c0462358ca
fix warnings under win
2013-02-01 14:35:27 +04:00
marina.kolpakova
a28f5a89b3
move preprocessor to objdetect
2013-02-01 14:35:27 +04:00
marina.kolpakova
8672ae58e2
fix globbing under win
2013-02-01 14:34:40 +04:00
marina.kolpakova
e2de3b0b81
fix build inder mac
2013-02-01 14:34:40 +04:00
marina.kolpakova
dc12b4476a
suppress debug out for soft cascade Octave
2013-02-01 14:34:40 +04:00
marina.kolpakova
e35eebd4d4
fix android build
2013-02-01 14:34:40 +04:00
marina.kolpakova
e7bab669fa
replace cv::Mat to Input/Output arrays
2013-02-01 14:34:40 +04:00
marina.kolpakova
184ae44dea
refactoring
2013-02-01 14:34:40 +04:00
marina.kolpakova
dd8de0c41f
move soft cascade octave to ml module
2013-02-01 14:34:40 +04:00
marina.kolpakova
a0e93d0482
move image extraction logic from Octave to Dataset class
2013-02-01 14:34:40 +04:00
marina.kolpakova
a3600b94db
created abstract FeaturePool class
2013-02-01 14:34:40 +04:00
marina.kolpakova
19236b6e43
remove dead code
2013-02-01 14:34:39 +04:00
marina.kolpakova
bda6f39d48
move rescaling script location
2013-02-01 14:34:39 +04:00
marina.kolpakova
2610a45a27
add file storage release
2013-02-01 14:34:39 +04:00
marina.kolpakova
23d0e36167
fix floating point precision
2013-02-01 14:34:39 +04:00
marina.kolpakova
ef4b18f341
script for scaling inria dataset for multiple-octaves training
2013-02-01 14:34:39 +04:00
marina.kolpakova
4356d34542
write features to soft cascade xml
2013-02-01 14:34:39 +04:00
marina.kolpakova
1f01052955
fix inintial weighting
2013-02-01 14:34:39 +04:00
marina.kolpakova
a8d0e04912
amplement weidhting according to L. Bourdev and J. Brandt paper "Robust Object Detection Via Soft Cascade"
2013-02-01 14:34:39 +04:00
marina.kolpakova
c091092174
fix typo
2013-02-01 14:34:39 +04:00
marina.kolpakova
c0f68ec400
add xml serialization
2013-02-01 14:34:39 +04:00
marina.kolpakova
69304611db
commented debug out
2013-02-01 14:34:39 +04:00
marina.kolpakova
2e4b8d07cc
integrate pruning
2013-02-01 14:34:39 +04:00
marina.kolpakova
a89299acb2
store result to xml.
2013-02-01 14:34:39 +04:00
marina.kolpakova
bfa26fd447
refactoring
2013-02-01 14:34:39 +04:00
marina.kolpakova
883d691c2b
fix feature computing
2013-02-01 14:34:39 +04:00
marina.kolpakova
30b2a94582
load from config xml and fix integral representation
2013-02-01 14:34:39 +04:00
marina.kolpakova
a2382ce6a2
add ability to store/load training configuration
2013-02-01 14:34:39 +04:00
marina.kolpakova
a8c3431e61
set parameters
2013-02-01 14:34:39 +04:00
marina.kolpakova
f6e3e3f049
add negatives generation
2013-02-01 14:34:39 +04:00
marina.kolpakova
a388884675
Positives preprocessing
2013-02-01 14:34:38 +04:00
marina.kolpakova
4ca760d9c9
debug output information.
2013-02-01 14:34:38 +04:00
marina.kolpakova
554080d89b
add file globbing
2013-02-01 14:34:38 +04:00
marina.kolpakova
86973f8ede
feature pool generation:
...
- use random from tr1 extension
- extend cv::Boost
2013-02-01 14:34:38 +04:00
marina.kolpakova
948365b1c8
Add new app dedicated for training soft cascades.
2013-02-01 14:34:38 +04:00
LeonidBeynenson
6de422701a
Made changes to allow ml module to work with big data.
2013-01-31 19:37:20 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
daead680cd
Add option to control build of applications (feature #2568 )
2013-01-29 16:38:59 +04:00
marina.kolpakova
cd301e530f
minor in train application
2012-11-07 03:19:04 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Maria Dimashova
69296c3333
fixed #2165
2012-07-12 12:32:54 +00:00
Maria Dimashova
249bf008ab
fixed #1834
2012-07-02 14:50:28 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
f341ce2665
fixed "Invalid background description file" bug, #1676
2012-03-26 09:48:43 +00:00
Marina Kolpakova
d4fb50277e
fixed bug #1479
2012-03-20 09:02:01 +00:00
Vadim Pisarevsky
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Andrey Kamaev
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
2012-03-03 15:49:23 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
