Commit Graph

347 Commits

Author SHA1 Message Date
Evgeny Talanin
50c2f87add Fix and test for #2607 2013-01-31 12:23:08 +04:00
marina.kolpakova
5b03d47fb8 fix broken links in cascade classification documentation 2013-01-30 19:28:16 +04:00
marina.kolpakova
cb329400df fix tests 2013-01-30 15:55:04 +04:00
marina.kolpakova
8d9c9c2690 integrate new cascade format to GPU soft cascade implementation 2013-01-30 15:55:04 +04:00
Andrey Kamaev
78a338159d Merge branch '2.4' 2013-01-29 14:17:13 +04:00
Andy Maloney
5bd56e7464 Fix mem leak and mismatched new/delete 2013-01-28 17:57:19 -05:00
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Siegfried Hochdorfer
195d501b43 fixed broken indentation 2013-01-24 11:40:35 +01:00
marina.kolpakova
e15bdea663 fix test for new cascade 2013-01-18 17:14:11 +04:00
marina.kolpakova
53433884ee fix python wrapping 2013-01-18 15:58:48 +04:00
marina.kolpakova
f9649a029b fix typo 2013-01-18 15:58:47 +04:00
marina.kolpakova
0a40bbd0d0 add two types of feature boxes support:
- (left, top, width, height)
 - (left, top, right, bottom)
