Vadim Pisarevsky
9c0a5523e4
Merge pull request #5757 from alalek:merge-2.4
2015-12-08 11:51:29 +00:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d99
8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
PR #3236 : 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792 : afdf319
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.
PR #3893 : 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490 : ec5244a
fixed memory leak in findHomography tests
PR #5491 : 0d5b739
delete video readers
PR #5574
PR #5202
2015-12-08 10:24:54 +03:00
Teng Cao
efacf7b6de
Update haarfeatures.cpp
2015-12-07 19:51:30 +08:00
Teng Cao
8a36402ec0
Update haarfeatures.cpp
2015-12-07 19:01:04 +08:00
Teng Cao
d68c392b42
calculate innTilted only for Haar::ALL mode
...
major time consuming part for training app is in function fillPassedSamples for negatives,
this change make SetImage quicker, in a test of my own data, the total time for SetImage decrease from 9177666 to 5839263,
only help for Haar feature and non Haar::ALL mode which is the most commonly case
2015-12-07 18:50:54 +08:00
teng88
8562bb7092
Update cascadeclassifier.cpp
...
minor fix since predict() returun int
2015-12-02 11:50:22 +08:00
Maksim Shabunin
f49936a849
Fixed cmake and build issues when using Visual Studio 2015
2015-10-29 11:50:48 +03:00
StevenPuttemans
d0344cd308
add checks for valid input data given to parameters
...
make the software system dependent
add LICENSE on top
2015-08-06 10:24:33 +02:00
StevenPuttemans
ba7bf1ef68
add checks on input parameters for valid path and folder
...
opening a folder is system specific - made system specific code
added license
2015-08-06 10:23:41 +02:00
zenev
5cb70d34d7
fixed vector out of range exception in nextImg
2015-05-18 13:29:15 -07:00
Vadim Pisarevsky
5b3f89df0a
Merge pull request #3911 from vpisarev:core_tweaks
2015-04-07 19:03:48 +00:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
Vadim Pisarevsky
052593c760
1. Input/OutputArray optimizations;
...
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
2015-04-07 16:44:26 +03:00
Vadim Pisarevsky
bd2be9c79c
Merge pull request #3890 from greensea:patch-1
2015-04-07 09:33:36 +00:00
Vadim Pisarevsky
a153948a19
Merge pull request #3898 from greensea:2.4
2015-04-07 09:31:36 +00:00
greensea
7274e2ff1a
Fix a segment fault issue in cascade classfier
2015-04-07 10:38:58 +08:00
greensea
52c727f09a
Fix a segment fault issue in cascade classfier
...
work_var_count and sample_count are both 32bit integer, if the product of work_var_count and sample_count is bigger than 2^31, the compiler will treat (work_var_count*sample_count) as a negative number. Force work_var_count as an unsigned 64bit integer to avoid this issue.
2015-04-07 10:31:12 +08:00
Vadim Pisarevsky
be9c6bdd67
Merge pull request #3901 from StevenPuttemans:add_breakrule_cascade_accuracy
2015-04-03 13:24:47 +00:00
StevenPuttemans
796c15d3e6
fixing wrong equation in accuracy break rule
2015-04-03 12:54:05 +02:00
StevenPuttemans
e30139edc3
add the possibility to add traincascade accuracy
2015-04-03 12:47:09 +02:00
Vadim Pisarevsky
240b52151d
Merge pull request #3798 from StevenPuttemans:add_breakrule_cascade_accuracy
2015-04-03 10:19:03 +00:00
StevenPuttemans
7e35f76d06
allowing people to manually define how sharp a cascade classifier model should be trained
2015-04-03 10:02:13 +02:00
Vadim Pisarevsky
ba0a8dc723
Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives
2015-04-01 13:56:29 +00:00
Vadim Pisarevsky
7ea0239776
Merge pull request #3835 from StevenPuttemans:upgrade_traincascade_memory_master
2015-03-24 15:19:56 +00:00
Vadim Pisarevsky
e12a04ac7e
Merge pull request #3811 from StevenPuttemans:fix_traincascade_getNegatives_master
2015-03-17 11:22:10 +00:00
StevenPuttemans
d0ad599a24
update traincascade assigned memory buffers
2015-03-17 09:00:41 +01:00
Vadim Pisarevsky
4ab525c880
Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory
2015-03-16 10:02:07 +00:00
Vadim Pisarevsky
2594e5e384
Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation
2015-03-12 14:29:04 +00:00
StevenPuttemans
bf16f74618
fixing universal location execution
2015-03-09 13:11:29 +01:00
StevenPuttemans
9f0cd9ee10
upgrade traincascade default memory
2015-03-09 10:43:14 +01:00
StevenPuttemans
3419c704a9
adding usage information
2015-03-06 13:52:52 +01:00
StevenPuttemans
a58bfbf3c7
info on how to use the tool
2015-03-06 13:52:02 +01:00
StevenPuttemans
cdbb661eab
update cmakelists of annotation tool
2015-03-06 12:51:28 +01:00
StevenPuttemans
217f628915
update cmakelists for annotation tool
2015-03-05 14:46:52 +01:00
StevenPuttemans
488babf3b3
fixing undesired behaviour
2015-03-04 12:03:33 +01:00
Vadim Pisarevsky
62b8895814
Merge pull request #3654 from StevenPuttemans:add_annotation_master
2015-03-03 12:53:07 +00:00
StevenPuttemans
0833352660
add annotation tool master branch
2015-02-25 11:31:50 +01:00
StevenPuttemans
387a0f26fb
fix annotation tool, add auto make of tool
2015-02-25 11:27:59 +01:00
Vadim Pisarevsky
2d2ecbf3ee
Merge pull request #3653 from StevenPuttemans:add_annotationtool
2015-02-24 13:50:39 +00:00
Vadim Pisarevsky
90fb43cd11
Merge pull request #3709 from StevenPuttemans:fix_traincascade_load_message_master
2015-02-24 12:50:38 +00:00
StevenPuttemans
2738939126
add same functionality as 2.4
2015-02-17 10:25:18 +01:00
StevenPuttemans
f5a14e5594
fix message of preloaded parameters
2015-02-17 10:21:31 +01:00
Maksim Shabunin
da383e65e2
Remove deprecated methods from cv::Algorithm
2015-02-16 15:28:54 +03:00
Maksim Shabunin
a5a510da4b
Support for compound modules, support for contrib_world
2015-02-10 18:30:05 +03:00
VBystricky
f5987c258f
Fix small error in traincascade application
2015-02-03 21:32:47 +04:00
StevenPuttemans
30d46313ec
adding a universal OpenCV based annotation tool for cascade classifier training
2015-01-29 13:03:28 +01:00
vbystricky
c48f30d4ec
Move createsamples application from 2.4 version
2014-12-10 12:17:58 +04:00
Alexander Smorkalov
6bb6039ebb
Fixes for QNX 6.6 Neitrino support.
2014-10-23 17:17:35 +04:00
Stephen Mell
5947519ff4
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
2014-09-18 16:54:22 +04:00
Grigory Serebryakov
18c0511d3c
Warning on converting int to bool fixed
2014-09-05 11:27:43 +04:00