2013-01-18 15:58:47 +04:00
marina.kolpakova
913faf2ef4 fix test for a new test data 2013-01-18 15:58:47 +04:00
marina.kolpakova
9efd668a57 a bit refactored soft cascade 2013-01-18 15:58:47 +04:00
marina.kolpakova
f1b4b13e64 perf test 2013-01-18 15:58:47 +04:00
marina.kolpakova
0c6c78d149 integrate 128x256 scale; remove log 2013-01-18 15:58:47 +04:00
marina.kolpakova
e09694bde8 integrated 128x256 scale 2013-01-18 15:58:47 +04:00
marina.kolpakova
3e7965a5a5 first debug integration of newly trained cascade 2013-01-18 15:58:46 +04:00
Siegfried Hochdorfer
82a9f9a5a9 MeanshiftGrouping Bugfix (Bug #2685) 2013-01-17 11:46:24 +01:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Andrey Kamaev
399c20a928 Merge pull request #272 from 5kg:fix_haar 2013-01-09 16:53:11 +04:00
marina.kolpakova
e53d57664d fix precompiled headers usage in gpu module 2012-12-30 16:58:41 +04:00
Zifei Tong
260bdc057c Changed parallel_for to parallel_for_ in haar.cpp 2012-12-28 22:56:47 +08:00
Zifei Tong
e331787645 Fix race condition for Cascade Classifier when TBB enabled. 2012-12-28 20:51:02 +08:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Andrey Kamaev
ca7abe1239 Reduce number of performance tests for LBP cascade 2012-12-20 12:25:59 +04:00
marina.kolpakova
2d45af790e fix according to pull requests comments 2012-12-12 05:07:39 +04:00
marina.kolpakova
88c71d1b7d add NMS according to Dollar's paper. 2012-12-12 04:31:44 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Maria Dimashova
97e36b9375 fix a compile error in case of building without highgui 2012-11-24 18:10:29 +04:00
marina.kolpakova
6ccd7aca4c fix tests for arm 2012-11-22 13:26:13 +04:00
marina.kolpakova
be40bd5c74 Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu' 2012-11-13 23:37:44 +04:00
marina.kolpakova
1edab12068 fix for negative confidence 2012-11-13 23:08:19 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
marina.kolpakova
bd9ca48fab export to python/java 2012-11-13 02:49:35 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
marina.kolpakova
665bf430d5 fix warnings under win 2012-11-09 00:07:32 +04:00
marina.kolpakova
8a3e897999 min and max params become double 2012-11-08 02:34:49 +04:00
marina.kolpakova
e379771c03 git warning 2012-11-08 02:34:49 +04:00
marina.kolpakova
f93cffaa0d fix compilation under win 2012-11-08 02:34:49 +04:00
marina.kolpakova
1022094dc0 fix levels computing 2012-11-08 02:34:49 +04:00
marina.kolpakova
f1e36043e6 clean code 2012-11-08 02:34:49 +04:00
marina.kolpakova
4656872161 fixed typo 2012-11-08 02:34:49 +04:00
marina.kolpakova
5fb9f48360 fix angle scaling 2012-11-08 02:34:49 +04:00
marina.kolpakova
31a073ca66 documentation 2012-11-08 02:34:49 +04:00
marina.kolpakova
4207552e19 add object init 2012-11-08 02:34:49 +04:00
marina.kolpakova
157ab66ab9 add ROI support 2012-11-08 02:34:49 +04:00
marina.kolpakova
6a3a723938 refactor integral channels 2012-11-08 02:34:48 +04:00
marina.kolpakova
65543c53f6 update test according to resize usage 2012-11-08 02:34:48 +04:00
marina.kolpakova
4a1c4a9862 soft cascade become Algorithm 2012-11-08 02:34:48 +04:00
marina.kolpakova
ff8417db00 remove input frame size constraints 2012-11-07 03:19:07 +04:00
marina.kolpakova
3cb9afb4e7 test update because changed Sobel Normalization 2012-11-07 03:19:07 +04:00
marina.kolpakova
a84334cfc2 brief soft cascade interface description 2012-11-07 03:19:07 +04:00
marina.kolpakova
2e8ed77383 get rid of hard-coded values 2012-11-07 03:19:07 +04:00
marina.kolpakova
16dd09ccfc move scale related parameters to SoftCascade constructor 2012-11-07 03:19:07 +04:00
marina.kolpakova
017d970b9a load SoftCascade from FileStorage 2012-11-07 03:19:06 +04:00
marina.kolpakova
a22ee13620 rename markDetection to addDetection 2012-11-07 03:19:06 +04:00
marina.kolpakova
40c0c60e2b remove unused struct 2012-11-07 03:19:06 +04:00
marina.kolpakova
7b6da394f0 rename Stage to Weak because there is no such term for Soft Cascades 2012-11-07 03:19:06 +04:00
marina.kolpakova
2d0fc80c95 use IntegralChannels class 2012-11-07 03:19:06 +04:00
marina.kolpakova
3d41846c39 move frame processing into separate class 2012-11-07 03:19:06 +04:00
marina.kolpakova
5651743784 remove debug imshow from code 2012-11-07 03:19:06 +04:00
marina.kolpakova
8e092f8b5d add Detection struct to interface 2012-11-07 03:19:06 +04:00
marina.kolpakova
754fd7311b improve pointer usage 2012-11-07 03:19:06 +04:00
marina.kolpakova
2914f24521 improve cpu version of SoftCascade:
- remove division
 - remove cvRound
 - cache feature area
2012-11-07 03:19:06 +04:00
marina.kolpakova
2d2c46e717 add const qualifier to detectMultiScale method 2012-11-07 03:19:06 +04:00
marina.kolpakova
9771c3c7ec remove Mat copying 2012-11-07 03:19:05 +04:00
marina.kolpakova
0ff8a4633d remove pow calculations 2012-11-07 03:19:05 +04:00
marina.kolpakova
cc300a69b1 add perfomance test for CPU soft cascade 2012-11-07 03:19:05 +04:00
marina.kolpakova
26af7d7389 refactor logs 2012-11-07 03:19:05 +04:00
marina.kolpakova
b6081438fa clean code 2012-11-07 03:19:05 +04:00
marina.kolpakova
296aa8854c fix hog channels 2012-11-07 03:19:05 +04:00
marina.kolpakova
efd2615844 fix floating point bug 2012-11-07 03:19:05 +04:00
marina.kolpakova
765dea9ddf fix bugs in the soft cascade detect method; add options for debug logging
- WITH_DEBUG_OUT for logging cascade scales
- DEBUG_STORE_IMAGES for xml matrix serialization
- DEBUG_SHOW_RESULT to see detection result
2012-11-07 03:19:05 +04:00
marina.kolpakova
ba27d89173 add feature rescaling according to Dollal's paper FPDW 2012-11-07 03:19:05 +04:00
marina.kolpakova
8d90b973b0 add detectAt to soft cascade 2012-11-07 03:19:05 +04:00
marina.kolpakova
801368ee82 refactoring 2012-11-07 03:19:05 +04:00
marina.kolpakova
6f53be4102 shrinking before integral calculation 2012-11-07 03:19:04 +04:00
marina.kolpakova
dc74ce20ab OpenCV friendly xml format for soft cascade 2012-11-07 03:19:04 +04:00
marina.kolpakova
c04725b681 add apply cascade method 2012-11-07 03:19:04 +04:00
marina.kolpakova
695827050f Integral images for ICF 2012-11-07 03:19:04 +04:00
marina.kolpakova
b0b85f36f6 add test for soft cascade detect method 2012-11-07 03:19:04 +04:00
marina.kolpakova
f01c5d9033 compute scales pyramid 2012-11-07 03:19:04 +04:00
marina.kolpakova
a54d456ad0 parse soft cascade from xml 2012-11-07 03:19:04 +04:00
marina.kolpakova
fe2c38be80 add method to fill soft cascade 2012-11-07 03:19:04 +04:00
marina.kolpakova
7290d8576d add ICF feature 2012-11-07 03:19:04 +04:00
marina.kolpakova
fb113e5ce4 scale pyramid calculations 2012-11-07 03:19:04 +04:00
marina.kolpakova
9966d7feba add structures for cascade representation 2012-11-07 03:19:04 +04:00
marina.kolpakova
108fd169f7 dummy soft cascade 2012-11-07 03:19:03 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Andrey Kamaev
63ee26adda Merge pull request #127 from cuda-geek/apple2clang 2012-11-02 14:29:39 +04:00
marina.kolpakova
7a5b9a6b7f replase __APPLE__ marco with __clang__ 2012-11-01 19:34:05 +04:00
Andrey Kamaev
e3be5f138a Fixed sanity checks in several performance tests 2012-11-01 16:29:30 +04:00
Andrey Kamaev
3e10e057cb Merge pull request #110 from vpisarev/test_fixes2 2012-10-31 16:52:50 +04:00
Vadim Pisarevsky
63bd6f9adf fixed compile errors in ocl tests; disabled a few problematic tests 2012-10-29 23:37:18 +04:00
Andrey Kamaev
2b0072d823 Suppress more warnings in gtest on OS X 2012-10-24 20:36:30 +04:00
Andrey Kamaev
673aa91bac Fix remaining windows build warnings 2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6 Merge 2.4.3-rc 2012-10-24 19:56:27 +04:00
Andrey Kamaev
8dbde3297e Merge branch '2.4' 2012-10-23 20:32:19 +04:00
Andrey Kamaev
9751014067 Fix warnings from MSVC 10 64-bit 2012-10-23 18:20:07 +04:00